HTV elesites utani verzio: 2.9.1

diff --git a/server/-product/production/LOCAL/settings/application.yaml b/server/-product/production/LOCAL/settings/application.yaml
index 42a5e798d02815e4a8bf3edcfcaea01668634c6e..ec8f844e66e0fd399c907db2a10f52e989b8512d 100644 (file)
--- a/server/-product/production/LOCAL/settings/application.yaml
+++ b/server/-product/production/LOCAL/settings/application.yaml
@@ -27,9 +27,9 @@ services:
   mediacube:\r
     proxy-root: /data/mediacube\r
   nexio:\r
-#    host: 10.10.1.55\r
-#    collection-name: nexioclips\r
-#    use-mos-gateway: true\r
+    host: 10.10.1.55\r
+    collection-name: nexioclips\r
+    use-mos-gateway: true\r
     disabled: true\r
 jobs:\r
   validate-transfers: false\r

diff --git a/server/-product/production/LOCAL/settings/mediacube.yaml b/server/-product/production/LOCAL/settings/mediacube.yaml
index 58e1653d99700833d45bbc24619b2c97c5d8cf6c..05ac59996b9bba98131ad3caecacf54a886bebee 100644 (file)
--- a/server/-product/production/LOCAL/settings/mediacube.yaml
+++ b/server/-product/production/LOCAL/settings/mediacube.yaml
@@ -25,8 +25,8 @@ bottomTypeFilters:
 - name: Reklám nyers\r
 authentication:\r
   authEnabled: true\r
-  defaultUser: root\r
-  defaultPassword: password\r
+#  defaultUser: root\r
+#  defaultPassword: password\r
   adHost: localhost\r
   adNonSecurePort: 3268\r
   adBaseDn: DC=intra,DC=mediavivantis,DC=hu\r

diff --git a/server/user.jobengine.osgi.db/build-db-module.launch b/server/user.jobengine.osgi.db/build-db-module.launch
index 4e36ed057be074cafb6738f6772c7e8e531b758c..42ea8773357be5e2f75790cb99e3644f2af8c55c 100644 (file)
--- a/server/user.jobengine.osgi.db/build-db-module.launch
+++ b/server/user.jobengine.osgi.db/build-db-module.launch
@@ -1,17 +1,19 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
-<launchConfiguration type="org.eclipse.m2e.Maven2LaunchConfigurationType">\r
-<booleanAttribute key="M2_DEBUG_OUTPUT" value="false"/>\r
-<stringAttribute key="M2_GOALS" value="clean install"/>\r
-<booleanAttribute key="M2_NON_RECURSIVE" value="false"/>\r
-<booleanAttribute key="M2_OFFLINE" value="true"/>\r
-<stringAttribute key="M2_PROFILES" value=""/>\r
-<listAttribute key="M2_PROPERTIES"/>\r
-<stringAttribute key="M2_RUNTIME" value="EMBEDDED"/>\r
-<booleanAttribute key="M2_SKIP_TESTS" value="true"/>\r
-<intAttribute key="M2_THREADS" value="1"/>\r
-<booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="false"/>\r
-<stringAttribute key="M2_USER_SETTINGS" value=""/>\r
-<booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="false"/>\r
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk"/>\r
-<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:/user.jobengine.osgi.db}"/>\r
+       <launchConfiguration type="org.eclipse.m2e.Maven2LaunchConfigurationType">\r
+       <booleanAttribute key="M2_DEBUG_OUTPUT" value="false"/>\r
+       <stringAttribute key="M2_GOALS" value="clean install"/>\r
+       <booleanAttribute key="M2_NON_RECURSIVE" value="false"/>\r
+       <booleanAttribute key="M2_OFFLINE" value="false"/>\r
+       <stringAttribute key="M2_PROFILES" value=""/>\r
+       <listAttribute key="M2_PROPERTIES"/>\r
+       <stringAttribute key="M2_RUNTIME" value="EMBEDDED"/>\r
+       <booleanAttribute key="M2_SKIP_TESTS" value="true"/>\r
+       <intAttribute key="M2_THREADS" value="1"/>\r
+       <booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="false"/>\r
+       <stringAttribute key="M2_USER_SETTINGS" value=""/>\r
+       <booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="false"/>\r
+       <listAttribute key="org.eclipse.debug.ui.favoriteGroups">\r
+               <listEntry value="org.eclipse.debug.ui.launchGroup.run"/>\r
+       </listAttribute>\r
+       <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:/user.jobengine.osgi.db}"/>\r
 </launchConfiguration>\r

