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/08/25 08:31:40 UTC
[1/3] isis git commit: ISIS-1052: fixing incorrect license in file
Repository: isis
Updated Branches:
refs/heads/master 89dbf9c56 -> 1f6d0aace
ISIS-1052: fixing incorrect license in file
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/73f77305
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/73f77305
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/73f77305
Branch: refs/heads/master
Commit: 73f7730596f413c8e57f38f3b8e5b8c449ff6ac1
Parents: 89dbf9c
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Tue Aug 25 06:42:23 2015 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Tue Aug 25 06:42:23 2015 +0100
----------------------------------------------------------------------
.../main/java/org/apache/isis/applib/IsisApplibModule.java | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/73f77305/core/applib/src/main/java/org/apache/isis/applib/IsisApplibModule.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/IsisApplibModule.java b/core/applib/src/main/java/org/apache/isis/applib/IsisApplibModule.java
index 3a43977..fa728f9 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/IsisApplibModule.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/IsisApplibModule.java
@@ -1,7 +1,9 @@
/*
- * Copyright 2013~2015 Dan Haywood
- *
- * Licensed under the Apache License, Version 2.0 (the
+ * 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
*
[2/3] isis git commit: ISIS-1052: fixes to release documentation
Posted by da...@apache.org.
ISIS-1052: fixes to release documentation
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/53e31c16
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/53e31c16
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/53e31c16
Branch: refs/heads/master
Commit: 53e31c16756c55815cea2e93a1154f01b0c6fb78
Parents: 73f7730
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Tue Aug 25 06:42:51 2015 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Tue Aug 25 06:42:51 2015 +0100
----------------------------------------------------------------------
adocs/documentation/src/main/asciidoc/documentation.adoc | 2 +-
.../asciidoc/guides/_cg_committers_cutting-a-release.adoc | 10 +++-------
2 files changed, 4 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/53e31c16/adocs/documentation/src/main/asciidoc/documentation.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/documentation.adoc b/adocs/documentation/src/main/asciidoc/documentation.adoc
index a76f05f..d1c6c41 100644
--- a/adocs/documentation/src/main/asciidoc/documentation.adoc
+++ b/adocs/documentation/src/main/asciidoc/documentation.adoc
@@ -97,7 +97,7 @@ including:
* Setting up link:./guides/cg.html#_cg_ide_intellij[IntelliJ] or link:./guides/cg.html#_cg_ide_eclipse[Eclipse]
* link:./guides/cg.html#_cg_ide-templates[*IDE templates*] (IntelliJ and Eclipse)
* link:./guides/cg.html#_cg_contributing[Contributing patches] (pull requests)
-* link:./guides/cg.html#_cg_committers_release-process[Cutting a release]
+* link:./guides/cg.html#_cg_committers_cutting-a-release[Cutting a release]
* link:./guides/cg.html#_cg_committers_verifying-releases[Verifying a release]
http://git-wip-us.apache.org/repos/asf/isis/blob/53e31c16/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 08be094..73039bc 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
@@ -65,7 +65,7 @@ Also, check that there are no snapshot dependencies:
[source,bash]
----
-grep SNAPSHOT `/bin/find . -name pom.xml | grep -v target | sort`
+grep SNAPSHOT `/bin/find . -name pom.xml | grep -v target | grep -v mothball | sort`
----
The only mention of `SNAPSHOT` should be for the Isis modules about to be released.
@@ -117,7 +117,8 @@ To run the RAT tool, use:
[source,bash]
----
mvn org.apache.rat:apache-rat-plugin:check -D rat.numUnapprovedLicenses=50 -o && \
-for a in `/bin/find . -name rat.txt -print`; do grep '!???' $a; done
+for a in `/bin/find . -name rat.txt -print`; do grep '!???' $a; done || \
+for a in `/bin/find . -name rat.txt -print`; do grep '!AL' $a; done
----
where `rat.numUnapprovedLicenses` property is set to a high figure, temporarily overriding the default value of 0. This will allow the command to run over all submodules, rather than failing after the first one. The command writes out a `target\rat.txt` for each submodule. missing license notes are indicated using the key `!???`. The `for` command collates all the errors.
@@ -177,11 +178,6 @@ licenses to remove from supplemental-models.xml (are spurious):
If any missing entries are listed or are spurious, then update `supplemental-models.xml` and try again.
-[NOTE]
-====
-Ignore any missing license warnings for the TCK modules; this is a result of the TCK modules for the viewers (eg `isis-viewer-bdd-concordion-tck`) depending on the TCK dom, fixtures etc.
-====
-
=== Commit changes
[3/3] isis git commit: ISIS-1044: deleted objects should be
automatically filtered
Posted by da...@apache.org.
ISIS-1044: deleted objects should be automatically filtered
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/1f6d0aac
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/1f6d0aac
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/1f6d0aac
Branch: refs/heads/master
Commit: 1f6d0aaceca0c55f6de2c5b44d494f7d2c54139c
Parents: 53e31c1
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Tue Aug 25 07:25:44 2015 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Tue Aug 25 07:25:44 2015 +0100
----------------------------------------------------------------------
.../org/apache/isis/core/metamodel/adapter/ObjectAdapter.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/1f6d0aac/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ObjectAdapter.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ObjectAdapter.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ObjectAdapter.java
index fc86a85..33fde6c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ObjectAdapter.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ObjectAdapter.java
@@ -390,6 +390,9 @@ public interface ObjectAdapter extends Instance, org.apache.isis.applib.annotati
final ObjectAdapter adapter,
final AuthenticationSession authenticationSession,
final DeploymentCategory deploymentCategory) {
+ if(adapter.isDestroyed()) {
+ return false;
+ }
if(authenticationSession == null) {
return true;
}