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 2016/06/02 13:50:38 UTC
[1/2] isis git commit: ISIS-1420: support overrides.properties file
Repository: isis
Updated Branches:
refs/heads/master 18a18bf73 -> 709416aae
ISIS-1420: support overrides.properties file
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/568c39a5
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/568c39a5
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/568c39a5
Branch: refs/heads/master
Commit: 568c39a5122b07ad1f64a2561c78b8eb8546cac8
Parents: 18a18bf
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Thu Jun 2 14:49:25 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Thu Jun 2 14:49:25 2016 +0100
----------------------------------------------------------------------
.../config/IsisConfigurationDefault.java | 38 ++--------
.../ConfigurationResourceAndPolicy.java | 46 ------------
.../configbuilder/IsisConfigurationBuilder.java | 78 +++++++++++---------
...isConfigurationDefault_PropertNamesTest.java | 4 +-
...IsisConfigurationDefault_WhitespaceTest.java | 2 +-
...ourceStreamsConfigResourceAndPolicyTest.java | 49 ------------
.../runner/opts/OptionHandlerConfiguration.java | 3 +-
.../opts/OptionHandlerDeploymentType.java | 3 +-
.../core/webapp/IsisWebAppBootstrapper.java | 2 +-
.../src/main/webapp/WEB-INF/logging.properties | 4 +-
10 files changed, 60 insertions(+), 169 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/568c39a5/core/metamodel/src/main/java/org/apache/isis/core/commons/config/IsisConfigurationDefault.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/commons/config/IsisConfigurationDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/commons/config/IsisConfigurationDefault.java
index 55b031f..b7971a7 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/commons/config/IsisConfigurationDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/commons/config/IsisConfigurationDefault.java
@@ -109,36 +109,12 @@ public class IsisConfigurationDefault implements IsisConfiguration, Configuratio
}
/**
- * Add the properties from an existing Properties object; if the key exists in the configuration then will be ignored.
- *
- * @see #addPerPolicy(Properties, ContainsPolicy)
- * @see #put(Properties)
+ * Add the properties from an existing Properties object.
*/
- public void add(final Properties properties) {
- addPerPolicy(properties, ContainsPolicy.IGNORE);
- }
-
- /**
- * Add the properties from an existing Properties object; if the key exists in the configuration then will be overwritten.
- *
- * @see #add(Properties)
- * @see #addPerPolicy(Properties, ContainsPolicy)
- */
- public void put(final Properties properties) {
- addPerPolicy(properties, ContainsPolicy.OVERWRITE);
- }
-
- /**
- * Add the properties from an existing Properties object; if the key exists in the configuration then the
- * {@link ContainsPolicy} will be applied.
- *
- * @see #add(Properties)
- * @see #put(Properties)
- */
- private void addPerPolicy(final Properties properties, final ContainsPolicy policy) {
+ public void add(final Properties properties, final ContainsPolicy containsPolicy) {
for(Object key: properties.keySet()) {
Object value = properties.get(key);
- addPerPolicy((String) key, (String) value, policy);
+ addPerPolicy((String) key, (String) value, containsPolicy);
}
}
@@ -387,17 +363,17 @@ public class IsisConfigurationDefault implements IsisConfiguration, Configuratio
public IsisConfiguration getProperties(final String withPrefix) {
final int prefixLength = "".length();
- final Properties pp = new Properties();
- final Enumeration<?> e = properties.keys();
+ final Properties properties = new Properties();
+ final Enumeration<?> e = this.properties.keys();
while (e.hasMoreElements()) {
final String key = (String) e.nextElement();
if (key.startsWith(withPrefix)) {
final String modifiedKey = key.substring(prefixLength);
- pp.put(modifiedKey, properties.get(key));
+ properties.put(modifiedKey, this.properties.get(key));
}
}
final IsisConfigurationDefault isisConfigurationDefault = new IsisConfigurationDefault(resourceStreamSource);
- isisConfigurationDefault.add(pp);
+ isisConfigurationDefault.add(properties, ContainsPolicy.IGNORE);
return isisConfigurationDefault;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/568c39a5/core/metamodel/src/main/java/org/apache/isis/core/commons/configbuilder/ConfigurationResourceAndPolicy.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/commons/configbuilder/ConfigurationResourceAndPolicy.java b/core/metamodel/src/main/java/org/apache/isis/core/commons/configbuilder/ConfigurationResourceAndPolicy.java
deleted file mode 100644
index f36bb83..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/commons/configbuilder/ConfigurationResourceAndPolicy.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.isis.core.commons.configbuilder;
-
-import org.apache.isis.core.commons.config.NotFoundPolicy;
-
-class ConfigurationResourceAndPolicy {
-
- private final String configurationResource;
- private final NotFoundPolicy notFoundPolicy;
-
- public ConfigurationResourceAndPolicy(
- final String configurationResource,
- final NotFoundPolicy notFoundPolicy) {
- this.configurationResource = configurationResource;
- this.notFoundPolicy = notFoundPolicy;
- }
-
- public String getConfigurationResource() {
- return configurationResource;
- }
- public NotFoundPolicy getNotFoundPolicy() {
- return notFoundPolicy;
- }
-
- @Override
- public String toString() {
- return String.format("%s{%s}", configurationResource, notFoundPolicy);
- }
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/568c39a5/core/metamodel/src/main/java/org/apache/isis/core/commons/configbuilder/IsisConfigurationBuilder.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/commons/configbuilder/IsisConfigurationBuilder.java b/core/metamodel/src/main/java/org/apache/isis/core/commons/configbuilder/IsisConfigurationBuilder.java
index 423d01a..6dc2895 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/commons/configbuilder/IsisConfigurationBuilder.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/commons/configbuilder/IsisConfigurationBuilder.java
@@ -25,7 +25,6 @@ import java.util.List;
import java.util.Set;
import com.google.common.base.Objects;
-import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
import org.apache.commons.cli.BasicParser;
@@ -33,13 +32,10 @@ import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.CommandLineParser;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
+import org.apache.isis.core.commons.config.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.isis.core.commons.config.ConfigurationConstants;
-import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.commons.config.IsisConfigurationDefault;
-import org.apache.isis.core.commons.config.NotFoundPolicy;
import org.apache.isis.core.commons.exceptions.IsisException;
import org.apache.isis.core.commons.resource.ResourceStreamSource;
import org.apache.isis.core.commons.resource.ResourceStreamSourceChainOfResponsibility;
@@ -71,7 +67,6 @@ public final class IsisConfigurationBuilder {
//region > constructor, fields
private final ResourceStreamSourceChainOfResponsibility resourceStreamSourceChain;
- private final List<ConfigurationResourceAndPolicy> configurationResources = Lists.newArrayList();
private final IsisConfigurationDefault configuration;
private boolean locked;
@@ -109,38 +104,47 @@ public final class IsisConfigurationBuilder {
}
public void addDefaultConfigurationResources() {
- addConfigurationResource(ConfigurationConstants.DEFAULT_CONFIG_FILE, NotFoundPolicy.FAIL_FAST);
- addConfigurationResource(ConfigurationConstants.WEB_CONFIG_FILE, NotFoundPolicy.CONTINUE); //web.properties
- addConfigurationResource("war.properties", NotFoundPolicy.CONTINUE);
+ IsisConfigurationDefault.ContainsPolicy ignorePolicy = IsisConfigurationDefault.ContainsPolicy.IGNORE;
+ NotFoundPolicy continuePolicy = NotFoundPolicy.CONTINUE;
- addConfigurationResource("viewer_wicket.properties", NotFoundPolicy.CONTINUE);
- addConfigurationResource("viewer_restful.properties", NotFoundPolicy.CONTINUE);
- addConfigurationResource("viewer_restfulobjects.properties", NotFoundPolicy.CONTINUE);
+ addConfigurationResource(ConfigurationConstants.DEFAULT_CONFIG_FILE, NotFoundPolicy.FAIL_FAST, ignorePolicy);
- addConfigurationResource("persistor_datanucleus.properties", NotFoundPolicy.CONTINUE);
- addConfigurationResource("persistor.properties", NotFoundPolicy.CONTINUE);
+ addConfigurationResource(ConfigurationConstants.WEB_CONFIG_FILE, continuePolicy, ignorePolicy);
+ addConfigurationResource("war.properties", continuePolicy, ignorePolicy);
- addConfigurationResource("authentication_shiro.properties", NotFoundPolicy.CONTINUE);
- addConfigurationResource("authentication_bypass.properties", NotFoundPolicy.CONTINUE);
- addConfigurationResource("authentication.properties", NotFoundPolicy.CONTINUE);
+ addConfigurationResource("viewer_wicket.properties", continuePolicy, ignorePolicy);
+ addConfigurationResource("viewer_restful.properties", continuePolicy, ignorePolicy);
+ addConfigurationResource("viewer_restfulobjects.properties", continuePolicy, ignorePolicy);
- addConfigurationResource("authorization_shiro.properties", NotFoundPolicy.CONTINUE);
- addConfigurationResource("authorization_bypass.properties", NotFoundPolicy.CONTINUE);
- addConfigurationResource("authorization.properties", NotFoundPolicy.CONTINUE);
+ addConfigurationResource("persistor_datanucleus.properties", continuePolicy, ignorePolicy);
+ addConfigurationResource("persistor.properties", continuePolicy, ignorePolicy);
- addConfigurationResource("reflector_java.properties", NotFoundPolicy.CONTINUE);
- addConfigurationResource("reflector.properties", NotFoundPolicy.CONTINUE);
+ addConfigurationResource("authentication_shiro.properties", continuePolicy, ignorePolicy);
+ addConfigurationResource("authentication_bypass.properties", continuePolicy, ignorePolicy);
+ addConfigurationResource("authentication.properties", continuePolicy, ignorePolicy);
- addConfigurationResource("fixtures-installer_configuration.properties", NotFoundPolicy.CONTINUE);
- addConfigurationResource("fixtures-installer.properties", NotFoundPolicy.CONTINUE);
+ addConfigurationResource("authorization_shiro.properties", continuePolicy, ignorePolicy);
+ addConfigurationResource("authorization_bypass.properties", continuePolicy, ignorePolicy);
+ addConfigurationResource("authorization.properties", continuePolicy, ignorePolicy);
- addConfigurationResource("services-installer_annotation.properties", NotFoundPolicy.CONTINUE);
- addConfigurationResource("services-installer_configuration.properties", NotFoundPolicy.CONTINUE);
+ addConfigurationResource("reflector_java.properties", continuePolicy, ignorePolicy);
+ addConfigurationResource("reflector.properties", continuePolicy, ignorePolicy);
- addConfigurationResource("services-installer_configuration-and-annotation.properties", NotFoundPolicy.CONTINUE);
- addConfigurationResource("services-installer.properties", NotFoundPolicy.CONTINUE);
+ addConfigurationResource("fixtures-installer_configuration.properties", continuePolicy, ignorePolicy);
+ addConfigurationResource("fixtures-installer.properties", continuePolicy, ignorePolicy);
+
+ addConfigurationResource("services-installer_annotation.properties", continuePolicy, ignorePolicy);
+ addConfigurationResource("services-installer_configuration.properties", continuePolicy, ignorePolicy);
+
+ addConfigurationResource("services-installer_configuration-and-annotation.properties", continuePolicy, ignorePolicy);
+ addConfigurationResource("services-installer.properties", continuePolicy, ignorePolicy);
+
+ // both override and overrides are accepted (because I keep forgetting which)
+ addConfigurationResource("override.properties", NotFoundPolicy.CONTINUE, IsisConfigurationDefault.ContainsPolicy.OVERWRITE);
+ addConfigurationResource("overrides.properties", NotFoundPolicy.CONTINUE, IsisConfigurationDefault.ContainsPolicy.OVERWRITE);
}
+
//endregion
//region > addResourceStreamSource, addResourceStreamSources
@@ -173,12 +177,12 @@ public final class IsisConfigurationBuilder {
* {@link NotFoundPolicy} determines whether an exception is thrown or not.
*
* <p>
- * Must be called before {@link IsisConfigurationBuilder#getConfiguration()}; the resource is
- * actually read on {@link IsisConfigurationBuilder#getConfiguration()}.
+ * Must be called before {@link IsisConfigurationBuilder#getConfiguration()}.
*/
public synchronized void addConfigurationResource(
final String configurationResource,
- final NotFoundPolicy notFoundPolicy) {
+ final NotFoundPolicy notFoundPolicy,
+ final IsisConfigurationDefault.ContainsPolicy containsPolicy) {
ensureNotLocked();
@@ -187,8 +191,7 @@ public final class IsisConfigurationBuilder {
"checking availability of configuration resource: %s, notFoundPolicy: %s",
configurationResource, notFoundPolicy));
}
- loadConfigurationResource(configurationResource, notFoundPolicy);
- configurationResources.add(new ConfigurationResourceAndPolicy(configurationResource, notFoundPolicy));
+ loadConfigurationResource(configurationResource, notFoundPolicy, containsPolicy);
}
/**
@@ -201,12 +204,14 @@ public final class IsisConfigurationBuilder {
*/
private void loadConfigurationResource(
final String configurationResource,
- final NotFoundPolicy notFoundPolicy) {
+ final NotFoundPolicy notFoundPolicy,
+ final IsisConfigurationDefault.ContainsPolicy containsPolicy) {
+
try {
final PropertiesReader propertiesReader =
loadConfigurationResource(resourceStreamSourceChain, configurationResource);
LOG.info("loading properties from " + configurationResource);
- configuration.add(propertiesReader.getProperties());
+ configuration.add(propertiesReader.getProperties(), containsPolicy);
configurationResourcesFound.add(configurationResource);
return;
} catch (final IOException ignore) {
@@ -362,7 +367,8 @@ public final class IsisConfigurationBuilder {
public String toString() {
return Objects.toStringHelper(this)
.add("resourceStream", resourceStreamSourceChain)
- .add("configResources", configurationResources).toString();
+ .add("configResources", configurationResourcesFound)
+ .toString();
}
//endregion
http://git-wip-us.apache.org/repos/asf/isis/blob/568c39a5/core/metamodel/src/test/java/org/apache/isis/core/commons/config/IsisConfigurationDefault_PropertNamesTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/commons/config/IsisConfigurationDefault_PropertNamesTest.java b/core/metamodel/src/test/java/org/apache/isis/core/commons/config/IsisConfigurationDefault_PropertNamesTest.java
index b9e0b4c..03b812d 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/commons/config/IsisConfigurationDefault_PropertNamesTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/commons/config/IsisConfigurationDefault_PropertNamesTest.java
@@ -39,12 +39,12 @@ public class IsisConfigurationDefault_PropertNamesTest extends TestCase {
final Properties p = new Properties();
p.put("isis.bool", "on");
p.put("isis.str", "original");
- configuration.add(p);
+ configuration.add(p, IsisConfigurationDefault.ContainsPolicy.IGNORE);
final Properties p1 = new Properties();
p1.put("isis.int", "1");
p1.put("isis.str", "replacement");
- configuration.add(p1);
+ configuration.add(p1, IsisConfigurationDefault.ContainsPolicy.IGNORE);
}
public void testDuplicatedPropertyIsNotReplaced() {
http://git-wip-us.apache.org/repos/asf/isis/blob/568c39a5/core/metamodel/src/test/java/org/apache/isis/core/commons/config/IsisConfigurationDefault_WhitespaceTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/commons/config/IsisConfigurationDefault_WhitespaceTest.java b/core/metamodel/src/test/java/org/apache/isis/core/commons/config/IsisConfigurationDefault_WhitespaceTest.java
index 4229575..03d71bc 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/commons/config/IsisConfigurationDefault_WhitespaceTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/commons/config/IsisConfigurationDefault_WhitespaceTest.java
@@ -42,7 +42,7 @@ public class IsisConfigurationDefault_WhitespaceTest extends TestCase {
p.put("properties.trailingSpaces", "twoSpacesAfterThis ");
p.put("properties.trailingTab", "oneTabAfterThis\t");
p.put("properties.trailingTabAndSpaces", "oneTabAndTwoSpacesAfterThis\t ");
- configuration.add(p);
+ configuration.add(p, IsisConfigurationDefault.ContainsPolicy.IGNORE);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/568c39a5/core/metamodel/src/test/java/org/apache/isis/core/commons/configbuilder/ConfigurationBuilderResourceStreamsConfigResourceAndPolicyTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/commons/configbuilder/ConfigurationBuilderResourceStreamsConfigResourceAndPolicyTest.java b/core/metamodel/src/test/java/org/apache/isis/core/commons/configbuilder/ConfigurationBuilderResourceStreamsConfigResourceAndPolicyTest.java
deleted file mode 100644
index f0b7ee9..0000000
--- a/core/metamodel/src/test/java/org/apache/isis/core/commons/configbuilder/ConfigurationBuilderResourceStreamsConfigResourceAndPolicyTest.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.isis.core.commons.configbuilder;
-
-import org.junit.Test;
-
-import org.apache.isis.core.commons.config.NotFoundPolicy;
-
-import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertThat;
-
-public class ConfigurationBuilderResourceStreamsConfigResourceAndPolicyTest {
-
- @Test
- public void toStringWhenNull() throws Exception {
- final ConfigurationResourceAndPolicy configurationResourceAndPolicy = new ConfigurationResourceAndPolicy(null, null);
- assertThat(configurationResourceAndPolicy.toString(), is("null{null}"));
- }
-
- @Test
- public void toStringWhenConfigResourceNotNull() throws Exception {
- final ConfigurationResourceAndPolicy configurationResourceAndPolicy = new ConfigurationResourceAndPolicy("foo.properties", null);
- assertThat(configurationResourceAndPolicy.toString(), is("foo.properties{null}"));
- }
-
- @Test
- public void toStringWhenAllSpecified() throws Exception {
- final ConfigurationResourceAndPolicy configurationResourceAndPolicy = new ConfigurationResourceAndPolicy("foo.properties", NotFoundPolicy.CONTINUE);
- assertThat(configurationResourceAndPolicy.toString(), is("foo.properties{CONTINUE}"));
- }
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/568c39a5/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerConfiguration.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerConfiguration.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerConfiguration.java
index f267adb..76350af 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerConfiguration.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerConfiguration.java
@@ -27,6 +27,7 @@ import org.apache.commons.cli.Option;
import org.apache.commons.cli.OptionBuilder;
import org.apache.commons.cli.Options;
+import org.apache.isis.core.commons.config.IsisConfigurationDefault;
import org.apache.isis.core.commons.configbuilder.IsisConfigurationBuilder;
import org.apache.isis.core.commons.config.NotFoundPolicy;
import org.apache.isis.core.runtime.optionhandler.BootPrinter;
@@ -55,7 +56,7 @@ public class OptionHandlerConfiguration extends OptionHandlerAbstract {
if (configurationResource == null) {
return;
}
- isisConfigurationBuilder.addConfigurationResource(configurationResource, NotFoundPolicy.FAIL_FAST);
+ isisConfigurationBuilder.addConfigurationResource(configurationResource, NotFoundPolicy.FAIL_FAST, IsisConfigurationDefault.ContainsPolicy.IGNORE);
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/568c39a5/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerDeploymentType.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerDeploymentType.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerDeploymentType.java
index 6a29977..31b2a15 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerDeploymentType.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerDeploymentType.java
@@ -24,6 +24,7 @@ import org.apache.commons.cli.Option;
import org.apache.commons.cli.OptionBuilder;
import org.apache.commons.cli.Options;
+import org.apache.isis.core.commons.config.IsisConfigurationDefault;
import org.apache.isis.core.commons.config.NotFoundPolicy;
import org.apache.isis.core.commons.configbuilder.IsisConfigurationBuilder;
import org.apache.isis.core.runtime.optionhandler.BootPrinter;
@@ -81,7 +82,7 @@ public abstract class OptionHandlerDeploymentType extends OptionHandlerAbstract
@Override
public void prime(final IsisConfigurationBuilder isisConfigurationBuilder) {
final String type = deploymentType.nameLowerCase();
- isisConfigurationBuilder.addConfigurationResource(type + ".properties", NotFoundPolicy.CONTINUE);
+ isisConfigurationBuilder.addConfigurationResource(type + ".properties", NotFoundPolicy.CONTINUE, IsisConfigurationDefault.ContainsPolicy.IGNORE);
isisConfigurationBuilder.add(SystemConstants.DEPLOYMENT_TYPE_KEY, deploymentType.name());
}
http://git-wip-us.apache.org/repos/asf/isis/blob/568c39a5/core/runtime/src/main/java/org/apache/isis/core/webapp/IsisWebAppBootstrapper.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/webapp/IsisWebAppBootstrapper.java b/core/runtime/src/main/java/org/apache/isis/core/webapp/IsisWebAppBootstrapper.java
index a3226bf..04b410a 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/webapp/IsisWebAppBootstrapper.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/webapp/IsisWebAppBootstrapper.java
@@ -199,7 +199,7 @@ public class IsisWebAppBootstrapper implements ServletContextListener {
final IsisConfigurationBuilder isisConfigurationBuilder,
final DeploymentType deploymentType) {
final String resourceName = deploymentType.name().toLowerCase() + ".properties";
- isisConfigurationBuilder.addConfigurationResource(resourceName, NotFoundPolicy.CONTINUE);
+ isisConfigurationBuilder.addConfigurationResource(resourceName, NotFoundPolicy.CONTINUE, IsisConfigurationDefault.ContainsPolicy.IGNORE);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/568c39a5/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/logging.properties
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/logging.properties b/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/logging.properties
index 5d663ef..f698042 100644
--- a/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/logging.properties
+++ b/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/logging.properties
@@ -89,6 +89,7 @@ log4j.additivity.log4j.logger.org.apache.isis.applib.services.publish.PublisherS
+
! turn on the internal log4j debugging flag so we can see what it is doing
#log4j.debug=true
@@ -190,9 +191,10 @@ log4j.additivity.org.apache.isis.core.metamodel.specloader.ServiceInitializer=fa
log4j.logger.org.apache.isis.core.runtime.services.ServicesInstallerFromConfiguration=WARN,Console
log4j.additivity.org.apache.isis.core.runtime.services.ServicesInstallerFromConfiguration=false
-log4j.logger.org.apache.isis.core.commons.config.IsisConfigurationDefault=WARN,Console
+log4j.logger.org.apache.isis.core.commons.config.IsisConfigurationDefault=INFO,Console
log4j.additivity.org.apache.isis.core.commons.config.IsisConfigurationDefault=false
+
log4j.logger.org.apache.isis.core.runtime.installers.InstallerLookupDefault=WARN,Console
log4j.additivity.org.apache.isis.core.runtime.installers.InstallerLookupDefault=false
[2/2] isis git commit: ISIS-1417: temporarily setting
ignoreDeprecated back to false (ie don't ignore).
Posted by da...@apache.org.
ISIS-1417: temporarily setting ignoreDeprecated back to false (ie don't ignore).
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/709416aa
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/709416aa
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/709416aa
Branch: refs/heads/master
Commit: 709416aaeb2f8a56d2760139a50f9283715eadd1
Parents: 568c39a
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Thu Jun 2 14:50:13 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Thu Jun 2 14:50:13 2016 +0100
----------------------------------------------------------------------
.../simpleapp/webapp/src/main/webapp/WEB-INF/isis.properties | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/709416aa/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/isis.properties
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/isis.properties b/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/isis.properties
index 64e69a2..7de67bc 100644
--- a/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/isis.properties
+++ b/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/isis.properties
@@ -75,7 +75,7 @@ isis.reflector.validator.allowDeprecated=false
# Whether to ignore or honour deprecated annotations/method prefixes.
# If not specified, default is to honour
#
-isis.reflector.facets.ignoreDeprecated=true
+isis.reflector.facets.ignoreDeprecated=false