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

diff --git a/server/user.jobengine.osgi.db/build-remote-sqlj.bat b/server/user.jobengine.osgi.db/build-remote-sqlj.bat
index 7874f5614e8252294c3473cd45d4d2bbd30508ad..19a80e3d87d2a8adc20e2f91224d3fe1e4ac655e 100644 (file)
--- a/server/user.jobengine.osgi.db/build-remote-sqlj.bat
+++ b/server/user.jobengine.osgi.db/build-remote-sqlj.bat
@@ -22,7 +22,7 @@
 \r
 :deploy_source\r
        ECHO --- Deploying source\r
-       WinSCP.com /command ^\r
+       c:\\apps\\putty\\WinSCP.com /command ^\r
        "open %REMOTE_SERVER_ADDRESS% -hostkey=""%REMOTE_SERVER_HOSTKEY%""" ^\r
        "call mkdir -p %REMOTE_LOCATION%" ^\r
        "cd %REMOTE_LOCATION%" ^\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 47bc6d9e7cecee3c7b73ca3aa152b29a8d227365..5d29a10e6217addb4f1ab399473d80bb5528b97b 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 c45cfa54e51a7c44cd84574daab0c8981d676605..dcb30d2d039d73e220419d798051521e5092feab 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 bcbb788c046bc4f29b7125cb6851253254f046b8..bd4f7326b2cdcb317d58160508b04018d63e92b6 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 e8cf325deeb8d2c96c810fa49b7d9ae17078520b..b68051e275ea3200a11fd23484b2eb102c72b5f1 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 26cf3cfd04c5cbf38049d08e74c84de844fefdb1..aa68a34b92d4ec4ab2fb8bc7279811a813f347af 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 69cc1902ce53990647f980c6c009a3271710e885..c85818110da7cc951cbe68e07681246a82fa2a1d 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 1e9b8447faa4455c160997a50b97af12dc72c420..298ec28f0019651014becffb60d4e370d8444714 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 b621d807aee6ecdcbcefa293d71040702b8dd9b5..a75535f6347508d506485732ea25cd0928c22122 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 74f74a4b46cfb3b0c0bdddfa83c6bda10a6a376f..55fff32ccfff85fc706be960799fb4b2927fc65b 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 f1ac7ed5d4b69d58387efa5cbd5003db23cb3e11..3d6ed2ba4ad6a7926e753ed6e1f284a13294f39d 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 7dec0bec46599519867060dd3d4a0f3197051feb..a3d4184441f2ab34a1fb135b48d87316495b0bed 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 226a3ff8eb28c5eb1426d03bf7ee9713f6a3b821..75b1a4df1ac0e639fed510acaac172fe8c1d82b6 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 f331a910d93641b9311bd70a83b6b0fa4854818e..ff5c2d58dc97eb78caee030aca25714eafb35d30 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_SJProfile0.ser b/server/user.jobengine.osgi.db/generated/user/jobengine/db/MediaDAO_SJProfile0.ser