diff --git a/server/user.jobengine.osgi.db/build-remote-sqlj.bat b/server/user.jobengine.osgi.db/build-remote-sqlj.bat
index 2c0c549273e819a55dacd6cbfb47c867db57f047..6aa07fb86bf64a07f418eac15bc8f58ef6809366 100644 (file)
--- a/server/user.jobengine.osgi.db/build-remote-sqlj.bat
+++ b/server/user.jobengine.osgi.db/build-remote-sqlj.bat
@@ -6,10 +6,20 @@
        ::Remote::\r
        SET REMOTE_LOCATION=/tmp/mediaarch\r
 \r
+::  USER       \r
+::     SET REMOTE_SERVER_HOSTKEY=ssh-ed25519 256 86:5b:9b:bc:df:7b:df:90:c6:bf:60:69:d2:c9:61:62\r
+::     SET REMOTE_SERVER_ADDRESS=scp://db2admin:password@10.228.198.1\r
+       \r
+::  MV \r
+::     SET REMOTE_SERVER_HOSTKEY=ssh-ed25519 256 01:03:8c:04:b0:a2:7d:a4:90:c8:01:c8:d8:4e:44:0d\r
+::     SET REMOTE_SERVER_ADDRESS=scp://db2admin:password@10.11.1.90\r
+\r
 ::LOCALVM HTV\r
        SET REMOTE_SERVER_HOSTKEY=ssh-ed25519 256 ea:58:1c:d3:b8:d5:7a:92:4c:a3:a5:8d:e2:7b:07:fd\r
        SET REMOTE_SERVER_ADDRESS=scp://db2admin:password@localvm\r
-       \r
+\r
+\r
+\r
        CALL :deploy_source\r
        if %ERRORLEVEL% neq 0 exit /b %ERRORLEVEL%\r
 \r

diff --git a/server/user.jobengine.osgi.db/generated/user/jobengine/db/BreakDAO_SJProfile0.ser b/server/user.jobengine.osgi.db/generated/user/jobengine/db/BreakDAO_SJProfile0.ser
index d21fb888ec40398e7758da458fa7bcf30078ddf9..cbacf0058b33d022b520ecd7bcefc86c57c7603c 100644 (file)
Binary files a/server/user.jobengine.osgi.db/generated/user/jobengine/db/BreakDAO_SJProfile0.ser and b/server/user.jobengine.osgi.db/generated/user/jobengine/db/BreakDAO_SJProfile0.ser differ

diff --git a/server/user.jobengine.osgi.db/generated/user/jobengine/db/DomainCategoryDAO_SJProfile0.ser b/server/user.jobengine.osgi.db/generated/user/jobengine/db/DomainCategoryDAO_SJProfile0.ser
index cca40b999d6a9d0cf6dea0b07546291cde53c891..31f62924e16e3c5e2247d2c2ae6a21f0b08f1f8b 100644 (file)
Binary files a/server/user.jobengine.osgi.db/generated/user/jobengine/db/DomainCategoryDAO_SJProfile0.ser and b/server/user.jobengine.osgi.db/generated/user/jobengine/db/DomainCategoryDAO_SJProfile0.ser differ

diff --git a/server/user.jobengine.osgi.db/generated/user/jobengine/db/DomainDAO_SJProfile0.ser b/server/user.jobengine.osgi.db/generated/user/jobengine/db/DomainDAO_SJProfile0.ser
index 6e2b3cf64236ebf4158898d5af30e699c0762a48..fc46f0798b7191e089626c96c96f76887be4b52d 100644 (file)
Binary files a/server/user.jobengine.osgi.db/generated/user/jobengine/db/DomainDAO_SJProfile0.ser and b/server/user.jobengine.osgi.db/generated/user/jobengine/db/DomainDAO_SJProfile0.ser differ

