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

diff --git a/server/user.jobengine.osgi.commons/src/user/commons/nexio/NexioDataMiner.java b/server/user.jobengine.osgi.commons/src/user/commons/nexio/NexioDataMiner.java
index 2e175ae91d09cfeccb059ef5fd448a3a22f209d0..1ce8b91a9835a86e9d433bd817513d6df8221097 100644 (file)
--- a/server/user.jobengine.osgi.commons/src/user/commons/nexio/NexioDataMiner.java
+++ b/server/user.jobengine.osgi.commons/src/user/commons/nexio/NexioDataMiner.java
@@ -173,7 +173,6 @@ public class NexioDataMiner implements Runnable, INexioChangeListener {
 \r
        @Override\r
        public void refreshClients() throws Exception {\r
-               // TODO Auto-generated method stub\r
 \r
        }\r
 \r
@@ -223,7 +222,8 @@ public class NexioDataMiner implements Runnable, INexioChangeListener {
                if (bundle != null) {\r
                        BundleContext bundleContext = bundle.getBundleContext();\r
                        if (bundleContext != null) {\r
-                               ServiceReference<INexioChangeListener> reference = bundleContext.getServiceReference(INexioChangeListener.class);\r
+                               ServiceReference<INexioChangeListener> reference = bundleContext\r
+                                               .getServiceReference(INexioChangeListener.class);\r
                                if (reference != null) {\r
                                        INexioChangeListener service = bundleContext.getService(reference);\r
                                        setNexioChangeListener(service);\r
@@ -301,10 +301,10 @@ public class NexioDataMiner implements Runnable, INexioChangeListener {
 \r
                                        Timestamp record = rs.getTimestamp(RECORDTIMESTAMP);\r
                                        clip.put(RECORDDATE, record);\r
-                                       //NEXIO GW modified date nem jo a regi klippeknel\r
+                                       // NEXIO GW modified date nem jo a regi klippeknel\r
                                        Timestamp modified = rs.getTimestamp(MODIFIEDTIMESTAMP);\r
 \r
-                                       //neha elrontja, es ez is null\r
+                                       // neha elrontja, es ez is null\r
                                        if (modified != null && modified.before(record))\r
                                                clip.put(MODIFIEDTIMESTAMP, record);\r
                                        else\r

diff --git a/server/user.jobengine.osgi.commons/src/user/commons/remotestore/SambaDirectoryLister.java b/server/user.jobengine.osgi.commons/src/user/commons/remotestore/SambaDirectoryLister.java
index 649fe77819c8ed5a6bce55176985d36ea8e156c9..881c96d0de476a52508705aba0d187fbcac609c7 100644 (file)
--- a/server/user.jobengine.osgi.commons/src/user/commons/remotestore/SambaDirectoryLister.java
+++ b/server/user.jobengine.osgi.commons/src/user/commons/remotestore/SambaDirectoryLister.java
@@ -23,7 +23,8 @@ public class SambaDirectoryLister implements IDirectoryLister {
        @Override\r
        public boolean checkAvailability(RemoteFile remoteFile) throws Exception {\r
                boolean result = false;\r
-               NtlmPasswordAuthentication auth = new NtlmPasswordAuthentication(null, storeUri.getUserName(), storeUri.getPassword());\r
+               NtlmPasswordAuthentication auth = new NtlmPasswordAuthentication(null, storeUri.getUserName(),\r
+                               storeUri.getPassword());\r
                long size = remoteFile.getSize();\r
                String path = storeUri.toString(true) + remoteFile.getName();\r
                SmbFile smbFile = new SmbFile(path, auth);\r
@@ -50,20 +51,19 @@ public class SambaDirectoryLister implements IDirectoryLister {
 \r
        @Override\r
        public void ensureOutputDirectory() {\r
-               // TODO Auto-generated method stub\r
 \r
        }\r
 \r
        @Override\r
        public boolean exists(String fileName) throws Exception {\r
-               // TODO Auto-generated method stub\r
                return false;\r
        }\r
 \r
        @Override\r
        public RemoteFile get(String fileName) throws Exception {\r
                RemoteFile result = null;\r
-               NtlmPasswordAuthentication auth = new NtlmPasswordAuthentication(null, storeUri.getUserName(), storeUri.getPassword());\r
+               NtlmPasswordAuthentication auth = new NtlmPasswordAuthentication(null, storeUri.getUserName(),\r
+                               storeUri.getPassword());\r
                String path = storeUri.toString(true) + fileName;\r
                SmbFile smbFile = new SmbFile(path, auth);\r
                if (smbFile != null)\r
@@ -73,13 +73,13 @@ public class SambaDirectoryLister implements IDirectoryLister {
 \r
        @Override\r
        public RemoteFile getFileWithContent(String name) throws Exception {\r
-               // TODO Auto-generated method stub\r
                return null;\r
        }\r
 \r
        @Override\r
        public InputStream getInputStream(RemoteFile remoteFile) throws Exception {\r
-               NtlmPasswordAuthentication auth = new NtlmPasswordAuthentication(null, storeUri.getUserName(), storeUri.getPassword());\r
+               NtlmPasswordAuthentication auth = new NtlmPasswordAuthentication(null, storeUri.getUserName(),\r
+                               storeUri.getPassword());\r
                String path = storeUri.toString(true) + remoteFile.getName();\r
                SmbFile smbFile = new SmbFile(path, auth);\r
                return smbFile.getInputStream();\r
@@ -87,7 +87,8 @@ public class SambaDirectoryLister implements IDirectoryLister {
 \r
        @Override\r
        public OutputStream getOutputStream(RemoteFile remoteFile) throws Exception {\r
-               NtlmPasswordAuthentication auth = new NtlmPasswordAuthentication(null, storeUri.getUserName(), storeUri.getPassword());\r
+               NtlmPasswordAuthentication auth = new NtlmPasswordAuthentication(null, storeUri.getUserName(),\r
+                               storeUri.getPassword());\r
                String path = storeUri.toString(true) + remoteFile.getName();\r
                SmbFile smbFile = new SmbFile(path, auth);\r
                return smbFile.getOutputStream();\r
@@ -96,7 +97,8 @@ public class SambaDirectoryLister implements IDirectoryLister {
        @Override\r
        public List<RemoteFile> list() throws Exception {\r
                List<RemoteFile> result = new ArrayList<RemoteFile>();\r
-               NtlmPasswordAuthentication auth = new NtlmPasswordAuthentication(null, storeUri.getUserName(), storeUri.getPassword());\r
+               NtlmPasswordAuthentication auth = new NtlmPasswordAuthentication(null, storeUri.getUserName(),\r
+                               storeUri.getPassword());\r
                String path = "smb:" + storeUri.toString(true).replace("\\", "/");\r
                SmbFile smbFile = new SmbFile(path, auth);\r
                SmbFile[] list = smbFile.listFiles();\r
@@ -109,7 +111,8 @@ public class SambaDirectoryLister implements IDirectoryLister {
 \r
        @Override\r
        public void list(IRemoteFileListCallback callback) throws Exception {\r
-               NtlmPasswordAuthentication auth = new NtlmPasswordAuthentication(null, storeUri.getUserName(), storeUri.getPassword());\r
+               NtlmPasswordAuthentication auth = new NtlmPasswordAuthentication(null, storeUri.getUserName(),\r
+                               storeUri.getPassword());\r
                String path = "smb:" + storeUri.toString(true).replace("\\", "/");\r
                SmbFile smbFile = new SmbFile(path, auth);\r
                SmbFile[] list = smbFile.listFiles();\r
@@ -125,7 +128,8 @@ public class SambaDirectoryLister implements IDirectoryLister {
        @Override\r
        public List<RemoteFile> list(String wildCard) throws Exception {\r
                List<RemoteFile> result = new ArrayList<RemoteFile>();\r
-               NtlmPasswordAuthentication auth = new NtlmPasswordAuthentication(null, storeUri.getUserName(), storeUri.getPassword());\r
+               NtlmPasswordAuthentication auth = new NtlmPasswordAuthentication(null, storeUri.getUserName(),\r
+                               storeUri.getPassword());\r
                String path = "smb:" + storeUri.toString(true).replace("\\", "/");\r
                SmbFile smbFile = new SmbFile(path, auth);\r
                SmbFile[] list = smbFile.listFiles(wildCard);\r
@@ -138,7 +142,8 @@ public class SambaDirectoryLister implements IDirectoryLister {
 \r
        @Override\r
        public void list(String wildCard, IRemoteFileListCallback callback) throws Exception {\r
-               NtlmPasswordAuthentication auth = new NtlmPasswordAuthentication(null, storeUri.getUserName(), storeUri.getPassword());\r
+               NtlmPasswordAuthentication auth = new NtlmPasswordAuthentication(null, storeUri.getUserName(),\r
+                               storeUri.getPassword());\r
                String path = "smb:" + storeUri.toString(true).replace("\\", "/");\r
                SmbFile smbFile = new SmbFile(path, auth);\r
                SmbFile[] list = smbFile.listFiles(wildCard);\r

diff --git a/server/user.jobengine.osgi.commons/src/user/commons/remotestore/TSMLister.java b/server/user.jobengine.osgi.commons/src/user/commons/remotestore/TSMLister.java
index 364592e6d29276aaa7ad8c566cd580f3c36c706e..f11ad5c5e4b8c69bcd09709f8229861cc4325431 100644 (file)
--- a/server/user.jobengine.osgi.commons/src/user/commons/remotestore/TSMLister.java
+++ b/server/user.jobengine.osgi.commons/src/user/commons/remotestore/TSMLister.java
@@ -33,7 +33,6 @@ public class TSMLister implements IDirectoryLister {
 \r
        @Override\r
        public boolean checkAvailability(RemoteFile remoteFile) throws Exception {\r
-               // TODO Auto-generated method stub\r
                return false;\r
        }\r
 \r
@@ -49,7 +48,7 @@ public class TSMLister implements IDirectoryLister {
                if (client != null)\r
                        return;\r
                client = new TSMBufferedClient(NODENAME);\r
-               //client.connect(storeUri.getUserName(), storeUri.getPassword(), "\\");\r
+               // client.connect(storeUri.getUserName(), storeUri.getPassword(), "\\");\r
                client.connect(storeUri.getUserName(), storeUri.getPassword());\r
                logger.info("TSMBufferedClient connected, parameters: {} {}/{} {}, separator: {}", NODENAME, FSNAME,\r
                                ALTERNATE_FSNAME, HLNAME, File.separator);\r
@@ -57,19 +56,16 @@ public class TSMLister implements IDirectoryLister {
 \r
        @Override\r
        public void delete(RemoteFile remoteFile) {\r
-               // TODO Auto-generated method stub\r
 \r
        }\r
 \r
        @Override\r
        public void ensureOutputDirectory() throws Exception {\r
-               // TODO Auto-generated method stub\r
 \r
        }\r
 \r
        @Override\r
        public boolean exists(String fileName) throws Exception {\r
-               // TODO Auto-generated method stub\r
                return false;\r
        }\r
 \r
@@ -83,23 +79,25 @@ public class TSMLister implements IDirectoryLister {
                TSMBackupFileObject backupFileObject = client.getActiveBackupFileObject(FSNAME, HLNAME,\r
                                DELIMITER + currentFileName);\r
 \r
-               //probaljuk meg a masik tarbol\r
+               // probaljuk meg a masik tarbol\r
                if (backupFileObject == null) {\r
                        logger.info("Getting {}, {}, {}", ALTERNATE_FSNAME, HLNAME, DELIMITER + currentFileName);\r
                        backupFileObject = client.getActiveBackupFileObject(ALTERNATE_FSNAME, HLNAME, DELIMITER + currentFileName);\r
                }\r
 \r
-               //probaljuk meg kiterjesztes nelkul is\r
-               //              if (backupFileObject == null && currentFileName.contains(".")) {\r
-               //                      currentFileName = fileName.substring(0, fileName.lastIndexOf("."));\r
-               //                      logger.info("Getting {}, {}, {}", FSNAME, HLNAME, currentFileName);\r
-               //                      backupFileObject = client.getActiveBackupFileObject(FSNAME, HLNAME, LLNAMEQUALIFIER + currentFileName);\r
+               // probaljuk meg kiterjesztes nelkul is\r
+               // if (backupFileObject == null && currentFileName.contains(".")) {\r
+               // currentFileName = fileName.substring(0, fileName.lastIndexOf("."));\r
+               // logger.info("Getting {}, {}, {}", FSNAME, HLNAME, currentFileName);\r
+               // backupFileObject = client.getActiveBackupFileObject(FSNAME, HLNAME,\r
+               // LLNAMEQUALIFIER + currentFileName);\r
                //\r
-               //                      if (backupFileObject == null) {\r
-               //                              logger.info("Getting {}, {}, {}", ALTERNATE_FSNAME, HLNAME, currentFileName);\r
-               //                              backupFileObject = client.getActiveBackupFileObject(ALTERNATE_FSNAME, HLNAME, LLNAMEQUALIFIER + currentFileName);\r
-               //                      }\r
-               //              }\r
+               // if (backupFileObject == null) {\r
+               // logger.info("Getting {}, {}, {}", ALTERNATE_FSNAME, HLNAME, currentFileName);\r
+               // backupFileObject = client.getActiveBackupFileObject(ALTERNATE_FSNAME, HLNAME,\r
+               // LLNAMEQUALIFIER + currentFileName);\r
+               // }\r
+               // }\r
 \r
                if (backupFileObject != null) {\r
                        result = toRemoteFile(backupFileObject);\r
@@ -113,7 +111,6 @@ public class TSMLister implements IDirectoryLister {
 \r
        @Override\r
        public RemoteFile getFileWithContent(String name) throws Exception {\r
-               // TODO Auto-generated method stub\r
                return null;\r
        }\r
 \r
@@ -154,13 +151,11 @@ public class TSMLister implements IDirectoryLister {
 \r
        @Override\r
        public List<RemoteFile> list(String wildCard) throws Exception {\r
-               // TODO Auto-generated method stub\r
                return null;\r
        }\r
 \r
        @Override\r
        public void list(String wildCard, IRemoteFileListCallback callback) throws Exception {\r
-               // TODO Auto-generated method stub\r
 \r
        }\r
 \r

diff --git a/server/user.jobengine.osgi.db/src/user/jobengine/search/LuceneMediaFinder.java b/server/user.jobengine.osgi.db/src/user/jobengine/search/LuceneMediaFinder.java
index 9c8966c6ec8c8a445d73e7b2ff6d4309ec9f611f..b597878d2861568a6d6872db43e139212ae14174 100644 (file)
--- a/server/user.jobengine.osgi.db/src/user/jobengine/search/LuceneMediaFinder.java
+++ b/server/user.jobengine.osgi.db/src/user/jobengine/search/LuceneMediaFinder.java
@@ -14,8 +14,7 @@ public class LuceneMediaFinder implements IMediaFinder {
        @Override\r
        public SearchResult<ArchivedMedia> search(SearchOptions options) {\r
                SearchResult<ArchivedMedia> ret = new SearchResult<ArchivedMedia>();\r
-               // TODO Auto-generated method stub\r
-               //              ResteasyClient client = new ResteasyClientBuilder().build();\r
+               // ResteasyClient client = new ResteasyClientBuilder().build();\r
                // if (criteria == "" || criteria == null)\r
                // apiPath = apiPath + "*:*/";\r
                // else\r
@@ -24,8 +23,8 @@ public class LuceneMediaFinder implements IMediaFinder {
                // apiPath = apiPath + fromResult + "/" + (toResult - fromResult) + "/"\r
                // + (orderAscending == true ? "1" : "0") + "/1";\r
 \r
-               //              webTarget = client.target(apiAddress);\r
-               //              WebTarget target = webTarget.path(apiPath);\r
+               // webTarget = client.target(apiAddress);\r
+               // WebTarget target = webTarget.path(apiPath);\r
                // Response response = target.request().get(IndexerDescription.class);\r
                // Response response = target.get(new\r
                // GenericType<List<IndexerDescription>>() {\r
@@ -36,8 +35,8 @@ public class LuceneMediaFinder implements IMediaFinder {
 \r
                // List<ArchivedMedia> archivedMedia = (List<ArchivedMedia>) response;\r
                // ret = (SearchResult<ArchivedMedia>) response;\r
-               //              ret = target.request().get(new GenericType<SearchResult<ArchivedMedia>>() {\r
-               //              });\r
+               // ret = target.request().get(new GenericType<SearchResult<ArchivedMedia>>() {\r
+               // });\r
 \r
                return ret;\r
        }\r