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 2015/11/02 19:35:45 UTC

[01/12] isis git commit: ISIS-1195: fixing missing licenses.

Repository: isis
Updated Branches:
  refs/heads/master 8f98cf47f -> d80a3f460


ISIS-1195: fixing missing licenses.

Also updates to RAT plugin itself, minor fix to release docs


Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/b36b9237
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/b36b9237
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/b36b9237

Branch: refs/heads/master
Commit: b36b9237a35c7e21488e916c9baf64085b880266
Parents: 8f98cf4
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Mon Oct 26 08:24:33 2015 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Mon Oct 26 08:24:33 2015 +0000

----------------------------------------------------------------------
 adocs/documentation/Gemfile.lock                  |  3 ---
 .../guides/_cg_committers_cutting-a-release.adoc  |  2 +-
 .../specimpl/ObjectActionMixedInTest.java         | 18 ++++++++++++++++++
 core/pom.xml                                      |  5 ++++-
 ...PersistenceSessionFactoryMetamodelRefiner.java | 18 ++++++++++++++++++
 5 files changed, 41 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/isis/blob/b36b9237/adocs/documentation/Gemfile.lock
----------------------------------------------------------------------
diff --git a/adocs/documentation/Gemfile.lock b/adocs/documentation/Gemfile.lock
index 808cd9a..6a495d9 100644
--- a/adocs/documentation/Gemfile.lock
+++ b/adocs/documentation/Gemfile.lock
@@ -43,6 +43,3 @@ DEPENDENCIES
   tilt
   wdm (>= 0.1.0)
   webrick
-
-BUNDLED WITH
-   1.10.6

http://git-wip-us.apache.org/repos/asf/isis/blob/b36b9237/adocs/documentation/src/main/asciidoc/guides/_cg_committers_cutting-a-release.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_cg_committers_cutting-a-release.adoc b/adocs/documentation/src/main/asciidoc/guides/_cg_committers_cutting-a-release.adoc
index 7362814..3e76549 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_cg_committers_cutting-a-release.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_cg_committers_cutting-a-release.adoc
@@ -92,7 +92,7 @@ Double check that the version number of the core POM (`core/pom.xml`) should ref
 ----
 <groupId>org.apache.isis.core</groupId>
 <artifactId>isis</artifactId>
-<version>1.11.0-SNAPSHOT</version>
+<version>1.10.0-SNAPSHOT</version>
 ----
 
 Also, check that there are no snapshot dependencies:

http://git-wip-us.apache.org/repos/asf/isis/blob/b36b9237/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionMixedInTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionMixedInTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionMixedInTest.java
index 9707af6..1677c7e 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionMixedInTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionMixedInTest.java
@@ -1,3 +1,21 @@
+/*
+ *  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.metamodel.specloader.specimpl;
 
 import org.junit.Test;

http://git-wip-us.apache.org/repos/asf/isis/blob/b36b9237/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 9548411..33d03a0 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -444,6 +444,7 @@
                             <exclude>**/MANIFEST.MF</exclude>
                             <exclude>**/*.ucd</exclude>
                             <exclude>**/*.ucls</exclude>
+                            <exclude>**/*.iml</exclude>
 
                             <exclude>**/xml/objects/**</exclude>
                             <exclude>**/test.data</exclude>
@@ -452,7 +453,9 @@
                             <exclude>**/jquery.zclip.js</exclude>
                             <exclude>**/bootstrap-growl.js</exclude>
                             <exclude>**/moment.js</exclude>
-
+                            
+                            <exclude>**/wicket-xhtml1.4-strict.dtd</exclude>
+                            
                             <exclude>**/bootstrap-datetimepicker.min.css</exclude>
                             <exclude>**/bootstrap-datetimepicker.css</exclude>
                             <exclude>**/select2-bootstrap.css</exclude>

http://git-wip-us.apache.org/repos/asf/isis/blob/b36b9237/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSessionFactoryMetamodelRefiner.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSessionFactoryMetamodelRefiner.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSessionFactoryMetamodelRefiner.java
index f8b4428..71a3f26 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSessionFactoryMetamodelRefiner.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSessionFactoryMetamodelRefiner.java
@@ -1,3 +1,21 @@
+/*
+ *  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.runtime.system.persistence;
 
 import org.apache.isis.core.commons.config.IsisConfiguration;

Re: [09/12] isis git commit: ISIS-1226: detach EntityModels in BreadcrumbModel

Posted by Dan Haywood <da...@haywood-associates.co.uk>.

thanks for the catch... was going to put the detach logic here, then
discovered I could override detach() in the class itself.

will remove.

Cheers
Dan

On 2 November 2015 at 18:47, Martin Grigorov <mg...@apache.org> wrote:

> Hi Dan,
>
> On Mon, Nov 2, 2015 at 7:35 PM, <da...@apache.org> wrote:
>
> > -
> > +
> > +        final AuthenticatedWebSessionForIsis
> > authenticatedWebSessionForIsis = AuthenticatedWebSessionForIsis.get();
> > +
> >
>
> What is the purpose of this ?
> It seems this local variable is not used later.
>
>
> Martin Grigorov
> Wicket Training and Consulting
> https://twitter.com/mtgrigorov
>