You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by rm...@apache.org on 2011/06/27 16:51:44 UTC
svn commit: r1140186 - in /incubator/isis/trunk:
core/commons/src/main/java/org/apache/isis/core/commons/config/
core/runtime/src/main/java/org/apache/isis/core/runtime/logging/
runtimes/dflt/objectstores/nosql/src/main/java/org/apache/isis/runtimes/df...
Author: rmatthews
Date: Mon Jun 27 14:51:44 2011
New Revision: 1140186
URL: http://svn.apache.org/viewvc?rev=1140186&view=rev
Log:
tweaking log messages to stop transactional messages being logged at info level
Modified:
incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/config/IsisConfigurationDefault.java
incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/logging/Logger.java
incubator/isis/trunk/runtimes/dflt/objectstores/nosql/src/main/java/org/apache/isis/runtimes/dflt/objectstores/nosql/file/server/FileServer.java
incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/installerregistry/installerapi/ObjectStorePersistenceMechanismInstallerAbstract.java
incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/installerregistry/installerapi/PersistenceMechanismInstallerAbstract.java
incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/PersistenceSessionAbstract.java
incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/adaptermanager/internal/PojoAdapterHashMap.java
incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/objectstore/PersistenceSessionObjectStore.java
incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/objectstore/algorithm/dflt/DefaultPersistAlgorithm.java
incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/objectstore/transaction/ObjectStoreTransaction.java
incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/objectstore/transaction/ObjectStoreTransactionManager.java
incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/context/IsisContextThreadLocal.java
incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/transaction/IsisTransactionAbstract.java
incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/userprofile/UserProfileLoaderDefault.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/Dispatcher.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/UserManager.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/HelpLink.java
incubator/isis/trunk/viewer/scimpi/servlet/src/main/java/org/apache/isis/viewer/scimpi/servlet/DispatcherServlet.java
Modified: incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/config/IsisConfigurationDefault.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/config/IsisConfigurationDefault.java?rev=1140186&r1=1140185&r2=1140186&view=diff
==============================================================================
--- incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/config/IsisConfigurationDefault.java (original)
+++ incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/config/IsisConfigurationDefault.java Mon Jun 27 14:51:44 2011
@@ -46,7 +46,7 @@ public class IsisConfigurationDefault im
public IsisConfigurationDefault(final ResourceStreamSource resourceStreamSource) {
this.resourceStreamSource = resourceStreamSource;
- LOG.info("from :" + nameOf(resourceStreamSource));
+ LOG.debug("from :" + nameOf(resourceStreamSource));
}
private String nameOf(final ResourceStreamSource resourceStreamSource) {
Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/logging/Logger.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/logging/Logger.java?rev=1140186&r1=1140185&r2=1140186&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/logging/Logger.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/logging/Logger.java Mon Jun 27 14:51:44 2011
@@ -30,7 +30,7 @@ public abstract class Logger {
private final Level level;
public Logger() {
- this(Level.INFO);
+ this(Level.DEBUG);
}
public Logger(final String level) {
Modified: incubator/isis/trunk/runtimes/dflt/objectstores/nosql/src/main/java/org/apache/isis/runtimes/dflt/objectstores/nosql/file/server/FileServer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/objectstores/nosql/src/main/java/org/apache/isis/runtimes/dflt/objectstores/nosql/file/server/FileServer.java?rev=1140186&r1=1140185&r2=1140186&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/objectstores/nosql/src/main/java/org/apache/isis/runtimes/dflt/objectstores/nosql/file/server/FileServer.java (original)
+++ incubator/isis/trunk/runtimes/dflt/objectstores/nosql/src/main/java/org/apache/isis/runtimes/dflt/objectstores/nosql/file/server/FileServer.java Mon Jun 27 14:51:44 2011
@@ -208,7 +208,7 @@ public class FileServer {
} catch (InterruptedException ignore) {}
}
final Socket connection = socket.accept();
- LOG.info("connection from " + connection);
+ LOG.debug("connection from " + connection);
connection.setSoTimeout(readTimeout);
serviceConnection(connection, readTimeout);
} catch (final SocketTimeoutException expected) {} catch (final IOException e) {
Modified: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/installerregistry/installerapi/ObjectStorePersistenceMechanismInstallerAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/installerregistry/installerapi/ObjectStorePersistenceMechanismInstallerAbstract.java?rev=1140186&r1=1140185&r2=1140186&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/installerregistry/installerapi/ObjectStorePersistenceMechanismInstallerAbstract.java (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/installerregistry/installerapi/ObjectStorePersistenceMechanismInstallerAbstract.java Mon Jun 27 14:51:44 2011
@@ -68,7 +68,7 @@ public abstract class ObjectStorePersist
ensureThatArg(objectStore, is(not(nullValue())));
if (getConfiguration().getBoolean(LOGGING_PROPERTY, false)) {
- final String level = getConfiguration().getString(LOGGING_PROPERTY + ".level", "info");
+ final String level = getConfiguration().getString(LOGGING_PROPERTY + ".level", "debug");
objectStore = new IsisStoreLogger(objectStore, level);
}
Modified: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/installerregistry/installerapi/PersistenceMechanismInstallerAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/installerregistry/installerapi/PersistenceMechanismInstallerAbstract.java?rev=1140186&r1=1140185&r2=1140186&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/installerregistry/installerapi/PersistenceMechanismInstallerAbstract.java (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/installerregistry/installerapi/PersistenceMechanismInstallerAbstract.java Mon Jun 27 14:51:44 2011
@@ -92,8 +92,8 @@ public abstract class PersistenceMechani
*/
@Override
public PersistenceSession createPersistenceSession(final PersistenceSessionFactory persistenceSessionFactory) {
- if (LOG.isInfoEnabled()) {
- LOG.info("installing " + this.getClass().getName());
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("installing " + this.getClass().getName());
}
final AdapterManagerExtended adapterManager = createAdapterManager(getConfiguration());
@@ -130,7 +130,7 @@ public abstract class PersistenceMechani
oidGenerator, servicesInjector);
if (getConfiguration().getBoolean(LOGGING_PROPERTY, false)) {
- final String level = getConfiguration().getString(LOGGING_PROPERTY + ".level", "info");
+ final String level = getConfiguration().getString(LOGGING_PROPERTY + ".level", "debug");
persistenceSession = new PersistenceSessionLogger(persistenceSession, level);
}
Modified: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/PersistenceSessionAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/PersistenceSessionAbstract.java?rev=1140186&r1=1140185&r2=1140186&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/PersistenceSessionAbstract.java (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/PersistenceSessionAbstract.java Mon Jun 27 14:51:44 2011
@@ -186,8 +186,8 @@ public abstract class PersistenceSession
return;
}
- if (LOG.isInfoEnabled()) {
- LOG.info("closing " + this);
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("closing " + this);
}
doClose();
@@ -402,7 +402,7 @@ public abstract class PersistenceSession
* representation}.
*/
protected final PersistenceQuery createPersistenceQueryFor(final Query<?> query, final QueryCardinality cardinality) {
- LOG.info("createPersistenceQueryFor: " + query.getDescription());
+ LOG.debug("createPersistenceQueryFor: " + query.getDescription());
final ObjectSpecification noSpec = specFor(query);
if (query instanceof QueryFindAllInstances) {
return new PersistenceQueryFindAllInstances(noSpec);
Modified: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/adaptermanager/internal/PojoAdapterHashMap.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/adaptermanager/internal/PojoAdapterHashMap.java?rev=1140186&r1=1140185&r2=1140186&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/adaptermanager/internal/PojoAdapterHashMap.java (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/adaptermanager/internal/PojoAdapterHashMap.java Mon Jun 27 14:51:44 2011
@@ -73,7 +73,7 @@ public class PojoAdapterHashMap implemen
@Override
protected void finalize() throws Throwable {
super.finalize();
- LOG.info("finalizing hash of pojos");
+ LOG.debug("finalizing hash of pojos");
}
// ///////////////////////////////////////////////////////////////////////////
Modified: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/objectstore/PersistenceSessionObjectStore.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/objectstore/PersistenceSessionObjectStore.java?rev=1140186&r1=1140185&r2=1140186&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/objectstore/PersistenceSessionObjectStore.java (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/objectstore/PersistenceSessionObjectStore.java Mon Jun 27 14:51:44 2011
@@ -158,7 +158,7 @@ public class PersistenceSessionObjectSto
@Override
protected void finalize() throws Throwable {
super.finalize();
- LOG.info("finalizing object manager");
+ LOG.debug("finalizing object manager");
}
// ///////////////////////////////////////////////////////////////////////////
@@ -215,9 +215,9 @@ public class PersistenceSessionObjectSto
Assert.assertFalse("only resolve object that is not yet resolved", adapter, resolveState.isResolved());
Assert.assertTrue("only resolve object that is persistent", adapter, adapter.isPersistent());
resolveImmediatelyFromPersistenceLayer(adapter);
- if (LOG.isInfoEnabled()) {
+ if (LOG.isDebugEnabled()) {
// don't log object - its toString() may use the unresolved field, or unresolved collection
- LOG.info("resolved: " + adapter.getSpecification().getShortIdentifier() + " " + resolveState.code()
+ LOG.debug("resolved: " + adapter.getSpecification().getShortIdentifier() + " " + resolveState.code()
+ " " + adapter.getOid());
}
}
@@ -414,8 +414,8 @@ public class PersistenceSessionObjectSto
if (adapter.getSpecification().isAggregated()) {
return;
}
- if (LOG.isInfoEnabled()) {
- LOG.info("destroyObject " + adapter);
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("destroyObject " + adapter);
}
destroyObjectInPersistenceLayer(adapter);
}
@@ -483,8 +483,8 @@ public class PersistenceSessionObjectSto
@Override
protected ObjectAdapter[] getInstances(final PersistenceQuery persistenceQuery) {
- if (LOG.isInfoEnabled()) {
- LOG.info("getInstances matching " + persistenceQuery);
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("getInstances matching " + persistenceQuery);
}
return getInstancesFromPersistenceLayer(persistenceQuery);
}
Modified: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/objectstore/algorithm/dflt/DefaultPersistAlgorithm.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/objectstore/algorithm/dflt/DefaultPersistAlgorithm.java?rev=1140186&r1=1140185&r2=1140186&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/objectstore/algorithm/dflt/DefaultPersistAlgorithm.java (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/objectstore/algorithm/dflt/DefaultPersistAlgorithm.java Mon Jun 27 14:51:44 2011
@@ -46,7 +46,7 @@ public class DefaultPersistAlgorithm ext
@Override
public void makePersistent(final ObjectAdapter object, final ToPersistObjectSet toPersistObjectSet) {
if (object.getSpecification().isCollection()) {
- LOG.info("persist " + object);
+ LOG.debug("persist " + object);
if (object.getResolveState() == ResolveState.GHOST) {
object.changeState(ResolveState.RESOLVING);
object.changeState(ResolveState.RESOLVED);
@@ -70,7 +70,7 @@ public class DefaultPersistAlgorithm ext
final List<ObjectAssociation> fields = object.getSpecification().getAssociations();
if (!object.getSpecification().isEncodeable() && fields.size() > 0) {
- LOG.info("make persistent " + object);
+ LOG.debug("make persistent " + object);
CallbackUtils.callCallback(object, PersistingCallbackFacet.class);
toPersistObjectSet.remapAsPersistent(object);
object.changeState(ResolveState.SERIALIZING_RESOLVED);
Modified: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/objectstore/transaction/ObjectStoreTransaction.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/objectstore/transaction/ObjectStoreTransaction.java?rev=1140186&r1=1140185&r2=1140186&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/objectstore/transaction/ObjectStoreTransaction.java (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/objectstore/transaction/ObjectStoreTransaction.java Mon Jun 27 14:51:44 2011
@@ -72,8 +72,8 @@ public class ObjectStoreTransaction exte
}
if (alreadyHasDestroy(onObject)) {
- if (LOG.isInfoEnabled()) {
- LOG.info("ignored command " + command + " as object no longer exists");
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("ignored command " + command + " as object no longer exists");
}
return;
}
@@ -83,22 +83,22 @@ public class ObjectStoreTransaction exte
if (command instanceof DestroyObjectCommand) {
if (alreadyHasCreate(onObject)) {
removeCreate(onObject);
- if (LOG.isInfoEnabled()) {
- LOG.info("ignored both create and destroy command " + command);
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("ignored both create and destroy command " + command);
}
return;
}
if (alreadyHasSave(onObject)) {
removeSave(onObject);
- if (LOG.isInfoEnabled()) {
- LOG.info("removed prior save command " + command);
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("removed prior save command " + command);
}
}
if (alreadyHasDestroy(onObject)) {
- if (LOG.isInfoEnabled()) {
- LOG.info("ignored command " + command + " as command already recorded");
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("ignored command " + command + " as command already recorded");
}
return;
}
Modified: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/objectstore/transaction/ObjectStoreTransactionManager.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/objectstore/transaction/ObjectStoreTransactionManager.java?rev=1140186&r1=1140185&r2=1140186&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/objectstore/transaction/ObjectStoreTransactionManager.java (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/objectstore/transaction/ObjectStoreTransactionManager.java Mon Jun 27 14:51:44 2011
@@ -65,8 +65,8 @@ public class ObjectStoreTransactionManag
transactionLevel++;
- if (LOG.isInfoEnabled()) {
- LOG.info("startTransaction: level "
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("startTransaction: level "
+ (transactionLevel - 1)
+ "->"
+ (transactionLevel)
@@ -91,13 +91,13 @@ public class ObjectStoreTransactionManag
@Override
public void endTransaction() {
- if (LOG.isInfoEnabled()) {
- LOG.info("endTransaction: level " + (transactionLevel) + "->" + (transactionLevel - 1));
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("endTransaction: level " + (transactionLevel) + "->" + (transactionLevel - 1));
}
transactionLevel--;
if (transactionLevel == 0) {
- LOG.info("endTransaction: committing");
+ LOG.debug("endTransaction: committing");
objectPersistor.objectChangedAllDirty();
getTransaction().commit();
objectStore.endTransaction();
Modified: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/context/IsisContextThreadLocal.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/context/IsisContextThreadLocal.java?rev=1140186&r1=1140185&r2=1140186&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/context/IsisContextThreadLocal.java (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/context/IsisContextThreadLocal.java Mon Jun 27 14:51:44 2011
@@ -132,7 +132,7 @@ public class IsisContextThreadLocal exte
synchronized (sessionsByThread) {
applySessionClosePolicy();
final IsisSession session = getSessionFactoryInstance().openSession(authenticationSession);
- LOG.info(" opening session " + session + " (count " + sessionsByThread.size() + ") for "
+ LOG.debug(" opening session " + session + " (count " + sessionsByThread.size() + ") for "
+ authenticationSession.getUserName());
saveSession(thread, session);
session.open();
@@ -152,7 +152,7 @@ public class IsisContextThreadLocal exte
synchronized (sessionsByThread) {
sessionsByThread.put(thread, session);
}
- LOG.info(" saving session " + session + "; now have " + sessionsByThread.size() + " sessions");
+ LOG.debug(" saving session " + session + "; now have " + sessionsByThread.size() + " sessions");
return session;
}
Modified: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/transaction/IsisTransactionAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/transaction/IsisTransactionAbstract.java?rev=1140186&r1=1140185&r2=1140186&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/transaction/IsisTransactionAbstract.java (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/transaction/IsisTransactionAbstract.java Mon Jun 27 14:51:44 2011
@@ -77,8 +77,8 @@ public abstract class IsisTransactionAbs
public final void flush() {
ensureThatState(getState().canFlush(), is(true), "state is: " + getState());
- if (LOG.isInfoEnabled()) {
- LOG.info("flush transaction " + this);
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("flush transaction " + this);
}
try {
@@ -93,8 +93,8 @@ public abstract class IsisTransactionAbs
public final void commit() {
ensureThatState(getState().canCommit(), is(true), "state is: " + getState());
- if (LOG.isInfoEnabled()) {
- LOG.info("commit transaction " + this);
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("commit transaction " + this);
}
if (getState() == State.COMMITTED) {
Modified: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/userprofile/UserProfileLoaderDefault.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/userprofile/UserProfileLoaderDefault.java?rev=1140186&r1=1140185&r2=1140186&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/userprofile/UserProfileLoaderDefault.java (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/userprofile/UserProfileLoaderDefault.java Mon Jun 27 14:51:44 2011
@@ -189,7 +189,7 @@ public class UserProfileLoaderDefault im
for (final Object service : services) {
profile.getPerspective().addToServices(service);
}
- LOG.info("creating exploration UserProfile for " + userName);
+ LOG.debug("creating exploration UserProfile for " + userName);
return profile;
}
Modified: incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/Dispatcher.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/Dispatcher.java?rev=1140186&r1=1140185&r2=1140186&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/Dispatcher.java (original)
+++ incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/Dispatcher.java Mon Jun 27 14:51:44 2011
@@ -92,7 +92,7 @@ public class Dispatcher {
private final Encoder encoder = new SimpleEncoder();
public void process(final RequestContext context, final String servletPath) {
- LOG.info("processing request " + servletPath);
+ LOG.debug("processing request " + servletPath);
final AuthenticationSession session = UserManager.startRequest(context);
LOG.debug("exsiting session: " + session);
Modified: incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/UserManager.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/UserManager.java?rev=1140186&r1=1140185&r2=1140186&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/UserManager.java (original)
+++ incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/UserManager.java Mon Jun 27 14:51:44 2011
@@ -43,9 +43,9 @@ public class UserManager {
AuthenticationSession session = context.getSession();
if (session == null) {
session = new AnonymousSession();
- LOG.info("start anonymous request: " + session);
+ LOG.debug("start anonymous request: " + session);
} else {
- LOG.info("start request for: " + session.getUserName());
+ LOG.debug("start request for: " + session.getUserName());
}
IsisContext.closeSession();
IsisContext.openSession(session);
@@ -64,9 +64,9 @@ public class UserManager {
public static void endRequest(final AuthenticationSession session) {
if (session == null) {
- LOG.info("end anonymous request");
+ LOG.debug("end anonymous request");
} else {
- LOG.info("end request for: " + session.getUserName());
+ LOG.debug("end request for: " + session.getUserName());
}
IsisContext.closeSession();
}
Modified: incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/HelpLink.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/HelpLink.java?rev=1140186&r1=1140185&r2=1140186&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/HelpLink.java (original)
+++ incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/HelpLink.java Mon Jun 27 14:51:44 2011
@@ -53,8 +53,9 @@ public class HelpLink extends AbstractEl
final String link = site + helpReference + suffix;
final String linkText = "Help";
final String target = "scimpi-help";
- return "<a class=\"" + elementClass + "\" href=\"" + link + "\" target=\"" + target + "\" title=\""
- + description + "\"><img src=\"/images/help.png\" alt=\"" + linkText + "\" /></a>";
+ String titleSection = description == null ? "" : ("\" title=\"" + description);
+ return "<a class=\"" + elementClass + "\" href=\"" + link + "\" target=\"" + target + titleSection
+ + "\"><img src=\"/images/help.png\" alt=\"" + linkText + "\" /></a>";
}
}
@@ -63,7 +64,7 @@ public class HelpLink extends AbstractEl
}
public void process(Request request) {
- String description = "description...";
+ String description = null;
String helpReference = request.getRequiredProperty("ref");
append(request, description, helpReference);
}
Modified: incubator/isis/trunk/viewer/scimpi/servlet/src/main/java/org/apache/isis/viewer/scimpi/servlet/DispatcherServlet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/scimpi/servlet/src/main/java/org/apache/isis/viewer/scimpi/servlet/DispatcherServlet.java?rev=1140186&r1=1140185&r2=1140186&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/scimpi/servlet/src/main/java/org/apache/isis/viewer/scimpi/servlet/DispatcherServlet.java (original)
+++ incubator/isis/trunk/viewer/scimpi/servlet/src/main/java/org/apache/isis/viewer/scimpi/servlet/DispatcherServlet.java Mon Jun 27 14:51:44 2011
@@ -44,14 +44,14 @@ public class DispatcherServlet extends H
@Override
protected void doPost(final HttpServletRequest request, final HttpServletResponse response)
throws ServletException, IOException {
- LOG.info("post " + request.getServletPath() + " " + request.getQueryString());
+ LOG.debug("post " + request.getServletPath() + " " + request.getQueryString());
process(request, response);
}
@Override
protected void doGet(final HttpServletRequest request, final HttpServletResponse response) throws ServletException,
IOException {
- LOG.info("get " + request.getServletPath() + " " + request.getQueryString());
+ LOG.debug("get " + request.getServletPath() + " " + request.getQueryString());
process(request, response);
}