From: vasary.daniel Date: Thu, 17 Jun 2021 09:21:27 +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=69266290e5dcc93924cd6919269ed5adc1e8286a;p=mediacube.git git-tfs-id: [tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C32269 --- diff --git a/server/user.jobengine.osgi.db/build-remote-sqlj.bat b/server/user.jobengine.osgi.db/build-remote-sqlj.bat index 7874f561..19a80e3d 100644 --- a/server/user.jobengine.osgi.db/build-remote-sqlj.bat +++ b/server/user.jobengine.osgi.db/build-remote-sqlj.bat @@ -22,7 +22,7 @@ :deploy_source ECHO --- Deploying source - WinSCP.com /command ^ + c:\\apps\\putty\\WinSCP.com /command ^ "open %REMOTE_SERVER_ADDRESS% -hostkey=""%REMOTE_SERVER_HOSTKEY%""" ^ "call mkdir -p %REMOTE_LOCATION%" ^ "cd %REMOTE_LOCATION%" ^ 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 47bc6d9e..5d29a10e 100644 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 c45cfa54..dcb30d2d 100644 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 bcbb788c..bd4f7326 100644 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 e8cf325d..b68051e2 100644 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 26cf3cfd..aa68a34b 100644 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 69cc1902..c8581811 100644 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 1e9b8447..298ec28f 100644 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 b621d807..a75535f6 100644 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 74f74a4b..55fff32c 100644 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 f1ac7ed5..3d6ed2ba 100644 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 7dec0bec..a3d41844 100644 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 226a3ff8..75b1a4df 100644 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 f331a910..ff5c2d58 100644 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_SJProfile0.ser b/server/user.jobengine.osgi.db/generated/user/jobengine/db/MediaDAO_SJProfile0.ser index 1c500535..7cf17e51 100644 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.java b/server/user.jobengine.osgi.db/generated/user/jobengine/db/MediaFileDAO.java index 39958450..e375b8c9 100644 --- a/server/user.jobengine.osgi.db/generated/user/jobengine/db/MediaFileDAO.java +++ b/server/user.jobengine.osgi.db/generated/user/jobengine/db/MediaFileDAO.java @@ -17,6 +17,7 @@ class MediaFileIter extends sqlj.runtime.ref.ResultSetIterImpl implements sqlj.runtime.NamedIterator { + private int disableProxyNdx; private int lastModifiedNdx; private int fileSizeNdx; private int houseIdNdx; @@ -39,6 +40,7 @@ implements sqlj.runtime.NamedIterator houseIdNdx = findColumn("houseId"); fileSizeNdx = findColumn("fileSize"); lastModifiedNdx = findColumn("lastModified"); + disableProxyNdx = findColumn("disableProxy"); } public MediaFileIter(sqlj.runtime.profile.RTResultSet resultSet, int fetchSize, int maxRows) throws java.sql.SQLException @@ -53,6 +55,7 @@ implements sqlj.runtime.NamedIterator houseIdNdx = findColumn("houseId"); fileSizeNdx = findColumn("fileSize"); lastModifiedNdx = findColumn("lastModified"); + disableProxyNdx = findColumn("disableProxy"); } public long id() throws java.sql.SQLException @@ -99,12 +102,17 @@ implements sqlj.runtime.NamedIterator { return resultSet.getTimestamp(lastModifiedNdx); } + public String disableProxy() + throws java.sql.SQLException + { + return resultSet.getString(disableProxyNdx); + } } // ************************************************************ -/*@lineinfo:user-code*//*@lineinfo:10^179*/ +/*@lineinfo:user-code*//*@lineinfo:10^201*/ @SuppressWarnings("unused") public class MediaFileDAO extends EntityBaseDAO { @@ -128,6 +136,7 @@ public class MediaFileDAO extends EntityBaseDAO { entity.setHouseId(iterator.houseId()); entity.setFileSize(iterator.fileSize()); entity.setLastModified(iterator.lastModified()); + entity.setDisableProxy(iterator.disableProxy().equals("Y") ? true : false); if (result == null) result = new ArrayList(); @@ -140,10 +149,10 @@ public class MediaFileDAO extends EntityBaseDAO { @Override protected ResultSetIterImpl selectByKey(DefaultContext context, long id) throws SQLException{ MediaFileIter iter = null; - /*@lineinfo:generated-code*//*@lineinfo:46^2*/ + /*@lineinfo:generated-code*//*@lineinfo:47^2*/ // ************************************************************ -// #sql [context] iter = { SELECT ID, MEDIAID, STOREID, FILETYPEID, RELATIVEPATH, FILESTRUCTINFO, HOUSEID, FILESIZE, LASTMODIFIED FROM MEDIAFILE WHERE ID = :id }; +// #sql [context] iter = { SELECT ID, MEDIAID, STOREID, FILETYPEID, RELATIVEPATH, FILESTRUCTINFO, HOUSEID, FILESIZE, LASTMODIFIED, DISABLEPROXY FROM MEDIAFILE WHERE ID = :id }; // ************************************************************ { @@ -168,17 +177,17 @@ public class MediaFileDAO extends EntityBaseDAO { // ************************************************************ -/*@lineinfo:user-code*//*@lineinfo:46^159*/ +/*@lineinfo:user-code*//*@lineinfo:47^173*/ return iter; } @Override protected ResultSetIterImpl selectByForeignKey(DefaultContext context, long id) throws SQLException{ MediaFileIter iter = null; - /*@lineinfo:generated-code*//*@lineinfo:53^2*/ + /*@lineinfo:generated-code*//*@lineinfo:54^2*/ // ************************************************************ -// #sql [context] iter = { SELECT ID, MEDIAID, STOREID, FILETYPEID, RELATIVEPATH, FILESTRUCTINFO, HOUSEID, FILESIZE, LASTMODIFIED FROM MEDIAFILE WHERE MEDIAID = :id }; +// #sql [context] iter = { SELECT ID, MEDIAID, STOREID, FILETYPEID, RELATIVEPATH, FILESTRUCTINFO, HOUSEID, FILESIZE, LASTMODIFIED, DISABLEPROXY FROM MEDIAFILE WHERE MEDIAID = :id }; // ************************************************************ { @@ -203,17 +212,17 @@ public class MediaFileDAO extends EntityBaseDAO { // ************************************************************ -/*@lineinfo:user-code*//*@lineinfo:53^164*/ +/*@lineinfo:user-code*//*@lineinfo:54^178*/ return iter; } @Override protected ResultSetIterImpl selectAll(DefaultContext context) throws SQLException{ MediaFileIter iter = null; - /*@lineinfo:generated-code*//*@lineinfo:60^2*/ + /*@lineinfo:generated-code*//*@lineinfo:61^2*/ // ************************************************************ -// #sql [context] iter = { SELECT ID, MEDIAID, STOREID, FILETYPEID, RELATIVEPATH, FILESTRUCTINFO, HOUSEID, FILESIZE, LASTMODIFIED FROM MEDIAFILE }; +// #sql [context] iter = { SELECT ID, MEDIAID, STOREID, FILETYPEID, RELATIVEPATH, FILESTRUCTINFO, HOUSEID, FILESIZE, LASTMODIFIED, DISABLEPROXY FROM MEDIAFILE }; // ************************************************************ { @@ -237,13 +246,13 @@ public class MediaFileDAO extends EntityBaseDAO { // ************************************************************ -/*@lineinfo:user-code*//*@lineinfo:60^144*/ +/*@lineinfo:user-code*//*@lineinfo:61^158*/ return iter; } @Override protected void delete(DefaultContext context, long id) throws SQLException{ - /*@lineinfo:generated-code*//*@lineinfo:66^2*/ + /*@lineinfo:generated-code*//*@lineinfo:67^2*/ // ************************************************************ // #sql [context] { DELETE FROM MEDIAFILE WHERE ID = :id }; @@ -271,12 +280,12 @@ public class MediaFileDAO extends EntityBaseDAO { // ************************************************************ -/*@lineinfo:user-code*//*@lineinfo:66^56*/ +/*@lineinfo:user-code*//*@lineinfo:67^56*/ } @Override protected void truncateTable(DefaultContext context) throws SQLException{ - /*@lineinfo:generated-code*//*@lineinfo:71^2*/ + /*@lineinfo:generated-code*//*@lineinfo:72^2*/ // ************************************************************ // #sql [context] { TRUNCATE TABLE MEDIAFILE DROP STORAGE IGNORE DELETE TRIGGERS IMMEDIATE }; @@ -303,7 +312,7 @@ public class MediaFileDAO extends EntityBaseDAO { // ************************************************************ -/*@lineinfo:user-code*//*@lineinfo:71^90*/ +/*@lineinfo:user-code*//*@lineinfo:72^90*/ } @Override @@ -318,10 +327,12 @@ public class MediaFileDAO extends EntityBaseDAO { String houseId = obj.getHouseId(); long fileSize = obj.getFileSize(); Timestamp lastModified = obj.getLastModified(); - /*@lineinfo:generated-code*//*@lineinfo:86^2*/ + String disableProxy = obj.isDisableProxy() ? "Y" : "N"; + + /*@lineinfo:generated-code*//*@lineinfo:89^2*/ // ************************************************************ -// #sql [context] { UPDATE MEDIAFILE SET MEDIAID = :mediaId, STOREID = :storeId, FILETYPEID = :fileTypeId, RELATIVEPATH = :relativePath, FILESTRUCTINFO = :fileStructInfo, HOUSEID = :houseId, FILESIZE = :fileSize, LASTMODIFIED = :lastModified WHERE ID = :id }; +// #sql [context] { UPDATE MEDIAFILE SET MEDIAID = :mediaId, STOREID = :storeId, FILETYPEID = :fileTypeId, RELATIVEPATH = :relativePath, FILESTRUCTINFO = :fileStructInfo, HOUSEID = :houseId, FILESIZE = :fileSize, LASTMODIFIED = :lastModified, DISABLEPROXY = :disableProxy WHERE ID = :id }; // ************************************************************ { @@ -341,7 +352,8 @@ public class MediaFileDAO extends EntityBaseDAO { __sJT_stmt.setString(6, houseId); __sJT_stmt.setLong(7, fileSize); __sJT_stmt.setTimestamp(8, lastModified); - __sJT_stmt.setLong(9, id); + __sJT_stmt.setString(9, disableProxy); + __sJT_stmt.setLong(10, id); __sJT_execCtx.executeUpdate(); } finally @@ -354,7 +366,7 @@ public class MediaFileDAO extends EntityBaseDAO { // ************************************************************ -/*@lineinfo:user-code*//*@lineinfo:86^256*/ +/*@lineinfo:user-code*//*@lineinfo:89^286*/ } @Override @@ -368,11 +380,12 @@ public class MediaFileDAO extends EntityBaseDAO { String houseId = obj.getHouseId(); long fileSize = obj.getFileSize(); Timestamp lastModified = obj.getLastModified(); + String disableProxy = obj.isDisableProxy() ? "Y" : "N"; - /*@lineinfo:generated-code*//*@lineinfo:101^2*/ + /*@lineinfo:generated-code*//*@lineinfo:105^2*/ // ************************************************************ -// #sql [context] { INSERT INTO MEDIAFILE (MEDIAID, STOREID, FILETYPEID, RELATIVEPATH, FILESTRUCTINFO, HOUSEID, FILESIZE, LASTMODIFIED) VALUES (:mediaId, :storeId, :fileTypeId, :relativePath, :fileStructInfo, :houseId, :fileSize, :lastModified) }; +// #sql [context] { INSERT INTO MEDIAFILE (MEDIAID, STOREID, FILETYPEID, RELATIVEPATH, FILESTRUCTINFO, HOUSEID, FILESIZE, LASTMODIFIED, DISABLEPROXY) VALUES (:mediaId, :storeId, :fileTypeId, :relativePath, :fileStructInfo, :houseId, :fileSize, :lastModified, :disableProxy) }; // ************************************************************ { @@ -392,6 +405,7 @@ public class MediaFileDAO extends EntityBaseDAO { __sJT_stmt.setString(6, houseId); __sJT_stmt.setLong(7, fileSize); __sJT_stmt.setTimestamp(8, lastModified); + __sJT_stmt.setString(9, disableProxy); __sJT_execCtx.executeUpdate(); } finally @@ -404,7 +418,7 @@ public class MediaFileDAO extends EntityBaseDAO { // ************************************************************ -/*@lineinfo:user-code*//*@lineinfo:101^244*/ +/*@lineinfo:user-code*//*@lineinfo:105^273*/ } void addAll(DefaultContext context, IEntityBase entity) throws SQLException { @@ -425,7 +439,7 @@ public class MediaFileDAO extends EntityBaseDAO { void removeAll(DefaultContext context, long filterId) throws SQLException { manager.traceIn(); - /*@lineinfo:generated-code*//*@lineinfo:122^2*/ + /*@lineinfo:generated-code*//*@lineinfo:126^2*/ // ************************************************************ // #sql [context] { DELETE FROM MEDIAFILE WHERE MEDIAID = :filterId }; @@ -453,16 +467,16 @@ public class MediaFileDAO extends EntityBaseDAO { // ************************************************************ -/*@lineinfo:user-code*//*@lineinfo:122^67*/ +/*@lineinfo:user-code*//*@lineinfo:126^67*/ manager.traceOut(); } private MediaFileIter selectByHouseId(DefaultContext context, String houseId) throws SQLException{ MediaFileIter iter = null; - /*@lineinfo:generated-code*//*@lineinfo:128^2*/ + /*@lineinfo:generated-code*//*@lineinfo:132^2*/ // ************************************************************ -// #sql [context] iter = { SELECT ID, MEDIAID, STOREID, FILETYPEID, RELATIVEPATH, FILESTRUCTINFO, HOUSEID, FILESIZE, LASTMODIFIED FROM MEDIAFILE WHERE HOUSEID = :houseId }; +// #sql [context] iter = { SELECT ID, MEDIAID, STOREID, FILETYPEID, RELATIVEPATH, FILESTRUCTINFO, HOUSEID, FILESIZE, LASTMODIFIED, DISABLEPROXY FROM MEDIAFILE WHERE HOUSEID = :houseId }; // ************************************************************ { @@ -487,7 +501,7 @@ public class MediaFileDAO extends EntityBaseDAO { // ************************************************************ -/*@lineinfo:user-code*//*@lineinfo:128^169*/ +/*@lineinfo:user-code*//*@lineinfo:132^183*/ return iter; } 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 63809492..05218e60 100644 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 9274bb75..fbde7347 100644 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 1f5f78fe..30f555c2 100644 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 3a1ed9b2..77db96cc 100644 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 ab0580c1..f9585132 100644 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 490e48fd..fece95b9 100644 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 cad6efea..7c4d89ff 100644 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 ae0b6b09..dfb82102 100644 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 c6dc7558..9d79a600 100644 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 755e7198..0fbd9bae 100644 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 7b493860..3e33e1b9 100644 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 5cfda85b..f21929d1 100644 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 1a33949c..751acc20 100644 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/src/user/jobengine/db/MediaFile.java b/server/user.jobengine.osgi.db/src/user/jobengine/db/MediaFile.java index d8a977d4..37120e55 100644 --- a/server/user.jobengine.osgi.db/src/user/jobengine/db/MediaFile.java +++ b/server/user.jobengine.osgi.db/src/user/jobengine/db/MediaFile.java @@ -6,7 +6,7 @@ import java.sql.Timestamp; import user.commons.EntityBase; public class MediaFile extends EntityBase implements Serializable { - //TODO change back to BLOB or BINARY (everywhere) + // TODO change back to BLOB or BINARY (everywhere) private static final long serialVersionUID = 1L; private String fileStructInfo = null; private FileType fileType = null; @@ -19,6 +19,7 @@ public class MediaFile extends EntityBase implements Serializable { private long fileSize = 0; private String houseId = null; private Timestamp lastModified; + private boolean disableProxy; public long getFileSize() { return fileSize; @@ -82,13 +83,13 @@ public class MediaFile extends EntityBase implements Serializable { } public void setFileType(FileType fileType) { - //checkParameter("FileType", fileType); + // checkParameter("FileType", fileType); this.fileType = fileType; this.fileTypeId = fileType.getId(); } public void setFileTypeId(long fileTypeId) { - //checkParameter("FileTypeId", fileTypeId); + // checkParameter("FileTypeId", fileTypeId); this.fileTypeId = fileTypeId; } @@ -101,30 +102,38 @@ public class MediaFile extends EntityBase implements Serializable { } public void setMedia(Media media) { - //checkParameter("Media", media); + // checkParameter("Media", media); this.media = media; this.mediaId = media.getId(); } public void setMediaId(long mediaId) { - //checkParameter("MediaId", mediaId); + // checkParameter("MediaId", mediaId); this.mediaId = mediaId; } public void setRelativePath(String relativePath) { - //checkParameter("RelativePath", relativePath); + // checkParameter("RelativePath", relativePath); this.relativePath = relativePath; } public void setStore(Store store) { - //checkParameter("Store", store); + // checkParameter("Store", store); this.store = store; this.storeId = store.getId(); } public void setStoreId(long id) { - //checkParameter("StoreId", id); + // checkParameter("StoreId", id); this.storeId = id; } + public boolean isDisableProxy() { + return disableProxy; + } + + public void setDisableProxy(boolean disableProxy) { + this.disableProxy = disableProxy; + } + } \ No newline at end of file diff --git a/server/user.jobengine.osgi.db/src/user/jobengine/db/MediaFileDAO.sqlj b/server/user.jobengine.osgi.db/src/user/jobengine/db/MediaFileDAO.sqlj index 697c69df..824f3726 100644 --- a/server/user.jobengine.osgi.db/src/user/jobengine/db/MediaFileDAO.sqlj +++ b/server/user.jobengine.osgi.db/src/user/jobengine/db/MediaFileDAO.sqlj @@ -7,7 +7,7 @@ import java.util.ArrayList; import java.util.List; import java.sql.Timestamp; -#sql iterator MediaFileIter(long id, long mediaId, long storeId, long fileTypeId, String relativePath, String fileStructInfo, String houseId, long fileSize, Timestamp lastModified); +#sql iterator MediaFileIter(long id, long mediaId, long storeId, long fileTypeId, String relativePath, String fileStructInfo, String houseId, long fileSize, Timestamp lastModified, String disableProxy); @SuppressWarnings("unused") public class MediaFileDAO extends EntityBaseDAO { @@ -31,6 +31,7 @@ public class MediaFileDAO extends EntityBaseDAO { entity.setHouseId(iterator.houseId()); entity.setFileSize(iterator.fileSize()); entity.setLastModified(iterator.lastModified()); + entity.setDisableProxy(iterator.disableProxy().equals("Y") ? true : false); if (result == null) result = new ArrayList(); @@ -43,21 +44,21 @@ public class MediaFileDAO extends EntityBaseDAO { @Override protected ResultSetIterImpl selectByKey(DefaultContext context, long id) throws SQLException{ MediaFileIter iter = null; - #sql [context] iter = { SELECT ID, MEDIAID, STOREID, FILETYPEID, RELATIVEPATH, FILESTRUCTINFO, HOUSEID, FILESIZE, LASTMODIFIED FROM MEDIAFILE WHERE ID = :id }; + #sql [context] iter = { SELECT ID, MEDIAID, STOREID, FILETYPEID, RELATIVEPATH, FILESTRUCTINFO, HOUSEID, FILESIZE, LASTMODIFIED, DISABLEPROXY FROM MEDIAFILE WHERE ID = :id }; return iter; } @Override protected ResultSetIterImpl selectByForeignKey(DefaultContext context, long id) throws SQLException{ MediaFileIter iter = null; - #sql [context] iter = { SELECT ID, MEDIAID, STOREID, FILETYPEID, RELATIVEPATH, FILESTRUCTINFO, HOUSEID, FILESIZE, LASTMODIFIED FROM MEDIAFILE WHERE MEDIAID = :id }; + #sql [context] iter = { SELECT ID, MEDIAID, STOREID, FILETYPEID, RELATIVEPATH, FILESTRUCTINFO, HOUSEID, FILESIZE, LASTMODIFIED, DISABLEPROXY FROM MEDIAFILE WHERE MEDIAID = :id }; return iter; } @Override protected ResultSetIterImpl selectAll(DefaultContext context) throws SQLException{ MediaFileIter iter = null; - #sql [context] iter = { SELECT ID, MEDIAID, STOREID, FILETYPEID, RELATIVEPATH, FILESTRUCTINFO, HOUSEID, FILESIZE, LASTMODIFIED FROM MEDIAFILE }; + #sql [context] iter = { SELECT ID, MEDIAID, STOREID, FILETYPEID, RELATIVEPATH, FILESTRUCTINFO, HOUSEID, FILESIZE, LASTMODIFIED, DISABLEPROXY FROM MEDIAFILE }; return iter; } @@ -83,7 +84,9 @@ public class MediaFileDAO extends EntityBaseDAO { String houseId = obj.getHouseId(); long fileSize = obj.getFileSize(); Timestamp lastModified = obj.getLastModified(); - #sql [context] { UPDATE MEDIAFILE SET MEDIAID = :mediaId, STOREID = :storeId, FILETYPEID = :fileTypeId, RELATIVEPATH = :relativePath, FILESTRUCTINFO = :fileStructInfo, HOUSEID = :houseId, FILESIZE = :fileSize, LASTMODIFIED = :lastModified WHERE ID = :id }; + String disableProxy = obj.isDisableProxy() ? "Y" : "N"; + + #sql [context] { UPDATE MEDIAFILE SET MEDIAID = :mediaId, STOREID = :storeId, FILETYPEID = :fileTypeId, RELATIVEPATH = :relativePath, FILESTRUCTINFO = :fileStructInfo, HOUSEID = :houseId, FILESIZE = :fileSize, LASTMODIFIED = :lastModified, DISABLEPROXY = :disableProxy WHERE ID = :id }; } @Override @@ -97,8 +100,9 @@ public class MediaFileDAO extends EntityBaseDAO { String houseId = obj.getHouseId(); long fileSize = obj.getFileSize(); Timestamp lastModified = obj.getLastModified(); + String disableProxy = obj.isDisableProxy() ? "Y" : "N"; - #sql [context] { INSERT INTO MEDIAFILE (MEDIAID, STOREID, FILETYPEID, RELATIVEPATH, FILESTRUCTINFO, HOUSEID, FILESIZE, LASTMODIFIED) VALUES (:mediaId, :storeId, :fileTypeId, :relativePath, :fileStructInfo, :houseId, :fileSize, :lastModified) }; + #sql [context] { INSERT INTO MEDIAFILE (MEDIAID, STOREID, FILETYPEID, RELATIVEPATH, FILESTRUCTINFO, HOUSEID, FILESIZE, LASTMODIFIED, DISABLEPROXY) VALUES (:mediaId, :storeId, :fileTypeId, :relativePath, :fileStructInfo, :houseId, :fileSize, :lastModified, :disableProxy) }; } void addAll(DefaultContext context, IEntityBase entity) throws SQLException { @@ -125,7 +129,7 @@ public class MediaFileDAO extends EntityBaseDAO { private MediaFileIter selectByHouseId(DefaultContext context, String houseId) throws SQLException{ MediaFileIter iter = null; - #sql [context] iter = { SELECT ID, MEDIAID, STOREID, FILETYPEID, RELATIVEPATH, FILESTRUCTINFO, HOUSEID, FILESIZE, LASTMODIFIED FROM MEDIAFILE WHERE HOUSEID = :houseId }; + #sql [context] iter = { SELECT ID, MEDIAID, STOREID, FILETYPEID, RELATIVEPATH, FILESTRUCTINFO, HOUSEID, FILESIZE, LASTMODIFIED, DISABLEPROXY FROM MEDIAFILE WHERE HOUSEID = :houseId }; return iter; }