diff --git a/server/user.jobengine.osgi.db/generated/user/jobengine/db/DomainIndexDAO_SJProfile0.ser b/server/user.jobengine.osgi.db/generated/user/jobengine/db/DomainIndexDAO_SJProfile0.ser
index 923cb88c6ba15c64a33a39cbf5b24ba9bc9a54f0..d594799c832ddc55f50799ef2bf69f10ed46595e 100644 (file)
Binary files a/server/user.jobengine.osgi.db/generated/user/jobengine/db/DomainIndexDAO_SJProfile0.ser and b/server/user.jobengine.osgi.db/generated/user/jobengine/db/DomainIndexDAO_SJProfile0.ser differ

diff --git a/server/user.jobengine.osgi.db/generated/user/jobengine/db/EntityBaseDAO_SJProfile0.ser b/server/user.jobengine.osgi.db/generated/user/jobengine/db/EntityBaseDAO_SJProfile0.ser
index de2b0008d90a49bad0a05e67849517b0d9409b6b..66abbe4dbac2e21a881792fb98c42bf01df338cb 100644 (file)
Binary files a/server/user.jobengine.osgi.db/generated/user/jobengine/db/EntityBaseDAO_SJProfile0.ser and b/server/user.jobengine.osgi.db/generated/user/jobengine/db/EntityBaseDAO_SJProfile0.ser differ

diff --git a/server/user.jobengine.osgi.db/generated/user/jobengine/db/FileTypeDAO_SJProfile0.ser b/server/user.jobengine.osgi.db/generated/user/jobengine/db/FileTypeDAO_SJProfile0.ser
index fa13d0812a71a85cb5f37e2760a19cf6a44b04be..7c1b21e1b1d10a7dfe33ad08eaa69e7fb2449d34 100644 (file)
Binary files a/server/user.jobengine.osgi.db/generated/user/jobengine/db/FileTypeDAO_SJProfile0.ser and b/server/user.jobengine.osgi.db/generated/user/jobengine/db/FileTypeDAO_SJProfile0.ser differ

diff --git a/server/user.jobengine.osgi.db/generated/user/jobengine/db/FolderDAO_SJProfile0.ser b/server/user.jobengine.osgi.db/generated/user/jobengine/db/FolderDAO_SJProfile0.ser
index 500e75281ea2bf3c95be2f83af6264da3a0eee55..d6a6b2029fbcfebbd6c8b2d1d4c67c822500f724 100644 (file)
Binary files a/server/user.jobengine.osgi.db/generated/user/jobengine/db/FolderDAO_SJProfile0.ser and b/server/user.jobengine.osgi.db/generated/user/jobengine/db/FolderDAO_SJProfile0.ser differ

diff --git a/server/user.jobengine.osgi.db/generated/user/jobengine/db/HelperDAO_SJProfile0.ser b/server/user.jobengine.osgi.db/generated/user/jobengine/db/HelperDAO_SJProfile0.ser
index ee0954fa2c9cb515172d6f84b938dbc4a8436fe4..8e47b15725857f773b4ab4f8e94321398be0f790 100644 (file)
Binary files a/server/user.jobengine.osgi.db/generated/user/jobengine/db/HelperDAO_SJProfile0.ser and b/server/user.jobengine.osgi.db/generated/user/jobengine/db/HelperDAO_SJProfile0.ser differ

diff --git a/server/user.jobengine.osgi.db/generated/user/jobengine/db/ItemDAO_SJProfile0.ser b/server/user.jobengine.osgi.db/generated/user/jobengine/db/ItemDAO_SJProfile0.ser
index 6118bbd029ea39204f088dfeda2a57be8c514e31..10ffa1283d7f69c8710be15041fe018da32714b6 100644 (file)
Binary files a/server/user.jobengine.osgi.db/generated/user/jobengine/db/ItemDAO_SJProfile0.ser and b/server/user.jobengine.osgi.db/generated/user/jobengine/db/ItemDAO_SJProfile0.ser differ

diff --git a/server/user.jobengine.osgi.db/generated/user/jobengine/db/ItemTypeDAO_SJProfile0.ser b/server/user.jobengine.osgi.db/generated/user/jobengine/db/ItemTypeDAO_SJProfile0.ser
index 846f31dc5dac8404f91a472833514a9f6aaa4d45..04d3f916ccd94c7dd8e5700ae01e282e2ef88a4e 100644 (file)
Binary files a/server/user.jobengine.osgi.db/generated/user/jobengine/db/ItemTypeDAO_SJProfile0.ser and b/server/user.jobengine.osgi.db/generated/user/jobengine/db/ItemTypeDAO_SJProfile0.ser differ

