2.3.863

Author: ITHitBuild

deltav/pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.ithit.webdav.samples</groupId>
     <artifactId>deltav</artifactId>
-    <version>2.2.710</version>
+    <version>2.3.863</version>
     <packaging>war</packaging>
 
     <properties>
@@ -88,7 +88,7 @@
         <dependency>
             <groupId>com.ithit.webdav</groupId>
             <artifactId>webdav-server</artifactId>
-            <version>2.2.710</version>
+            <version>2.3.863</version>
         </dependency>
 
         <dependency>
@@ -128,7 +128,7 @@
                             <goal>copy-resources</goal>
                         </goals>
                         <configuration>
-                            <outputDirectory>${project.build.directory}/deltav-2.2.710/META-INF</outputDirectory>
+                            <outputDirectory>${project.build.directory}/deltav-2.3.863/META-INF</outputDirectory>
                             <overwrite>true</overwrite>
                             <resources>
                                 <resource>
@@ -207,7 +207,7 @@
                     <server>filesystem</server>
                     <port>11021</port>
                     <path>/</path>
-                    <warSourceDirectory>target/deltav-2.2.710</warSourceDirectory>
+                    <warSourceDirectory>target/deltav-2.3.863</warSourceDirectory>
                 </configuration>
             </plugin>
             <plugin>

deltav/src/main/java/com/ithit/webdav/samples/deltavservlet/CustomFolderGetHandler.java

