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 2012/10/17 15:20:01 UTC
svn commit: r1399222 - in /incubator/isis/trunk/framework:
core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetdecorator/
core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/
core/runtime/src/main/java/org/apache/isis/co...
Author: rmatthews
Date: Wed Oct 17 13:20:00 2012
New Revision: 1399222
URL: http://svn.apache.org/viewvc?rev=1399222&view=rev
Log:
Improved debug information being made available.
Modified:
incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetdecorator/FacetDecoratorSet.java
incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/ObjectReflectorDefault.java
incubator/isis/trunk/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/standard/AuthenticationManagerStandard.java
incubator/isis/trunk/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/authorization/standard/AuthorizationManagerStandard.java
incubator/isis/trunk/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/userprofile/UserProfile.java
incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/context/IsisContext.java
incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/context/IsisContextThreadLocal.java
incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/systemusinginstallers/IsisSystemAbstract.java
incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/userprofile/UserProfileLoaderDefault.java
incubator/isis/trunk/framework/runtimes/dflt/testsupport/src/main/java/org/apache/isis/runtimes/dflt/testsupport/IsisSystemDefault.java
incubator/isis/trunk/framework/runtimes/dflt/testsupport/src/main/java/org/apache/isis/runtimes/dflt/testsupport/IsisSystemWithFixtures.java
Modified: incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetdecorator/FacetDecoratorSet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetdecorator/FacetDecoratorSet.java?rev=1399222&r1=1399221&r2=1399222&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetdecorator/FacetDecoratorSet.java (original)
+++ incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetdecorator/FacetDecoratorSet.java Wed Oct 17 13:20:00 2012
@@ -163,7 +163,6 @@ public class FacetDecoratorSet implement
public void debugData(final DebugBuilder str) {
str.appendTitle("Facet decorators");
- str.indent();
final Set<Class<? extends Facet>> facetTypes = facetDecoratorByFacetType.keySet();
if (facetTypes.size() == 0) {
str.append("none");
@@ -172,7 +171,6 @@ public class FacetDecoratorSet implement
str.appendln(cls.getName(), facetDecoratorByFacetType.get(cls));
}
}
- str.unindent();
}
}
Modified: incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/ObjectReflectorDefault.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/ObjectReflectorDefault.java?rev=1399222&r1=1399221&r2=1399222&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/ObjectReflectorDefault.java (original)
+++ incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/ObjectReflectorDefault.java Wed Oct 17 13:20:00 2012
@@ -520,14 +520,15 @@ public class ObjectReflectorDefault impl
// /////////////////////////////////////////////////////////////
@Override
- public void debugData(final DebugBuilder str) {
- facetDecoratorSet.debugData(str);
- str.appendln();
+ public void debugData(final DebugBuilder debug) {
+ facetDecoratorSet.debugData(debug);
+ debug.appendln();
- str.appendTitle("Specifications");
+ debug.appendTitle("Specifications");
final List<ObjectSpecification> specs = Lists.newArrayList(allSpecifications());
Collections.sort(specs, ObjectSpecification.COMPARATOR_SHORT_IDENTIFIER_IGNORE_CASE);
for (final ObjectSpecification spec : specs) {
+ StringBuffer str = new StringBuffer();
str.append(spec.isAbstract() ? "A" : ".");
str.append(spec.isService() ? "S" : ".");
str.append(BoundedFacetUtils.isBoundedSet(spec) ? "B" : ".");
@@ -540,15 +541,12 @@ public class ObjectReflectorDefault impl
final boolean hasIdentity = !(spec.isParentedOrFreeCollection() || spec.isParented() || spec.isValue());
str.append( hasIdentity ? "I" : ".");
str.append(" ");
- str.append(spec.getShortIdentifier());
- str.append(" [fqc=");
str.append(spec.getFullIdentifier());
- str.append(",type=");
- str.append(spec.getClass().getName());
- str.appendln("]");
+
+ debug.appendPreformatted(spec.getShortIdentifier(), str.toString());
}
}
-
+
@Override
public String debugTitle() {
return "Reflector";
Modified: incubator/isis/trunk/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/standard/AuthenticationManagerStandard.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/standard/AuthenticationManagerStandard.java?rev=1399222&r1=1399221&r2=1399222&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/standard/AuthenticationManagerStandard.java (original)
+++ incubator/isis/trunk/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/standard/AuthenticationManagerStandard.java Wed Oct 17 13:20:00 2012
@@ -250,18 +250,14 @@ public class AuthenticationManagerStanda
@Override
public void debugData(final DebugBuilder debug) {
debug.appendTitle("Authenticators");
- debug.indent();
for (final Authenticator authenticator : authenticators) {
debug.appendln(authenticator.toString());
}
- debug.unindent();
debug.appendTitle("Users");
- debug.indent();
for (final String userName : userByValidationCode.values()) {
debug.appendln(userName);
}
- debug.unindent();
}
@Override
Modified: incubator/isis/trunk/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/authorization/standard/AuthorizationManagerStandard.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/authorization/standard/AuthorizationManagerStandard.java?rev=1399222&r1=1399221&r2=1399222&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/authorization/standard/AuthorizationManagerStandard.java (original)
+++ incubator/isis/trunk/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/authorization/standard/AuthorizationManagerStandard.java Wed Oct 17 13:20:00 2012
@@ -22,12 +22,14 @@ package org.apache.isis.core.runtime.aut
import org.apache.isis.applib.Identifier;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.commons.config.IsisConfiguration;
+import org.apache.isis.core.commons.debug.DebugBuilder;
+import org.apache.isis.core.commons.debug.DebuggableWithTitle;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.progmodel.ProgrammingModel;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorComposite;
import org.apache.isis.core.runtime.authorization.AuthorizationManagerAbstract;
-public class AuthorizationManagerStandard extends AuthorizationManagerAbstract {
+public class AuthorizationManagerStandard extends AuthorizationManagerAbstract implements DebuggableWithTitle {
private Authorizor authorizor;
@@ -140,6 +142,21 @@ public class AuthorizationManagerStandar
baseProgrammingModel.addFactory(facetFactory);
}
+ // //////////////////////////////////////////////////////////
+ // Debugging
+ // //////////////////////////////////////////////////////////
+
+ @Override
+ public String debugTitle() {
+ return "Authorization Manager";
+ }
+
+ @Override
+ public void debugData(final DebugBuilder debug) {
+ debug.appendTitle("Authorizor Manager");
+ debug.appendln("Authorizer", authorizor);
+ }
+
// //////////////////////////////////////////////////
// Dependencies (injected)
// //////////////////////////////////////////////////
Modified: incubator/isis/trunk/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/userprofile/UserProfile.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/userprofile/UserProfile.java?rev=1399222&r1=1399221&r2=1399222&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/userprofile/UserProfile.java (original)
+++ incubator/isis/trunk/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/userprofile/UserProfile.java Wed Oct 17 13:20:00 2012
@@ -25,10 +25,12 @@ import java.util.List;
import com.google.common.collect.Lists;
import org.apache.isis.applib.profiles.Localization;
+import org.apache.isis.core.commons.debug.DebugBuilder;
+import org.apache.isis.core.commons.debug.DebuggableWithTitle;
import org.apache.isis.core.commons.exceptions.IsisException;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-public class UserProfile {
+public class UserProfile implements DebuggableWithTitle {
public UserProfile() {
}
@@ -154,4 +156,13 @@ public class UserProfile {
entry.save(objects);
}
+ public String debugTitle() {
+ return "User Profle";
+ }
+
+ public void debugData(DebugBuilder debug) {
+ debug.appendln("Localization", localization);
+ debug.appendln("Options", options);
+ debug.appendln("Entry", entry);
+ }
}
Modified: incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/context/IsisContext.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/context/IsisContext.java?rev=1399222&r1=1399221&r2=1399222&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/context/IsisContext.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/context/IsisContext.java Wed Oct 17 13:20:00 2012
@@ -513,6 +513,7 @@ public abstract class IsisContext implem
debugList.add("Context", getInstance());
debugList.add("Apache Isis session factory", getSessionFactory());
debugList.add(" Authentication manager", getSessionFactory().getAuthenticationManager());
+ debugList.add(" Authorization manager", getSessionFactory().getAuthorizationManager());
debugList.add(" Persistence session factory", getSessionFactory().getPersistenceSessionFactory());
debugList.add("User profile loader", getUserProfileLoader());
Modified: incubator/isis/trunk/framework/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/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/context/IsisContextThreadLocal.java?rev=1399222&r1=1399221&r2=1399222&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/context/IsisContextThreadLocal.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/context/IsisContextThreadLocal.java Wed Oct 17 13:20:00 2012
@@ -99,7 +99,6 @@ public class IsisContextThreadLocal exte
@Override
public void debugData(final DebugBuilder debug) {
super.debugData(debug);
- debug.appendln();
debug.appendTitle("Threads based Contexts");
for (final Thread thread : sessionsByThread.keySet()) {
final IsisSession data = sessionsByThread.get(thread);
Modified: incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/systemusinginstallers/IsisSystemAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/systemusinginstallers/IsisSystemAbstract.java?rev=1399222&r1=1399221&r2=1399222&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/systemusinginstallers/IsisSystemAbstract.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/systemusinginstallers/IsisSystemAbstract.java Wed Oct 17 13:20:00 2012
@@ -19,18 +19,10 @@
package org.apache.isis.runtimes.dflt.runtime.systemusinginstallers;
-import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.List;
-import com.google.common.base.Function;
-import com.google.common.base.Predicate;
-import com.google.common.collect.Collections2;
-import com.google.common.collect.Lists;
-
-import org.apache.log4j.Logger;
-
import org.apache.isis.applib.fixtures.LogonFixture;
import org.apache.isis.core.commons.components.Installer;
import org.apache.isis.core.commons.components.Noop;
@@ -40,7 +32,6 @@ import org.apache.isis.core.commons.lang
import org.apache.isis.core.metamodel.adapter.oid.OidMarshaller;
import org.apache.isis.core.metamodel.facetapi.MetaModelRefiner;
import org.apache.isis.core.metamodel.spec.SpecificationLoaderSpi;
-import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidator;
import org.apache.isis.core.runtime.authentication.AuthenticationManager;
import org.apache.isis.core.runtime.authorization.AuthorizationManager;
import org.apache.isis.core.runtime.imageloader.TemplateImageLoader;
@@ -60,6 +51,7 @@ import org.apache.isis.runtimes.dflt.run
import org.apache.isis.runtimes.dflt.runtime.system.session.IsisSessionFactory;
import org.apache.isis.runtimes.dflt.runtime.system.session.IsisSessionFactoryDefault;
import org.apache.isis.runtimes.dflt.runtime.userprofile.UserProfileLoaderDefault;
+import org.apache.log4j.Logger;
/**
*
Modified: incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/userprofile/UserProfileLoaderDefault.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/userprofile/UserProfileLoaderDefault.java?rev=1399222&r1=1399221&r2=1399222&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/userprofile/UserProfileLoaderDefault.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/userprofile/UserProfileLoaderDefault.java Wed Oct 17 13:20:00 2012
@@ -209,8 +209,8 @@ public class UserProfileLoaderDefault im
debug.appendln("Store", store.toString());
debug.appendln("Mode", mode);
- debug.append(store);
- debug.append(userProfile);
+ debug.appendln("Store", store);
+ debug.appendln("User Profile", userProfile);
}
@Override
Modified: incubator/isis/trunk/framework/runtimes/dflt/testsupport/src/main/java/org/apache/isis/runtimes/dflt/testsupport/IsisSystemDefault.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/testsupport/src/main/java/org/apache/isis/runtimes/dflt/testsupport/IsisSystemDefault.java?rev=1399222&r1=1399221&r2=1399222&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/testsupport/src/main/java/org/apache/isis/runtimes/dflt/testsupport/IsisSystemDefault.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/testsupport/src/main/java/org/apache/isis/runtimes/dflt/testsupport/IsisSystemDefault.java Wed Oct 17 13:20:00 2012
@@ -2,13 +2,9 @@ package org.apache.isis.runtimes.dflt.te
import java.util.Collection;
import java.util.Collections;
-import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Sets;
-
import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.commons.config.IsisConfigurationDefault;
import org.apache.isis.core.commons.resource.ResourceStreamSourceContextLoaderClassPath;
@@ -48,6 +44,9 @@ import org.apache.isis.runtimes.dflt.run
import org.apache.isis.runtimes.dflt.runtime.transaction.facetdecorator.standard.StandardTransactionFacetDecorator;
import org.apache.isis.security.dflt.authentication.AuthenticatorDefault;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Sets;
+
public class IsisSystemDefault extends IsisSystemAbstract {
private final IsisConfigurationDefault configuration;
Modified: incubator/isis/trunk/framework/runtimes/dflt/testsupport/src/main/java/org/apache/isis/runtimes/dflt/testsupport/IsisSystemWithFixtures.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/testsupport/src/main/java/org/apache/isis/runtimes/dflt/testsupport/IsisSystemWithFixtures.java?rev=1399222&r1=1399221&r2=1399222&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/testsupport/src/main/java/org/apache/isis/runtimes/dflt/testsupport/IsisSystemWithFixtures.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/testsupport/src/main/java/org/apache/isis/runtimes/dflt/testsupport/IsisSystemWithFixtures.java Wed Oct 17 13:20:00 2012
@@ -22,16 +22,6 @@ package org.apache.isis.runtimes.dflt.te
import java.util.Arrays;
import java.util.List;
-import com.google.common.collect.Lists;
-
-import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.runner.Description;
-import org.junit.runners.model.Statement;
-
import org.apache.isis.applib.DomainObjectContainer;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.commons.config.IsisConfiguration;
@@ -48,24 +38,31 @@ import org.apache.isis.runtimes.dflt.run
import org.apache.isis.runtimes.dflt.runtime.persistence.objectstore.ObjectStoreSpi;
import org.apache.isis.runtimes.dflt.runtime.system.DeploymentType;
import org.apache.isis.runtimes.dflt.runtime.system.context.IsisContext;
-import org.apache.isis.runtimes.dflt.runtime.system.persistence.AdapterManagerSpi;
import org.apache.isis.runtimes.dflt.runtime.system.persistence.PersistenceSession;
import org.apache.isis.runtimes.dflt.runtime.system.persistence.Persistor;
-import org.apache.isis.runtimes.dflt.runtime.system.session.IsisSession;
import org.apache.isis.runtimes.dflt.runtime.system.transaction.IsisTransaction;
import org.apache.isis.runtimes.dflt.runtime.system.transaction.IsisTransaction.State;
import org.apache.isis.runtimes.dflt.runtime.system.transaction.IsisTransactionManager;
import org.apache.isis.runtimes.dflt.testsupport.IsisSystemWithFixtures.Fixtures.Initialization;
import org.apache.isis.security.dflt.authentication.AuthenticationRequestDefault;
import org.apache.isis.tck.dom.refs.AggregatedEntity;
-import org.apache.isis.tck.dom.refs.ParentEntityRepository;
import org.apache.isis.tck.dom.refs.ParentEntity;
+import org.apache.isis.tck.dom.refs.ParentEntityRepository;
import org.apache.isis.tck.dom.refs.ReferencingEntity;
import org.apache.isis.tck.dom.refs.SimpleEntity;
import org.apache.isis.tck.dom.scalars.ApplibValuedEntity;
import org.apache.isis.tck.dom.scalars.JdkValuedEntity;
import org.apache.isis.tck.dom.scalars.PrimitiveValuedEntity;
import org.apache.isis.tck.dom.scalars.WrapperValuedEntity;
+import org.apache.log4j.Level;
+import org.apache.log4j.Logger;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.runner.Description;
+import org.junit.runners.model.Statement;
+
+import com.google.common.collect.Lists;
/**
* Wraps a plain {@link IsisSystemDefault}, and provides a number of features to assist with testing.