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 2017/01/30 16:12:43 UTC
[1/3] isis git commit: Replace aggregate jetty uber dependency with
webapp
Repository: isis
Updated Branches:
refs/heads/maint-1.14.0 482286e2b -> 58722f9d2
Replace aggregate jetty uber dependency with webapp
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/688e0a9a
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/688e0a9a
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/688e0a9a
Branch: refs/heads/maint-1.14.0
Commit: 688e0a9a220fda3a2c97e34ae62ec4643793d863
Parents: 482286e
Author: Martin Hesse <mw...@gmail.com>
Authored: Mon Jan 9 13:34:25 2017 +0700
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Fri Jan 20 17:03:11 2017 +0000
----------------------------------------------------------------------
core/pom.xml | 11 ++++++++---
core/webserver/pom.xml | 9 ++++++---
2 files changed, 14 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/688e0a9a/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index c43564b..4e43f3d 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -1788,10 +1788,9 @@ ${license.additional-notes}
<!-- Web development -->
<dependency>
- <groupId>org.eclipse.jetty.aggregate</groupId>
- <artifactId>jetty-all</artifactId>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-servlet</artifactId>
<version>${jetty.version}</version>
- <classifier>uber</classifier>
<exclusions>
<exclusion>
<groupId>org.eclipse.jetty.orbit</groupId>
@@ -1799,6 +1798,12 @@ ${license.additional-notes}
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-webapp</artifactId>
+ <version>${jetty.version}</version>
+ </dependency>
+
<!-- Testing libraries (not scope=test because used by isis-core-integtest) -->
<dependency>
http://git-wip-us.apache.org/repos/asf/isis/blob/688e0a9a/core/webserver/pom.xml
----------------------------------------------------------------------
diff --git a/core/webserver/pom.xml b/core/webserver/pom.xml
index a7172cc..9afc7f3 100644
--- a/core/webserver/pom.xml
+++ b/core/webserver/pom.xml
@@ -35,9 +35,12 @@
<artifactId>isis-core-runtime</artifactId>
</dependency>
<dependency>
- <groupId>org.eclipse.jetty.aggregate</groupId>
- <artifactId>jetty-all</artifactId>
- <classifier>uber</classifier>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-servlet</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-webapp</artifactId>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
[2/3] isis git commit: ISIS-785: fix to CSS for multi-select
Posted by da...@apache.org.
ISIS-785: fix to CSS for multi-select
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/4c4bd539
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/4c4bd539
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/4c4bd539
Branch: refs/heads/maint-1.14.0
Commit: 4c4bd5392b484e7ef9ccfd062bfa1d79844907e6
Parents: 688e0a9
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Fri Jan 27 17:06:22 2017 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Fri Jan 27 17:07:54 2017 +0000
----------------------------------------------------------------------
.../apache/isis/viewer/wicket/ui/pages/bootstrap-overrides.css | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/4c4bd539/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides.css
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides.css b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides.css
index 08d069d..4317cfb 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides.css
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides.css
@@ -861,3 +861,7 @@ tr.headers th form input {
margin-left: 4px;
margin-right: 10px;
}
+
+.select2-container-multi.input-sm {
+ height: inherit;
+}
\ No newline at end of file
[3/3] isis git commit: ISIS-1573: accept ISIS_OPTS values that
contain strings.
Posted by da...@apache.org.
ISIS-1573: accept ISIS_OPTS values that contain strings.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/58722f9d
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/58722f9d
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/58722f9d
Branch: refs/heads/maint-1.14.0
Commit: 58722f9d29806d5428b42c119be1213ac4c69585
Parents: 4c4bd53
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Mon Jan 30 16:08:44 2017 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Mon Jan 30 16:08:44 2017 +0000
----------------------------------------------------------------------
.../configbuilder/IsisConfigurationBuilder.java | 2 +-
.../PrimerForEnvironmentVariableISIS_OPT.java | 66 ---------------
.../PrimerForEnvironmentVariableISIS_OPTS.java | 81 ++++++++++++++++++
...merForEnvironmentVariableISIS_OPTS_Test.java | 89 ++++++++++++++++++++
4 files changed, 171 insertions(+), 67 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/58722f9d/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 22c8a5c..3ad72c7 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
@@ -156,7 +156,7 @@ public final class IsisConfigurationBuilder {
private void addDefaultPrimers() {
primeWith(new PrimerForSystemProperties());
primeWith(new PrimerForEnvironmentVariablesIsisPrefix());
- primeWith(new PrimerForEnvironmentVariableISIS_OPT());
+ primeWith(new PrimerForEnvironmentVariableISIS_OPTS());
}
//endregion
http://git-wip-us.apache.org/repos/asf/isis/blob/58722f9d/core/metamodel/src/main/java/org/apache/isis/core/commons/configbuilder/PrimerForEnvironmentVariableISIS_OPT.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/commons/configbuilder/PrimerForEnvironmentVariableISIS_OPT.java b/core/metamodel/src/main/java/org/apache/isis/core/commons/configbuilder/PrimerForEnvironmentVariableISIS_OPT.java
deleted file mode 100644
index e0bebd9..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/commons/configbuilder/PrimerForEnvironmentVariableISIS_OPT.java
+++ /dev/null
@@ -1,66 +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 java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
-import com.google.common.base.Splitter;
-import com.google.common.collect.Maps;
-
-public class PrimerForEnvironmentVariableISIS_OPT implements IsisConfigurationBuilder.Primer {
-
- public static final String OPT_ENV = "ISIS_OPTS";
- public static final String SEPARATOR_ENV = "ISIS_OPTS_SEPARATOR";
- public static final String SEPARATOR_DEFAULT = "||";
-
- @Override
- public void prime(final IsisConfigurationBuilder builder) {
- final String separator = determineSeparator();
- final String env = System.getenv(OPT_ENV);
- for (Map.Entry<String, String> entry : fromEnv(env, separator).entrySet()) {
- final String envVarName = entry.getKey();
- final String envVarValue = entry.getValue();
- builder.put(envVarName, envVarValue);
- }
- }
-
- private static String determineSeparator() {
- final String separator = System.getenv(SEPARATOR_ENV);
- if (separator != null) {
- return separator;
- }
- return SEPARATOR_DEFAULT;
- }
-
- private static Map<String, String> fromEnv(final String env, final String separator) {
- final LinkedHashMap<String, String> map = Maps.newLinkedHashMap();
- if (env != null) {
- final List<String> keyAndValues = Splitter.on(separator).splitToList(env);
- for (String keyAndValue : keyAndValues) {
- final List<String> parts = Splitter.on("=").splitToList(keyAndValue);
- if (parts.size() == 2) {
- map.put(parts.get(0), parts.get(1));
- }
- }
- }
- return map;
- }
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/58722f9d/core/metamodel/src/main/java/org/apache/isis/core/commons/configbuilder/PrimerForEnvironmentVariableISIS_OPTS.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/commons/configbuilder/PrimerForEnvironmentVariableISIS_OPTS.java b/core/metamodel/src/main/java/org/apache/isis/core/commons/configbuilder/PrimerForEnvironmentVariableISIS_OPTS.java
new file mode 100644
index 0000000..c8b6a00
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/commons/configbuilder/PrimerForEnvironmentVariableISIS_OPTS.java
@@ -0,0 +1,81 @@
+/*
+ * 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 java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import com.google.common.base.Joiner;
+import com.google.common.base.Splitter;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+
+public class PrimerForEnvironmentVariableISIS_OPTS implements IsisConfigurationBuilder.Primer {
+
+ public static final String OPT_ENV = "ISIS_OPTS";
+ public static final String SEPARATOR_ENV = "ISIS_OPTS_SEPARATOR";
+ public static final String SEPARATOR_DEFAULT = "||";
+
+ @Override
+ public void prime(final IsisConfigurationBuilder builder) {
+ final String separator = determineSeparator();
+ final String optEnv = OPT_ENV;
+ final String env = getEnv(optEnv);
+ for (Map.Entry<String, String> entry : fromEnv(env, separator).entrySet()) {
+ final String envVarName = entry.getKey();
+ final String envVarValue = entry.getValue();
+ builder.put(envVarName, envVarValue);
+ }
+ }
+
+ /**
+ * Factored out for testing
+ */
+ String getEnv(final String optEnv) {
+ return System.getenv(optEnv);
+ }
+
+ private String determineSeparator() {
+ final String separator = getEnv(SEPARATOR_ENV);
+ if (separator != null) {
+ return separator;
+ }
+ return SEPARATOR_DEFAULT;
+ }
+
+ private static Map<String, String> fromEnv(final String env, final String separator) {
+ final LinkedHashMap<String, String> map = Maps.newLinkedHashMap();
+ if (env != null) {
+ final List<String> keyAndValues = Splitter.on(separator).splitToList(env);
+ for (String keyAndValue : keyAndValues) {
+ final List<String> parts = Lists.newArrayList(Splitter.on("=").splitToList(keyAndValue));
+
+ if (parts.size() >= 2) {
+ String key = parts.get(0);
+ parts.remove(0);
+ final String value = Joiner.on("=").join(parts);
+
+ map.put(key, value);
+ }
+ }
+ }
+ return map;
+ }
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/58722f9d/core/metamodel/src/test/java/org/apache/isis/core/commons/configbuilder/PrimerForEnvironmentVariableISIS_OPTS_Test.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/commons/configbuilder/PrimerForEnvironmentVariableISIS_OPTS_Test.java b/core/metamodel/src/test/java/org/apache/isis/core/commons/configbuilder/PrimerForEnvironmentVariableISIS_OPTS_Test.java
new file mode 100644
index 0000000..ed6b8e9
--- /dev/null
+++ b/core/metamodel/src/test/java/org/apache/isis/core/commons/configbuilder/PrimerForEnvironmentVariableISIS_OPTS_Test.java
@@ -0,0 +1,89 @@
+package org.apache.isis.core.commons.configbuilder;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import org.apache.isis.core.commons.config.IsisConfigurationDefault;
+
+import static org.hamcrest.Matchers.is;
+import static org.junit.Assert.assertThat;
+
+public class PrimerForEnvironmentVariableISIS_OPTS_Test {
+
+ IsisConfigurationBuilder builder;
+
+ PrimerForEnvironmentVariableISIS_OPTS primer;
+
+ @Before
+ public void setUp() throws Exception {
+ builder = new IsisConfigurationBuilder();
+ }
+
+ @Test
+ public void when_value_contains_equal_signs() throws Exception {
+
+ // given
+ primer = new PrimerForEnvironmentVariableISIS_OPTS() {
+ @Override
+ String getEnv(final String optEnv) {
+ return "ISIS_OPTS".equals(optEnv)
+ ? "isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionURL=jdbc:sqlserver://HALCHILLBLAST;instance=.;databaseName=estatio"
+ : null;
+ }
+ };
+
+ // when
+ primer.prime(builder);
+
+ // then
+ final IsisConfigurationDefault configuration = builder.getConfiguration();
+ assertThat(configuration.asMap().size(), is(1));
+ assertThat(configuration.getString("isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionURL"), is("jdbc:sqlserver://HALCHILLBLAST;instance=.;databaseName=estatio"));
+ }
+
+ @Test
+ public void when_value_does_not_contain_equal_signs() throws Exception {
+
+ // given
+ primer = new PrimerForEnvironmentVariableISIS_OPTS() {
+ @Override
+ String getEnv(final String optEnv) {
+ return "ISIS_OPTS".equals(optEnv)
+ ? "isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionDriverName=com.microsoft.sqlserver.jdbc.SQLServerDriver"
+ : null;
+ }
+ };
+
+ // when
+ primer.prime(builder);
+
+ // then
+ final IsisConfigurationDefault configuration = builder.getConfiguration();
+
+ assertThat(configuration.asMap().size(), is(1));
+ assertThat(configuration.getString("isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionDriverName"), is("com.microsoft.sqlserver.jdbc.SQLServerDriver"));
+ }
+
+ @Test
+ public void when_string_does_not_contain_equal_signs() throws Exception {
+
+ // given
+ primer = new PrimerForEnvironmentVariableISIS_OPTS() {
+ @Override
+ String getEnv(final String optEnv) {
+ return "ISIS_OPTS".equals(optEnv)
+ ? "isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionURL~foo"
+ : null;
+ }
+ };
+
+ // when
+ primer.prime(builder);
+
+ // then
+ final IsisConfigurationDefault configuration = builder.getConfiguration();
+ assertThat(configuration.asMap().size(), is(0));
+ }
+
+
+}
\ No newline at end of file