index 1c50053578455c4b36e4853c27ccb4082be246c2..7cf17e5150b872faffbd9a6983aebc4c63ff3499 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.java b/server/user.jobengine.osgi.db/generated/user/jobengine/db/MediaFileDAO.java
index 39958450e98d1168970d83bdf50f93971e6e2722..e375b8c91f6ace66ac4cea94048ae1c443b5fef5 100644 (file)
--- 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<IEntityBase>();                          
@@ -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 63809492d02630a31d8fd9b2bd6094ae994342d7..05218e6037c1dcd3e083e5876b0e4db6c5963c77 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 9274bb7582025c4af8f7f79e4dab45cc5ffa14d3..fbde73470e618aac335623b8961833fa852cf621 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 1f5f78fe1d009da60c7b11dc12f816d6155093c0..30f555c292c2cc2a15b8bdbdf5f596fa64aa212d 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 3a1ed9b2f6b6cf6e295cd53a4f2dcd17e4ea5724..77db96cc632df74cdae4178a51dbbdd6074a4390 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 ab0580c12708fded082a1fe7e5386ab82539f103..f95851324e8e9433a2dae9de9be5258e358891b8 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 490e48fd25d96011c21a42806aa14044c6de57b1..fece95b9692c17e56b0c359f5c1540d33a8b5590 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 cad6efeae01b27bbd4fb0482cc6c45f52e9f618c..7c4d89fff8ba387366e9e616a09360025d5444ab 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 ae0b6b0961c7385f5708f12de8950edf406ba754..dfb821026f0efd714e63f5105c8299169528aa6d 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 c6dc75586fc40b65fce42888bb3d60c093ebf1fe..9d79a600ae399bcbc0fdb2571412bd6484e80301 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 755e7198d5dfbe1b865fc4c72623d192a5fbbce3..0fbd9bae048e5b50ee590604225efe37bc64722a 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 7b493860db149ab06ace7b4fa682ae9869361de3..3e33e1b9c4efdbc2c1de52cf048828baf4996b7a 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 5cfda85b32789d2cd2e404d1bd636914a7368750..f21929d1d6e0dfcf53c0a0f56e0e5d207eb71a28 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 1a33949c6f730b2664313815018e04736d2078d1..751acc2087c70fa75aa06e8c7e37c5d49513c380 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/src/user/jobengine/db/MediaFile.java b/server/user.jobengine.osgi.db/src/user/jobengine/db/MediaFile.java
index d8a977d4da8606c934149f0490aa3505164e0c94..37120e557a6d45dae2506b6ee54d0390a601c35c 100644 (file)
--- 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 697c69df717a6ea9adfb50b555360246e393bae7..824f37269343e3af8e1328cf4d33a84cc609e584 100644 (file)
--- 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;\r
 import java.sql.Timestamp;\r
 \r
