[exo-jcr-commits] exo-jcr SVN: r4269 - in jcr/trunk: exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl and 23 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Thu Apr 21 10:58:33 EDT 2011
Author: areshetnyak
Date: 2011-04-21 10:58:32 -0400 (Thu, 21 Apr 2011)
New Revision: 4269
Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/core/nodetype/DefaulStringConversion.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/Constants.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/PropertyImpl.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/SessionFactory.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionReference.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/LockImpl.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/cacheable/CacheLockImpl.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/NodeTypeImpl.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/IndexingConfigurationEntityResolver.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/NodeTypeVirtualTableResolver.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/OfflinePersistentIndex.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/RowIteratorImpl.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/SharedFieldSortComparator.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/SpellSuggestion.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/PropertyDataOrderComparator.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/LinkedWorkspaceStorageCacheImpl.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/ext/action/SessionActionCatalog.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/ext/action/SessionActionInterceptor.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/proccess/WorkerThread.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.core/src/main/java/org/exoplatform/services/jcr/impl/xml/exporting/DocumentViewContentExporter.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/exporting/DocumentViewStreamExporter.java
jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/BackupManagerImpl.java
jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/BackupScheduler.java
jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/FileNameProducer.java
jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/server/HTTPBackupAgent.java
jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/registry/RegistryService.java
jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/resource/AbstractXMLViewNodeRepresentation.java
jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/resource/representation/NtFileNodeRepresentationFactory.java
jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/resource/representation/NtResourceNodeRepresentationFactory.java
jcr/trunk/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/common/DynamicSessionProviderTest.java
jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/FtpTextUtils.java
jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/client/FtpClientCommandThread.java
jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/command/CmdStor.java
jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/dasl/SearchResultResponseEntity.java
jcr/trunk/exo.jcr.connectors.localadapter/src/main/java/org/exoplatform/connectors/jcr/adapters/local/JcrResourceAdapter.java
jcr/trunk/exo.jcr.framework.ftpclient/src/main/java/org/exoplatform/frameworks/ftpclient/data/FtpDataTransiverImpl.java
Log:
EXOJCR-1221 : The same violations was fixed in JCR.
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/core/nodetype/DefaulStringConversion.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/core/nodetype/DefaulStringConversion.java 2011-04-21 13:27:25 UTC (rev 4268)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/core/nodetype/DefaulStringConversion.java 2011-04-21 14:58:32 UTC (rev 4269)
@@ -18,7 +18,8 @@
*/
package org.exoplatform.services.jcr.core.nodetype;
-import java.util.ArrayList;
+import org.exoplatform.services.log.ExoLogger;
+import org.exoplatform.services.log.Log;
/**
* Serialization/Deserialization for simple java types and Strings. For JiBX binding process only.
@@ -28,6 +29,8 @@
public class DefaulStringConversion
{
+ private static Log LOG = ExoLogger.getLogger("exo.jcr.component.core.DefaulStringConversion");
+
public static String serializeString(String stringValue)
{
@@ -38,7 +41,7 @@
}
catch (Exception e)
{
- System.err.println("serializeString.Exception: " + e);
+ LOG.error("serializeString.Exception: " + e, e);
}
return r;
}
@@ -53,7 +56,7 @@
}
catch (Exception e)
{
- System.err.println("deserializeString.Exception: " + e);
+ LOG.error("deserializeString.Exception: " + e, e);
}
return r;
}
@@ -67,6 +70,7 @@
}
catch (Exception e)
{
+ LOG.error("serializeInt.Exception: " + e, e);
}
return r;
}
@@ -81,6 +85,7 @@
}
catch (Exception e)
{
+ LOG.error("deserializeInt.Exception: " + e, e);
}
return r;
}
@@ -95,6 +100,7 @@
}
catch (Exception e)
{
+ LOG.error("serializeLong.Exception: " + e, e);
}
return r;
}
@@ -109,6 +115,7 @@
}
catch (Exception e)
{
+ LOG.error("deserializeLong.Exception: " + e, e);
}
return r;
}
@@ -123,6 +130,7 @@
}
catch (Exception e)
{
+ LOG.error("serializeLong.Exception: " + e, e);
}
return r;
}
@@ -133,36 +141,12 @@
boolean r = false;
try
{
- System.err.println("deserializeBoolean: " + boolString);
r = Boolean.parseBoolean(boolString);
- System.err.println("deserializeBoolean: res: " + r);
}
catch (Exception e)
{
- System.err.println("deserializeBoolean.Exception: " + e);
+ LOG.error("deserializeBoolean.Exception: " + e, e);
}
return r;
}
-
- public static String serializeArrayList(ArrayList arrayList)
- {
-
- String r = ""; // default
- try
- {
- if (arrayList != null)
- {
-
- }
- }
- catch (IllegalArgumentException e)
- {
- // r = PropertyType.TYPENAME_UNDEFINED;
- }
- catch (Exception e)
- {
- // r = PropertyType.TYPENAME_UNDEFINED;
- }
- return r;
- }
}
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/Constants.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/Constants.java 2011-04-21 13:27:25 UTC (rev 4268)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/Constants.java 2011-04-21 14:58:32 UTC (rev 4269)
@@ -21,6 +21,8 @@
import org.exoplatform.services.jcr.datamodel.IllegalPathException;
import org.exoplatform.services.jcr.datamodel.InternalQName;
import org.exoplatform.services.jcr.datamodel.QPath;
+import org.exoplatform.services.log.ExoLogger;
+import org.exoplatform.services.log.Log;
/**
* Created by The eXo Platform SAS.
@@ -31,6 +33,8 @@
public class Constants
{
+ private static Log log = ExoLogger.getLogger("exo.jcr.component.core.Constants");
+
/**
* Default namespace prefix (empty uri).
*/
@@ -708,8 +712,7 @@
}
catch (IllegalPathException e)
{
- e.printStackTrace();
- System.err.println("ERROR: Can't parse JCR_SYSTEM_URI for constant JCR_SYSTEM (" + JCR_SYSTEM_URI + "): " + e);
+ log.error("ERROR: Can't parse JCR_SYSTEM_URI for constant JCR_SYSTEM (" + JCR_SYSTEM_URI + "): " + e, e);
}
try
@@ -718,9 +721,8 @@
}
catch (IllegalPathException e)
{
- e.printStackTrace();
- System.err.println("ERROR: Can't parse JCR_VERSION_STORAGE_URI for constant JCR_VERSION_STORAGE_PATH ("
- + JCR_VERSION_STORAGE_URI + "): " + e);
+ log.error("ERROR: Can't parse JCR_VERSION_STORAGE_URI for constant JCR_VERSION_STORAGE_PATH ("
+ + JCR_VERSION_STORAGE_URI + "): " + e, e);
}
try
@@ -729,9 +731,8 @@
}
catch (IllegalPathException e)
{
- e.printStackTrace();
- System.err.println("ERROR: Can't parse JCR_NODETYPES_URI for constant JCR_NODETYPES_PATH ("
- + JCR_NODETYPES_URI + "): " + e);
+ log.error("ERROR: Can't parse JCR_NODETYPES_URI for constant JCR_NODETYPES_PATH ("
+ + JCR_NODETYPES_URI + "): " + e, e);
}
String nsUri = JCR_SYSTEM_URI + EXO_NAMESPACES.getAsString() + ":1";
@@ -741,8 +742,7 @@
}
catch (IllegalPathException e)
{
- e.printStackTrace();
- System.err.println("ERROR: Can't parse EXO_NAMESPACES_URI for constant EXO_NAMESPACES (" + nsUri + "): " + e);
+ log.error("ERROR: Can't parse EXO_NAMESPACES_URI for constant EXO_NAMESPACES (" + nsUri + "): " + e, e);
}
try
@@ -751,8 +751,7 @@
}
catch (IllegalPathException e)
{
- e.printStackTrace();
- System.err.println("ERROR: Can't parse ROOT_URI " + e);
+ log.error("ERROR: Can't parse ROOT_URI " + e, e);
}
}
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/PropertyImpl.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/PropertyImpl.java 2011-04-21 13:27:25 UTC (rev 4268)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/PropertyImpl.java 2011-04-21 14:58:32 UTC (rev 4269)
@@ -28,6 +28,8 @@
import org.exoplatform.services.jcr.datamodel.PropertyData;
import org.exoplatform.services.jcr.impl.core.nodetype.PropertyDefinitionImpl;
import org.exoplatform.services.jcr.impl.core.value.BaseValue;
+import org.exoplatform.services.log.ExoLogger;
+import org.exoplatform.services.log.Log;
import java.io.InputStream;
import java.util.Calendar;
@@ -54,6 +56,11 @@
{
/**
+ * Logger.
+ */
+ protected static final Log LOG = ExoLogger.getLogger("exo.jcr.component.core.PropertyImpl");
+
+ /**
* Value type.
*/
protected int type;
@@ -580,7 +587,7 @@
}
catch (Exception e)
{
- e.printStackTrace();
+ LOG.error(e.getLocalizedMessage(), e);
}
return vals;
}
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-04-21 13:27:25 UTC (rev 4268)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionDataManager.java 2011-04-21 14:58:32 UTC (rev 4269)
@@ -2457,7 +2457,7 @@
}
catch (Exception e)
{
- e.printStackTrace();
+ log.error(e.getLocalizedMessage(), e);
}
return str;
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionFactory.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionFactory.java 2011-04-21 13:27:25 UTC (rev 4268)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionFactory.java 2011-04-21 14:58:32 UTC (rev 4269)
@@ -44,7 +44,7 @@
public class SessionFactory
{
- protected static Log LOG = ExoLogger.getLogger("exo.jcr.component.core.SessionFactory");
+ private static Log LOG = ExoLogger.getLogger("exo.jcr.component.core.SessionFactory");
private final ExoContainer container;
@@ -99,7 +99,7 @@
}
catch (Exception e)
{
- e.printStackTrace();
+ LOG.error(e.getLocalizedMessage(), e);
}
}
}
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionReference.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionReference.java 2011-04-21 13:27:25 UTC (rev 4268)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionReference.java 2011-04-21 14:58:32 UTC (rev 4269)
@@ -18,6 +18,9 @@
*/
package org.exoplatform.services.jcr.impl.core;
+import org.exoplatform.services.log.ExoLogger;
+import org.exoplatform.services.log.Log;
+
import java.lang.ref.WeakReference;
import java.util.ArrayList;
import java.util.concurrent.ConcurrentHashMap;
@@ -36,6 +39,11 @@
public class SessionReference extends WeakReference<Session>
{
+ /**
+ * The logger instance for this class.
+ */
+ private static Log LOG = ExoLogger.getLogger("exo.jcr.component.core.SessionReference");
+
//
private static final int INITIAL_DELAY = 10;
@@ -75,7 +83,7 @@
{
public void run()
{
- System.out.println("Starting detector task");
+ LOG.info("Starting detector task");
//
ArrayList<SessionReference> list;
@@ -117,13 +125,13 @@
objects.remove(ref.key);
Exception e = new Exception();
e.setStackTrace(ref.stack);
- System.out.println("<" + error + ">");
- e.printStackTrace();
- System.out.println("</" + error + ">");
+ LOG.error("<" + error + ">");
+ LOG.error(e.getLocalizedMessage(), e);
+ LOG.error("</" + error + ">");
}
}
}
- System.out.println("Finished detector task");
+ LOG.info("Finished detector task");
}
};
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/LockImpl.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/LockImpl.java 2011-04-21 13:27:25 UTC (rev 4268)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/LockImpl.java 2011-04-21 14:58:32 UTC (rev 4269)
@@ -20,6 +20,8 @@
import org.exoplatform.services.jcr.core.lock.ExtendedLock;
import org.exoplatform.services.jcr.impl.core.SessionImpl;
+import org.exoplatform.services.log.ExoLogger;
+import org.exoplatform.services.log.Log;
import javax.jcr.Node;
import javax.jcr.RepositoryException;
@@ -34,6 +36,11 @@
public class LockImpl implements ExtendedLock
{
+ /**
+ * Logger.
+ */
+ private static final Log LOG = ExoLogger.getLogger("exo.jcr.component.core.LockImpl");
+
private LockData lockData;
private SessionImpl session;
@@ -79,14 +86,13 @@
}
catch (RepositoryException e)
{
- e.printStackTrace();
+ LOG.error(e.getLocalizedMessage(), e);
}
return null;
}
public boolean isDeep()
{
-
return lockData.isDeep();
}
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/cacheable/CacheLockImpl.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/cacheable/CacheLockImpl.java 2011-04-21 13:27:25 UTC (rev 4268)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/cacheable/CacheLockImpl.java 2011-04-21 14:58:32 UTC (rev 4269)
@@ -18,6 +18,8 @@
import org.exoplatform.services.jcr.impl.core.SessionImpl;
import org.exoplatform.services.jcr.impl.core.lock.LockImpl;
+import org.exoplatform.services.log.ExoLogger;
+import org.exoplatform.services.log.Log;
import javax.jcr.Node;
import javax.jcr.RepositoryException;
@@ -33,6 +35,8 @@
*/
public class CacheLockImpl extends LockImpl
{
+ private static final Log log = ExoLogger.getLogger("exo.jcr.component.core.CacheLockImpl");
+
private boolean live;
private LockData lockData;
@@ -113,8 +117,7 @@
}
catch (RepositoryException e)
{
- //TODO
- e.printStackTrace();
+ log.error(e.getLocalizedMessage(), e);
}
return null;
}
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/NodeTypeImpl.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/NodeTypeImpl.java 2011-04-21 13:27:25 UTC (rev 4268)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/NodeTypeImpl.java 2011-04-21 14:58:32 UTC (rev 4269)
@@ -376,11 +376,11 @@
}
catch (NoSuchNodeTypeException e)
{
- e.printStackTrace();
+ LOG.error(e.getLocalizedMessage(), e);
}
catch (RepositoryException e)
{
- e.printStackTrace();
+ LOG.error(e.getLocalizedMessage(), e);
}
}
return superTypes;
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/IndexingConfigurationEntityResolver.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/IndexingConfigurationEntityResolver.java 2011-04-21 13:27:25 UTC (rev 4268)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/IndexingConfigurationEntityResolver.java 2011-04-21 14:58:32 UTC (rev 4269)
@@ -30,42 +30,38 @@
* <code>IndexingConfigurationEntityResolver</code> implements an entity
* resolver for the indexing configuration DTD.
*/
-public class IndexingConfigurationEntityResolver implements EntityResolver {
+public class IndexingConfigurationEntityResolver
+ implements EntityResolver
+{
- /**
- * Maps system ids to DTD resource names.
- */
- private static final Map<String, String> SYSTEM_IDS;
+ /**
+ * Maps system ids to DTD resource names.
+ */
+ private static final Map<String, String> SYSTEM_IDS;
- static {
- Map<String, String> systemIds = new HashMap<String, String>();
- systemIds
- .put(
- "http://www.exoplatform.org/dtd/indexing-configuration-1.0.dtd",
- "indexing-configuration-1.0.dtd");
- systemIds
- .put(
- "http://www.exoplatform.org/dtd/indexing-configuration-1.1.dtd",
- "indexing-configuration-1.1.dtd");
- systemIds
- .put(
- "http://www.exoplatform.org/dtd/indexing-configuration-1.2.dtd",
- "indexing-configuration-1.2.dtd");
- SYSTEM_IDS = Collections.unmodifiableMap(systemIds);
- }
+ static
+ {
+ Map<String, String> systemIds = new HashMap<String, String>();
+ systemIds.put("http://www.exoplatform.org/dtd/indexing-configuration-1.0.dtd", "indexing-configuration-1.0.dtd");
+ systemIds.put("http://www.exoplatform.org/dtd/indexing-configuration-1.1.dtd", "indexing-configuration-1.1.dtd");
+ systemIds.put("http://www.exoplatform.org/dtd/indexing-configuration-1.2.dtd", "indexing-configuration-1.2.dtd");
+ SYSTEM_IDS = Collections.unmodifiableMap(systemIds);
+ }
- /**
- * {@inheritDoc}
- */
- public InputSource resolveEntity(String publicId, String systemId)
- throws SAXException, IOException {
- String resourceName = SYSTEM_IDS.get(systemId);
- if (resourceName != null) {
- InputStream in = getClass().getResourceAsStream(resourceName);
- if (in != null) {
- return new InputSource(in);
- }
- }
- return null;
- }
+ /**
+ * {@inheritDoc}
+ */
+ public InputSource resolveEntity(String publicId, String systemId) throws SAXException, IOException
+ {
+ String resourceName = SYSTEM_IDS.get(systemId);
+ if (resourceName != null)
+ {
+ InputStream in = getClass().getResourceAsStream(resourceName);
+ if (in != null)
+ {
+ return new InputSource(in);
+ }
+ }
+ return null;
+ }
}
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/NodeTypeVirtualTableResolver.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/NodeTypeVirtualTableResolver.java 2011-04-21 13:27:25 UTC (rev 4268)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/NodeTypeVirtualTableResolver.java 2011-04-21 14:58:32 UTC (rev 4269)
@@ -32,45 +32,45 @@
* @version $Id: exo-jboss-codetemplates.xml 34027 2009-07-15 23:26:43Z
* aheritier $
*/
-public abstract class NodeTypeVirtualTableResolver<Q> implements
- VirtualTableResolver<Q> {
- private final NodeTypeDataManager nodeTypeDataManager;
+public abstract class NodeTypeVirtualTableResolver<Q>
+ implements VirtualTableResolver<Q>
+{
+ private final NodeTypeDataManager nodeTypeDataManager;
- /**
- * @param nodeTypeDataManager
- */
- public NodeTypeVirtualTableResolver(
- final NodeTypeDataManager nodeTypeDataManager) {
- super();
- this.nodeTypeDataManager = nodeTypeDataManager;
- }
+ /**
+ * @param nodeTypeDataManager
+ */
+ public NodeTypeVirtualTableResolver(final NodeTypeDataManager nodeTypeDataManager)
+ {
+ super();
+ this.nodeTypeDataManager = nodeTypeDataManager;
+ }
- /**
- * @param nodeTypeName
- * name.
- * @return Returns all subtypes of node type <code>nodeTypeName</code> in
- * the node type inheritance hierarchy.
- * @throws RepositoryException
- */
- protected Set<InternalQName> getSubTypes(final InternalQName nodeTypeName)
- throws RepositoryException {
- return this.nodeTypeDataManager.getSubtypes(nodeTypeName);
- }
+ /**
+ * @param nodeTypeName
+ * name.
+ * @return Returns all subtypes of node type <code>nodeTypeName</code> in
+ * the node type inheritance hierarchy.
+ * @throws RepositoryException
+ */
+ protected Set<InternalQName> getSubTypes(final InternalQName nodeTypeName) throws RepositoryException
+ {
+ return this.nodeTypeDataManager.getSubtypes(nodeTypeName);
+ }
- /**
- * @param nodeTypeName
- * name.
- * @return true if node type with name <code>nodeTypeName</code> is mixin.
- * @throws RepositoryException
- */
- protected boolean isMixin(final InternalQName nodeTypeName)
- throws RepositoryException {
- final NodeTypeData nodeType = this.nodeTypeDataManager
- .getNodeType(nodeTypeName);
- if (nodeType == null) {
- throw new NoSuchNodeTypeException("Node type "
- + nodeTypeName.getAsString() + " not found");
- }
- return nodeType.isMixin();
- }
+ /**
+ * @param nodeTypeName
+ * name.
+ * @return true if node type with name <code>nodeTypeName</code> is mixin.
+ * @throws RepositoryException
+ */
+ protected boolean isMixin(final InternalQName nodeTypeName) throws RepositoryException
+ {
+ final NodeTypeData nodeType = this.nodeTypeDataManager.getNodeType(nodeTypeName);
+ if (nodeType == null)
+ {
+ throw new NoSuchNodeTypeException("Node type " + nodeTypeName.getAsString() + " not found");
+ }
+ return nodeType.isMixin();
+ }
}
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/OfflinePersistentIndex.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/OfflinePersistentIndex.java 2011-04-21 13:27:25 UTC (rev 4268)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/OfflinePersistentIndex.java 2011-04-21 14:58:32 UTC (rev 4269)
@@ -23,6 +23,8 @@
import org.apache.lucene.index.Term;
import org.apache.lucene.search.Similarity;
import org.exoplatform.services.jcr.impl.core.query.lucene.directory.DirectoryManager;
+import org.exoplatform.services.log.ExoLogger;
+import org.exoplatform.services.log.Log;
import java.io.IOException;
import java.util.ArrayList;
@@ -40,6 +42,12 @@
*/
public class OfflinePersistentIndex extends PersistentIndex
{
+
+ /**
+ * The logger
+ */
+ private static Log LOG = ExoLogger.getLogger("exo.jcr.component.core.OfflinePersistentIndex");
+
public static final String NAME = "offline";
private List<String> processedIDs;
@@ -73,7 +81,7 @@
{
int count = super.removeDocument(idTerm);
processedIDs.add(idTerm.text());
- System.out.println("RM: " + idTerm.text());
+ LOG.info("RM: " + idTerm.text());
return count;
}
@@ -83,7 +91,7 @@
super.addDocuments(docs);
for (Document doc : docs)
{
- System.out.println("add: " + doc.get(FieldNames.UUID));
+ LOG.info("add: " + doc.get(FieldNames.UUID));
processedIDs.add(doc.get(FieldNames.UUID));
}
}
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/RowIteratorImpl.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/RowIteratorImpl.java 2011-04-21 13:27:25 UTC (rev 4268)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/RowIteratorImpl.java 2011-04-21 14:58:32 UTC (rev 4269)
@@ -708,8 +708,7 @@
}
catch (RepositoryException e)
{
- // TODO Auto-generated catch block
- e.printStackTrace();
+ log.error(e.getLocalizedMessage(), e);
return false;
}
}
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/SharedFieldSortComparator.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/SharedFieldSortComparator.java 2011-04-21 13:27:25 UTC (rev 4268)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/SharedFieldSortComparator.java 2011-04-21 14:58:32 UTC (rev 4269)
@@ -35,6 +35,8 @@
import org.exoplatform.services.jcr.impl.Constants;
import org.exoplatform.services.jcr.impl.core.JCRPath;
import org.exoplatform.services.jcr.impl.core.LocationFactory;
+import org.exoplatform.services.log.ExoLogger;
+import org.exoplatform.services.log.Log;
import java.io.IOException;
import java.util.ArrayList;
@@ -51,6 +53,11 @@
{
/**
+ * The logger
+ */
+ private static Log LOG = ExoLogger.getLogger("exo.jcr.component.core.SharedFieldSortComparator");
+
+ /**
* The name of the shared field in the lucene index.
*/
private final String field;
@@ -336,7 +343,7 @@
}
catch (Exception e)
{
- e.printStackTrace();
+ LOG.error(e.getLocalizedMessage(), e);
return null;
}
}
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/SpellSuggestion.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/SpellSuggestion.java 2011-04-21 13:27:25 UTC (rev 4268)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/SpellSuggestion.java 2011-04-21 14:58:32 UTC (rev 4269)
@@ -47,8 +47,8 @@
* the abstract query tree.
*/
SpellSuggestion(SpellChecker spellChecker, QueryRootNode root) {
- this.spellChecker = spellChecker;
- this.root = root;
+ this.spellChecker = spellChecker;
+ this.root = root;
}
/**
@@ -62,10 +62,13 @@
* @throws RepositoryException
*/
public String getSuggestion() throws IOException, RepositoryException {
- if (spellChecker != null) {
- return spellChecker.check(root);
- } else {
- return null;
- }
- }
+ if (spellChecker != null)
+ {
+ return spellChecker.check(root);
+ }
+ else
+ {
+ return null;
+ }
+ }
}
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/PropertyDataOrderComparator.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/PropertyDataOrderComparator.java 2011-04-21 13:27:25 UTC (rev 4268)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/PropertyDataOrderComparator.java 2011-04-21 14:58:32 UTC (rev 4269)
@@ -21,6 +21,8 @@
import org.exoplatform.services.jcr.datamodel.InternalQName;
import org.exoplatform.services.jcr.datamodel.PropertyData;
import org.exoplatform.services.jcr.impl.Constants;
+import org.exoplatform.services.log.ExoLogger;
+import org.exoplatform.services.log.Log;
import java.util.Comparator;
@@ -30,6 +32,10 @@
*/
public class PropertyDataOrderComparator implements Comparator<PropertyData>
{
+ /**
+ * Logger.
+ */
+ protected static final Log LOG = ExoLogger.getLogger("exo.jcr.component.core.PropertyDataOrderComparator");
public int compare(PropertyData p1, PropertyData p2)
{
@@ -69,7 +75,7 @@
}
catch (Exception e)
{
- System.err.println("PropertiesOrderComparator error: " + e);
+ LOG.error("PropertiesOrderComparator error: " + e, e);
}
return r;
}
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/LinkedWorkspaceStorageCacheImpl.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/LinkedWorkspaceStorageCacheImpl.java 2011-04-21 13:27:25 UTC (rev 4268)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/LinkedWorkspaceStorageCacheImpl.java 2011-04-21 14:58:32 UTC (rev 4269)
@@ -798,7 +798,7 @@
}
catch (Throwable e)
{
- System.err.println(this.name + " cache, finalyze error " + e);
+ LOG.error(this.name + " cache, finalyze error " + e, e);
}
nodesCache.clear();
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/ext/action/SessionActionCatalog.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/ext/action/SessionActionCatalog.java 2011-04-21 13:27:25 UTC (rev 4268)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/ext/action/SessionActionCatalog.java 2011-04-21 14:58:32 UTC (rev 4269)
@@ -77,7 +77,7 @@
}
catch (Exception e)
{
- e.printStackTrace();
+ log.error(e.getLocalizedMessage(), e);
}
}
}
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/ext/action/SessionActionInterceptor.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/ext/action/SessionActionInterceptor.java 2011-04-21 13:27:25 UTC (rev 4268)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/ext/action/SessionActionInterceptor.java 2011-04-21 14:58:32 UTC (rev 4269)
@@ -48,12 +48,15 @@
public class SessionActionInterceptor
{
+ /**
+ * Logger
+ */
+ private static Log log = ExoLogger.getLogger("exo.jcr.component.core.SessionActionInterceptor");
+
private final ActionCatalog catalog;
private final ExoContainer container;
- private static Log log = ExoLogger.getLogger("exo.jcr.component.core.SessionActionInterceptor");
-
/**
* SessionActionInterceptor is per session, and only one action per session/time can be active.
*/
@@ -403,10 +406,7 @@
InternalQName[] nodeTypeNames = new InternalQName[mixinNames.length + 1];
nodeTypeNames[0] = primaryTypeName;
- for (int i = 1; i <= mixinNames.length; i++)
- {
- nodeTypeNames[i] = mixinNames[i - 1];
- }
+ System.arraycopy(mixinNames, 0, nodeTypeNames, 1, mixinNames.length);
return nodeTypeNames;
}
@@ -425,7 +425,7 @@
}
catch (Exception e)
{
- e.printStackTrace();
+ log.error(e.getLocalizedMessage(), e);
}
}
}
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/proccess/WorkerThread.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/proccess/WorkerThread.java 2011-04-21 13:27:25 UTC (rev 4268)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/proccess/WorkerThread.java 2011-04-21 14:58:32 UTC (rev 4269)
@@ -18,6 +18,9 @@
*/
package org.exoplatform.services.jcr.impl.proccess;
+import org.exoplatform.services.log.ExoLogger;
+import org.exoplatform.services.log.Log;
+
/**
* Created by The eXo Platform SAS.
*
@@ -27,6 +30,10 @@
public abstract class WorkerThread extends Thread
{
+ /**
+ * Logger.
+ */
+ private static Log LOG = ExoLogger.getLogger("exo.jcr.component.core.WorkerThread");
protected boolean stopped = false;
@@ -57,8 +64,9 @@
catch (Exception e)
{
if (!(e instanceof InterruptedException))
- e.printStackTrace();
-
+ {
+ LOG.error(e.getLocalizedMessage(), e);
+ }
}
}
}
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-04-21 13:27:25 UTC (rev 4268)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/update/StorageUpdateManager.java 2011-04-21 14:58:32 UTC (rev 4269)
@@ -18,6 +18,11 @@
*/
package org.exoplatform.services.jcr.impl.storage.jdbc.update;
+import org.exoplatform.services.jcr.impl.Constants;
+import org.exoplatform.services.jcr.util.IdGenerator;
+import org.exoplatform.services.log.ExoLogger;
+import org.exoplatform.services.log.Log;
+
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
@@ -30,11 +35,6 @@
import javax.jcr.PropertyType;
import javax.jcr.RepositoryException;
-import org.exoplatform.services.jcr.impl.Constants;
-import org.exoplatform.services.jcr.util.IdGenerator;
-import org.exoplatform.services.log.ExoLogger;
-import org.exoplatform.services.log.Log;
-
/**
* Created by The eXo Platform SAS.
*
@@ -416,7 +416,7 @@
}
catch (SQLException e)
{
- e.printStackTrace();
+ log.error(e.getLocalizedMessage(), e);
}
finally
{
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/exporting/DocumentViewContentExporter.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/exporting/DocumentViewContentExporter.java 2011-04-21 13:27:25 UTC (rev 4268)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/exporting/DocumentViewContentExporter.java 2011-04-21 14:58:32 UTC (rev 4269)
@@ -109,7 +109,7 @@
for (ValueData valueData : property.getValues())
{
String strVal = getValueAsStringForExport(valueData, property.getType());
- if (strVal == "")
+ if (strVal.equals(""))
{
continue;
}
@@ -124,7 +124,7 @@
InternalQName internalPropName = ISO9075.encode(property.getQPath().getName());
currentAttr.addAttribute(internalPropName.getNamespace(), internalPropName.getName(), getExportName(
- property, true), "CDATA", strValue != "" ? strValue.substring(1) : strValue);
+ property, true), "CDATA", !strValue.equals("") ? strValue.substring(1) : strValue);
}
if (Constants.ROOT_PATH.equals(node.getQPath()))
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/exporting/DocumentViewStreamExporter.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/exporting/DocumentViewStreamExporter.java 2011-04-21 13:27:25 UTC (rev 4268)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/exporting/DocumentViewStreamExporter.java 2011-04-21 14:58:32 UTC (rev 4269)
@@ -113,7 +113,7 @@
for (ValueData valueData : property.getValues())
{
String strVal = getValueAsStringForExport(valueData, property.getType());
- if (strVal == "")
+ if (strVal.equals(""))
{
continue;
}
Modified: jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/BackupManagerImpl.java
===================================================================
--- jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/BackupManagerImpl.java 2011-04-21 13:27:25 UTC (rev 4268)
+++ jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/BackupManagerImpl.java 2011-04-21 14:58:32 UTC (rev 4269)
@@ -1291,7 +1291,8 @@
if (!log.getBackupConfig().getRepository().equals(repositoryName))
{
throw new WorkspaceRestoreException("If workspaceEntry is null, so will be restored with original configuration. " +
- "The repositoryName (\"" + repositoryName +"\") should be equals original repository name (\"" + log.getBackupConfig().getRepository() +"\"). " );
+ "The repositoryName (\"" + repositoryName +"\") should be equals original repository name (\""
+ + log.getBackupConfig().getRepository() +"\"). " );
}
if (log.getOriginalWorkspaceEntry() == null)
Modified: jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/BackupScheduler.java
===================================================================
--- jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/BackupScheduler.java 2011-04-21 13:27:25 UTC (rev 4268)
+++ jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/BackupScheduler.java 2011-04-21 14:58:32 UTC (rev 4269)
@@ -499,7 +499,7 @@
backupConfig = conf;
}
- // TODO use cycle to read CHARACTERS
+ // Read CHARACTERS
private String readContent() throws XMLStreamException
{
String content = null;
@@ -853,26 +853,6 @@
// registerShutdownHook();
}
- private void registerShutdownHook()
- {
- // register shutdownhook for final cancel all taskes scheduled
- try
- {
- Runtime.getRuntime().addShutdownHook(new Thread()
- {
- @Override
- public void run()
- {
- timer.cancel();
- }
- });
- }
- catch (IllegalStateException e)
- {
- // can't register shutdownhook
- }
- }
-
public BackupMessage[] getErrors()
{
return messages.getMessages();
@@ -908,7 +888,7 @@
{
// by stop time
- // TODO restore without scheduler now. Add task search capabilities to the scheduler and add
+ // Restore without scheduler now. Add task search capabilities to the scheduler and add
// listener to a task
schedule(tconf.backupConfig, tconf.startTime, tconf.stopTime, tconf.chainPeriod, tconf.incrPeriod, null);
} // else - the start time in past and no periodic configuration found
Modified: jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/FileNameProducer.java
===================================================================
--- jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/FileNameProducer.java 2011-04-21 13:27:25 UTC (rev 4268)
+++ jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/FileNameProducer.java 2011-04-21 14:58:32 UTC (rev 4269)
@@ -19,6 +19,8 @@
package org.exoplatform.services.jcr.ext.backup.impl;
import org.exoplatform.commons.utils.PrivilegedFileHelper;
+import org.exoplatform.services.log.ExoLogger;
+import org.exoplatform.services.log.Log;
import java.io.File;
import java.io.FilenameFilter;
@@ -31,6 +33,11 @@
*/
public class FileNameProducer
{
+ /**
+ * Logger.
+ */
+ private static final Log LOG = ExoLogger.getLogger("exo.jcr.component.ext.FileNameProducer");
+
class SkipBackupLogFilter
implements FilenameFilter
{
@@ -183,7 +190,7 @@
}
catch (IOException e)
{
- e.printStackTrace();
+ LOG.error("Can nit get next file : " + e.getLocalizedMessage(), e);
}
return nextFile;
Modified: jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/server/HTTPBackupAgent.java
===================================================================
--- jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/server/HTTPBackupAgent.java 2011-04-21 13:27:25 UTC (rev 4268)
+++ jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/server/HTTPBackupAgent.java 2011-04-21 14:58:32 UTC (rev 4269)
@@ -2790,7 +2790,8 @@
for (JobWorkspaceRestore job : backupManager.getRestores())
if (repositoryName.equals(job.getRepositoryName())
&& workspaceName.endsWith(job.getWorkspaceName())
- && (job.getStateRestore() == JobWorkspaceRestore.RESTORE_INITIALIZED || job.getStateRestore() == JobWorkspaceRestore.RESTORE_STARTED))
+ && (job.getStateRestore() == JobWorkspaceRestore.RESTORE_INITIALIZED
+ || job.getStateRestore() == JobWorkspaceRestore.RESTORE_STARTED))
{
throw new WorkspaceRestoreExeption("The workspace '" + "/" + repositoryName + "/" + workspaceName
+ "' is already restoring.");
@@ -2810,7 +2811,8 @@
for (JobRepositoryRestore job : backupManager.getRepositoryRestores())
{
if (repositoryName.equals(job.getRepositoryName())
- && (job.getStateRestore() == JobWorkspaceRestore.RESTORE_INITIALIZED || job.getStateRestore() == JobWorkspaceRestore.RESTORE_STARTED))
+ && (job.getStateRestore() == JobWorkspaceRestore.RESTORE_INITIALIZED
+ || job.getStateRestore() == JobWorkspaceRestore.RESTORE_STARTED))
{
throw new RepositoryRestoreExeption("The repository '" + "/" + repositoryName + "' is already restoring.");
}
@@ -2818,25 +2820,6 @@
}
/**
- * validateOneRestoreInstants.
- *
- * @param repositoryName
- * the repository name
- * @throws WorkspaceRestoreExeption
- * will be generated WorkspaceRestoreExeption
- */
- private void validateOneRestoreInstants(String repositoryName) throws WorkspaceRestoreExeption
- {
-
- for (JobWorkspaceRestore job : backupManager.getRestores())
- if (repositoryName.equals(job.getRepositoryName())
- && (job.getStateRestore() == JobWorkspaceRestore.RESTORE_INITIALIZED || job.getStateRestore() == JobWorkspaceRestore.RESTORE_STARTED))
- {
- throw new WorkspaceRestoreExeption("The workspace '" + "/" + repositoryName + "' is already restoring.");
- }
- }
-
- /**
* forceCloseSession. Close sessions on specific workspace.
*
* @param repositoryName
Modified: jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/registry/RegistryService.java
===================================================================
--- jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/registry/RegistryService.java 2011-04-21 13:27:25 UTC (rev 4268)
+++ jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/registry/RegistryService.java 2011-04-21 14:58:32 UTC (rev 4269)
@@ -375,13 +375,11 @@
}
catch (RepositoryConfigurationException e)
{
- log.error(e.getLocalizedMessage());
- e.printStackTrace();
+ log.error(e.getLocalizedMessage(), e);
}
catch (RepositoryException e)
{
- log.error(e.getLocalizedMessage());
- e.printStackTrace();
+ log.error(e.getLocalizedMessage(), e);
}
else if (log.isDebugEnabled())
log.warn("Registry service already started");
@@ -443,19 +441,19 @@
Throwable cause = pae.getCause();
if (cause instanceof ParserConfigurationException)
{
- cause.printStackTrace();
+ log.error(cause.getLocalizedMessage(), cause);
}
else if (cause instanceof IOException)
{
- cause.printStackTrace();
+ log.error(cause.getLocalizedMessage(), cause);
}
else if (cause instanceof SAXException)
{
- cause.printStackTrace();
+ log.error(cause.getLocalizedMessage(), cause);
}
else if (cause instanceof TransformerException)
{
- cause.printStackTrace();
+ log.error(cause.getLocalizedMessage(), cause);
}
else if (cause instanceof RuntimeException)
{
Modified: jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/resource/AbstractXMLViewNodeRepresentation.java
===================================================================
--- jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/resource/AbstractXMLViewNodeRepresentation.java 2011-04-21 13:27:25 UTC (rev 4268)
+++ jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/resource/AbstractXMLViewNodeRepresentation.java 2011-04-21 14:58:32 UTC (rev 4269)
@@ -20,6 +20,8 @@
import org.exoplatform.common.util.HierarchicalProperty;
import org.exoplatform.services.jcr.impl.Constants;
+import org.exoplatform.services.log.ExoLogger;
+import org.exoplatform.services.log.Log;
import java.io.IOException;
import java.io.InputStream;
@@ -41,6 +43,11 @@
public abstract class AbstractXMLViewNodeRepresentation implements NodeRepresentation
{
+ /**
+ * Logger.
+ */
+ private static final Log LOG = ExoLogger.getLogger("exo.jcr.component.ext.AbstractXMLViewNodeRepresentation");
+
private Node node;
protected boolean isSystem;
@@ -176,7 +183,7 @@
}
catch (Exception e)
{
- e.printStackTrace();
+ LOG.error(e.getLocalizedMessage(), e);
throw new IOException("can't get input stream");
}
Modified: jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/resource/representation/NtFileNodeRepresentationFactory.java
===================================================================
--- jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/resource/representation/NtFileNodeRepresentationFactory.java 2011-04-21 13:27:25 UTC (rev 4268)
+++ jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/resource/representation/NtFileNodeRepresentationFactory.java 2011-04-21 14:58:32 UTC (rev 4269)
@@ -21,6 +21,8 @@
import org.exoplatform.services.jcr.ext.resource.NodeRepresentation;
import org.exoplatform.services.jcr.ext.resource.NodeRepresentationFactory;
import org.exoplatform.services.jcr.ext.resource.NodeRepresentationService;
+import org.exoplatform.services.log.ExoLogger;
+import org.exoplatform.services.log.Log;
import javax.jcr.Node;
import javax.jcr.RepositoryException;
@@ -32,6 +34,11 @@
public class NtFileNodeRepresentationFactory implements NodeRepresentationFactory
{
+ /**
+ * Logger.
+ */
+ private static Log LOG = ExoLogger.getLogger("exo.jcr.component.ext.NtFileNodeRepresentationFactory");
+
protected NodeRepresentationService nodeRepresentationService;
/**
@@ -64,7 +71,7 @@
}
catch (RepositoryException e)
{
- e.printStackTrace();
+ LOG.error(e.getLocalizedMessage(), e);
}
return null;
}
Modified: jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/resource/representation/NtResourceNodeRepresentationFactory.java
===================================================================
--- jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/resource/representation/NtResourceNodeRepresentationFactory.java 2011-04-21 13:27:25 UTC (rev 4268)
+++ jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/resource/representation/NtResourceNodeRepresentationFactory.java 2011-04-21 14:58:32 UTC (rev 4269)
@@ -20,6 +20,8 @@
import org.exoplatform.services.jcr.ext.resource.NodeRepresentation;
import org.exoplatform.services.jcr.ext.resource.NodeRepresentationFactory;
+import org.exoplatform.services.log.ExoLogger;
+import org.exoplatform.services.log.Log;
import javax.jcr.Node;
import javax.jcr.RepositoryException;
@@ -30,6 +32,10 @@
*/
public class NtResourceNodeRepresentationFactory implements NodeRepresentationFactory
{
+ /**
+ * Logger.
+ */
+ private static Log LOG = ExoLogger.getLogger("exo.jcr.component.ext.NtFileNodeRepresentationFactory");
/**
* {@inheritDoc}
@@ -45,7 +51,7 @@
}
catch (RepositoryException e)
{
- e.printStackTrace();
+ LOG.error(e.getLocalizedMessage(), e);
}
return null;
}
Modified: jcr/trunk/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/common/DynamicSessionProviderTest.java
===================================================================
--- jcr/trunk/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/common/DynamicSessionProviderTest.java 2011-04-21 13:27:25 UTC (rev 4268)
+++ jcr/trunk/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/common/DynamicSessionProviderTest.java 2011-04-21 14:58:32 UTC (rev 4269)
@@ -21,8 +21,9 @@
import org.exoplatform.services.jcr.access.SystemIdentity;
import org.exoplatform.services.jcr.core.CredentialsImpl;
import org.exoplatform.services.jcr.ext.BaseStandaloneTest;
-import org.exoplatform.services.jcr.ext.common.SessionProvider;
import org.exoplatform.services.jcr.impl.core.NodeImpl;
+import org.exoplatform.services.log.ExoLogger;
+import org.exoplatform.services.log.Log;
import java.util.ArrayList;
import java.util.List;
@@ -52,6 +53,8 @@
root.save();
}
+ private static final Log log = ExoLogger.getLogger("exo.jcr.component.ext.DynamicTest");
+
public void testDynamicSession() throws Exception
{
// Mary only node, Mary membership is '*:/platform/users', seems it's user
Modified: jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/FtpTextUtils.java
===================================================================
--- jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/FtpTextUtils.java 2011-04-21 13:27:25 UTC (rev 4268)
+++ jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/FtpTextUtils.java 2011-04-21 14:58:32 UTC (rev 4269)
@@ -52,8 +52,7 @@
}
catch (Exception exc)
{
- log.info("Unhandled exception. " + exc.getMessage());
- exc.printStackTrace();
+ log.info("Unhandled exception. " + exc.getMessage(), exc);
}
String resStr = "";
for (int i = 0; i < reqLen; i++)
Modified: jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/client/FtpClientCommandThread.java
===================================================================
--- jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/client/FtpClientCommandThread.java 2011-04-21 13:27:25 UTC (rev 4268)
+++ jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/client/FtpClientCommandThread.java 2011-04-21 14:58:32 UTC (rev 4269)
@@ -185,8 +185,7 @@
}
catch (Exception exc)
{
- log.info("Unahdled exception. " + exc.getMessage());
- exc.printStackTrace();
+ log.info("Unahdled exception. " + exc.getMessage(), exc);
}
}
Modified: jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/command/CmdStor.java
===================================================================
--- jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/command/CmdStor.java 2011-04-21 13:27:25 UTC (rev 4268)
+++ jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/command/CmdStor.java 2011-04-21 14:58:32 UTC (rev 4269)
@@ -240,7 +240,6 @@
}
catch (Exception exc)
{
- exc.printStackTrace();
log.info("Unhandled exception. " + exc.getMessage(), exc);
}
Modified: jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/dasl/SearchResultResponseEntity.java
===================================================================
--- jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/dasl/SearchResultResponseEntity.java 2011-04-21 13:27:25 UTC (rev 4268)
+++ jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/dasl/SearchResultResponseEntity.java 2011-04-21 14:58:32 UTC (rev 4269)
@@ -192,10 +192,7 @@
}
catch (Exception exc)
{
-
- System.out.println("Unhandled Exception. " + exc.getMessage());
log.error(exc.getMessage(), exc);
-
throw new IOException(exc.getMessage());
}
}
Modified: jcr/trunk/exo.jcr.connectors.localadapter/src/main/java/org/exoplatform/connectors/jcr/adapters/local/JcrResourceAdapter.java
===================================================================
--- jcr/trunk/exo.jcr.connectors.localadapter/src/main/java/org/exoplatform/connectors/jcr/adapters/local/JcrResourceAdapter.java 2011-04-21 13:27:25 UTC (rev 4268)
+++ jcr/trunk/exo.jcr.connectors.localadapter/src/main/java/org/exoplatform/connectors/jcr/adapters/local/JcrResourceAdapter.java 2011-04-21 14:58:32 UTC (rev 4269)
@@ -53,7 +53,7 @@
public synchronized void start(BootstrapContext ctx) throws ResourceAdapterInternalException
{
- System.out.println("<<<<<<<<<<<<<<<<<< JcrResourceAdapter.start(), " + containerConfig + " >>>>>>>>>>>>>>>>>>>");
+ log.info("<<<<<<<<<<<<<<<<<< JcrResourceAdapter.start(), " + containerConfig + " >>>>>>>>>>>>>>>>>>>");
log.info("Container config: " + containerConfig);
Thread.currentThread().setContextClassLoader(getClass().getClassLoader());
@@ -68,8 +68,7 @@
}
catch (MalformedURLException e)
{
- log.warn("Invalid containerConfig URL, ignored: " + containerConfig);
- e.printStackTrace();
+ log.warn("Invalid containerConfig URL, ignored: " + containerConfig, e);
}
try
@@ -78,8 +77,7 @@
}
catch (Exception e)
{
- log.error("Standalone container start error: " + e);
- e.printStackTrace();
+ log.error("Standalone container start error: " + e, e);
}
}
@@ -89,7 +87,7 @@
*/
public void stop()
{
- System.out.println("<<<<<<<<<<<<<<<<<< JcrResourceAdapter.stop(), " + containerConfig + " >>>>>>>>>>>>>>>>>>>");
+ log.info("<<<<<<<<<<<<<<<<<< JcrResourceAdapter.stop(), " + containerConfig + " >>>>>>>>>>>>>>>>>>>");
try
{
StandaloneContainer sc = StandaloneContainer.getInstance();
@@ -97,8 +95,7 @@
}
catch (Exception e)
{
- log.error("Standalone container stop error: " + e);
- e.printStackTrace();
+ log.error("Standalone container stop error: " + e, e);
}
}
Modified: jcr/trunk/exo.jcr.framework.ftpclient/src/main/java/org/exoplatform/frameworks/ftpclient/data/FtpDataTransiverImpl.java
===================================================================
--- jcr/trunk/exo.jcr.framework.ftpclient/src/main/java/org/exoplatform/frameworks/ftpclient/data/FtpDataTransiverImpl.java 2011-04-21 13:27:25 UTC (rev 4268)
+++ jcr/trunk/exo.jcr.framework.ftpclient/src/main/java/org/exoplatform/frameworks/ftpclient/data/FtpDataTransiverImpl.java 2011-04-21 14:58:32 UTC (rev 4269)
@@ -127,7 +127,7 @@
}
catch (Exception exc)
{
- exc.printStackTrace();
+ log.error(exc.getLocalizedMessage(), exc);
}
try
More information about the exo-jcr-commits
mailing list