You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2014/09/11 15:58:20 UTC
[3/4] git commit: ISIS-872: removing references to components
previously mothballed (in installer-registry.properties, and SystemConstants).
ISIS-872: removing references to components previously mothballed (in installer-registry.properties, and SystemConstants).
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/3a837981
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/3a837981
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/3a837981
Branch: refs/heads/master
Commit: 3a8379813bd064872cea85b94977888e206792b5
Parents: 0949eb1
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Thu Sep 11 06:46:08 2014 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Thu Sep 11 06:46:08 2014 +0100
----------------------------------------------------------------------
.../isis/core/runtime/system/SystemConstants.java | 16 ++++++++--------
.../isis/core/runtime/installer-registry.properties | 12 +-----------
2 files changed, 9 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/3a837981/core/runtime/src/main/java/org/apache/isis/core/runtime/system/SystemConstants.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/SystemConstants.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/SystemConstants.java
index cf92c9c..f5b4513 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/SystemConstants.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/SystemConstants.java
@@ -70,7 +70,7 @@ public final class SystemConstants {
/**
* Default for {@link #VIEWER_KEY}.
*/
- public static final String VIEWER_DEFAULT = "dnd";
+ public static final String VIEWER_DEFAULT = "restfulobjects";
/**
* Key used to lookup {@link PersistenceSessionFactory persistor} in
@@ -83,9 +83,9 @@ public final class SystemConstants {
// TODO: inline
public static final String OBJECT_PERSISTOR_KEY = OBJECT_PERSISTOR_INSTALLER_KEY;
// TODO: move to being a responsibility of DeploymentType instead
- public static final String OBJECT_PERSISTOR_NON_PRODUCTION_DEFAULT = "in-memory";
+ public static final String OBJECT_PERSISTOR_NON_PRODUCTION_DEFAULT = "datanucleus";
// TODO: move to being a responsibility of DeploymentType instead
- public static final String OBJECT_PERSISTOR_PRODUCTION_DEFAULT = "xml";
+ public static final String OBJECT_PERSISTOR_PRODUCTION_DEFAULT = "datanucleus";
/**
* Key used to lookup {@link UserProfileStore user profile store} (via
@@ -100,7 +100,7 @@ public final class SystemConstants {
// TODO: move to being a responsibility of DeploymentType instead
public static final String USER_PROFILE_STORE_NON_PRODUCTION_DEFAULT = "in-memory";
// TODO: move to being a responsibility of DeploymentType instead
- public static final String USER_PROFILE_STORE_PRODUCTION_DEFAULT = "xml";
+ public static final String USER_PROFILE_STORE_PRODUCTION_DEFAULT = "in-memory";
/**
* Key used to lookup {@link AuthenticationManager authentication manager}
@@ -112,11 +112,11 @@ public final class SystemConstants {
/**
* Default for {@link #AUTHENTICATION_INSTALLER_KEY} if not exploring.
*/
- public static final String AUTHENTICATION_DEFAULT = "file";
+ public static final String AUTHENTICATION_DEFAULT = "shiro";
/**
* Default for {@link #AUTHENTICATION_INSTALLER_KEY} if exploring.
*/
- public static final String AUTHENTICATION_EXPLORATION_DEFAULT = "bypass";
+ public static final String AUTHENTICATION_EXPLORATION_DEFAULT = "shiro";
/**
* Key used to lookup {@link AuthorizationManager authorization manager} in
@@ -128,12 +128,12 @@ public final class SystemConstants {
/**
* Default for {@link #AUTHORIZATION_DEFAULT} if production.
*/
- public static final String AUTHORIZATION_DEFAULT = "file";
+ public static final String AUTHORIZATION_DEFAULT = "shiro";
/**
* Default for {@link #AUTHORIZATION_DEFAULT} if not production.
*/
- public static final String AUTHORIZATION_NON_PRODUCTION_DEFAULT = "bypass";
+ public static final String AUTHORIZATION_NON_PRODUCTION_DEFAULT = "shiro";
/**
* Key used to lookup {@link ServicesInstaller services installer} in
http://git-wip-us.apache.org/repos/asf/isis/blob/3a837981/core/runtime/src/main/resources/org/apache/isis/core/runtime/installer-registry.properties
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/resources/org/apache/isis/core/runtime/installer-registry.properties b/core/runtime/src/main/resources/org/apache/isis/core/runtime/installer-registry.properties
index 153aaad..6360209 100644
--- a/core/runtime/src/main/resources/org/apache/isis/core/runtime/installer-registry.properties
+++ b/core/runtime/src/main/resources/org/apache/isis/core/runtime/installer-registry.properties
@@ -32,19 +32,13 @@ org.apache.isis.core.security.authorization.BypassAuthorizationManagerInstaller
org.apache.isis.security.shiro.authentication.ShiroAuthenticationManagerInstaller # "shiro"
org.apache.isis.security.shiro.authorization.ShiroAuthorizationManagerInstaller # "shiro"
-org.apache.isis.security.file.authentication.FileAuthenticationManagerInstaller # "file"
-org.apache.isis.security.file.authorization.FileAuthorizationManagerInstaller # "file"
-
-org.apache.isis.security.ldap.authorization.LdapAuthorizationManagerInstaller # "ldap"
-org.apache.isis.security.ldap.authentication.LdapAuthenticationManagerInstaller # "ldap"
############################################################
# VIEWERS
############################################################
-org.apache.isis.viewer.dnd.DndViewerInstaller # "dnd"
-org.apache.isis.viewer.restfulobjects.viewer.embedded.RestfulObjectsViewerInstaller # "restfulobjects" (runs within embedded web server)
+org.apache.isis.viewer.restfulobjects.viewer.embedded.RestfulObjectsViewerInstaller # "restfulobjects"
############################################################
@@ -73,14 +67,10 @@ org.apache.isis.core.runtime.services.ServicesInstallerFromConfigurationAndAnnot
# objectstores
org.apache.isis.core.objectstore.InMemoryPersistenceMechanismInstaller # "in-memory"
-org.apache.isis.objectstore.xml.XmlPersistenceMechanismInstaller # "xml"
-org.apache.isis.objectstore.nosql.db.mongo.MongoPersistorMechanismInstaller # "mongo"
-org.apache.isis.objectstore.nosql.db.file.FileServerPersistorMechanismInstaller # "fileserver"
org.apache.isis.objectstore.jdo.datanucleus.DataNucleusPersistenceMechanismInstaller # datanucleus
# profilestores
org.apache.isis.core.profilestore.InMemoryUserProfileStoreInstaller # "in-memory"
-org.apache.isis.profilestore.xml.XmlUserProfileStoreInstaller # "xml"
# reflector decorators
org.apache.isis.core.runtime.transaction.facetdecorator.standard.TransactionFacetDecoratorInstaller # "transaction"