diff --git a/server/user.jobengine.osgi.db/generated/user/jobengine/db/JobDAO_SJProfile0.ser b/server/user.jobengine.osgi.db/generated/user/jobengine/db/JobDAO_SJProfile0.ser
index 9f1469135219269398b97199e84882a06851ba68..92af79ff8f5e4f25996c2b03a448e77ca554d2d2 100644 (file)
Binary files a/server/user.jobengine.osgi.db/generated/user/jobengine/db/JobDAO_SJProfile0.ser and b/server/user.jobengine.osgi.db/generated/user/jobengine/db/JobDAO_SJProfile0.ser differ

diff --git a/server/user.jobengine.osgi.db/generated/user/jobengine/db/JobParametersDAO_SJProfile0.ser b/server/user.jobengine.osgi.db/generated/user/jobengine/db/JobParametersDAO_SJProfile0.ser
index 27214e3ee99095b9c574df5da0a976ab1089ee95..94656c69bb8a9e9333508771e8640159eb9156a7 100644 (file)
Binary files a/server/user.jobengine.osgi.db/generated/user/jobengine/db/JobParametersDAO_SJProfile0.ser and b/server/user.jobengine.osgi.db/generated/user/jobengine/db/JobParametersDAO_SJProfile0.ser differ

diff --git a/server/user.jobengine.osgi.db/generated/user/jobengine/db/MasterIdDAO_SJProfile0.ser b/server/user.jobengine.osgi.db/generated/user/jobengine/db/MasterIdDAO_SJProfile0.ser
index 38032664216ca11b6384b61482f3c56b380c51cb..af198b2f0aacad65f4c97c12ace33cb9f3ad20c6 100644 (file)
Binary files a/server/user.jobengine.osgi.db/generated/user/jobengine/db/MasterIdDAO_SJProfile0.ser and b/server/user.jobengine.osgi.db/generated/user/jobengine/db/MasterIdDAO_SJProfile0.ser differ

