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/02/17 18:42:34 UTC
[1/3] git commit: ISIS-700: fix for memento service.
Repository: isis
Updated Branches:
refs/heads/master 6a2034605 -> 7dc5b0b26
ISIS-700: fix for memento service.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/e6054f26
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/e6054f26
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/e6054f26
Branch: refs/heads/master
Commit: e6054f26fa4529770ed4c6c80b4cd5cef79f31dc
Parents: 6a20346
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Mon Feb 17 12:57:34 2014 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Mon Feb 17 12:57:34 2014 +0000
----------------------------------------------------------------------
.../isis/core/runtime/services/memento/Dom4jUtil.java | 10 ++++++----
.../services/memento/MementoServiceDefaultTest.java | 4 +++-
2 files changed, 9 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/e6054f26/core/runtime/src/main/java/org/apache/isis/core/runtime/services/memento/Dom4jUtil.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/memento/Dom4jUtil.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/memento/Dom4jUtil.java
index d4652d4..88e9a89 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/memento/Dom4jUtil.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/memento/Dom4jUtil.java
@@ -25,7 +25,6 @@ import java.math.BigInteger;
import org.dom4j.Document;
import org.dom4j.DocumentException;
import org.dom4j.Element;
-import org.dom4j.io.OutputFormat;
import org.dom4j.io.SAXReader;
import org.dom4j.io.XMLWriter;
import org.joda.time.LocalDate;
@@ -35,7 +34,6 @@ import org.apache.isis.core.commons.exceptions.IsisException;
class Dom4jUtil {
-
private Dom4jUtil(){}
private final static String NULL_MARKER = "$$_isis_null_value_$$";
@@ -81,8 +79,12 @@ class Dom4jUtil {
XMLWriter writer = null;
final StringWriter sw = new StringWriter();
try {
- OutputFormat outputFormat = OutputFormat.createPrettyPrint();
- writer = new XMLWriter(sw, outputFormat);
+ // previously this code used pretty print.
+ // however, that tripped up on strings with double spaces in them; the double space was normalized
+ // to a single space!
+ // OutputFormat outputFormat = OutputFormat.createPrettyPrint();
+ // writer = new XMLWriter(sw, outputFormat);
+ writer = new XMLWriter(sw);
writer.write(doc);
return sw.toString();
} catch (IOException e) {
http://git-wip-us.apache.org/repos/asf/isis/blob/e6054f26/core/runtime/src/test/java/org/apache/isis/core/runtime/services/memento/MementoServiceDefaultTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/isis/core/runtime/services/memento/MementoServiceDefaultTest.java b/core/runtime/src/test/java/org/apache/isis/core/runtime/services/memento/MementoServiceDefaultTest.java
index 028d548..222f8ab 100644
--- a/core/runtime/src/test/java/org/apache/isis/core/runtime/services/memento/MementoServiceDefaultTest.java
+++ b/core/runtime/src/test/java/org/apache/isis/core/runtime/services/memento/MementoServiceDefaultTest.java
@@ -36,7 +36,7 @@ public class MementoServiceDefaultTest {
@Before
public void setUp() throws Exception {
- mementoService = new MementoServiceDefault();
+ mementoService = new MementoServiceDefault().withNoEncoding();
}
@Test
@@ -44,6 +44,7 @@ public class MementoServiceDefaultTest {
final Memento memento = mementoService.create();
memento.set("someString", "a string");
+ memento.set("someStringWithDoubleSpaces", "a string");
memento.set("someByte", (byte)123);
memento.set("someShort", (short)12345);
memento.set("someInt", 123456789);
@@ -64,6 +65,7 @@ public class MementoServiceDefaultTest {
final Memento memento2 = mementoService.parse(str);
assertThat(memento2.get("someString", String.class), is("a string"));
+ assertThat(memento2.get("someStringWithDoubleSpaces", String.class), is("a string"));
assertThat(memento2.get("someByte", Byte.class), is((byte)123));
assertThat(memento2.get("someShort", Short.class), is((short)12345));
assertThat(memento2.get("someInt", Integer.class), is(123456789));
[3/3] git commit: ISIS-695: fixing missing license headers
Posted by da...@apache.org.
ISIS-695: fixing missing license headers
- also reinstating cron job for example app, accidentally removed
- moving hsqldb to 2.3.1, since 2.3.2 seems to be a bust
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/7dc5b0b2
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/7dc5b0b2
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/7dc5b0b2
Branch: refs/heads/master
Commit: 7dc5b0b264fb2621a8291dc65e78565d63b63392
Parents: 8c381b1
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Mon Feb 17 17:37:42 2014 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Mon Feb 17 17:37:42 2014 +0000
----------------------------------------------------------------------
...xecutionFromBackgroundCommandServiceJdo.java | 24 ++++++++++++++++++++
.../jdo/service/RegisterEntities.java | 2 +-
component/objectstore/jdo/pom.xml | 2 +-
component/objectstore/xml/pom.xml | 2 ++
.../model/hints/UiHintsBroadcastEvent.java | 16 +++++++++++++
.../model/hints/UiHintsEventAbstract.java | 18 +++++++++++++--
.../wicket/model/hints/UiHintsSetEvent.java | 18 +++++++++++++--
component/viewer/wicket/pom.xml | 1 +
.../ui/actionresponse/ActionResultResponse.java | 16 +++++++++++++
.../ActionResultResponseHandlingStrategy.java | 16 +++++++++++++
.../ActionResultResponseType.java | 16 +++++++++++++
.../QueryResultsCacheTest.java | 18 +++++++++++++--
.../QueryResultsCache_KeyTest.java | 16 +++++++++++++
.../XmlSnapshotServiceAbstractTest.xml | 18 +++++++++++++++
.../webapp/scheduler/quartz-config.xml | 22 ++++++++++++++++--
.../webapp/scheduler/quartz.properties | 19 ++++++++++++++++
16 files changed, 214 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/7dc5b0b2/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/service/BackgroundCommandExecutionFromBackgroundCommandServiceJdo.java
----------------------------------------------------------------------
diff --git a/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/service/BackgroundCommandExecutionFromBackgroundCommandServiceJdo.java b/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/service/BackgroundCommandExecutionFromBackgroundCommandServiceJdo.java
index b0a3fdb..0e1e42c 100644
--- a/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/service/BackgroundCommandExecutionFromBackgroundCommandServiceJdo.java
+++ b/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/service/BackgroundCommandExecutionFromBackgroundCommandServiceJdo.java
@@ -1,7 +1,28 @@
+/*
+ * 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.objectstore.jdo.service;
import java.util.List;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import org.apache.isis.applib.services.command.Command;
import org.apache.isis.core.runtime.services.background.BackgroundCommandExecution;
import org.apache.isis.objectstore.jdo.applib.service.background.BackgroundCommandServiceJdoRepository;
@@ -9,6 +30,9 @@ import org.apache.isis.objectstore.jdo.applib.service.command.CommandJdo;
public final class BackgroundCommandExecutionFromBackgroundCommandServiceJdo extends BackgroundCommandExecution {
+ @SuppressWarnings("unused")
+ private final static Logger LOG = LoggerFactory.getLogger(BackgroundCommandExecutionFromBackgroundCommandServiceJdo.class);
+
@Override
protected List<? extends Command> findBackgroundCommandsToExecute() {
final List<CommandJdo> commands = backgroundCommandRepository.findBackgroundCommandsNotYetStarted();
http://git-wip-us.apache.org/repos/asf/isis/blob/7dc5b0b2/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/service/RegisterEntities.java
----------------------------------------------------------------------
diff --git a/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/service/RegisterEntities.java b/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/service/RegisterEntities.java
index d8e260b..ec828c0 100644
--- a/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/service/RegisterEntities.java
+++ b/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/service/RegisterEntities.java
@@ -41,7 +41,7 @@ import org.apache.isis.core.runtime.system.context.IsisContext;
@Hidden
public class RegisterEntities {
-
+ @SuppressWarnings("unused")
private final static Logger LOG = LoggerFactory.getLogger(RegisterEntities.class);
private static final String LOCAL_KEY = "datanucleus.RegisterEntities.packagePrefix";
http://git-wip-us.apache.org/repos/asf/isis/blob/7dc5b0b2/component/objectstore/jdo/pom.xml
----------------------------------------------------------------------
diff --git a/component/objectstore/jdo/pom.xml b/component/objectstore/jdo/pom.xml
index 9d84206..6bc43cc 100644
--- a/component/objectstore/jdo/pom.xml
+++ b/component/objectstore/jdo/pom.xml
@@ -85,7 +85,7 @@
-->
<exclude>**/target/**</exclude>
<exclude>**/target-ide/**</exclude>
- <exclude>**/.log</exclude>
+ <exclude>**/*.log</exclude>
<exclude>**/*.project</exclude>
<exclude>**/.classpath</exclude>
http://git-wip-us.apache.org/repos/asf/isis/blob/7dc5b0b2/component/objectstore/xml/pom.xml
----------------------------------------------------------------------
diff --git a/component/objectstore/xml/pom.xml b/component/objectstore/xml/pom.xml
index 8b98f33..057273c 100644
--- a/component/objectstore/xml/pom.xml
+++ b/component/objectstore/xml/pom.xml
@@ -57,6 +57,8 @@
-->
<exclude>**/target/**</exclude>
<exclude>**/target-ide/**</exclude>
+ <exclude>**/xml/tmp/**</exclude>
+ <exclude>**/xml/xml/objects/services.xml</exclude>
<exclude>**/*.project</exclude>
<exclude>**/.classpath</exclude>
http://git-wip-us.apache.org/repos/asf/isis/blob/7dc5b0b2/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/hints/UiHintsBroadcastEvent.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/hints/UiHintsBroadcastEvent.java b/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/hints/UiHintsBroadcastEvent.java
index 2cad595..45d70cb 100644
--- a/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/hints/UiHintsBroadcastEvent.java
+++ b/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/hints/UiHintsBroadcastEvent.java
@@ -1,3 +1,19 @@
+/**
+ * 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.viewer.wicket.model.hints;
http://git-wip-us.apache.org/repos/asf/isis/blob/7dc5b0b2/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/hints/UiHintsEventAbstract.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/hints/UiHintsEventAbstract.java b/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/hints/UiHintsEventAbstract.java
index ef9bbba..cd32772 100644
--- a/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/hints/UiHintsEventAbstract.java
+++ b/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/hints/UiHintsEventAbstract.java
@@ -1,9 +1,23 @@
+/**
+ * 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.viewer.wicket.model.hints;
import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.isis.viewer.wicket.model.models.EntityModel;
-
public abstract class UiHintsEventAbstract {
private final UiHintContainer uiHintContainer;
http://git-wip-us.apache.org/repos/asf/isis/blob/7dc5b0b2/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/hints/UiHintsSetEvent.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/hints/UiHintsSetEvent.java b/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/hints/UiHintsSetEvent.java
index 22286f3..cc216f2 100644
--- a/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/hints/UiHintsSetEvent.java
+++ b/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/hints/UiHintsSetEvent.java
@@ -1,9 +1,23 @@
+/**
+ * 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.viewer.wicket.model.hints;
import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.isis.viewer.wicket.model.models.EntityModel;
-
public class UiHintsSetEvent extends UiHintsEventAbstract {
public UiHintsSetEvent(UiHintContainer uiHintContainer, AjaxRequestTarget target) {
http://git-wip-us.apache.org/repos/asf/isis/blob/7dc5b0b2/component/viewer/wicket/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/pom.xml b/component/viewer/wicket/pom.xml
index aadea09..5e8673c 100644
--- a/component/viewer/wicket/pom.xml
+++ b/component/viewer/wicket/pom.xml
@@ -77,6 +77,7 @@
<exclude>**/.classpath</exclude>
<exclude>**/.settings/**</exclude>
<exclude>**/*.pdn</exclude>
+ <exclude>**/jquery.zclip.js</exclude>
<!-- not released code, so excluded -->
<exclude>jquery-ui/**</exclude>
http://git-wip-us.apache.org/repos/asf/isis/blob/7dc5b0b2/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/actionresponse/ActionResultResponse.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/actionresponse/ActionResultResponse.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/actionresponse/ActionResultResponse.java
index 4f967d0..219fa75 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/actionresponse/ActionResultResponse.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/actionresponse/ActionResultResponse.java
@@ -1,3 +1,19 @@
+/**
+ * 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.viewer.wicket.ui.actionresponse;
import org.apache.wicket.request.IRequestHandler;
http://git-wip-us.apache.org/repos/asf/isis/blob/7dc5b0b2/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/actionresponse/ActionResultResponseHandlingStrategy.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/actionresponse/ActionResultResponseHandlingStrategy.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/actionresponse/ActionResultResponseHandlingStrategy.java
index bad371a..5ad6ab5 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/actionresponse/ActionResultResponseHandlingStrategy.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/actionresponse/ActionResultResponseHandlingStrategy.java
@@ -1,3 +1,19 @@
+/**
+ * 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.viewer.wicket.ui.actionresponse;
import org.apache.wicket.Component;
http://git-wip-us.apache.org/repos/asf/isis/blob/7dc5b0b2/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/actionresponse/ActionResultResponseType.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/actionresponse/ActionResultResponseType.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/actionresponse/ActionResultResponseType.java
index 1b1d7fa..8f8b2a7 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/actionresponse/ActionResultResponseType.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/actionresponse/ActionResultResponseType.java
@@ -1,3 +1,19 @@
+/**
+ * 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.viewer.wicket.ui.actionresponse;
import java.util.Collection;
http://git-wip-us.apache.org/repos/asf/isis/blob/7dc5b0b2/core/applib/src/test/java/org/apache/isis/applib/services/queryresultscache/QueryResultsCacheTest.java
----------------------------------------------------------------------
diff --git a/core/applib/src/test/java/org/apache/isis/applib/services/queryresultscache/QueryResultsCacheTest.java b/core/applib/src/test/java/org/apache/isis/applib/services/queryresultscache/QueryResultsCacheTest.java
index db2dbfd..d5210dd 100644
--- a/core/applib/src/test/java/org/apache/isis/applib/services/queryresultscache/QueryResultsCacheTest.java
+++ b/core/applib/src/test/java/org/apache/isis/applib/services/queryresultscache/QueryResultsCacheTest.java
@@ -1,8 +1,22 @@
+/**
+ * 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.applib.services.queryresultscache;
import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.not;
-import static org.hamcrest.CoreMatchers.nullValue;
import static org.junit.Assert.assertThat;
import java.util.concurrent.Callable;
http://git-wip-us.apache.org/repos/asf/isis/blob/7dc5b0b2/core/applib/src/test/java/org/apache/isis/applib/services/queryresultscache/QueryResultsCache_KeyTest.java
----------------------------------------------------------------------
diff --git a/core/applib/src/test/java/org/apache/isis/applib/services/queryresultscache/QueryResultsCache_KeyTest.java b/core/applib/src/test/java/org/apache/isis/applib/services/queryresultscache/QueryResultsCache_KeyTest.java
index 2bd5e29..591f56f 100644
--- a/core/applib/src/test/java/org/apache/isis/applib/services/queryresultscache/QueryResultsCache_KeyTest.java
+++ b/core/applib/src/test/java/org/apache/isis/applib/services/queryresultscache/QueryResultsCache_KeyTest.java
@@ -1,3 +1,19 @@
+/**
+ * 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.applib.services.queryresultscache;
import static org.hamcrest.CoreMatchers.is;
http://git-wip-us.apache.org/repos/asf/isis/blob/7dc5b0b2/core/applib/src/test/resources/org/apache/isis/applib/services/xmlsnapshot/XmlSnapshotServiceAbstractTest.xml
----------------------------------------------------------------------
diff --git a/core/applib/src/test/resources/org/apache/isis/applib/services/xmlsnapshot/XmlSnapshotServiceAbstractTest.xml b/core/applib/src/test/resources/org/apache/isis/applib/services/xmlsnapshot/XmlSnapshotServiceAbstractTest.xml
index 1dc36b5..8914e42 100644
--- a/core/applib/src/test/resources/org/apache/isis/applib/services/xmlsnapshot/XmlSnapshotServiceAbstractTest.xml
+++ b/core/applib/src/test/resources/org/apache/isis/applib/services/xmlsnapshot/XmlSnapshotServiceAbstractTest.xml
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!--
+ 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.
+-->
<app:InvoiceSummaryForPropertyDueDate xmlns:app="http://isis.apache.org/ns/app/org.estatio.dom.invoice.viewmodel/InvoiceSummaryForPropertyDueDate" xmlns:isis="http://isis.apache.org/ns/0.1/metamodel" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" isis:feature="class" isis:fqn="org.estatio.dom.invoice.viewmodel.InvoiceSummaryForPropertyDueDate" isis:oid="viewmodel-fakeoid-90b304cf-c18a-4e36-839b-55ea285de9a6" isis:plural="Invoice Summary For Property Due Dates" isis:singular="Invoice Summary For Property Due Date" xsi:schemaLocation="http://isis.apache.org/ns/app/org.estatio.dom.invoice.viewmodel/InvoiceSummaryForPropertyDueDate org.estatio.dom.invoice.viewmodel.InvoiceSummaryForPropertyDueDate.xsd">
<isis:title>[OXF] Oxford Super Mall - 01-Apr-2013</isis:title>
<app:invoices isis:feature="collection" isis:size="1" isis:type="app:org.estatio.dom.invoice.Invoice"/>
http://git-wip-us.apache.org/repos/asf/isis/blob/7dc5b0b2/example/application/quickstart_wicket_restful_jdo/webapp/src/main/resources/webapp/scheduler/quartz-config.xml
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/webapp/src/main/resources/webapp/scheduler/quartz-config.xml b/example/application/quickstart_wicket_restful_jdo/webapp/src/main/resources/webapp/scheduler/quartz-config.xml
index 57f51ec..d80875b 100644
--- a/example/application/quickstart_wicket_restful_jdo/webapp/src/main/resources/webapp/scheduler/quartz-config.xml
+++ b/example/application/quickstart_wicket_restful_jdo/webapp/src/main/resources/webapp/scheduler/quartz-config.xml
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
<job-scheduling-data
xmlns="http://www.quartz-scheduler.org/xml/JobSchedulingData"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -34,9 +52,9 @@ http://www.quartz-scheduler.org/xml/job_scheduling_data_1_8.xsd"
<job-name>BackgroundCommandExecutionJob</job-name>
<job-group>Isis</job-group>
<!--
- <cron-expression>0/10 * * * * ?</cron-expression>
- -->
<cron-expression>0 1 * * * ?</cron-expression>
+ -->
+ <cron-expression>0/10 * * * * ?</cron-expression>
</cron>
</trigger>
http://git-wip-us.apache.org/repos/asf/isis/blob/7dc5b0b2/example/application/quickstart_wicket_restful_jdo/webapp/src/main/resources/webapp/scheduler/quartz.properties
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/webapp/src/main/resources/webapp/scheduler/quartz.properties b/example/application/quickstart_wicket_restful_jdo/webapp/src/main/resources/webapp/scheduler/quartz.properties
index da9158d..6c0a21b 100644
--- a/example/application/quickstart_wicket_restful_jdo/webapp/src/main/resources/webapp/scheduler/quartz.properties
+++ b/example/application/quickstart_wicket_restful_jdo/webapp/src/main/resources/webapp/scheduler/quartz.properties
@@ -1,3 +1,22 @@
+#
+# 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.
+#
+
org.quartz.scheduler.instanceName = SchedulerQuartzConfigXml
org.quartz.threadPool.threadCount = 1
org.quartz.jobStore.class = org.quartz.simpl.RAMJobStore
[2/3] git commit: ISIS-695: updating dependency versions.
Posted by da...@apache.org.
ISIS-695: updating dependency versions.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/8c381b14
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/8c381b14
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/8c381b14
Branch: refs/heads/master
Commit: 8c381b148880c2dda85f5eb5dc7e1875753a846e
Parents: e6054f2
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Mon Feb 17 17:08:07 2014 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Mon Feb 17 17:08:07 2014 +0000
----------------------------------------------------------------------
component/objectstore/nosql/pom.xml | 4 ++++
component/viewer/scimpi/pom.xml | 6 ++++++
core/pom.xml | 18 +++++++-----------
3 files changed, 17 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/8c381b14/component/objectstore/nosql/pom.xml
----------------------------------------------------------------------
diff --git a/component/objectstore/nosql/pom.xml b/component/objectstore/nosql/pom.xml
index 4807c44..08af607 100644
--- a/component/objectstore/nosql/pom.xml
+++ b/component/objectstore/nosql/pom.xml
@@ -117,6 +117,10 @@
<groupId>org.json</groupId>
<artifactId>json</artifactId>
<version>20090211</version>
+ <!--
+ upgrading the dependency caused tests to fail...
+ <version>20140107</version>
+ -->
</dependency>
<dependency>
<groupId>commons-configuration</groupId>
http://git-wip-us.apache.org/repos/asf/isis/blob/8c381b14/component/viewer/scimpi/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/scimpi/pom.xml b/component/viewer/scimpi/pom.xml
index cccd2d0..07a07e7 100644
--- a/component/viewer/scimpi/pom.xml
+++ b/component/viewer/scimpi/pom.xml
@@ -115,6 +115,12 @@
<version>2.6</version>
</dependency>
+ <dependency>
+ <groupId>org.json</groupId>
+ <artifactId>json</artifactId>
+ <version>20140107</version>
+ </dependency>
+
</dependencies>
</dependencyManagement>
http://git-wip-us.apache.org/repos/asf/isis/blob/8c381b14/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 28597b1..54e8709 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -1082,12 +1082,12 @@ ${license.additional-notes}
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.7.5</version>
+ <version>1.7.6</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.7.5</version>
+ <version>1.7.6</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
@@ -1110,7 +1110,7 @@ ${license.additional-notes}
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <version>1.8</version>
+ <version>1.9</version>
</dependency>
@@ -1126,7 +1126,7 @@ ${license.additional-notes}
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>15.0</version>
+ <version>16.0.1</version>
</dependency>
<!-- Google Guice (dependency injection) -->
@@ -1145,7 +1145,7 @@ ${license.additional-notes}
<dependency>
<groupId>org.objenesis</groupId>
<artifactId>objenesis</artifactId>
- <version>1.3</version>
+ <version>1.4</version>
</dependency>
<dependency>
<groupId>cglib</groupId>
@@ -1173,17 +1173,12 @@ ${license.additional-notes}
<dependency>
<groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId>
- <version>1.4.5</version>
+ <version>1.4.7</version>
</dependency>
<!-- JSON libraries -->
<dependency>
- <groupId>org.json</groupId>
- <artifactId>json</artifactId>
- <version>20090211</version>
- </dependency>
- <dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-core-asl</artifactId>
<version>1.9.11</version>
@@ -1212,6 +1207,7 @@ ${license.additional-notes}
<dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
+ <!-- using 2.3.2 throws strange error about not finding org.hsqldb.jdbcDriver -->
<version>2.3.1</version>
</dependency>