@@ -38,6 +38,11 @@ public void processRequest(HttpServletRequest request, HttpServletResponse respo
             PrintStream stream = new PrintStream(response.getOutputStream(), true, charset);
             Path path = Paths.get(WebDavServlet.getRealPath(), pathToHTML);
             String context = WebDavServlet.getContext() + "/";
+            String wsContext = context.replaceFirst("/", "");
+            int ind = wsContext.lastIndexOf("/");
+            if (ind >= 0) {
+                wsContext = new StringBuilder(wsContext).replace(ind, ind + 1, "\\/").toString();
+            }
             for (String line : Files.readAllLines(path, StandardCharsets.UTF_8)) {
                 String contextRootString = "<%context root%>";
                 if (line.contains(contextRootString)) {
@@ -51,6 +56,10 @@ public void processRequest(HttpServletRequest request, HttpServletResponse respo
                 if (line.contains(versionNumber)) {
                     line = line.replace(versionNumber, version);
                 }
+                String ws = "<%ws root%>";
+                if (line.contains(ws)) {
+                    line = line.replace(ws, wsContext);
+                }
                 stream.println(line);
             }
             stream.flush();

deltav/src/main/java/com/ithit/webdav/samples/deltavservlet/DataAccess.java

@@ -35,7 +35,8 @@ public class DataAccess {
 
     /**
      * Initialize {@link DataAccess} with {@link WebDavEngine}
-     *.
+     * .
+     *
      * @param engine {@link WebDavEngine}.
      */
     DataAccess(WebDavEngine engine) {
@@ -88,6 +89,7 @@ private Connection getConnection() throws ServerException {
 
     /**
      * Returns default table space in which DB is stored.
+     *
      * @return Returns default table space in which DB is stored.
      */
     String getDefaultTableSpace() {
@@ -96,6 +98,7 @@ String getDefaultTableSpace() {
 
     /**
      * Returns total bytes used by DB.
+     *
      * @return Returns total bytes used by DB.
      */
     long getTotalBytes() {
@@ -271,9 +274,9 @@ List<Property> readProperties(String sql, Object... args) throws ServerException
     /**
      * Read DB for {@link VersionImpl}.
      *
-     * @param sql  Query executed against Lock table.
+     * @param sql      Query executed against Lock table.
      * @param itemPath Path to the HierarchyItemImpl.
-     * @param args Query arguments.
+     * @param args     Query arguments.
      * @return Property.
      * @throws ServerException in case of DB exception.
      */
@@ -482,7 +485,6 @@ FolderImpl getFolderImpl(HierarchyItem item) throws ServerException {
 
     /**
      * Interface that helps to read object from DB.
-     *
      */
     interface ElementReader<T> {
         /**
@@ -501,7 +503,7 @@ interface ElementReader<T> {
      *
      * @return List of {@link HierarchyItemImpl} objects. Each item is a {@link FileImpl} item.
      */
-    List<HierarchyItemImpl> getFiles()  {
+    List<HierarchyItemImpl> getFiles() {
         try {
             return readItems("SELECT ID," +
                     " Parent," +
@@ -525,11 +527,12 @@ List<HierarchyItemImpl> getFiles()  {
 
     /**
      * Gets {@link HierarchyItem} from DB by id and specified path.
-     * @param id File id.
+     *
+     * @param id   File id.
      * @param path Path of file.
      * @return HierarchyItem.
      */
-    HierarchyItem getFile(int id, String path)  {
+    HierarchyItem getFile(int id, String path) {
         HierarchyItem result = null;
         try {
             List<HierarchyItemImpl> hierarchyItems = readItems("SELECT ID," +

deltav/src/main/java/com/ithit/webdav/samples/deltavservlet/DownloadUtil.java

@@ -25,7 +25,7 @@ class DownloadUtil {
      * @param blob       Blob to write to the stream.
      * @param startIndex Zero-bazed byte offset in file content at which to begin copying bytes to the output stream.
      * @param count      Number of bytes to be written to the output stream.
-     * @throws IOException In case of blob reading exception.
+     * @throws IOException  In case of blob reading exception.
      * @throws SQLException In case of an error.
      */
     static void readBlob(Logger logger, OutputStream output, Blob blob, long startIndex, long count) throws SQLException, IOException {

deltav/src/main/java/com/ithit/webdav/samples/deltavservlet/FileImpl.java

@@ -45,20 +45,20 @@ public class FileImpl extends HierarchyItemImpl implements
     /**
      * Initializes a new instance of the {@link FileImpl} class.
      *
-     * @param id                 Id of the item in DB.
-     * @param parentId           Id of the parent item in DB.
-     * @param name               Name of hierarchy item.
-     * @param path               Relative to WebDAV root folder path.
-     * @param created            Creation time of the hierarchy item.
-     * @param modified           Modification time of the hierarchy item.
-     * @param lastChunkSaved     Last byte saved.
-     * @param totalContentLength Length of the file.
-     * @param versionControlled  Whether file version controlled.
-     * @param checkedOut         Determines whether item is in checked-in or checked-out state.
-     * @param checkInDuringUnlock Whether we need check in file during unlock.
+     * @param id                    Id of the item in DB.
+     * @param parentId              Id of the parent item in DB.
+     * @param name                  Name of hierarchy item.
+     * @param path                  Relative to WebDAV root folder path.
+     * @param created               Creation time of the hierarchy item.
+     * @param modified              Modification time of the hierarchy item.
+     * @param lastChunkSaved        Last byte saved.
+     * @param totalContentLength    Length of the file.
+     * @param versionControlled     Whether file version controlled.
+     * @param checkedOut            Determines whether item is in checked-in or checked-out state.
+     * @param checkInDuringUnlock   Whether we need check in file during unlock.
      * @param checkInOnFileComplete Whether to checking on file complete.
-     * @param autoVersion        Auto versioning rule.
-     * @param engine             Instance of current {@link WebDavEngine}.
+     * @param autoVersion           Auto versioning rule.
+     * @param engine                Instance of current {@link WebDavEngine}.
      */
     FileImpl(int id, int parentId, String name,
              String path, long created, long modified, long lastChunkSaved,
@@ -112,10 +112,10 @@ public void delete() throws LockedException, MultistatusException, ServerExcepti
         ensureHasToken();
 
         deleteThisItem();
-        getEngine().notifyRefresh(getParent(getPath()));
+        getEngine().getWebSocketServer().notifyRefresh(getParent(getPath()));
         try {
-            getEngine().getIndexer().deleteIndex(this);
-        } catch (Exception ex){
+            getEngine().getSearchFacade().getIndexer().deleteIndex(this);
+        } catch (Exception ex) {
             getEngine().getLogger().logError("Errors during indexing.", ex);
         }
     }
@@ -215,13 +215,13 @@ public void copyTo(Folder folder, String destName, boolean deep)
         } else {
             copy = copyThisItem(destFolder, null, destName);
         }
-        getEngine().notifyRefresh(folder.getPath());
+        getEngine().getWebSocketServer().notifyRefresh(folder.getPath());
         try {
             if (copy != null) {
                 newID = copy.getId();
             }
-            getEngine().getIndexer().indexFile(destName, newID, null, this);
-        } catch (Exception ex){
+            getEngine().getSearchFacade().getIndexer().indexFile(destName, newID, null, this);
+        } catch (Exception ex) {
             getEngine().getLogger().logError("Errors during indexing.", ex);
         }
     }
@@ -346,10 +346,10 @@ public long write(InputStream content, String contentType, long startIndex, long
                 if (os != null)
                     os.close();
             }
-            getEngine().notifyRefresh(getParent(getPath()));
+            getEngine().getWebSocketServer().notifyRefresh(getParent(getPath()));
             try {
-                getEngine().getIndexer().indexFile(getName(), getId(), getId(), this);
-            } catch (Exception ex){
+                getEngine().getSearchFacade().getIndexer().indexFile(getName(), getId(), getId(), this);
+            } catch (Exception ex) {
                 getEngine().getLogger().logError("Errors during indexing.", ex);
             }
             return totalSaved;
@@ -384,11 +384,11 @@ public void moveTo(Folder folder, String destName)
         } else {
             moveThisItem(destFolder, destName, parent);
         }
-        getEngine().notifyRefresh(getParent(getPath()));
-        getEngine().notifyRefresh(folder.getPath());
+        getEngine().getWebSocketServer().notifyRefresh(getParent(getPath()));
+        getEngine().getWebSocketServer().notifyRefresh(folder.getPath());
         try {
-            getEngine().getIndexer().indexFile(destName, getId(), getId(), this);
-        } catch (Exception ex){
+            getEngine().getSearchFacade().getIndexer().indexFile(destName, getId(), getId(), this);
+        } catch (Exception ex) {
             getEngine().getLogger().logError("Errors during indexing.", ex);
         }
     }
@@ -525,6 +525,7 @@ public String checkIn() throws ServerException, LockedException {
 
     /**
      * Creates new version of the file in the DB.
+     *
      * @param newVersionNumber New version number.
      * @return Path to the new version.
      * @throws ServerException in case of DB errors.
@@ -561,6 +562,7 @@ private String createNewVersion(int newVersionNumber) throws ServerException {
 
     /**
      * Updates CheckedOut filed in the Repository table to the specified value.
+     *
      * @param value Value to set.
      * @throws ServerException in case of DB errors.
      */
@@ -660,6 +662,7 @@ public AutoVersion getAutoVersion() throws ServerException {
 
     /**
      * Sets auth versioning mode for this item.
+     *
      * @param value Auto versioning mode.
      * @throws ServerException in case of an error.
      */
@@ -773,6 +776,7 @@ public void setCreatorDisplayName(String name) throws ServerException {
 
     /**
      * Loads file content input stream for indexing.
+     *
      * @param id File id
      * @return InputStream for indexing.
      */

deltav/src/main/java/com/ithit/webdav/samples/deltavservlet/FolderImpl.java

@@ -144,7 +144,7 @@ private HierarchyItemImpl createChild(String name, byte itemType) throws ServerE
                 item = new FileImpl(newId, getId(), name, getPath() + name,
                         now, now, now, 0, false, false, false, false, getEngine().getAutoVersionMode(), getEngine());
         }
-        getEngine().notifyRefresh(getPath());
+        getEngine().getWebSocketServer().notifyRefresh(getPath());
         return item;
 
     }
@@ -229,15 +229,15 @@ public void moveTo(Folder folder, String destName)
         if (mr.getResponses().length > 0)
             throw mr;
         try {
-            getEngine().getIndexer().deleteIndex(this);
-            getEngine().getIndexer().indexFile(newDestFolder.getName(), newDestFolder.getId(), null, this);
-        } catch (Exception ex){
+            getEngine().getSearchFacade().getIndexer().deleteIndex(this);
+            getEngine().getSearchFacade().getIndexer().indexFile(newDestFolder.getName(), newDestFolder.getId(), null, this);
+        } catch (Exception ex) {
             getEngine().getLogger().logError("Errors during indexing.", ex);
         }
         // delete this folder
         deleteThisItem();
-        getEngine().notifyDelete(getPath());
-        getEngine().notifyRefresh(folder.getPath());
+        getEngine().getWebSocketServer().notifyDelete(getPath());
+        getEngine().getWebSocketServer().notifyRefresh(folder.getPath());
     }
 
     @Override
@@ -266,8 +266,8 @@ public void copyTo(Folder folder, String destName, boolean deep)
         }
 
         try {
-            getEngine().getIndexer().indexFile(newDestFolder.getName(), newDestFolder.getId(), null, this);
-        } catch (Exception ex){
+            getEngine().getSearchFacade().getIndexer().indexFile(newDestFolder.getName(), newDestFolder.getId(), null, this);
+        } catch (Exception ex) {
             getEngine().getLogger().logError("Errors during indexing.", ex);
         }
 
@@ -285,7 +285,7 @@ public void copyTo(Folder folder, String destName, boolean deep)
             }
         }
 
-        getEngine().notifyRefresh(folder.getPath());
+        getEngine().getWebSocketServer().notifyRefresh(folder.getPath());
         if (mr.getResponses().length > 0)
             throw mr;
 
@@ -321,13 +321,13 @@ public void delete() throws ServerException, LockedException, MultistatusExcepti
             throw mx;
         else {
             try {
-                getEngine().getIndexer().deleteIndex(this);
-            } catch (Exception ex){
+                getEngine().getSearchFacade().getIndexer().deleteIndex(this);
+            } catch (Exception ex) {
                 getEngine().getLogger().logError("Errors during indexing.", ex);
             }
             deleteThisItem();
         }
-        getEngine().notifyDelete(getPath());
+        getEngine().getWebSocketServer().notifyDelete(getPath());
     }
 
     /**
@@ -389,18 +389,18 @@ protected HierarchyItemImpl createItemCopy(int id, int parentId, String name, St
      *
      * @param searchString A phrase to search.
      * @param options      Search parameters.
-     * @param propNames List of properties to retrieve with the children. They will be queried by the engine later.
+     * @param propNames    List of properties to retrieve with the children. They will be queried by the engine later.
      * @return ist of {@link HierarchyItem} satisfying the search parameters or empty list.
      */
     @Override
     public List<HierarchyItem> search(String searchString, SearchOptions options, List<Property> propNames) {
         List<HierarchyItem> results = new LinkedList<>();
-        Searcher searcher = getEngine().getSearcher();
+        SearchFacade.Searcher searcher = getEngine().getSearchFacade().getSearcher();
         if (searcher == null) {
             return results;
         }
         boolean snippet = false;
-        for (Property pr: propNames) {
+        for (Property pr : propNames) {
             if (SNIPPET.equalsIgnoreCase(pr.getName())) {
                 snippet = true;
                 break;
@@ -416,9 +416,9 @@ public List<HierarchyItem> search(String searchString, SearchOptions options, Li
                         "   START WITH id = ? " +
                         "   CONNECT BY id = PRIOR parent and parent!= prior id)", entry.getKey());
                 String[] pathParts = path.split("/");
-                pathParts = Arrays.copyOf(pathParts, pathParts.length-1);
+                pathParts = Arrays.copyOf(pathParts, pathParts.length - 1);
                 StringBuilder pathBuilder = new StringBuilder();
-                for (int i = pathParts.length - 1 ; i>=0 ; i--) {
+                for (int i = pathParts.length - 1; i >= 0; i--) {
                     if (Objects.equals(pathParts[i], "")) {
                         continue;
                     }