diff --git a/server/user.jobengine.osgi.db/generated/user/jobengine/db/MediaDAO.java b/server/user.jobengine.osgi.db/generated/user/jobengine/db/MediaDAO.java
index 6ab99cc47d1f4d30183500968f733b1fc5e2d12f..1bd55dd4a3dd41b91ba9b2a014760372cd707399 100644 (file)
--- a/server/user.jobengine.osgi.db/generated/user/jobengine/db/MediaDAO.java
+++ b/server/user.jobengine.osgi.db/generated/user/jobengine/db/MediaDAO.java
@@ -421,12 +421,11 @@ class MediaDAO extends EntityBaseDAO {
                Timestamp archived = obj.getArchived();
                Timestamp modified = obj.getModified();
                Timestamp creation = obj.getCreation();
-               int fileCount = obj.getFileCount();
 
-               /*@lineinfo:generated-code*//*@lineinfo:131^2*/
+               /*@lineinfo:generated-code*//*@lineinfo:130^2*/
 
 //  ************************************************************
-//  #sql [context] { UPDATE MEDIA SET TITLE = :title, DESCRIPTION = :description, ITEMID = :itemId, ITEMTYPEID = :itemTypeId, HOUSEID = :houseId, LENGTH = :length, POSTER = :poster, ARCHIVED = :archived, MODIFIED = :modified, CREATION = :creation, FILECOUNT = :fileCount WHERE ID = :id  };
+//  #sql [context] { UPDATE MEDIA SET TITLE = :title, DESCRIPTION = :description, ITEMID = :itemId, ITEMTYPEID = :itemTypeId, HOUSEID = :houseId, LENGTH = :length, POSTER = :poster, ARCHIVED = :archived, MODIFIED = :modified, CREATION = :creation WHERE ID = :id  };
 //  ************************************************************
 
 {
@@ -448,8 +447,7 @@ class MediaDAO extends EntityBaseDAO {
       __sJT_stmt.setTimestamp(8, archived);
       __sJT_stmt.setTimestamp(9, modified);
       __sJT_stmt.setTimestamp(10, creation);
-      __sJT_stmt.setInt(11, fileCount);
-      __sJT_stmt.setLong(12, id);
+      __sJT_stmt.setLong(11, id);
       __sJT_execCtx.executeUpdate();
     }
     finally 
@@ -462,7 +460,7 @@ class MediaDAO extends EntityBaseDAO {
 
 //  ************************************************************
 
-/*@lineinfo:user-code*//*@lineinfo:131^284*/
+/*@lineinfo:user-code*//*@lineinfo:130^260*/
        }
        
        @Override
@@ -479,12 +477,11 @@ class MediaDAO extends EntityBaseDAO {
                Timestamp archived = obj.getArchived();
                Timestamp modified = obj.getModified();
                Timestamp creation = obj.getCreation();
-               int fileCount = obj.getFileCount();
                
-               /*@lineinfo:generated-code*//*@lineinfo:150^2*/
+               /*@lineinfo:generated-code*//*@lineinfo:148^2*/
 
 //  ************************************************************
-//  #sql [context] { INSERT INTO MEDIA (ID, TITLE, DESCRIPTION, ITEMID, ITEMTYPEID, HOUSEID, LENGTH, POSTER, ARCHIVED, MODIFIED, CREATION, FILECOUNT) VALUES (:id, :title, :description, :itemId, :itemTypeId, :houseId, :length, :poster, :archived, :modified, :creation, :fileCount)  };
+//  #sql [context] { INSERT INTO MEDIA (ID, TITLE, DESCRIPTION, ITEMID, ITEMTYPEID, HOUSEID, LENGTH, POSTER, ARCHIVED, MODIFIED, CREATION) VALUES (:id, :title, :description, :itemId, :itemTypeId, :houseId, :length, :poster, :archived, :modified, :creation)  };
 //  ************************************************************
 
 {
@@ -507,7 +504,6 @@ class MediaDAO extends EntityBaseDAO {
       __sJT_stmt.setTimestamp(9, archived);
       __sJT_stmt.setTimestamp(10, modified);
       __sJT_stmt.setTimestamp(11, creation);
-      __sJT_stmt.setInt(12, fileCount);
       __sJT_execCtx.executeUpdate();
     }
     finally 
@@ -520,7 +516,7 @@ class MediaDAO extends EntityBaseDAO {
 
 //  ************************************************************
 
-/*@lineinfo:user-code*//*@lineinfo:150^278*/
+/*@lineinfo:user-code*//*@lineinfo:148^255*/
        }
        
        /**

diff --git a/server/user.jobengine.osgi.db/generated/user/jobengine/db/MediaDAO_SJProfile0.ser b/server/user.jobengine.osgi.db/generated/user/jobengine/db/MediaDAO_SJProfile0.ser
index f9a233381afbb470ee4d4adb2a193a7603844b47..0488636a034b4d6b6202d1e2e22569df815870eb 100644 (file)
Binary files a/server/user.jobengine.osgi.db/generated/user/jobengine/db/MediaDAO_SJProfile0.ser and b/server/user.jobengine.osgi.db/generated/user/jobengine/db/MediaDAO_SJProfile0.ser differ

diff --git a/server/user.jobengine.osgi.db/generated/user/jobengine/db/MediaFileDAO_SJProfile0.ser b/server/user.jobengine.osgi.db/generated/user/jobengine/db/MediaFileDAO_SJProfile0.ser
index 89a865010f7e9706e23a4d3f0988148592b28ba1..8dfc650845562191a3a0f2147dd2238aa3ec92c6 100644 (file)
Binary files a/server/user.jobengine.osgi.db/generated/user/jobengine/db/MediaFileDAO_SJProfile0.ser and b/server/user.jobengine.osgi.db/generated/user/jobengine/db/MediaFileDAO_SJProfile0.ser differ

diff --git a/server/user.jobengine.osgi.db/generated/user/jobengine/db/MetadataDAO_SJProfile0.ser b/server/user.jobengine.osgi.db/generated/user/jobengine/db/MetadataDAO_SJProfile0.ser
index f9359c445e93f002fa4eecb8fc525d3232a01878..a7e76fc3b8dd45785a2e3aaca2255d9dcf8cfecf 100644 (file)
Binary files a/server/user.jobengine.osgi.db/generated/user/jobengine/db/MetadataDAO_SJProfile0.ser and b/server/user.jobengine.osgi.db/generated/user/jobengine/db/MetadataDAO_SJProfile0.ser differ

diff --git a/server/user.jobengine.osgi.db/generated/user/jobengine/db/MetadataElementDAO_SJProfile0.ser b/server/user.jobengine.osgi.db/generated/user/jobengine/db/MetadataElementDAO_SJProfile0.ser
index 8e1b38491f8b3fe6d4611650a9b519d86a8cbaad..e3e40946ea2e54f3934c254bea4fcac9d97d8b82 100644 (file)
Binary files a/server/user.jobengine.osgi.db/generated/user/jobengine/db/MetadataElementDAO_SJProfile0.ser and b/server/user.jobengine.osgi.db/generated/user/jobengine/db/MetadataElementDAO_SJProfile0.ser differ

diff --git a/server/user.jobengine.osgi.db/generated/user/jobengine/db/MetadataTypeDAO_SJProfile0.ser b/server/user.jobengine.osgi.db/generated/user/jobengine/db/MetadataTypeDAO_SJProfile0.ser
index 6489ee7f7653d7dc2e949e7530f0907d7454273f..57c9bd3bb8b0dfef0be4de7a101224d4e01bb78e 100644 (file)
Binary files a/server/user.jobengine.osgi.db/generated/user/jobengine/db/MetadataTypeDAO_SJProfile0.ser and b/server/user.jobengine.osgi.db/generated/user/jobengine/db/MetadataTypeDAO_SJProfile0.ser differ

diff --git a/server/user.jobengine.osgi.db/generated/user/jobengine/db/RemoteStoreDAO_SJProfile0.ser b/server/user.jobengine.osgi.db/generated/user/jobengine/db/RemoteStoreDAO_SJProfile0.ser
index 67f9262a4c885b91938a80991fb9b9c586398b2a..3235d0626366f61afa69380b0bec454966f2f872 100644 (file)
Binary files a/server/user.jobengine.osgi.db/generated/user/jobengine/db/RemoteStoreDAO_SJProfile0.ser and b/server/user.jobengine.osgi.db/generated/user/jobengine/db/RemoteStoreDAO_SJProfile0.ser differ

diff --git a/server/user.jobengine.osgi.db/generated/user/jobengine/db/SceneContentDAO_SJProfile0.ser b/server/user.jobengine.osgi.db/generated/user/jobengine/db/SceneContentDAO_SJProfile0.ser
index d83fe252d0949fee7fcac0a22a9ab0a137c02310..4cbd8c354f5483931ca53a70a86c2ca704f1b5c6 100644 (file)
Binary files a/server/user.jobengine.osgi.db/generated/user/jobengine/db/SceneContentDAO_SJProfile0.ser and b/server/user.jobengine.osgi.db/generated/user/jobengine/db/SceneContentDAO_SJProfile0.ser differ

diff --git a/server/user.jobengine.osgi.db/generated/user/jobengine/db/SceneDAO_SJProfile0.ser b/server/user.jobengine.osgi.db/generated/user/jobengine/db/SceneDAO_SJProfile0.ser
index 66d96f471f1408041b24310f0a555775f0735f1b..c5fb24ce8e5e18cf11e9dddda258cf95e0601694 100644 (file)
Binary files a/server/user.jobengine.osgi.db/generated/user/jobengine/db/SceneDAO_SJProfile0.ser and b/server/user.jobengine.osgi.db/generated/user/jobengine/db/SceneDAO_SJProfile0.ser differ

diff --git a/server/user.jobengine.osgi.db/generated/user/jobengine/db/SearchDefinitionDAO_SJProfile0.ser b/server/user.jobengine.osgi.db/generated/user/jobengine/db/SearchDefinitionDAO_SJProfile0.ser
index 79020c66f1bf901979ff684519c433b8606f24f7..958625207bcdf291b95a760a755d780db80d8d1d 100644 (file)
Binary files a/server/user.jobengine.osgi.db/generated/user/jobengine/db/SearchDefinitionDAO_SJProfile0.ser and b/server/user.jobengine.osgi.db/generated/user/jobengine/db/SearchDefinitionDAO_SJProfile0.ser differ

diff --git a/server/user.jobengine.osgi.db/generated/user/jobengine/db/ShotDAO_SJProfile0.ser b/server/user.jobengine.osgi.db/generated/user/jobengine/db/ShotDAO_SJProfile0.ser
index 75db3eebf590dd0a85f1843a3aef5b82ca4b1f1e..20e7f5ddcad0033a07fbda0a79a07b6179b5fa34 100644 (file)
Binary files a/server/user.jobengine.osgi.db/generated/user/jobengine/db/ShotDAO_SJProfile0.ser and b/server/user.jobengine.osgi.db/generated/user/jobengine/db/ShotDAO_SJProfile0.ser differ

diff --git a/server/user.jobengine.osgi.db/generated/user/jobengine/db/StoreDAO_SJProfile0.ser b/server/user.jobengine.osgi.db/generated/user/jobengine/db/StoreDAO_SJProfile0.ser
index b590640bd3fb819b7fcc7de684d5b1e14cc2dd24..da4173b9592c8e5f638a4406cdcf898070b3ce36 100644 (file)
Binary files a/server/user.jobengine.osgi.db/generated/user/jobengine/db/StoreDAO_SJProfile0.ser and b/server/user.jobengine.osgi.db/generated/user/jobengine/db/StoreDAO_SJProfile0.ser differ

diff --git a/server/user.jobengine.osgi.db/generated/user/jobengine/db/StoreUriDAO_SJProfile0.ser b/server/user.jobengine.osgi.db/generated/user/jobengine/db/StoreUriDAO_SJProfile0.ser
index 89ce9145c525a60c054c9c0a5b32ca7e9167bce7..7898f8054940448ed1ab4316fcaa72a0111266c9 100644 (file)
Binary files a/server/user.jobengine.osgi.db/generated/user/jobengine/db/StoreUriDAO_SJProfile0.ser and b/server/user.jobengine.osgi.db/generated/user/jobengine/db/StoreUriDAO_SJProfile0.ser differ

diff --git a/server/user.jobengine.osgi.db/generated/user/jobengine/db/UserInfoDAO_SJProfile0.ser b/server/user.jobengine.osgi.db/generated/user/jobengine/db/UserInfoDAO_SJProfile0.ser
index c1113d8dc660f0b61b4779e5a49bebbf525a899b..4827ee769571747e1fa5cee2651351666ecb4da3 100644 (file)
Binary files a/server/user.jobengine.osgi.db/generated/user/jobengine/db/UserInfoDAO_SJProfile0.ser and b/server/user.jobengine.osgi.db/generated/user/jobengine/db/UserInfoDAO_SJProfile0.ser differ

diff --git a/server/user.jobengine.osgi.db/generated/user/jobengine/db/WorkflowActionDAO_SJProfile0.ser b/server/user.jobengine.osgi.db/generated/user/jobengine/db/WorkflowActionDAO_SJProfile0.ser
index cbb4e30c34f55d4de49728ff32464d5304bff900..03fd8c29c59886b8951d5c44c8fc2b62fc714cb2 100644 (file)
Binary files a/server/user.jobengine.osgi.db/generated/user/jobengine/db/WorkflowActionDAO_SJProfile0.ser and b/server/user.jobengine.osgi.db/generated/user/jobengine/db/WorkflowActionDAO_SJProfile0.ser differ

diff --git a/server/user.jobengine.osgi.db/migrations/scripts/043_add_filecount_to_media.sql b/server/user.jobengine.osgi.db/migrations/scripts/043_add_filecount_to_media.sql
index 4acd2fdc8195e3bd5fe9dc8f1385a9d8f33b32c7..3f2c100d67a4d6e966d9a8cc6c373128d8439102 100644 (file)
--- a/server/user.jobengine.osgi.db/migrations/scripts/043_add_filecount_to_media.sql
+++ b/server/user.jobengine.osgi.db/migrations/scripts/043_add_filecount_to_media.sql
@@ -2,7 +2,7 @@
 DROP TRIGGER TRG_MEDIA_AFTER_UPDATE \r
 @\r
 \r
-ALTER TABLE MEDIA ADD COLUMN FILECOUNT INT\r
+ALTER TABLE MEDIA ADD COLUMN FILECOUNT INT DEFAULT 0\r
 @\r
 \r
 CREATE TABLE FILECOUNTS AS \r

diff --git a/server/user.jobengine.osgi.db/src/user/jobengine/db/MediaDAO.sqlj b/server/user.jobengine.osgi.db/src/user/jobengine/db/MediaDAO.sqlj
index 9e590b172a60ff95b163fc27aaf33ed4960df2f6..e2d7aa4630894d932e685b0bb03574fbb0dce7e4 100644 (file)
--- a/server/user.jobengine.osgi.db/src/user/jobengine/db/MediaDAO.sqlj
+++ b/server/user.jobengine.osgi.db/src/user/jobengine/db/MediaDAO.sqlj
@@ -126,9 +126,8 @@ class MediaDAO extends EntityBaseDAO {
                Timestamp archived = obj.getArchived();\r
                Timestamp modified = obj.getModified();\r
                Timestamp creation = obj.getCreation();\r
-               int fileCount = obj.getFileCount();\r
 \r
-               #sql [context] { UPDATE MEDIA SET TITLE = :title, DESCRIPTION = :description, ITEMID = :itemId, ITEMTYPEID = :itemTypeId, HOUSEID = :houseId, LENGTH = :length, POSTER = :poster, ARCHIVED = :archived, MODIFIED = :modified, CREATION = :creation, FILECOUNT = :fileCount WHERE ID = :id };\r
+               #sql [context] { UPDATE MEDIA SET TITLE = :title, DESCRIPTION = :description, ITEMID = :itemId, ITEMTYPEID = :itemTypeId, HOUSEID = :houseId, LENGTH = :length, POSTER = :poster, ARCHIVED = :archived, MODIFIED = :modified, CREATION = :creation WHERE ID = :id };\r
        }\r
        \r
        @Override\r
@@ -145,9 +144,8 @@ class MediaDAO extends EntityBaseDAO {
                Timestamp archived = obj.getArchived();\r
                Timestamp modified = obj.getModified();\r
                Timestamp creation = obj.getCreation();\r
-               int fileCount = obj.getFileCount();\r
                \r
-               #sql [context] { INSERT INTO MEDIA (ID, TITLE, DESCRIPTION, ITEMID, ITEMTYPEID, HOUSEID, LENGTH, POSTER, ARCHIVED, MODIFIED, CREATION, FILECOUNT) VALUES (:id, :title, :description, :itemId, :itemTypeId, :houseId, :length, :poster, :archived, :modified, :creation, :fileCount) };\r
+               #sql [context] { INSERT INTO MEDIA (ID, TITLE, DESCRIPTION, ITEMID, ITEMTYPEID, HOUSEID, LENGTH, POSTER, ARCHIVED, MODIFIED, CREATION) VALUES (:id, :title, :description, :itemId, :itemTypeId, :houseId, :length, :poster, :archived, :modified, :creation) };\r
        }\r
        \r
        /**\r

diff --git a/server/user.mediacube.gui/pages/login.zul b/server/user.mediacube.gui/pages/login.zul
index 9de0df773565852a81d1c35c07d1ce7f7e3769fb..05955a81f2db0eab5ef22056af45e0adf6409edc 100644 (file)
--- a/server/user.mediacube.gui/pages/login.zul
+++ b/server/user.mediacube.gui/pages/login.zul
@@ -11,7 +11,6 @@
        <style src="/css/mediacube-${sessionScope.theme}.css"/>\r
        <hbox self="@define(content)" vflex="1" hflex="1" align="center" pack="center" spacing="20px">\r
         <vlayout>\r
-               <label value="${sessionScope.theme}"/>\r
             <window id="loginWin" viewModel="@id('jlm') @init('user.jobengine.zk.model.LoginModel')"\r
                 border="normal" hflex="min" sclass="loginWindow">\r
                                <caption>\r
@@ -43,7 +42,7 @@
                         </rows>\r
                     </grid>\r
                     <label sclass="loginMessage" value="@bind(jlm.message)" />\r
-                    <button label="Bejelentkezés" onClick="@command('authenticate')"/>\r
+                    <button id="login" label="Bejelentkezés" onClick="@command('authenticate')"/>\r
                 </vbox>\r
             </window>\r
         </vlayout>\r