-#sql iterator MediaFileIter(long id, long mediaId, long storeId, long fileTypeId, String relativePath, String fileStructInfo, String houseId, long fileSize, Timestamp lastModified);\r
+#sql iterator MediaFileIter(long id, long mediaId, long storeId, long fileTypeId, String relativePath, String fileStructInfo, String houseId, long fileSize, Timestamp lastModified,  String disableProxy);\r
 \r
 @SuppressWarnings("unused")\r
 public class MediaFileDAO extends EntityBaseDAO {\r
@@ -31,6 +31,7 @@ public class MediaFileDAO extends EntityBaseDAO {
                        entity.setHouseId(iterator.houseId());\r
                        entity.setFileSize(iterator.fileSize());\r
                        entity.setLastModified(iterator.lastModified());\r
+                       entity.setDisableProxy(iterator.disableProxy().equals("Y") ? true : false);\r
 \r
                        if (result == null)\r
                                result = new ArrayList<IEntityBase>();                          \r
@@ -43,21 +44,21 @@ public class MediaFileDAO extends EntityBaseDAO {
        @Override\r
        protected ResultSetIterImpl selectByKey(DefaultContext context, long id) throws SQLException{\r
                MediaFileIter iter = null;\r
-               #sql [context] iter = { SELECT ID, MEDIAID, STOREID, FILETYPEID, RELATIVEPATH, FILESTRUCTINFO, HOUSEID, FILESIZE, LASTMODIFIED FROM MEDIAFILE WHERE ID = :id };\r
+               #sql [context] iter = { SELECT ID, MEDIAID, STOREID, FILETYPEID, RELATIVEPATH, FILESTRUCTINFO, HOUSEID, FILESIZE, LASTMODIFIED, DISABLEPROXY FROM MEDIAFILE WHERE ID = :id };\r
                return iter;\r
        }\r
 \r
        @Override\r
        protected ResultSetIterImpl selectByForeignKey(DefaultContext context, long id) throws SQLException{\r
                MediaFileIter iter = null;\r
-               #sql [context] iter = { SELECT ID, MEDIAID, STOREID, FILETYPEID, RELATIVEPATH, FILESTRUCTINFO, HOUSEID, FILESIZE, LASTMODIFIED FROM MEDIAFILE WHERE MEDIAID = :id };\r
+               #sql [context] iter = { SELECT ID, MEDIAID, STOREID, FILETYPEID, RELATIVEPATH, FILESTRUCTINFO, HOUSEID, FILESIZE, LASTMODIFIED, DISABLEPROXY FROM MEDIAFILE WHERE MEDIAID = :id };\r
                return iter;\r
        }\r
        \r
        @Override\r
        protected ResultSetIterImpl selectAll(DefaultContext context) throws SQLException{\r
                MediaFileIter iter = null;\r
-               #sql [context] iter = { SELECT ID, MEDIAID, STOREID, FILETYPEID, RELATIVEPATH, FILESTRUCTINFO, HOUSEID, FILESIZE, LASTMODIFIED FROM MEDIAFILE };\r
+               #sql [context] iter = { SELECT ID, MEDIAID, STOREID, FILETYPEID, RELATIVEPATH, FILESTRUCTINFO, HOUSEID, FILESIZE, LASTMODIFIED, DISABLEPROXY FROM MEDIAFILE };\r
                return iter;\r
        }\r
        \r
@@ -83,7 +84,9 @@ public class MediaFileDAO extends EntityBaseDAO {
                String houseId = obj.getHouseId();\r
                long fileSize = obj.getFileSize();\r
                Timestamp lastModified = obj.getLastModified();\r
-               #sql [context] { UPDATE MEDIAFILE SET MEDIAID = :mediaId, STOREID = :storeId, FILETYPEID = :fileTypeId, RELATIVEPATH = :relativePath, FILESTRUCTINFO = :fileStructInfo, HOUSEID = :houseId, FILESIZE = :fileSize, LASTMODIFIED = :lastModified WHERE ID = :id };\r
+               String disableProxy = obj.isDisableProxy() ? "Y" : "N";\r
+               \r
+               #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 };\r
        }\r
        \r
        @Override\r
@@ -97,8 +100,9 @@ public class MediaFileDAO extends EntityBaseDAO {
                String houseId = obj.getHouseId();\r
                long fileSize = obj.getFileSize();\r
                Timestamp lastModified = obj.getLastModified();\r
+               String disableProxy = obj.isDisableProxy() ? "Y" : "N";\r
 \r
-               #sql [context] { INSERT INTO MEDIAFILE (MEDIAID, STOREID, FILETYPEID, RELATIVEPATH, FILESTRUCTINFO, HOUSEID, FILESIZE, LASTMODIFIED) VALUES (:mediaId, :storeId, :fileTypeId, :relativePath, :fileStructInfo, :houseId, :fileSize, :lastModified) };\r
+               #sql [context] { INSERT INTO MEDIAFILE (MEDIAID, STOREID, FILETYPEID, RELATIVEPATH, FILESTRUCTINFO, HOUSEID, FILESIZE, LASTMODIFIED, DISABLEPROXY) VALUES (:mediaId, :storeId, :fileTypeId, :relativePath, :fileStructInfo, :houseId, :fileSize, :lastModified, :disableProxy) };\r
        }\r
        \r
        void addAll(DefaultContext context, IEntityBase entity) throws SQLException {\r
@@ -125,7 +129,7 @@ public class MediaFileDAO extends EntityBaseDAO {
 \r
        private MediaFileIter selectByHouseId(DefaultContext context, String houseId) throws SQLException{\r
                MediaFileIter iter = null;\r
-               #sql [context] iter = { SELECT ID, MEDIAID, STOREID, FILETYPEID, RELATIVEPATH, FILESTRUCTINFO, HOUSEID, FILESIZE, LASTMODIFIED FROM MEDIAFILE WHERE HOUSEID = :houseId };\r
+               #sql [context] iter = { SELECT ID, MEDIAID, STOREID, FILETYPEID, RELATIVEPATH, FILESTRUCTINFO, HOUSEID, FILESIZE, LASTMODIFIED, DISABLEPROXY FROM MEDIAFILE WHERE HOUSEID = :houseId };\r
                return iter;\r
        }\r
        \r