From: Vásáry Dániel Date: Fri, 29 Sep 2017 15:14:16 +0000 (+0000) Subject: git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube... X-Git-Url: http://git.useribm.hu/?a=commitdiff_plain;h=b1b061869d392e7c4583f7ddbb7af03fdfa4e5ef;p=mediacube.git git-tfs-id: [tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C30490 --- diff --git a/server/-modules/pom.xml b/server/-modules/pom.xml index fedf35ba..4599ca36 100644 --- a/server/-modules/pom.xml +++ b/server/-modules/pom.xml @@ -22,7 +22,7 @@ 1.0.0 UTF-8 - scp://root:password@10.10.1.26 + scp://root:password@10.10.1.28 ssh-ed25519 256 ea:ab:67:70:79:63:2f:6a:34:81:48:e2:b9:dd:ca:d4 diff --git a/server/user.jobengine.osgi.server/META-INF/MANIFEST.MF b/server/user.jobengine.osgi.server/META-INF/MANIFEST.MF index 659645ff..bb3fd83c 100644 --- 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/component.xml +Service-Component: OSGI-INF/*.xml Import-Package: javax.servlet;version="3.1.0", javax.servlet.http;version="3.1.0", org.apache.logging.log4j.core;version="2.8.2", @@ -15,7 +15,10 @@ Import-Package: javax.servlet;version="3.1.0", org.apache.logging.log4j.core.layout;version="2.8.2", org.apache.logging.log4j.core.net;version="2.8.2", org.apache.logging.log4j.core.util;version="2.8.2", + org.eclipse.core.runtime.adaptor, + org.eclipse.osgi.framework.console;version="1.1.0", org.osgi.framework;version="1.5.0", + org.osgi.framework.wiring;version="1.2.0", org.osgi.util.tracker;version="1.4.0", org.slf4j;version="1.6.3" Require-Bundle: user.jobengine.osgi.db;bundle-version="1.0.0", diff --git a/server/user.jobengine.osgi.server/OSGI-INF/ConsoleCommandProvider.xml b/server/user.jobengine.osgi.server/OSGI-INF/ConsoleCommandProvider.xml new file mode 100644 index 00000000..7a46c0c5 --- /dev/null +++ b/server/user.jobengine.osgi.server/OSGI-INF/ConsoleCommandProvider.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/server/user.jobengine.osgi.server/src/user/jobengine/osgi/server/ConsoleCommandProvider.java b/server/user.jobengine.osgi.server/src/user/jobengine/osgi/server/ConsoleCommandProvider.java new file mode 100644 index 00000000..34970877 --- /dev/null +++ b/server/user.jobengine.osgi.server/src/user/jobengine/osgi/server/ConsoleCommandProvider.java @@ -0,0 +1,63 @@ +package user.jobengine.osgi.server; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.eclipse.core.runtime.adaptor.EclipseStarter; +import org.eclipse.osgi.framework.console.CommandInterpreter; +import org.eclipse.osgi.framework.console.CommandProvider; +import org.osgi.framework.Bundle; +import org.osgi.framework.BundleContext; +import org.osgi.framework.FrameworkUtil; +import org.osgi.framework.wiring.BundleRevision; + +public class ConsoleCommandProvider implements CommandProvider { + private static final Logger logger = LogManager.getLogger(); + + @SuppressWarnings("restriction") + public Object _halt(CommandInterpreter intp) { + StringBuffer buffer = new StringBuffer(); + Thread shutdownThread = new Thread(() -> { + try { + Thread.sleep(1000); + BundleContext bundleContext = FrameworkUtil.getBundle(this.getClass()).getBundleContext(); + if (bundleContext != null) { + Bundle[] bundles = bundleContext.getBundles(); + for (Bundle b : bundles) { + if ((b.adapt(BundleRevision.class).getTypes() & BundleRevision.TYPE_FRAGMENT) != 0) + continue; + if ("org.eclipse.equinox.ds".equals(b.getSymbolicName())) + continue; + if ("user.jobengine.osgi.commons".equals(b.getSymbolicName())) + continue; + + logger.info("Stopping {} ", b.getSymbolicName()); + b.stop(); + } + } + EclipseStarter.shutdown(); + + System.exit(0); + } catch (Exception e) { + logger.error("Error:", e); + } + }); + buffer.append("Shutdown initiated"); + shutdownThread.start(); + return buffer.toString(); + } + + public void activate() { + logger.info("{} activated", getClass().getSimpleName()); + } + + public void deactivate() { + logger.info("{} deactivated", getClass().getSimpleName()); + } + + @Override + public String getHelp() { + StringBuffer buffer = new StringBuffer(); + buffer.append("halt - Halt server\n"); + return buffer.toString(); + } +} \ No newline at end of file diff --git a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/SearchModel.java b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/SearchModel.java index 3e9629ba..cf789dd2 100644 --- a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/SearchModel.java +++ b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/SearchModel.java @@ -37,69 +37,25 @@ public class SearchModel extends BaseModel { searchResult = new CachedListModel(searchValue); } catch (Exception exc) { // Error during search dialog - Messagebox.show(Labels.getLabel("error.search"), Labels.getLabel("dialogger.warning"), Messagebox.OK, - Messagebox.ERROR, defaultOKEventListener); + Messagebox.show(Labels.getLabel("error.search"), Labels.getLabel("dialogger.warning"), Messagebox.OK, Messagebox.ERROR, defaultOKEventListener); logger.error("", exc); } } - public String getSearchValue() { - return searchValue; - } - - public void setSearchValue(String searchValue) { - this.searchValue = searchValue; - } - - public CachedListModel getSearchResult() { - return searchResult; - } - - public Item getSelectedItem() { - return selectedItem; - } - - public void setSelectedItem(Item _selectedItem) { - this.selectedItem = _selectedItem; - } - - public Media getSelectedMedia() { - return selectedMedia; - } - - public void setSelectedMedia(Media _selectedMedia) { - this.selectedMedia = _selectedMedia; - } - @Command - @NotifyChange({ "mediaFilePath", "hasSelectedMediaFile" }) - public void onSelectMedia(@BindingParam("media") Media m) { - this.selectedMedia = m; - } - - //islowres player protocol + address + relativepath - //issystem TSM - - /* - public String getMediaFilePath(){ - String ret = ""; - if(this.selectedMedia != null){ - List mediaFiles = this.selectedMedia.getMediaFiles(); - for(MediaFile mf : mediaFiles){ - //if(!mf.isArchived() ???){ ++++++++++++++++++++ - ret = "/pages/mediaplayer.jsp?mediaurl=" + mf.getRelativePath(); - //ret = mf.getRelativePath(); - //} - } + public void downloadMedia() { + if (getHasTSMMediaFile()) { + try { + Map parameters1 = new HashMap<>(); + parameters1.put("media", this.selectedMedia); + IJobEngine jobEngine = JobEngine.getInstance(); + IJobRuntime runtime1 = jobEngine.submit("tsmrestore.xml", "TSMRestoreMedia", parameters1); + } catch (Exception exc) { + logger.error("", exc); } - return ret; - } - - public boolean getHasSelectedMediaFile(){ - String mediaFilePath =getMediaFilePath(); - return (mediaFilePath != null && !"".equals(mediaFilePath)); } - */ + + } public boolean getHasLowresMediaFile() { boolean ret = false; @@ -143,6 +99,46 @@ public class SearchModel extends BaseModel { return ret; } + public CachedListModel getSearchResult() { + return searchResult; + } + + public String getSearchValue() { + return searchValue; + } + + public Item getSelectedItem() { + return selectedItem; + } + + public Media getSelectedMedia() { + return selectedMedia; + } + + //islowres player protocol + address + relativepath + //issystem TSM + + /* + public String getMediaFilePath(){ + String ret = ""; + if(this.selectedMedia != null){ + List mediaFiles = this.selectedMedia.getMediaFiles(); + for(MediaFile mf : mediaFiles){ + //if(!mf.isArchived() ???){ ++++++++++++++++++++ + ret = "/pages/mediaplayer.jsp?mediaurl=" + mf.getRelativePath(); + //ret = mf.getRelativePath(); + //} + } + } + return ret; + } + + public boolean getHasSelectedMediaFile(){ + String mediaFilePath =getMediaFilePath(); + return (mediaFilePath != null && !"".equals(mediaFilePath)); + } + */ + public String getTSMMediaFilePath() throws Exception { String ret = ""; if (this.selectedMedia != null) { @@ -158,18 +154,21 @@ public class SearchModel extends BaseModel { } @Command - public void downloadMedia() { - if (getHasTSMMediaFile()) { - try{ - Map parameters1 = new HashMap<>(); - parameters1.put("media", this.selectedMedia); - IJobEngine jobEngine = JobEngine.getInstance(); - IJobRuntime runtime1 = jobEngine.submit("tsmrestore.xml", "TSMRestoreMedia", parameters1); - }catch(Exception exc){ - logger.error("",exc); - } - } - + @NotifyChange({ "mediaFilePath", "hasSelectedMediaFile", "hasLowresMediaFile" }) + public void onSelectMedia(@BindingParam("media") Media m) { + this.selectedMedia = m; + } + + public void setSearchValue(String searchValue) { + this.searchValue = searchValue; + } + + public void setSelectedItem(Item _selectedItem) { + this.selectedItem = _selectedItem; + } + + public void setSelectedMedia(Media _selectedMedia) { + this.selectedMedia = _selectedMedia; } }