[exo-jcr-commits] exo-jcr SVN: r5367 - in jcr/trunk: exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core and 8 other directories.

do-not-reply at jboss.org do-not-reply at jboss.org
Tue Dec 27 07:19:58 EST 2011


Author: andrew.plotnikov
Date: 2011-12-27 07:19:56 -0500 (Tue, 27 Dec 2011)
New Revision: 5367

Modified:
   jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/config/RepositoryServiceConfigurationImpl.java
   jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionDataManager.java
   jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/registration/PropertyDefinitionComparator.java
   jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/NodeIndexer.java
   jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCStorageConnection.java
   jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/update/StorageUpdateManager.java
   jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/BackupChainLog.java
   jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/server/bean/response/Pair.java
   jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/replication/recovery/RecoveryWriter.java
   jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/xml/PropertyWriteUtil.java
Log:
EXOJCR-1687: Fixed new sonar violations in project

Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/config/RepositoryServiceConfigurationImpl.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/config/RepositoryServiceConfigurationImpl.java	2011-12-27 11:48:23 UTC (rev 5366)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/config/RepositoryServiceConfigurationImpl.java	2011-12-27 12:19:56 UTC (rev 5367)
@@ -252,37 +252,6 @@
 
    }
 
-   private void initFromStream(InputStream jcrConfigurationInputStream) throws RepositoryConfigurationException
-   {
-      try
-      {
-         if (configurationPersister != null)
-         {
-            if (!configurationPersister.hasConfig())
-            {
-               configurationPersister.write(jcrConfigurationInputStream);
-            }
-            init(configurationPersister.read());
-         }
-         else
-         {
-            init(jcrConfigurationInputStream);
-         }
-      }
-      finally
-      {
-         try
-         {
-            jcrConfigurationInputStream.close();
-         }
-         catch (IOException e)
-         {
-            // ignore me
-         }
-      }
-
-   }
-
    /**
     * {@inheritDoc}
     */

Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionDataManager.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionDataManager.java	2011-12-27 11:48:23 UTC (rev 5366)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionDataManager.java	2011-12-27 12:19:56 UTC (rev 5367)
@@ -1840,35 +1840,6 @@
    }
 
    /**
-    * Validate size of access control list.
-    * 
-    * @param changedItem
-    * @throws RepositoryException
-    */
-   @Deprecated
-   private void validateAclSize(ItemState changedItem) throws RepositoryException
-   {
-      NodeData node;
-      if (changedItem.getData().isNode())
-      {
-         node = ((NodeData)changedItem.getData());
-      }
-      else
-      {
-         node = (NodeData)getItemData(changedItem.getData().getParentIdentifier());
-         if (node == null)
-         {
-            return; // parent was deleted
-         }
-      }
-
-      if (node.getACL().getPermissionsSize() < 1)
-      {
-         throw new RepositoryException("Node " + node.getQPath().getAsString() + " has wrong formed ACL.");
-      }
-   }
-
-   /**
     * Validate ItemState for access permeations
     * 
     * @param changedItem
@@ -2765,19 +2736,6 @@
    private class SessionItemFactory
    {
 
-      private ItemImpl createItem(ItemData data) throws RepositoryException
-      {
-
-         if (data.isNode())
-         {
-            return createNode((NodeData)data);
-         }
-         else
-         {
-            return createProperty(data);
-         }
-      }
-
       private ItemImpl createItem(ItemData data, NodeData parent) throws RepositoryException
       {
 
@@ -2791,23 +2749,6 @@
          }
       }
 
-      private NodeImpl createNode(NodeData data) throws RepositoryException
-      {
-         NodeImpl node = new NodeImpl(data, session);
-         if (node.isNodeType(Constants.NT_VERSION))
-         {
-            return new VersionImpl(data, session);
-         }
-         else if (node.isNodeType(Constants.NT_VERSIONHISTORY))
-         {
-            return new VersionHistoryImpl(data, session);
-         }
-         else
-         {
-            return node;
-         }
-      }
-
       private NodeImpl createNode(NodeData data, NodeData parent) throws RepositoryException
       {
          NodeImpl node = new NodeImpl(data, parent, session);
@@ -2825,11 +2766,6 @@
          }
       }
 
-      private PropertyImpl createProperty(ItemData data) throws RepositoryException
-      {
-         return new PropertyImpl(data, session);
-      }
-
       private PropertyImpl createProperty(ItemData data, NodeData parent) throws RepositoryException
       {
          return new PropertyImpl(data, parent, session);

Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/registration/PropertyDefinitionComparator.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/registration/PropertyDefinitionComparator.java	2011-12-27 11:48:23 UTC (rev 5366)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/registration/PropertyDefinitionComparator.java	2011-12-27 12:19:56 UTC (rev 5367)
@@ -204,37 +204,7 @@
 
    /**
     * @param registeredNodeType
-    * @param nodes
     * @param recipientDefinitionData
-    * @throws RepositoryException
-    */
-   private void checkProtected(NodeTypeData registeredNodeType, List<NodeData> nodesData,
-      PropertyDefinitionData recipientDefinitionData) throws RepositoryException
-   {
-      if (Constants.JCR_ANY_NAME.equals(recipientDefinitionData.getName()) && recipientDefinitionData.isMandatory())
-         throw new ConstraintViolationException("Invalid property definition " + recipientDefinitionData.getName()
-            + ". Residual definition can't be protected");
-
-      List<NodeData> protectedNodes =
-         getNodes(nodesData, new InternalQName[]{}, new InternalQName[]{recipientDefinitionData.getName()});
-      if (protectedNodes.size() > 0)
-      {
-         String message =
-            "Can not change " + recipientDefinitionData.getName().getAsString()
-               + " property definition from Protected=false to Protected = true , because " + " the following nodes ";
-         for (NodeData nodeData : protectedNodes)
-         {
-            message += nodeData.getQPath().getAsString() + " ";
-         }
-         message += "  doesn't have these properties ";
-
-         throw new ConstraintViolationException(message);
-      }
-   }
-
-   /**
-    * @param registeredNodeType
-    * @param recipientDefinitionData
     * @param allRecipientDefinition
     * @throws RepositoryException
     */

Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/NodeIndexer.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/NodeIndexer.java	2011-12-27 11:48:23 UTC (rev 5366)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/NodeIndexer.java	2011-12-27 12:19:56 UTC (rev 5367)
@@ -255,20 +255,6 @@
    }
 
    /**
-    * Wraps the exception <code>e</code> into a <code>RepositoryException</code>
-    * and throws the created exception.
-    *
-    * @param e the base exception.
-    */
-   private void throwRepositoryException(Exception e) throws RepositoryException
-   {
-      String msg =
-         "Error while indexing node: " + node.getIdentifier() + " of " + "type: "
-            + node.getPrimaryTypeName().getAsString();
-      throw new RepositoryException(msg, e);
-   }
-
-   /**
     * Adds a {@link FieldNames#MVP} field to <code>doc</code> with the resolved
     * <code>name</code> using the internal search index namespace mapping.
     *

Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCStorageConnection.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCStorageConnection.java	2011-12-27 11:48:23 UTC (rev 5366)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCStorageConnection.java	2011-12-27 12:19:56 UTC (rev 5367)
@@ -1576,46 +1576,6 @@
       }
    }
 
-   /**
-    * Find ancestor permissions by cpid. Will search till find the permissions or meet a root node.
-    * 
-    * @param cpid
-    *          - initial parent node id
-    * @return Collection<String>
-    * @throws SQLException
-    *           if database error
-    * @throws IllegalACLException
-    *           if wrong ACL
-    * @throws IllegalNameException
-    *           if wrong QName
-    * @throws RepositoryException
-    *           if Repository error
-    */
-   private List<AccessControlEntry> traverseACLPermissions(String cpid) throws SQLException, IllegalACLException,
-      IllegalNameException, RepositoryException
-   {
-      String caid = cpid;
-      while (!caid.equals(Constants.ROOT_PARENT_UUID))
-      {
-         MixinInfo naMixins = readMixins(caid);
-         if (naMixins.hasPrivilegeable())
-         {
-            return readACLPermisions(caid);
-         }
-
-         if (naMixins.parentId == null)
-         {
-            caid = findParentId(caid);
-         }
-         else
-         {
-            caid = naMixins.parentId;
-         }
-      }
-
-      throw new IllegalACLException("Can not find permissions for a node with id " + getIdentifier(cpid));
-   }
-
    protected String findParentId(String cid) throws SQLException, RepositoryException
    {
       ResultSet pidrs = findItemByIdentifier(cid);
@@ -1644,202 +1604,6 @@
    }
 
    /**
-    * Find ancestor owner by cpid. Will search till find the owner or meet a root node.
-    * 
-    * @param cpid
-    *          - initial parent node id
-    * @return owner name
-    * @throws SQLException
-    *           if database error
-    * @throws IllegalACLException
-    *           if wrong ACL
-    * @throws IllegalNameException
-    *           if wrong QName
-    * @throws RepositoryException
-    *           if Repository error
-    */
-   private String traverseACLOwner(String cpid) throws SQLException, IllegalACLException, IllegalNameException,
-      RepositoryException
-   {
-      String caid = cpid;
-
-      while (!caid.equals(Constants.ROOT_PARENT_UUID))
-      {
-         MixinInfo naMixins = readMixins(caid);
-         if (naMixins.hasOwneable())
-         {
-            return readACLOwner(caid);
-         }
-
-         if (naMixins.parentId == null)
-         {
-            caid = findParentId(caid);
-         }
-         else
-         {
-            caid = naMixins.parentId;
-         }
-      }
-
-      throw new IllegalACLException("Can not find owner for a node with id " + getIdentifier(cpid));
-   }
-
-   /**
-    * Find ancestor ACL by cpid. Will search till find the ACL or meet a root node.
-    * 
-    * @param cpid
-    *          - initial parent node id
-    * @return owner name
-    * @throws SQLException
-    *           if database error
-    * @throws IllegalACLException
-    *           if wrong ACL
-    * @throws IllegalNameException
-    *           if wrong QName
-    * @throws RepositoryException
-    *           if Repository error
-    */
-   private AccessControlList traverseACL(String cpid) throws SQLException, IllegalACLException, IllegalNameException,
-      RepositoryException
-   {
-      String naOwner = null;
-      List<AccessControlEntry> naPermissions = null;
-
-      String caid = cpid;
-
-      while (!caid.equals(Constants.ROOT_PARENT_UUID))
-      {
-         MixinInfo naMixins = readMixins(caid);
-         if (naOwner == null && naMixins.hasOwneable())
-         {
-            naOwner = readACLOwner(caid);
-            if (naPermissions != null)
-            {
-               break;
-            }
-         }
-         if (naPermissions == null && naMixins.hasPrivilegeable())
-         {
-            naPermissions = readACLPermisions(caid);
-            if (naOwner != null)
-            {
-               break;
-            }
-         }
-
-         if (naMixins.parentId == null)
-         {
-            caid = findParentId(caid);
-         }
-         else
-         {
-            caid = naMixins.parentId;
-         }
-      }
-
-      if (naOwner != null && naPermissions != null)
-      {
-         // got all
-         return new AccessControlList(naOwner, naPermissions);
-      }
-      else if (naOwner == null && naPermissions == null)
-      {
-         // Default values (i.e. ACL is disabled in repository)
-         return new AccessControlList();
-      }
-      else
-      {
-         throw new IllegalACLException("ACL is not found for node with id " + getIdentifier(cpid)
-            + " or for its ancestors. But repository is ACL enabled.");
-      }
-   }
-
-   /**
-    * [PN] Experimental. Use SP for traversing Qpath on the database server side. Hm, I haven't a
-    * good result for that yet. Few seconds only for TCK execution. PGSQL SP: CREATE OR REPLACE
-    * FUNCTION get_qpath(parentId VARCHAR) RETURNS SETOF record AS $$ DECLARE cur_item RECORD; cur_id
-    * varchar; BEGIN cur_id := parentId; WHILE NOT cur_id = ' ' LOOP SELECT id, name, parent_id,
-    * i_index INTO cur_item FROM JCR_SITEM WHERE ID=cur_id; IF NOT found THEN RETURN; END IF; RETURN
-    * NEXT cur_item; cur_id := cur_item.parent_id; END LOOP; RETURN; END; $$ LANGUAGE plpgsql;
-    * 
-    * @param cpid
-    * @return
-    * @throws SQLException
-    *           if database error
-    * @throws InvalidItemStateException
-    *           if Item state is obsolete
-    * @throws IllegalNameException
-    *           if invalid QName
-    */
-   private QPath traverseQPath_SP_PGSQL(String cpid) throws SQLException, InvalidItemStateException,
-      IllegalNameException
-   {
-      // get item by Identifier usecase:
-      // find parent path in db by cpid
-      if (cpid == null)
-      {
-         // root node
-         return null; // Constants.ROOT_PATH
-      }
-      else
-      {
-         List<QPathEntry> qrpath = new ArrayList<QPathEntry>(); // reverted path
-         PreparedStatement cstmt = null;
-         ResultSet parent = null;
-         try
-         {
-            cstmt =
-               dbConnection
-                  .prepareStatement("select * from get_qpath(?) AS (id varchar, name varchar, parent_id varchar, i_index int)");
-            cstmt.setString(1, cpid);
-            // cstmt.setString(2, caid);
-            parent = cstmt.executeQuery();
-
-            while (parent.next())
-            {
-               QPathEntry qpe =
-                  new QPathEntry(InternalQName.parse(parent.getString(COLUMN_NAME)), parent.getInt(COLUMN_INDEX));
-               qrpath.add(qpe);
-            }
-
-            // parent = findItemByIdentifier(caid);
-            if (qrpath.size() <= 0)
-            {
-               throw new InvalidItemStateException("Parent not found, uuid: " + getIdentifier(cpid));
-            }
-
-         }
-         finally
-         {
-            if (parent != null)
-            {
-               try
-               {
-                  parent.close();
-               }
-               catch (SQLException e)
-               {
-                  LOG.error("Can't close the ResultSet: " + e);
-               }
-            }
-
-            if (cstmt != null)
-            {
-               cstmt.close();
-            }
-         }
-
-         QPathEntry[] qentries = new QPathEntry[qrpath.size()];
-         int qi = 0;
-         for (int i = qrpath.size() - 1; i >= 0; i--)
-         {
-            qentries[qi++] = qrpath.get(i);
-         }
-         return new QPath(qentries);
-      }
-   }
-
-   /**
     * Build ItemData.
     * 
     * @param parentPath

Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/update/StorageUpdateManager.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/update/StorageUpdateManager.java	2011-12-27 11:48:23 UTC (rev 5366)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/update/StorageUpdateManager.java	2011-12-27 12:19:56 UTC (rev 5367)
@@ -462,88 +462,6 @@
       }
    }
 
-   private void fixCopyFrozenIdentifierBug(JcrIdentifier jcrIdentifier, Connection conn) throws SQLException
-   {
-      String searchCriteria =
-         "'" + Constants.JCR_VERSION_STORAGE_PATH.getAsString() + ":1[]" + jcrIdentifier.getNodeIdentifier() + "%"
-            + Constants.JCR_FROZENUUID.getAsString() + "%' ";
-
-      ResultSet refs = null;
-      PreparedStatement update = null;
-      Statement st = null;
-      try
-      {
-         String sql = SQL_SELECT_FROZENJCRUUID.replaceAll(FROZENJCRUUID, searchCriteria);
-         st = conn.createStatement();
-         refs = st.executeQuery(SQL_SELECT_FROZENJCRUUID);
-         while (refs.next())
-         {
-            try
-            {
-               JcrIdentifier frozenIdentifier =
-                  new JcrIdentifier(refs.getString("PATH"), refs.getString("NID"), refs.getString("VID"), refs
-                     .getBinaryStream("DATA"));
-               if (!frozenIdentifier.getNodeIdentifier().equals(frozenIdentifier.getJcrIdentifier()))
-               {
-                  log
-                     .info("VERSION STORAGE UPDATE >>>: Property jcr:frozenUuid have to be updated with actual value. Property: "
-                        + frozenIdentifier.getPath()
-                        + ", actual:"
-                        + jcrIdentifier.getNodeIdentifier()
-                        + ", existed: "
-                        + frozenIdentifier.getJcrIdentifier());
-               }
-            }
-            catch (IOException e)
-            {
-               log.error("Can't read property value data: " + e.getMessage(), e);
-            }
-         }
-      }
-      catch (SQLException e)
-      {
-         log.error("Fix of copy uuid bug. Storage update error: " + e.getMessage(), e);
-      }
-      finally
-      {
-         if (refs != null)
-         {
-            try
-            {
-               refs.close();
-            }
-            catch (SQLException e)
-            {
-               log.error("Can't close the ResultSet: " + e);
-            }
-         }
-
-         if (update != null)
-         {
-            try
-            {
-               update.close();
-            }
-            catch (SQLException e)
-            {
-               log.error("Can't close the Statement: " + e);
-            }
-         }
-
-         if (st != null)
-         {
-            try
-            {
-               st.close();
-            }
-            catch (SQLException e)
-            {
-               log.error("Can't close the Statement: " + e);
-            }
-         }
-      }
-   }
-
    /**
     * fill JCR_XREF table with refernces values from JCR_XVALUE
     * 

Modified: jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/BackupChainLog.java
===================================================================
--- jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/BackupChainLog.java	2011-12-27 11:48:23 UTC (rev 5366)
+++ jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/BackupChainLog.java	2011-12-27 12:19:56 UTC (rev 5367)
@@ -29,19 +29,12 @@
 import org.exoplatform.services.jcr.impl.util.JCRDateFormat;
 import org.exoplatform.services.log.ExoLogger;
 import org.exoplatform.services.log.Log;
-import org.exoplatform.ws.frameworks.json.JsonHandler;
-import org.exoplatform.ws.frameworks.json.JsonParser;
-import org.exoplatform.ws.frameworks.json.impl.BeanBuilder;
-import org.exoplatform.ws.frameworks.json.impl.JsonDefaultHandler;
-import org.exoplatform.ws.frameworks.json.impl.JsonParserImpl;
-import org.exoplatform.ws.frameworks.json.value.JsonValue;
 import org.jibx.runtime.BindingDirectory;
 import org.jibx.runtime.IBindingFactory;
 import org.jibx.runtime.IMarshallingContext;
 import org.jibx.runtime.IUnmarshallingContext;
 import org.jibx.runtime.JiBXException;
 
-import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
@@ -631,28 +624,6 @@
          return repositoryEntry.getWorkspaceEntries().get(0);
       }
 
-      /**
-       * Will be created the Object from JSON binary data.
-       * 
-       * @param cl
-       *          Class
-       * @param data
-       *          binary data (JSON)
-       * @return Object
-       * @throws Exception
-       *           will be generated Exception
-       */
-      private Object getObject(Class cl, byte[] data) throws Exception
-      {
-         JsonHandler jsonHandler = new JsonDefaultHandler();
-         JsonParser jsonParser = new JsonParserImpl();
-         InputStream inputStream = new ByteArrayInputStream(data);
-         jsonParser.parse(inputStream, jsonHandler);
-         JsonValue jsonValue = jsonHandler.getJsonObject();
-
-         return new BeanBuilder().createObject(cl, jsonValue);
-      }
-
       private JobEntryInfo readJobEntryInfo() throws XMLStreamException, ValueFormatException, IOException
       {
          JobEntryInfo info = new JobEntryInfo();

Modified: jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/server/bean/response/Pair.java
===================================================================
--- jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/server/bean/response/Pair.java	2011-12-27 11:48:23 UTC (rev 5366)
+++ jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/server/bean/response/Pair.java	2011-12-27 12:19:56 UTC (rev 5367)
@@ -56,7 +56,7 @@
     * @param value
     *          String, value of parameter
     */
-   private Pair(String name, String value)
+   private Pair(String name, String value) //NOSONAR
    {
       this.name = name;
       this.value = value;

Modified: jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/replication/recovery/RecoveryWriter.java
===================================================================
--- jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/replication/recovery/RecoveryWriter.java	2011-12-27 11:48:23 UTC (rev 5366)
+++ jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/replication/recovery/RecoveryWriter.java	2011-12-27 12:19:56 UTC (rev 5367)
@@ -600,49 +600,4 @@
 
       return list;
    }
-
-   /**
-    * getAllSavedBinaryFile.
-    * 
-    * @param recoveryDataDir
-    *          The recovery data directory
-    * @return List return the list of File
-    * @throws IOException
-    *           will be generated the IOException
-    */
-   private List<File> getAllSavedBinaryFile(File recoveryDataDir) throws IOException
-   {
-      ArrayList<File> list = new ArrayList<File>();
-
-      long startTime = System.currentTimeMillis();
-
-      getFiles(recoveryDataDir, list);
-
-      if (log.isDebugEnabled())
-         log.debug("The total time of parced : " + (System.currentTimeMillis() - startTime) / ONE_SECOND);
-      return list;
-   }
-
-   /**
-    * getFiles. The recurcive parcing the directory. Will be added to list all files from tree.
-    * 
-    * @param f
-    *          the directory
-    * @param list
-    *          the list of Files.
-    */
-   private void getFiles(File f, List<File> list)
-   {
-      if (PrivilegedFileHelper.isDirectory(f))
-      {
-         for (File subFile : PrivilegedFileHelper.listFiles(f))
-         {
-            getFiles(subFile, list);
-         }
-      }
-      else if (f.isFile() && !(f.getName().endsWith(AbstractFSAccess.REMOVED_SUFFIX)))
-      {
-         list.add(f);
-      }
-   }
-}
+}
\ No newline at end of file

Modified: jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/xml/PropertyWriteUtil.java
===================================================================
--- jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/xml/PropertyWriteUtil.java	2011-12-27 11:48:23 UTC (rev 5366)
+++ jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/xml/PropertyWriteUtil.java	2011-12-27 12:19:56 UTC (rev 5367)
@@ -24,7 +24,6 @@
 import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
-import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import javax.xml.stream.XMLStreamException;
@@ -159,16 +158,4 @@
          xmlStreamWriter.writeAttribute(attrName, attrValue);
       }
    }
-   
-   /**
-    * Checks if string contains encoded characters like %2f.
-    * @param str string to check.
-    * @return <code>true</code> if string contains encoded characters, otherwise returns <code>false</code> 
-    */
-   private static boolean containsEncodedChar(String str){
-      Matcher matcher = ESCAPE_PATTERN.matcher(str);
-      return matcher.find();
-      
-   }
-
-}
+}
\ No newline at end of file



More information about the exo-jcr-commits mailing list