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

diff --git a/server/-configuration/run-mediacube-server-hirtv.launch b/server/-configuration/run-mediacube-server-hirtv.launch
index 3c9d8e684a65f3a1e1e99ada0dcbf67b7fc11efe..e616cf01ddc72e144a6b2500908b6d77251b0a3d 100644 (file)
--- a/server/-configuration/run-mediacube-server-hirtv.launch
+++ b/server/-configuration/run-mediacube-server-hirtv.launch
@@ -100,7 +100,7 @@
     </setAttribute>\r
     <setAttribute key="selected_workspace_bundles">\r
         <setEntry value="user.commons.zk@default:default"/>\r
-        <setEntry value="user.jobengine.log4j@default:default"/>\r
+        <setEntry value="user.jobengine.log4j@1:true"/>\r
         <setEntry value="user.jobengine.osgi.commons@default:true"/>\r
         <setEntry value="user.jobengine.osgi.db@default:default"/>\r
         <setEntry value="user.jobengine.osgi.server@default:default"/>\r

diff --git a/server/-configuration/run-mediacube-server-local.launch b/server/-configuration/run-mediacube-server-local.launch
index a479b5ddb504ec5be9adb683e384f3f40620e984..6b842065e5f037f4c7922b4540ca9d0747c648ce 100644 (file)
--- a/server/-configuration/run-mediacube-server-local.launch
+++ b/server/-configuration/run-mediacube-server-local.launch
@@ -111,7 +111,7 @@
     </setAttribute>\r
     <setAttribute key="selected_workspace_bundles">\r
         <setEntry value="user.commons.zk@default:default"/>\r
-        <setEntry value="user.jobengine.log4j@default:default"/>\r
+        <setEntry value="user.jobengine.log4j@1:true"/>\r
         <setEntry value="user.jobengine.osgi.commons@default:true"/>\r
         <setEntry value="user.jobengine.osgi.db@default:default"/>\r
         <setEntry value="user.jobengine.osgi.server@default:default"/>\r

diff --git a/server/-configuration/run-mediacube-server-mv.launch b/server/-configuration/run-mediacube-server-mv.launch
index 8efb4093e75e21725d61be1df4beb427e0c03e37..442bcae76861abd1e9c6c8527de9a2ad65162d57 100644 (file)
--- a/server/-configuration/run-mediacube-server-mv.launch
+++ b/server/-configuration/run-mediacube-server-mv.launch
@@ -111,7 +111,7 @@
     </setAttribute>\r
     <setAttribute key="selected_workspace_bundles">\r
         <setEntry value="user.commons.zk@default:default"/>\r
-        <setEntry value="user.jobengine.log4j@default:default"/>\r
+        <setEntry value="user.jobengine.log4j@1:true"/>\r
         <setEntry value="user.jobengine.osgi.commons@default:true"/>\r
         <setEntry value="user.jobengine.osgi.db@default:default"/>\r
         <setEntry value="user.jobengine.osgi.server@default:default"/>\r

diff --git a/server/-configuration/run-mediacube-server-omar.launch b/server/-configuration/run-mediacube-server-omar.launch
index 4ebacff2a7546ae2acc27cc3a0d72332a58ccdca..3d55a3c34ffa01a3cf884cee69699c48cad783e5 100644 (file)
--- a/server/-configuration/run-mediacube-server-omar.launch
+++ b/server/-configuration/run-mediacube-server-omar.launch
@@ -111,7 +111,7 @@
     </setAttribute>\r
     <setAttribute key="selected_workspace_bundles">\r
         <setEntry value="user.commons.zk@default:default"/>\r
-        <setEntry value="user.jobengine.log4j@default:default"/>\r
+        <setEntry value="user.jobengine.log4j@1:true"/>\r
         <setEntry value="user.jobengine.osgi.commons@default:true"/>\r
         <setEntry value="user.jobengine.osgi.db@default:default"/>\r
         <setEntry value="user.jobengine.osgi.server@default:default"/>\r

diff --git a/server/user.mediacube.gui/pages/searchitems.zul b/server/user.mediacube.gui/pages/searchitems.zul
index ac99467aec51739f24178034d64ece7ca64043b0..84b3024f01591e28eeb5c4e974330190c766855b 100644 (file)
--- a/server/user.mediacube.gui/pages/searchitems.zul
+++ b/server/user.mediacube.gui/pages/searchitems.zul
@@ -4,7 +4,8 @@
 \r
 <!-- tag deklarációja -->\r
 <?component name="search-filters" inline="true" macroURI="searchitems/filters.zul"?>\r
-<?component name="search-results" inline="true" macroURI="searchitems/listresults.zul"?>\r
+<?component  name="search-results" if  inline="true" macroURI="searchitems/listresults.zul"?>\r
+<!-- <?component  name="search-results" if  inline="true" macroURI="searchitems/gridresults.zul"?> -->\r
 <?component name="item-details" inline="true" macroURI="searchitems/details.zul"?>\r
 \r
 <!DOCTYPE xml>\r