svn commit: r1440975 - /isis/site/trunk/content/release-matrix.md
Author: danhaywood Date: Thu Jan 31 14:27:40 2013 New Revision: 1440975 URL: http://svn.apache.org/viewvc?rev=1440975view=rev Log: isis site - updates for 1.1.0 releases Modified: isis/site/trunk/content/release-matrix.md Modified: isis/site/trunk/content/release-matrix.md URL: http://svn.apache.org/viewvc/isis/site/trunk/content/release-matrix.md?rev=1440975r1=1440974r2=1440975view=diff == --- isis/site/trunk/content/release-matrix.md (original) +++ isis/site/trunk/content/release-matrix.md Thu Jan 31 14:27:40 2013 @@ -135,5 +135,16 @@ The table below lists dependencies betwe td1.0.0/td td1.0.0/td /tr +tr +tdnbsp;/td +tdnbsp;/td +tdb1.0.0/b/td +td1.0.0/td +td-/td +td1.0.0/td +td1.0.0/td +td1.0.0/td +td1.0.0/td +/tr /table
svn commit: r1440983 - in /isis/site/trunk: content/release-matrix.md templates/isis-template.html
Author: danhaywood
Date: Thu Jan 31 14:36:23 2013
New Revision: 1440983
URL: http://svn.apache.org/viewvc?rev=1440983view=rev
Log:
isis site - updates for 1.1.0 releases
Modified:
isis/site/trunk/content/release-matrix.md
isis/site/trunk/templates/isis-template.html
Modified: isis/site/trunk/content/release-matrix.md
URL:
http://svn.apache.org/viewvc/isis/site/trunk/content/release-matrix.md?rev=1440983r1=1440982r2=1440983view=diff
==
--- isis/site/trunk/content/release-matrix.md (original)
+++ isis/site/trunk/content/release-matrix.md Thu Jan 31 14:36:23 2013
@@ -1,9 +1,11 @@
Title: Release Matrix
+{release-matrix
+
The table below lists dependencies between core, components and archetypes.
table
-tr
+tr class=heading
thnbsp;/th
thnbsp;/th
thnbsp;/th
@@ -15,9 +17,9 @@ The table below lists dependencies betwe
thRestfulbr/Viewer/th
/tr
tr
-tdba href=core/about.htmlCore/a/b/td
-tdnbsp;/td
-tdb1.1.0/b/td
+td class=headingba href=core/about.htmlCore/a/b/td
+td class=headingnbsp;/td
+td class=headingb1.1.0/b/td
td-/td
td-/td
td-/td
@@ -26,9 +28,9 @@ The table below lists dependencies betwe
td-/td
/tr
tr
-tdnbsp;/td
-tdnbsp;/td
-tdb1.0.0/b/td
+td class=headingnbsp;/td
+td class=headingnbsp;/td
+td class=headingb1.0.0/b/td
td-/td
td-/td
td-/td
@@ -37,9 +39,9 @@ The table below lists dependencies betwe
td-/td
/tr
tr
-tdbSecurity/b/td
-tdba href=components/security/file/about.htmlFile/a/b/td
-tdb1.0.0/b/td
+td class=headingbSecurity/b/td
+td class=headingba
href=components/security/file/about.htmlFile/a/b/td
+td class=headingb1.0.0/b/td
td1.0.0/td
td-/td
td-/td
@@ -48,9 +50,9 @@ The table below lists dependencies betwe
td-/td
/tr
tr
-tdnbsp;/td
-tdba href=components/security/shiro/about.htmlShiro/a/b/td
-tdb1.1.0/b/td
+td class=headingnbsp;/td
+td class=headingba
href=components/security/shiro/about.htmlShiro/a/b/td
+td class=headingb1.1.0/b/td
td1.1.0/td
td-/td
td-/td
@@ -59,9 +61,9 @@ The table below lists dependencies betwe
td-/td
/tr
tr
-tdnbsp;/td
-tdnbsp;/td
-tdb1.0.0/b/td
+td class=headingnbsp;/td
+td class=headingnbsp;/td
+td class=headingb1.0.0/b/td
td1.0.0/td
td-/td
td-/td
@@ -70,9 +72,9 @@ The table below lists dependencies betwe
td-/td
/tr
tr
-tdbObjectstore/b/td
-tdba href=components/objectstores/jdo/about.htmlJDO/a/b/td
-tdb1.0.0/b/td
+td class=headingbObjectstore/b/td
+td class=headingba
href=components/objectstores/jdo/about.htmlJDO/a/b/td
+td class=headingb1.0.0/b/td
td1.0.0/td
td-/td
td-/td
@@ -81,9 +83,9 @@ The table below lists dependencies betwe
td-/td
/tr
tr
-tdbViewer/b/td
-tdba href=components/viewers/wicket/about.htmlWicket/a/b/td
-tdb1.1.0/b/td
+td class=headingbViewer/b/td
+td class=headingba
href=components/viewers/wicket/about.htmlWicket/a/b/td
+td class=headingb1.1.0/b/td
td1.1.0/td
td-/td
td-/td
@@ -92,9 +94,9 @@ The table below lists dependencies betwe
td-/td
/tr
tr
-tdnbsp;/td
-tdnbsp;/td
-tdb1.0.0/b/td
+td class=headingnbsp;/td
+td class=headingnbsp;/td
+td class=headingb1.0.0/b/td
td1.0.0/td
td-/td
td-/td
@@ -103,9 +105,9 @@ The table below lists dependencies betwe
td-/td
/tr
tr
-tdnbsp;/td
-tdba
href=components/viewers/restfulobjects/about.htmlRestful/a/b/td
-tdb1.0.0/b/td
+td class=headingnbsp;/td
+td class=headingba
href=components/viewers/restfulobjects/about.htmlRestful/a/b/td
+td class=headingb1.0.0/b/td
td1.0.0/td
td-/td
td-/td
@@ -114,31 +116,31 @@ The table below lists dependencies betwe
td-/td
/tr
tr
-tdbArchetype/b/td
-tdba href=getting-started/quickstart-archetype.htmlWRJ/a/b/td
-tdb1.0.2/b/td
-td1.1.0/td
-td1.1.0/td
+td class=headingbArchetype/b/td
+td class=headingba
href=getting-started/quickstart-archetype.htmlWRJ/a/b/td
+td class=headingb1.0.2/b/td
+tdb1.1.0/b/td
+tdb1.1.0/b/td
td-/td
td1.0.0/td
-td1.1.0/td
+tdb1.1.0/b/td
td1.0.0/td
/tr
tr
-tdnbsp;/td
-tdnbsp;/td
-tdb1.0.1/b/td
-td1.0.0/td
+td class=headingnbsp;/td
+td class=headingnbsp;/td
+td class=headingb1.0.1/b/td
td1.0.0/td
+tdb1.0.0/b/td
td-/td
td1.0.0/td
td1.0.0/td
td1.0.0/td
/tr
tr
-tdnbsp;/td
-tdnbsp;/td
-tdb1.0.0/b/td
+td class=headingnbsp;/td
+td class=headingnbsp;/td
+td class=headingb1.0.0/b/td
td1.0.0/td
td-/td
td1.0.0/td
@@ -148,3 +150,4 @@ The table below lists dependencies betwe
/tr
/table
+}
Modified: isis/site/trunk/templates/isis-template.html
URL:
http://svn.apache.org/viewvc/isis/site/trunk
svn commit: r1440986 - /isis/site/trunk/templates/isis-template.html
Author: danhaywood
Date: Thu Jan 31 14:39:48 2013
New Revision: 1440986
URL: http://svn.apache.org/viewvc?rev=1440986view=rev
Log:
isis site - updates for 1.1.0 releases
Modified:
isis/site/trunk/templates/isis-template.html
Modified: isis/site/trunk/templates/isis-template.html
URL:
http://svn.apache.org/viewvc/isis/site/trunk/templates/isis-template.html?rev=1440986r1=1440985r2=1440986view=diff
==
--- isis/site/trunk/templates/isis-template.html (original)
+++ isis/site/trunk/templates/isis-template.html Thu Jan 31 14:39:48 2013
@@ -62,7 +62,7 @@
border-style: solid;
}
.release-matrix .heading {
-background-color: #dd;
+background-color: #ee;
}
.release-matrix .new {
color: #dd;
svn commit: r1440989 - /isis/site/trunk/content/release-matrix.md
Author: danhaywood Date: Thu Jan 31 14:42:28 2013 New Revision: 1440989 URL: http://svn.apache.org/viewvc?rev=1440989view=rev Log: isis site - updates for 1.1.0 releases Modified: isis/site/trunk/content/release-matrix.md Modified: isis/site/trunk/content/release-matrix.md URL: http://svn.apache.org/viewvc/isis/site/trunk/content/release-matrix.md?rev=1440989r1=1440988r2=1440989view=diff == --- isis/site/trunk/content/release-matrix.md (original) +++ isis/site/trunk/content/release-matrix.md Thu Jan 31 14:42:28 2013 @@ -17,9 +17,9 @@ The table below lists dependencies betwe thRestfulbr/Viewer/th /tr tr -td class=headingba href=core/about.htmlCore/a/b/td +td class=headinga href=core/about.htmlCore/a/td td class=headingnbsp;/td -td class=headingb1.1.0/b/td +td class=heading1.1.0/td td-/td td-/td td-/td @@ -30,7 +30,7 @@ The table below lists dependencies betwe tr td class=headingnbsp;/td td class=headingnbsp;/td -td class=headingb1.0.0/b/td +td class=heading1.0.0/td td-/td td-/td td-/td @@ -39,9 +39,9 @@ The table below lists dependencies betwe td-/td /tr tr -td class=headingbSecurity/b/td -td class=headingba href=components/security/file/about.htmlFile/a/b/td -td class=headingb1.0.0/b/td +td class=headingSecurity/td +td class=headinga href=components/security/file/about.htmlFile/a/td +td class=heading1.0.0/td td1.0.0/td td-/td td-/td @@ -51,8 +51,8 @@ The table below lists dependencies betwe /tr tr td class=headingnbsp;/td -td class=headingba href=components/security/shiro/about.htmlShiro/a/b/td -td class=headingb1.1.0/b/td +td class=headinga href=components/security/shiro/about.htmlShiro/a/td +td class=heading1.1.0/td td1.1.0/td td-/td td-/td @@ -63,7 +63,7 @@ The table below lists dependencies betwe tr td class=headingnbsp;/td td class=headingnbsp;/td -td class=headingb1.0.0/b/td +td class=heading1.0.0/td td1.0.0/td td-/td td-/td @@ -72,9 +72,9 @@ The table below lists dependencies betwe td-/td /tr tr -td class=headingbObjectstore/b/td -td class=headingba href=components/objectstores/jdo/about.htmlJDO/a/b/td -td class=headingb1.0.0/b/td +td class=headingObjectstore/td +td class=headinga href=components/objectstores/jdo/about.htmlJDO/a/td +td class=heading1.0.0/td td1.0.0/td td-/td td-/td @@ -83,9 +83,9 @@ The table below lists dependencies betwe td-/td /tr tr -td class=headingbViewer/b/td -td class=headingba href=components/viewers/wicket/about.htmlWicket/a/b/td -td class=headingb1.1.0/b/td +td class=headingViewer/td +td class=headinga href=components/viewers/wicket/about.htmlWicket/a/td +td class=heading1.1.0/td td1.1.0/td td-/td td-/td @@ -96,7 +96,7 @@ The table below lists dependencies betwe tr td class=headingnbsp;/td td class=headingnbsp;/td -td class=headingb1.0.0/b/td +td class=heading1.0.0/td td1.0.0/td td-/td td-/td @@ -106,8 +106,8 @@ The table below lists dependencies betwe /tr tr td class=headingnbsp;/td -td class=headingba href=components/viewers/restfulobjects/about.htmlRestful/a/b/td -td class=headingb1.0.0/b/td +td class=headinga href=components/viewers/restfulobjects/about.htmlRestful/a/td +td class=heading1.0.0/td td1.0.0/td td-/td td-/td @@ -116,22 +116,22 @@ The table below lists dependencies betwe td-/td /tr tr -td class=headingbArchetype/b/td -td class=headingba href=getting-started/quickstart-archetype.htmlWRJ/a/b/td -td class=headingb1.0.2/b/td -tdb1.1.0/b/td -tdb1.1.0/b/td +td class=headingArchetype/td +td class=headinga href=getting-started/quickstart-archetype.htmlWRJ/a/td +td class=heading1.0.2/td +td class=new1.1.0/td +td class=new1.1.0/td td-/td td1.0.0/td -tdb1.1.0/b/td +td class=new1.1.0/b/td td1.0.0/td /tr tr td class=headingnbsp;/td td class=headingnbsp;/td -td class=headingb1.0.1/b/td +td class=heading1.0.1/td td1.0.0/td -tdb1.0.0/b/td +td class=new1.0.0/td td-/td td1.0.0/td td1.0.0/td @@ -140,7 +140,7 @@ The table below lists dependencies betwe tr td class=headingnbsp;/td td class=headingnbsp;/td -td class=headingb1.0.0/b/td +td class=heading1.0.0/td td1.0.0/td td-/td td1.0.0/td
svn commit: r1440994 - in /isis/site/trunk: content/release-matrix.md templates/isis-template.html
Author: danhaywood
Date: Thu Jan 31 14:46:45 2013
New Revision: 1440994
URL: http://svn.apache.org/viewvc?rev=1440994view=rev
Log:
isis site - updates for 1.1.0 releases
Modified:
isis/site/trunk/content/release-matrix.md
isis/site/trunk/templates/isis-template.html
Modified: isis/site/trunk/content/release-matrix.md
URL:
http://svn.apache.org/viewvc/isis/site/trunk/content/release-matrix.md?rev=1440994r1=1440993r2=1440994view=diff
==
--- isis/site/trunk/content/release-matrix.md (original)
+++ isis/site/trunk/content/release-matrix.md Thu Jan 31 14:46:45 2013
@@ -17,9 +17,9 @@ The table below lists dependencies betwe
thRestfulbr/Viewer/th
/tr
tr
-td class=headinga href=core/about.htmlCore/a/td
-td class=headingnbsp;/td
-td class=heading1.1.0/td
+th class=headinga href=core/about.htmlCore/a/th
+th class=headingnbsp;/th
+th class=heading1.1.0/th
td-/td
td-/td
td-/td
@@ -86,7 +86,7 @@ The table below lists dependencies betwe
td class=headingViewer/td
td class=headinga
href=components/viewers/wicket/about.htmlWicket/a/td
td class=heading1.1.0/td
-td1.1.0/td
+td class=new1.1.0/td
td-/td
td-/td
td-/td
Modified: isis/site/trunk/templates/isis-template.html
URL:
http://svn.apache.org/viewvc/isis/site/trunk/templates/isis-template.html?rev=1440994r1=1440993r2=1440994view=diff
==
--- isis/site/trunk/templates/isis-template.html (original)
+++ isis/site/trunk/templates/isis-template.html Thu Jan 31 14:46:45 2013
@@ -66,6 +66,7 @@
}
.release-matrix .new {
color: #dd;
+font-weight: bolder;
}
.stub,.note {
position: relative;
svn commit: r1440996 - /isis/site/trunk/content/release-matrix.md
Author: danhaywood Date: Thu Jan 31 14:48:24 2013 New Revision: 1440996 URL: http://svn.apache.org/viewvc?rev=1440996view=rev Log: isis site - updates for 1.1.0 releases Modified: isis/site/trunk/content/release-matrix.md Modified: isis/site/trunk/content/release-matrix.md URL: http://svn.apache.org/viewvc/isis/site/trunk/content/release-matrix.md?rev=1440996r1=1440995r2=1440996view=diff == --- isis/site/trunk/content/release-matrix.md (original) +++ isis/site/trunk/content/release-matrix.md Thu Jan 31 14:48:24 2013 @@ -28,9 +28,9 @@ The table below lists dependencies betwe td-/td /tr tr -td class=headingnbsp;/td -td class=headingnbsp;/td -td class=heading1.0.0/td +th class=headingnbsp;/th +th class=headingnbsp;/th +th class=heading1.0.0/th td-/td td-/td td-/td @@ -39,9 +39,9 @@ The table below lists dependencies betwe td-/td /tr tr -td class=headingSecurity/td -td class=headinga href=components/security/file/about.htmlFile/a/td -td class=heading1.0.0/td +th class=headingSecurity/th +th class=headinga href=components/security/file/about.htmlFile/a/th +th class=heading1.0.0/th td1.0.0/td td-/td td-/td @@ -50,9 +50,9 @@ The table below lists dependencies betwe td-/td /tr tr -td class=headingnbsp;/td -td class=headinga href=components/security/shiro/about.htmlShiro/a/td -td class=heading1.1.0/td +th class=headingnbsp;/th +th class=headinga href=components/security/shiro/about.htmlShiro/a/th +th class=heading1.1.0/th td1.1.0/td td-/td td-/td @@ -61,9 +61,9 @@ The table below lists dependencies betwe td-/td /tr tr -td class=headingnbsp;/td -td class=headingnbsp;/td -td class=heading1.0.0/td +th class=headingnbsp;/th +th class=headingnbsp;/th +th class=heading1.0.0/th td1.0.0/td td-/td td-/td @@ -72,9 +72,9 @@ The table below lists dependencies betwe td-/td /tr tr -td class=headingObjectstore/td -td class=headinga href=components/objectstores/jdo/about.htmlJDO/a/td -td class=heading1.0.0/td +th class=headingObjectstore/th +th class=headinga href=components/objectstores/jdo/about.htmlJDO/a/th +th class=heading1.0.0/th td1.0.0/td td-/td td-/td @@ -83,9 +83,9 @@ The table below lists dependencies betwe td-/td /tr tr -td class=headingViewer/td -td class=headinga href=components/viewers/wicket/about.htmlWicket/a/td -td class=heading1.1.0/td +th class=headingViewer/th +th class=headinga href=components/viewers/wicket/about.htmlWicket/a/th +th class=heading1.1.0/th td class=new1.1.0/td td-/td td-/td @@ -94,9 +94,9 @@ The table below lists dependencies betwe td-/td /tr tr -td class=headingnbsp;/td -td class=headingnbsp;/td -td class=heading1.0.0/td +th class=headingnbsp;/th +th class=headingnbsp;/th +th class=heading1.0.0/th td1.0.0/td td-/td td-/td @@ -105,9 +105,9 @@ The table below lists dependencies betwe td-/td /tr tr -td class=headingnbsp;/td -td class=headinga href=components/viewers/restfulobjects/about.htmlRestful/a/td -td class=heading1.0.0/td +th class=headingnbsp;/th +th class=headinga href=components/viewers/restfulobjects/about.htmlRestful/a/th +th class=heading1.0.0/th td1.0.0/td td-/td td-/td @@ -116,9 +116,9 @@ The table below lists dependencies betwe td-/td /tr tr -td class=headingArchetype/td -td class=headinga href=getting-started/quickstart-archetype.htmlWRJ/a/td -td class=heading1.0.2/td +th class=headingArchetype/th +th class=headinga href=getting-started/quickstart-archetype.htmlWRJ/a/th +th class=heading1.0.2/th td class=new1.1.0/td td class=new1.1.0/td td-/td @@ -127,9 +127,9 @@ The table below lists dependencies betwe td1.0.0/td /tr tr -td class=headingnbsp;/td -td class=headingnbsp;/td -td class=heading1.0.1/td +th class=headingnbsp;/th +th class=headingnbsp;/th +th class=heading1.0.1/th td1.0.0/td td class=new1.0.0/td td-/td @@ -138,9 +138,9 @@ The table below lists dependencies betwe td1.0.0/td /tr tr -td class=headingnbsp;/td -td class=headingnbsp;/td -td class=heading1.0.0/td +th class=headingnbsp;/th +th class=headingnbsp;/th +th class=heading1.0.0/th td1.0.0/td td-/td td1.0.0/td
svn commit: r848778 - in /websites/production/isis: cgi-bin/ content/
Author: danhaywood Date: Thu Jan 31 14:49:27 2013 New Revision: 848778 Log: Publishing svnmucc operation to isis site by danhaywood Added: websites/production/isis/cgi-bin/ - copied from r848777, websites/staging/isis/trunk/cgi-bin/ websites/production/isis/content/ - copied from r848777, websites/staging/isis/trunk/content/
svn commit: r1441001 - /isis/site/trunk/content/getting-started/release-notes/about.md
Author: danhaywood Date: Thu Jan 31 14:58:20 2013 New Revision: 1441001 URL: http://svn.apache.org/viewvc?rev=1441001view=rev Log: isis site - 1.1.0 release updates Modified: isis/site/trunk/content/getting-started/release-notes/about.md Modified: isis/site/trunk/content/getting-started/release-notes/about.md URL: http://svn.apache.org/viewvc/isis/site/trunk/content/getting-started/release-notes/about.md?rev=1441001r1=1441000r2=1441001view=diff == --- isis/site/trunk/content/getting-started/release-notes/about.md (original) +++ isis/site/trunk/content/getting-started/release-notes/about.md Thu Jan 31 14:58:20 2013 @@ -1,5 +1,5 @@ Title: Release Notes -* [quickstart_wrj-archetype-1.0.2](quickstart_wrj-archetype-1.0.2.html) (RC1) +* [quickstart_wrj-archetype-1.0.2](quickstart_wrj-archetype-1.0.2.html) * [quickstart_wrj-archetype-1.0.1](quickstart_wrj-archetype-1.0.1.html) * [quickstart_wrj-archetype-1.0.0](quickstart_wrj-archetype-1.0.0.html)
svn commit: r848792 - in /websites/production/isis: cgi-bin/ content/
Author: danhaywood Date: Thu Jan 31 15:26:57 2013 New Revision: 848792 Log: Publishing svnmucc operation to isis site by danhaywood Added: websites/production/isis/cgi-bin/ - copied from r848791, websites/staging/isis/trunk/cgi-bin/ websites/production/isis/content/ - copied from r848791, websites/staging/isis/trunk/content/
Git Push Summary
Updated Tags: refs/tags/isis-0.1.2-incubating [deleted] 40c529018
Git Push Summary
Updated Tags: refs/tags/isis-0.1.2-RC3-incubating [deleted] 0b09a4c2e
Git Push Summary
Updated Tags: refs/tags/isis-0.1.2-RC4-incubating [deleted] 234a55fb5
Git Push Summary
Updated Tags: refs/tags/isis-0.2.0-incubating [deleted] 6dce716dd
[9/16] git commit: [maven-release-plugin] prepare release isis-viewer-wicket-1.1.0
[maven-release-plugin] prepare release isis-viewer-wicket-1.1.0 Project: http://git-wip-us.apache.org/repos/asf/isis/repo Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/90ff4e3c Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/90ff4e3c Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/90ff4e3c Branch: refs/heads/master Commit: 90ff4e3c56a59923713e92f77c3a857abc8ab9a1 Parents: 838c425 Author: Dan Haywood danhayw...@apache.org Authored: Sun Jan 27 18:35:28 2013 + Committer: Dan Haywood danhayw...@apache.org Committed: Sun Jan 27 18:35:28 2013 + -- component/viewer/wicket/impl/pom.xml |2 +- component/viewer/wicket/model/pom.xml |2 +- component/viewer/wicket/pom.xml | 18 +++--- component/viewer/wicket/tck/pom.xml |8 ++-- component/viewer/wicket/ui/pom.xml|2 +- 5 files changed, 20 insertions(+), 12 deletions(-) -- http://git-wip-us.apache.org/repos/asf/isis/blob/90ff4e3c/component/viewer/wicket/impl/pom.xml -- diff --git a/component/viewer/wicket/impl/pom.xml b/component/viewer/wicket/impl/pom.xml index 287909f..d246133 100644 --- a/component/viewer/wicket/impl/pom.xml +++ b/component/viewer/wicket/impl/pom.xml @@ -24,7 +24,7 @@ parent groupIdorg.apache.isis.viewer/groupId artifactIdisis-viewer-wicket/artifactId -version1.1.0-SNAPSHOT/version +version1.1.0/version /parent nameIsis Wicket Viewer Implementation/name http://git-wip-us.apache.org/repos/asf/isis/blob/90ff4e3c/component/viewer/wicket/model/pom.xml -- diff --git a/component/viewer/wicket/model/pom.xml b/component/viewer/wicket/model/pom.xml index 0367603..4d3cfe8 100644 --- a/component/viewer/wicket/model/pom.xml +++ b/component/viewer/wicket/model/pom.xml @@ -24,7 +24,7 @@ parent groupIdorg.apache.isis.viewer/groupId artifactIdisis-viewer-wicket/artifactId -version1.1.0-SNAPSHOT/version +version1.1.0/version /parent artifactIdisis-viewer-wicket-model/artifactId http://git-wip-us.apache.org/repos/asf/isis/blob/90ff4e3c/component/viewer/wicket/pom.xml -- diff --git a/component/viewer/wicket/pom.xml b/component/viewer/wicket/pom.xml index a9abb31..c0a1776 100644 --- a/component/viewer/wicket/pom.xml +++ b/component/viewer/wicket/pom.xml @@ -30,7 +30,7 @@ groupIdorg.apache.isis.viewer/groupId artifactIdisis-viewer-wicket/artifactId -version1.1.0-SNAPSHOT/version +version1.1.0/version nameIsis Wicket Viewer/name @@ -101,36 +101,36 @@ dependency groupIdorg.apache.isis.viewer/groupId artifactIdisis-viewer-wicket-model/artifactId - version1.1.0-SNAPSHOT/version + version1.1.0/version /dependency dependency groupIdorg.apache.isis.viewer/groupId artifactIdisis-viewer-wicket-model/artifactId -version1.1.0-SNAPSHOT/version +version1.1.0/version scopetest/scope typetest-jar/type /dependency dependency groupIdorg.apache.isis.viewer/groupId artifactIdisis-viewer-wicket-ui/artifactId -version1.1.0-SNAPSHOT/version +version1.1.0/version /dependency dependency groupIdorg.apache.isis.viewer/groupId artifactIdisis-viewer-wicket-ui/artifactId -version1.1.0-SNAPSHOT/version +version1.1.0/version scopetest/scope typetest-jar/type /dependency dependency groupIdorg.apache.isis.viewer/groupId artifactIdisis-viewer-wicket-impl/artifactId -version1.1.0-SNAPSHOT/version +version1.1.0/version /dependency dependency groupIdorg.apache.isis.viewer/groupId artifactIdisis-viewer-wicket-impl/artifactId -version1.1.0-SNAPSHOT/version +version1.1.0/version
[12/16] git commit: ISIS-319: updating archetype wrj
ISIS-319: updating archetype wrj Project: http://git-wip-us.apache.org/repos/asf/isis/repo Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/b0f15259 Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/b0f15259 Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/b0f15259 Branch: refs/heads/master Commit: b0f152593a88a059461c7b6e2cb3ccefde624600 Parents: b3ca808 Author: Dan Haywood danhayw...@apache.org Authored: Sun Jan 27 19:31:44 2013 + Committer: Dan Haywood danhayw...@apache.org Committed: Sun Jan 27 19:31:44 2013 + -- .../quickstart_wicket_restful_jdo/pom.xml |4 +- .../main/resources/archetype-resources/dom/pom.xml |9 + .../dom/src/main/java/dom/todo/ToDoItem.java | 90 +-- .../dom/src/main/java/dom/todo/ToDoItems.java | 14 ++- .../src/main/resources/archetype-resources/pom.xml | 117 ++- .../archetype-resources/viewer-webapp/pom.xml |9 + .../src/main/jettyconsole/isis-banner.pdn | Bin 68424 - 69658 bytes .../src/main/jettyconsole/isis-banner.png | Bin 30645 - 30776 bytes .../WEB-INF/persistor_datanucleus.properties | 16 +- .../src/main/webapp/WEB-INF/shiro.ini | 39 + .../viewer-webapp/src/main/webapp/WEB-INF/web.xml | 13 ++- .../viewer-webapp/src/main/webapp/about/index.html |2 +- .../resources/projects/basic/archetype.properties |2 +- 13 files changed, 280 insertions(+), 35 deletions(-) -- http://git-wip-us.apache.org/repos/asf/isis/blob/b0f15259/example/archetype/quickstart_wicket_restful_jdo/pom.xml -- diff --git a/example/archetype/quickstart_wicket_restful_jdo/pom.xml b/example/archetype/quickstart_wicket_restful_jdo/pom.xml index 55832f2..0aa2e65 100644 --- a/example/archetype/quickstart_wicket_restful_jdo/pom.xml +++ b/example/archetype/quickstart_wicket_restful_jdo/pom.xml @@ -17,7 +17,7 @@ specific language governing permissions and limitations under the License. -- -project xmlns=http://maven.apache.org/POM/4.0.0; xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation=http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd; +project xmlns=http://maven.apache.org/POM/4.0.0; xsi:schemaLocation=http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd; xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; modelVersion4.0.0/modelVersion groupIdorg.apache.isis.archetype/groupId artifactIdquickstart_wicket_restful_jdo-archetype/artifactId @@ -44,6 +44,6 @@ parent groupIdorg.apache.isis.core/groupId artifactIdisis/artifactId -version1.0.0/version +version1.1.0/version /parent /project http://git-wip-us.apache.org/repos/asf/isis/blob/b0f15259/example/archetype/quickstart_wicket_restful_jdo/src/main/resources/archetype-resources/dom/pom.xml -- diff --git a/example/archetype/quickstart_wicket_restful_jdo/src/main/resources/archetype-resources/dom/pom.xml b/example/archetype/quickstart_wicket_restful_jdo/src/main/resources/archetype-resources/dom/pom.xml index d2f8f31..5f55223 100644 --- a/example/archetype/quickstart_wicket_restful_jdo/src/main/resources/archetype-resources/dom/pom.xml +++ b/example/archetype/quickstart_wicket_restful_jdo/src/main/resources/archetype-resources/dom/pom.xml @@ -110,6 +110,15 @@ groupIdorg.datanucleus/groupId artifactIddatanucleus-api-jdo/artifactId /dependency + +!-- +GMAP3: uncomment to use https://github.com/danhaywood/isis-wicket-gmap3 +dependency +groupIdcom.danhaywood.isis.wicket.ui.components/groupId +artifactIddanhaywood-isis-wicket-gmap3-applib/artifactId +/dependency + -- + /dependencies profiles http://git-wip-us.apache.org/repos/asf/isis/blob/b0f15259/example/archetype/quickstart_wicket_restful_jdo/src/main/resources/archetype-resources/dom/src/main/java/dom/todo/ToDoItem.java -- diff --git a/example/archetype/quickstart_wicket_restful_jdo/src/main/resources/archetype-resources/dom/src/main/java/dom/todo/ToDoItem.java b/example/archetype/quickstart_wicket_restful_jdo/src/main/resources/archetype-resources/dom/src/main/java/dom/todo/ToDoItem.java index 0075b16..8ae05a2 100644 --- a/example/archetype/quickstart_wicket_restful_jdo/src/main/resources/archetype-resources/dom/src/main/java/dom/todo/ToDoItem.java +++ b/example/archetype/quickstart_wicket_restful_jdo/src/main/resources/archetype-resources/dom/src/main/java/dom/todo/ToDoItem.java @@ -21,16 +21,21 @@ */ package dom.todo; -import java.util.ArrayList; import
[13/16] git commit: [maven-release-plugin] prepare release quickstart_wicket_restful_jdo-archetype-1.0.2
[maven-release-plugin] prepare release quickstart_wicket_restful_jdo-archetype-1.0.2 Project: http://git-wip-us.apache.org/repos/asf/isis/repo Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/37ba6f2e Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/37ba6f2e Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/37ba6f2e Branch: refs/heads/master Commit: 37ba6f2e7b47f61f357e10d877e2dbb8c40b5b25 Parents: b0f1525 Author: Dan Haywood danhayw...@apache.org Authored: Sun Jan 27 19:35:31 2013 + Committer: Dan Haywood danhayw...@apache.org Committed: Sun Jan 27 19:35:31 2013 + -- .../quickstart_wicket_restful_jdo/pom.xml |8 ++-- 1 files changed, 6 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/isis/blob/37ba6f2e/example/archetype/quickstart_wicket_restful_jdo/pom.xml -- diff --git a/example/archetype/quickstart_wicket_restful_jdo/pom.xml b/example/archetype/quickstart_wicket_restful_jdo/pom.xml index 0aa2e65..875e6b7 100644 --- a/example/archetype/quickstart_wicket_restful_jdo/pom.xml +++ b/example/archetype/quickstart_wicket_restful_jdo/pom.xml @@ -17,11 +17,11 @@ specific language governing permissions and limitations under the License. -- -project xmlns=http://maven.apache.org/POM/4.0.0; xsi:schemaLocation=http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd; xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; +project xmlns=http://maven.apache.org/POM/4.0.0; xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation=http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd; modelVersion4.0.0/modelVersion groupIdorg.apache.isis.archetype/groupId artifactIdquickstart_wicket_restful_jdo-archetype/artifactId - version1.0.2-SNAPSHOT/version + version1.0.2/version packagingmaven-archetype/packaging namequickstart_wicket_restful_jdo-archetype/name build @@ -46,4 +46,8 @@ artifactIdisis/artifactId version1.1.0/version /parent + + scm +tagquickstart_wicket_restful_jdo-archetype-1.0.2/tag + /scm /project
[3/16] git commit: [maven-release-plugin] prepare for next development iteration
[maven-release-plugin] prepare for next development iteration
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/d87b77f1
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/d87b77f1
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/d87b77f1
Branch: refs/heads/master
Commit: d87b77f170bdd8a9121e0058b1b67596da0c633e
Parents: 86e3fa5
Author: Dan Haywood danhayw...@apache.org
Authored: Sun Jan 27 16:44:52 2013 +
Committer: Dan Haywood danhayw...@apache.org
Committed: Sun Jan 27 16:44:52 2013 +
--
core/applib/pom.xml|2 +-
core/bytecode-cglib/pom.xml|2 +-
core/bytecode-javassist/pom.xml|4 +-
core/integtestsupport/pom.xml |2 +-
core/metamodel/pom.xml |2 +-
core/objectstore-inmemory/pom.xml |2 +-
core/pom.xml | 42 +++---
core/profilestore-inmemory/pom.xml |2 +-
core/runtime/pom.xml |2 +-
core/security-noop/pom.xml |2 +-
core/tck/pom.xml |2 +-
core/tck/tck-dom/pom.xml |2 +-
core/tck/tck-fixture/pom.xml |2 +-
core/unittestsupport/pom.xml |2 +-
core/webserver/pom.xml |2 +-
15 files changed, 36 insertions(+), 36 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/isis/blob/d87b77f1/core/applib/pom.xml
--
diff --git a/core/applib/pom.xml b/core/applib/pom.xml
index 2eb4a9b..7a83bbe 100644
--- a/core/applib/pom.xml
+++ b/core/applib/pom.xml
@@ -23,7 +23,7 @@
parent
groupIdorg.apache.isis.core/groupId
artifactIdisis/artifactId
- version1.1.0/version
+ version1.1.1-SNAPSHOT/version
/parent
artifactIdisis-core-applib/artifactId
http://git-wip-us.apache.org/repos/asf/isis/blob/d87b77f1/core/bytecode-cglib/pom.xml
--
diff --git a/core/bytecode-cglib/pom.xml b/core/bytecode-cglib/pom.xml
index 77b5232..f023bf1 100644
--- a/core/bytecode-cglib/pom.xml
+++ b/core/bytecode-cglib/pom.xml
@@ -23,7 +23,7 @@
parent
groupIdorg.apache.isis.core/groupId
artifactIdisis/artifactId
- version1.1.0/version
+ version1.1.1-SNAPSHOT/version
/parent
artifactIdisis-core-bytecode-cglib/artifactId
http://git-wip-us.apache.org/repos/asf/isis/blob/d87b77f1/core/bytecode-javassist/pom.xml
--
diff --git a/core/bytecode-javassist/pom.xml b/core/bytecode-javassist/pom.xml
index 9ff4057..8b32681 100644
--- a/core/bytecode-javassist/pom.xml
+++ b/core/bytecode-javassist/pom.xml
@@ -23,7 +23,7 @@
parent
groupIdorg.apache.isis.core/groupId
artifactIdisis/artifactId
- version1.1.0/version
+ version1.1.1-SNAPSHOT/version
/parent
artifactIdisis-core-bytecode-javassist/artifactId
@@ -39,7 +39,7 @@
connectionscm:svn:http://svn.apache.org/repos/asf/incubator/isis/trunk/runtimes/dflt/bytecode/javassist//connection
developerConnectionscm:svn:https://svn.apache.org/repos/asf/incubator/isis/trunk$/{relativeUrl}/developerConnection
urlhttp://svn.apache.org/repos/asf/incubator/isis/trunk/runtimes/dflt/bytecode/javassist//url
- tagisis-1.1.0/tag
+ tagHEAD/tag
/scm
!-- used in Site generation for relative references. --
http://git-wip-us.apache.org/repos/asf/isis/blob/d87b77f1/core/integtestsupport/pom.xml
--
diff --git a/core/integtestsupport/pom.xml b/core/integtestsupport/pom.xml
index 0d8037d..1a57670 100644
--- a/core/integtestsupport/pom.xml
+++ b/core/integtestsupport/pom.xml
@@ -23,7 +23,7 @@
parent
groupIdorg.apache.isis.core/groupId
artifactIdisis/artifactId
-version1.1.0/version
+version1.1.1-SNAPSHOT/version
/parent
artifactIdisis-core-integtestsupport/artifactId
http://git-wip-us.apache.org/repos/asf/isis/blob/d87b77f1/core/metamodel/pom.xml
--
diff --git a/core/metamodel/pom.xml b/core/metamodel/pom.xml
index 5ca5dd6..89411d0 100644
--- a/core/metamodel/pom.xml
+++ b/core/metamodel/pom.xml
@@ -15,7 +15,7 @@
parent
groupIdorg.apache.isis.core/groupId
artifactIdisis/artifactId
-version1.1.0/version
+version1.1.1-SNAPSHOT/version
/parent
artifactIdisis-core-metamodel/artifactId
[2/16] git commit: [maven-release-plugin] prepare release isis-1.1.0
[maven-release-plugin] prepare release isis-1.1.0
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/86e3fa56
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/86e3fa56
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/86e3fa56
Branch: refs/heads/master
Commit: 86e3fa5635ea160aea0539e940e9ca19befd7d80
Parents: fcbf5ca
Author: Dan Haywood danhayw...@apache.org
Authored: Sun Jan 27 16:44:45 2013 +
Committer: Dan Haywood danhayw...@apache.org
Committed: Sun Jan 27 16:44:45 2013 +
--
core/applib/pom.xml|2 +-
core/bytecode-cglib/pom.xml|2 +-
core/bytecode-javassist/pom.xml|4 +-
core/integtestsupport/pom.xml |2 +-
core/metamodel/pom.xml |2 +-
core/objectstore-inmemory/pom.xml |2 +-
core/pom.xml | 42 +++---
core/profilestore-inmemory/pom.xml |2 +-
core/runtime/pom.xml |2 +-
core/security-noop/pom.xml |2 +-
core/tck/pom.xml |2 +-
core/tck/tck-dom/pom.xml |2 +-
core/tck/tck-fixture/pom.xml |2 +-
core/unittestsupport/pom.xml |2 +-
core/webserver/pom.xml |2 +-
15 files changed, 36 insertions(+), 36 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/isis/blob/86e3fa56/core/applib/pom.xml
--
diff --git a/core/applib/pom.xml b/core/applib/pom.xml
index 0e18f3a..2eb4a9b 100644
--- a/core/applib/pom.xml
+++ b/core/applib/pom.xml
@@ -23,7 +23,7 @@
parent
groupIdorg.apache.isis.core/groupId
artifactIdisis/artifactId
- version1.1.0-SNAPSHOT/version
+ version1.1.0/version
/parent
artifactIdisis-core-applib/artifactId
http://git-wip-us.apache.org/repos/asf/isis/blob/86e3fa56/core/bytecode-cglib/pom.xml
--
diff --git a/core/bytecode-cglib/pom.xml b/core/bytecode-cglib/pom.xml
index 50773b0..77b5232 100644
--- a/core/bytecode-cglib/pom.xml
+++ b/core/bytecode-cglib/pom.xml
@@ -23,7 +23,7 @@
parent
groupIdorg.apache.isis.core/groupId
artifactIdisis/artifactId
- version1.1.0-SNAPSHOT/version
+ version1.1.0/version
/parent
artifactIdisis-core-bytecode-cglib/artifactId
http://git-wip-us.apache.org/repos/asf/isis/blob/86e3fa56/core/bytecode-javassist/pom.xml
--
diff --git a/core/bytecode-javassist/pom.xml b/core/bytecode-javassist/pom.xml
index 60da7d6..9ff4057 100644
--- a/core/bytecode-javassist/pom.xml
+++ b/core/bytecode-javassist/pom.xml
@@ -23,7 +23,7 @@
parent
groupIdorg.apache.isis.core/groupId
artifactIdisis/artifactId
- version1.1.0-SNAPSHOT/version
+ version1.1.0/version
/parent
artifactIdisis-core-bytecode-javassist/artifactId
@@ -39,7 +39,7 @@
connectionscm:svn:http://svn.apache.org/repos/asf/incubator/isis/trunk/runtimes/dflt/bytecode/javassist//connection
developerConnectionscm:svn:https://svn.apache.org/repos/asf/incubator/isis/trunk$/{relativeUrl}/developerConnection
urlhttp://svn.apache.org/repos/asf/incubator/isis/trunk/runtimes/dflt/bytecode/javassist//url
- tagHEAD/tag
+ tagisis-1.1.0/tag
/scm
!-- used in Site generation for relative references. --
http://git-wip-us.apache.org/repos/asf/isis/blob/86e3fa56/core/integtestsupport/pom.xml
--
diff --git a/core/integtestsupport/pom.xml b/core/integtestsupport/pom.xml
index 6bc611d..0d8037d 100644
--- a/core/integtestsupport/pom.xml
+++ b/core/integtestsupport/pom.xml
@@ -23,7 +23,7 @@
parent
groupIdorg.apache.isis.core/groupId
artifactIdisis/artifactId
-version1.1.0-SNAPSHOT/version
+version1.1.0/version
/parent
artifactIdisis-core-integtestsupport/artifactId
http://git-wip-us.apache.org/repos/asf/isis/blob/86e3fa56/core/metamodel/pom.xml
--
diff --git a/core/metamodel/pom.xml b/core/metamodel/pom.xml
index 0405268..5ca5dd6 100644
--- a/core/metamodel/pom.xml
+++ b/core/metamodel/pom.xml
@@ -15,7 +15,7 @@
parent
groupIdorg.apache.isis.core/groupId
artifactIdisis/artifactId
-version1.1.0-SNAPSHOT/version
+version1.1.0/version
/parent
artifactIdisis-core-metamodel/artifactId
[15/16] git commit: Merge branch 'prepare/isis-archetype-wrj-1.0.2-RC1'
Merge branch 'prepare/isis-archetype-wrj-1.0.2-RC1' Project: http://git-wip-us.apache.org/repos/asf/isis/repo Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/63c00e26 Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/63c00e26 Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/63c00e26 Branch: refs/heads/master Commit: 63c00e266ca1bda482b4b99982b37bae50f87c66 Parents: c3f2969 5db4ae5 Author: Dan Haywood danhayw...@apache.org Authored: Thu Jan 31 15:31:56 2013 + Committer: Dan Haywood danhayw...@apache.org Committed: Thu Jan 31 15:31:56 2013 + -- component/security/shiro/pom.xml |6 +- .../security/shiro/IsisLdapContextFactory.java | 18 +++ .../apache/isis/security/shiro/IsisLdapRealm.java | 18 +++ .../org/apache/isis/security/shiro/util/Util.java | 18 +++ .../isis/security/shiro/util/UtilTest_parse.java | 18 +++ component/viewer/wicket/impl/pom.xml |2 +- component/viewer/wicket/model/pom.xml |2 +- component/viewer/wicket/pom.xml| 23 ++-- .../appended-resources/supplemental-models.xml |3 +- component/viewer/wicket/tck/pom.xml|6 +- component/viewer/wicket/ui/pom.xml |2 +- .../wicket/ui/HeaderContributorProvider.java | 18 +++ .../isisapplib/IsisBlobOrClobPanelAbstract.java| 18 +++ .../isis/viewer/wicket/ui/panels/PanelUtil.java| 18 +++ core/applib/pom.xml|2 +- core/bytecode-cglib/pom.xml|2 +- core/bytecode-javassist/pom.xml|2 +- core/integtestsupport/pom.xml |2 +- core/metamodel/pom.xml |2 +- core/objectstore-inmemory/pom.xml |2 +- core/pom.xml | 50 +++--- core/profilestore-inmemory/pom.xml |2 +- core/runtime/pom.xml |2 +- core/security-noop/pom.xml |2 +- core/tck/pom.xml |2 +- core/tck/tck-dom/pom.xml |2 +- core/tck/tck-fixture/pom.xml |2 +- core/unittestsupport/pom.xml |2 +- core/webserver/pom.xml |2 +- .../quickstart_wicket_restful_jdo/pom.xml | 104 - .../quickstart_wicket_restful_jdo/pom.xml |4 +- .../main/resources/archetype-resources/dom/pom.xml |9 + .../dom/src/main/java/dom/todo/ToDoItem.java | 90 +-- .../dom/src/main/java/dom/todo/ToDoItems.java | 14 ++- .../src/main/resources/archetype-resources/pom.xml | 117 ++- .../archetype-resources/viewer-webapp/pom.xml |9 + .../src/main/jettyconsole/isis-banner.pdn | Bin 68424 - 69658 bytes .../src/main/jettyconsole/isis-banner.png | Bin 30645 - 30776 bytes .../WEB-INF/persistor_datanucleus.properties | 16 +- .../src/main/webapp/WEB-INF/shiro.ini | 39 + .../viewer-webapp/src/main/webapp/WEB-INF/web.xml | 13 ++- .../viewer-webapp/src/main/webapp/about/index.html |2 +- .../resources/projects/basic/archetype.properties |2 +- 43 files changed, 567 insertions(+), 100 deletions(-) --
[16/16] git commit: ISIS-319: merging back into master post release of 1.1.0 etc
Updated Branches: refs/heads/master c3f296997 - 56c1fbdba ISIS-319: merging back into master post release of 1.1.0 etc Project: http://git-wip-us.apache.org/repos/asf/isis/repo Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/56c1fbdb Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/56c1fbdb Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/56c1fbdb Branch: refs/heads/master Commit: 56c1fbdba621a3205928614f1cd5fc60e7c882bd Parents: 63c00e2 Author: Dan Haywood danhayw...@apache.org Authored: Thu Jan 31 16:53:27 2013 + Committer: Dan Haywood danhayw...@apache.org Committed: Thu Jan 31 16:53:27 2013 + -- component/objectstore/jdo/pom.xml |2 +- component/objectstore/nosql/pom.xml|2 +- component/objectstore/sql/pom.xml |2 +- component/objectstore/xml/pom.xml |2 +- component/profilestore/sql/pom.xml |2 +- component/profilestore/xml/pom.xml |2 +- component/progmodel/groovy/pom.xml |2 +- component/progmodel/wrapper/pom.xml|2 +- component/security/file/pom.xml|2 +- component/security/ldap/pom.xml|2 +- component/security/shiro/pom.xml |2 +- component/security/sql/pom.xml |2 +- component/viewer/bdd/pom.xml |2 +- component/viewer/bdd/tck/pom.xml |2 +- component/viewer/dnd/pom.xml |2 +- component/viewer/dnd/tck/pom.xml |2 +- component/viewer/html/pom.xml |2 +- component/viewer/html/tck/pom.xml |2 +- component/viewer/junit/pom.xml |2 +- component/viewer/junit/tck/pom.xml |2 +- component/viewer/restfulobjects/pom.xml|2 +- component/viewer/restfulobjects/tck/pom.xml|2 +- component/viewer/scimpi/pom.xml|2 +- component/viewer/scimpi/tck/pom.xml|2 +- component/viewer/wicket/pom.xml|2 +- component/viewer/wicket/tck/pom.xml|2 +- example/application/claims/pom.xml |2 +- .../application/quickstart_dnd_junit_bdd/pom.xml |2 +- example/application/quickstart_html_sql/pom.xml|2 +- .../application/quickstart_scimpi_nosql/pom.xml|2 +- .../quickstart_wicket_restful_jdo/pom.xml | 12 ++-- .../quickstart_wicket_restful_jdo/pom.xml |3 ++- example/domain-service/email-service/pom.xml |2 +- example/misc/metamodel/namefile/pom.xml|2 +- scripts/updateGeneratedArchetypeSources.groovy |1 + site-skin/pom.xml |2 +- tool/maven-plugin/pom.xml |2 +- 37 files changed, 43 insertions(+), 41 deletions(-) -- http://git-wip-us.apache.org/repos/asf/isis/blob/56c1fbdb/component/objectstore/jdo/pom.xml -- diff --git a/component/objectstore/jdo/pom.xml b/component/objectstore/jdo/pom.xml index 35890ff..01ec14d 100644 --- a/component/objectstore/jdo/pom.xml +++ b/component/objectstore/jdo/pom.xml @@ -16,7 +16,7 @@ parent groupIdorg.apache.isis.core/groupId artifactIdisis/artifactId -version1.1.0-SNAPSHOT/version +version1.1.1-SNAPSHOT/version relativePath../../../core/pom.xml/relativePath /parent http://git-wip-us.apache.org/repos/asf/isis/blob/56c1fbdb/component/objectstore/nosql/pom.xml -- diff --git a/component/objectstore/nosql/pom.xml b/component/objectstore/nosql/pom.xml index b025a72..1e86890 100644 --- a/component/objectstore/nosql/pom.xml +++ b/component/objectstore/nosql/pom.xml @@ -23,7 +23,7 @@ parent groupIdorg.apache.isis.core/groupId artifactIdisis/artifactId -version1.1.0-SNAPSHOT/version +version1.1.1-SNAPSHOT/version relativePath../../../core/pom.xml/relativePath /parent http://git-wip-us.apache.org/repos/asf/isis/blob/56c1fbdb/component/objectstore/sql/pom.xml -- diff --git a/component/objectstore/sql/pom.xml b/component/objectstore/sql/pom.xml index 337a6f4..a9d0d55 100644 --- a/component/objectstore/sql/pom.xml +++ b/component/objectstore/sql/pom.xml @@ -15,7 +15,7 @@ parent groupIdorg.apache.isis.core/groupId artifactIdisis/artifactId -version1.1.0-SNAPSHOT/version +version1.1.1-SNAPSHOT/version
[10/16] git commit: [maven-release-plugin] prepare for next development iteration
[maven-release-plugin] prepare for next development iteration Project: http://git-wip-us.apache.org/repos/asf/isis/repo Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/d990683d Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/d990683d Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/d990683d Branch: refs/heads/master Commit: d990683d4af4625bc0ffd955c56ff2f57382b4a8 Parents: 90ff4e3 Author: Dan Haywood danhayw...@apache.org Authored: Sun Jan 27 18:35:33 2013 + Committer: Dan Haywood danhayw...@apache.org Committed: Sun Jan 27 18:35:33 2013 + -- component/viewer/wicket/impl/pom.xml |2 +- component/viewer/wicket/model/pom.xml |2 +- component/viewer/wicket/pom.xml | 18 +++--- component/viewer/wicket/tck/pom.xml |8 ++-- component/viewer/wicket/ui/pom.xml|2 +- 5 files changed, 12 insertions(+), 20 deletions(-) -- http://git-wip-us.apache.org/repos/asf/isis/blob/d990683d/component/viewer/wicket/impl/pom.xml -- diff --git a/component/viewer/wicket/impl/pom.xml b/component/viewer/wicket/impl/pom.xml index d246133..c888fed 100644 --- a/component/viewer/wicket/impl/pom.xml +++ b/component/viewer/wicket/impl/pom.xml @@ -24,7 +24,7 @@ parent groupIdorg.apache.isis.viewer/groupId artifactIdisis-viewer-wicket/artifactId -version1.1.0/version +version1.1.1-SNAPSHOT/version /parent nameIsis Wicket Viewer Implementation/name http://git-wip-us.apache.org/repos/asf/isis/blob/d990683d/component/viewer/wicket/model/pom.xml -- diff --git a/component/viewer/wicket/model/pom.xml b/component/viewer/wicket/model/pom.xml index 4d3cfe8..6d18764 100644 --- a/component/viewer/wicket/model/pom.xml +++ b/component/viewer/wicket/model/pom.xml @@ -24,7 +24,7 @@ parent groupIdorg.apache.isis.viewer/groupId artifactIdisis-viewer-wicket/artifactId -version1.1.0/version +version1.1.1-SNAPSHOT/version /parent artifactIdisis-viewer-wicket-model/artifactId http://git-wip-us.apache.org/repos/asf/isis/blob/d990683d/component/viewer/wicket/pom.xml -- diff --git a/component/viewer/wicket/pom.xml b/component/viewer/wicket/pom.xml index c0a1776..299a6e9 100644 --- a/component/viewer/wicket/pom.xml +++ b/component/viewer/wicket/pom.xml @@ -30,7 +30,7 @@ groupIdorg.apache.isis.viewer/groupId artifactIdisis-viewer-wicket/artifactId -version1.1.0/version +version1.1.1-SNAPSHOT/version nameIsis Wicket Viewer/name @@ -101,36 +101,36 @@ dependency groupIdorg.apache.isis.viewer/groupId artifactIdisis-viewer-wicket-model/artifactId - version1.1.0/version + version1.1.1-SNAPSHOT/version /dependency dependency groupIdorg.apache.isis.viewer/groupId artifactIdisis-viewer-wicket-model/artifactId -version1.1.0/version +version1.1.1-SNAPSHOT/version scopetest/scope typetest-jar/type /dependency dependency groupIdorg.apache.isis.viewer/groupId artifactIdisis-viewer-wicket-ui/artifactId -version1.1.0/version +version1.1.1-SNAPSHOT/version /dependency dependency groupIdorg.apache.isis.viewer/groupId artifactIdisis-viewer-wicket-ui/artifactId -version1.1.0/version +version1.1.1-SNAPSHOT/version scopetest/scope typetest-jar/type /dependency dependency groupIdorg.apache.isis.viewer/groupId artifactIdisis-viewer-wicket-impl/artifactId -version1.1.0/version +version1.1.1-SNAPSHOT/version /dependency dependency groupIdorg.apache.isis.viewer/groupId artifactIdisis-viewer-wicket-impl/artifactId -version1.1.0/version +version1.1.1-SNAPSHOT/version
[11/16] git commit: ISIS-319: updating pom for archetype-wrj
ISIS-319: updating pom for archetype-wrj Project: http://git-wip-us.apache.org/repos/asf/isis/repo Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/b3ca808a Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/b3ca808a Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/b3ca808a Branch: refs/heads/master Commit: b3ca808ac0e9b6be006932e32a992b0c941a32e3 Parents: d990683 Author: Dan Haywood danhayw...@apache.org Authored: Sun Jan 27 19:22:45 2013 + Committer: Dan Haywood danhayw...@apache.org Committed: Sun Jan 27 19:22:45 2013 + -- .../quickstart_wicket_restful_jdo/pom.xml | 104 ++- 1 files changed, 99 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/isis/blob/b3ca808a/example/application/quickstart_wicket_restful_jdo/pom.xml -- diff --git a/example/application/quickstart_wicket_restful_jdo/pom.xml b/example/application/quickstart_wicket_restful_jdo/pom.xml index 76c2688..ae9875b 100644 --- a/example/application/quickstart_wicket_restful_jdo/pom.xml +++ b/example/application/quickstart_wicket_restful_jdo/pom.xml @@ -30,11 +30,11 @@ packagingpom/packaging properties -isis.version1.1.0-SNAPSHOT/isis.version - isis-objectstore-jdo.version1.0.1-SNAPSHOT/isis-objectstore-jdo.version - isis-viewer-wicket.version1.1.0-SNAPSHOT/isis-viewer-wicket.version - isis-viewer-restfulobjects.version1.0.1-SNAPSHOT/isis-viewer-restfulobjects.version - isis-security-shiro.version1.1.0-SNAPSHOT/isis-security-shiro.version +isis.version1.1.0/isis.version + isis-objectstore-jdo.version1.0.0/isis-objectstore-jdo.version + isis-viewer-wicket.version1.1.0/isis-viewer-wicket.version + isis-viewer-restfulobjects.version1.0.0/isis-viewer-restfulobjects.version + isis-security-shiro.version1.1.0/isis-security-shiro.version /properties repositories @@ -135,6 +135,100 @@ artifactIdjetty-console-maven-plugin/artifactId version1.43/version /plugin + +!-- Apache Release Audit Tool -- +plugin +groupIdorg.apache.rat/groupId +artifactIdapache-rat-plugin/artifactId +version0.8/version +configuration + addDefaultLicenseMatcherstrue/addDefaultLicenseMatchers +excludeSubProjectstrue/excludeSubProjects +excludes +exclude**/target/**/exclude +exclude**/target-ide/**/exclude + +exclude**/*.project/exclude +exclude**/.classpath/exclude +exclude**/.settings/**/exclude +exclude**/*.launch/exclude + excludesrc/site/resources/ide/eclipse/**/exclude + +exclude**/*.gitignore/exclude +exclude**/*.log/exclude +exclude**/*.pdn/exclude +exclude**/*.svg/exclude +exclude**/*.json/exclude +exclude**/*.min.js/exclude +exclude**/*.js/exclude +/excludes +licenses + license implementation=org.apache.rat.analysis.license.SimplePatternBasedLicense +licenseFamilyCategoryAL2 /licenseFamilyCategory +licenseFamilyNameApache License 2.0/licenseFamilyName +notes / +patterns + patternLicensed to the Apache Software Foundation (ASF) under one/pattern +/patterns + /license + license implementation=org.apache.rat.analysis.license.SimplePatternBasedLicense +licenseFamilyCategoryJQRY/licenseFamilyCategory +licenseFamilyNameMIT /licenseFamilyName +notes / +patterns + patternDual licensed under the MIT or GPL Version 2 licenses./pattern +/patterns + /license + license implementation=org.apache.rat.analysis.license.SimplePatternBasedLicense + licenseFamilyCategoryJMOCK/licenseFamilyCategory +licenseFamilyNameJMock/licenseFamilyName +
[1/16] git commit: ISIS-319: updates to core pom.xml
ISIS-319: updates to core pom.xml
... for release; moving to org.apache:apache:13 and also
bumping up the version of some of our dependencies
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/fcbf5ca0
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/fcbf5ca0
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/fcbf5ca0
Branch: refs/heads/master
Commit: fcbf5ca04da3b31106c9d5b91c11f37de4e05128
Parents: ed19fe9
Author: Dan Haywood danhayw...@apache.org
Authored: Sun Jan 27 16:17:56 2013 +
Committer: Dan Haywood danhayw...@apache.org
Committed: Sun Jan 27 16:17:56 2013 +
--
core/pom.xml | 10 +-
1 files changed, 5 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/isis/blob/fcbf5ca0/core/pom.xml
--
diff --git a/core/pom.xml b/core/pom.xml
index 9817d88..7b42c47 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -15,7 +15,7 @@
parent
groupIdorg.apache/groupId
artifactIdapache/artifactId
-version12/version
+version13/version
relativePath /
/parent
@@ -1139,7 +1139,7 @@ ${license.additional-notes}
dependency
groupIdorg.objenesis/groupId
artifactIdobjenesis/artifactId
-version1.2/version
+version1.3/version
/dependency
dependency
groupIdcglib/groupId
@@ -1172,12 +1172,12 @@ ${license.additional-notes}
dependency
groupIdcom.thoughtworks.xstream/groupId
artifactIdxstream/artifactId
-version1.4.3/version
+version1.4.4/version
/dependency
dependency
groupIdorg.codehaus.jettison/groupId
artifactIdjettison/artifactId
-version1.3.2/version
+version1.3.3/version
/dependency
@@ -1217,7 +1217,7 @@ ${license.additional-notes}
dependency
groupIdorg.jboss.resteasy/groupId
artifactIdresteasy-jaxrs/artifactId
-version2.3.1.GA/version
+version2.3.5.Final/version
exclusions
!-- instead use
org.apache.geronimo.specs:geronimo-servlet_2.5_spec --
exclusion
[4/16] git commit: ISIS-319: adding missing license headers...
ISIS-319: adding missing license headers... ... to files in shiro security Project: http://git-wip-us.apache.org/repos/asf/isis/repo Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/99eb6928 Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/99eb6928 Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/99eb6928 Branch: refs/heads/master Commit: 99eb6928a9e0a33384c2995067afcbea3053bc43 Parents: d87b77f Author: Dan Haywood danhayw...@apache.org Authored: Sun Jan 27 17:39:05 2013 + Committer: Dan Haywood danhayw...@apache.org Committed: Sun Jan 27 17:39:05 2013 + -- component/security/shiro/pom.xml |2 +- .../security/shiro/IsisLdapContextFactory.java | 18 +++ .../apache/isis/security/shiro/IsisLdapRealm.java | 18 +++ .../org/apache/isis/security/shiro/util/Util.java | 18 +++ .../isis/security/shiro/util/UtilTest_parse.java | 18 +++ 5 files changed, 73 insertions(+), 1 deletions(-) -- http://git-wip-us.apache.org/repos/asf/isis/blob/99eb6928/component/security/shiro/pom.xml -- diff --git a/component/security/shiro/pom.xml b/component/security/shiro/pom.xml index 38cb484..7700540 100644 --- a/component/security/shiro/pom.xml +++ b/component/security/shiro/pom.xml @@ -23,7 +23,7 @@ parent groupIdorg.apache.isis.core/groupId artifactIdisis/artifactId -version1.1.0-SNAPSHOT/version +version1.1.0/version relativePath../../../core/pom.xml/relativePath /parent http://git-wip-us.apache.org/repos/asf/isis/blob/99eb6928/component/security/shiro/src/main/java/org/apache/isis/security/shiro/IsisLdapContextFactory.java -- diff --git a/component/security/shiro/src/main/java/org/apache/isis/security/shiro/IsisLdapContextFactory.java b/component/security/shiro/src/main/java/org/apache/isis/security/shiro/IsisLdapContextFactory.java index a68ecef..69ea869 100644 --- a/component/security/shiro/src/main/java/org/apache/isis/security/shiro/IsisLdapContextFactory.java +++ b/component/security/shiro/src/main/java/org/apache/isis/security/shiro/IsisLdapContextFactory.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.security.shiro; import java.util.Hashtable; http://git-wip-us.apache.org/repos/asf/isis/blob/99eb6928/component/security/shiro/src/main/java/org/apache/isis/security/shiro/IsisLdapRealm.java -- diff --git a/component/security/shiro/src/main/java/org/apache/isis/security/shiro/IsisLdapRealm.java b/component/security/shiro/src/main/java/org/apache/isis/security/shiro/IsisLdapRealm.java index 9cac5fe..21e88c5 100644 --- a/component/security/shiro/src/main/java/org/apache/isis/security/shiro/IsisLdapRealm.java +++ b/component/security/shiro/src/main/java/org/apache/isis/security/shiro/IsisLdapRealm.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.security.shiro; import java.util.Collections;
[7/16] git commit: ISIS-319: adding missing license headers for wicket viewer
ISIS-319: adding missing license headers for wicket viewer Project: http://git-wip-us.apache.org/repos/asf/isis/repo Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/fe860daa Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/fe860daa Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/fe860daa Branch: refs/heads/master Commit: fe860daa1d3da07763ca299825aaed6771ef7398 Parents: 776b357 Author: Dan Haywood danhayw...@apache.org Authored: Sun Jan 27 18:09:25 2013 + Committer: Dan Haywood danhayw...@apache.org Committed: Sun Jan 27 18:09:25 2013 + -- component/viewer/bdd/tck/pom.xml |2 +- component/viewer/wicket/pom.xml|9 --- component/viewer/wicket/tck/pom.xml|2 +- .../wicket/ui/HeaderContributorProvider.java | 18 +++ .../isisapplib/IsisBlobOrClobPanelAbstract.java| 18 +++ .../isis/viewer/wicket/ui/panels/PanelUtil.java| 18 +++ 6 files changed, 61 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/isis/blob/fe860daa/component/viewer/bdd/tck/pom.xml -- diff --git a/component/viewer/bdd/tck/pom.xml b/component/viewer/bdd/tck/pom.xml index 7ceef6d..52faeb7 100644 --- a/component/viewer/bdd/tck/pom.xml +++ b/component/viewer/bdd/tck/pom.xml @@ -22,7 +22,7 @@ parent groupIdorg.apache.isis.core/groupId artifactIdisis-core-tck/artifactId -version1.0.1-SNAPSHOT/version +version1.1.0-SNAPSHOT/version relativePath../../../../core/tck/pom.xml/relativePath /parent http://git-wip-us.apache.org/repos/asf/isis/blob/fe860daa/component/viewer/wicket/pom.xml -- diff --git a/component/viewer/wicket/pom.xml b/component/viewer/wicket/pom.xml index ddeacd1..a9abb31 100644 --- a/component/viewer/wicket/pom.xml +++ b/component/viewer/wicket/pom.xml @@ -24,7 +24,7 @@ parent groupIdorg.apache.isis.core/groupId artifactIdisis/artifactId -version1.1.0-SNAPSHOT/version +version1.1.0/version relativePath../../../core/pom.xml/relativePath /parent @@ -40,9 +40,9 @@ siteBaseDir./siteBaseDir relativeUrl / -wicket.version6.3.0/wicket.version -wicketstuff.version6.0.0/wicketstuff.version -wicket-select2.version2.0/wicket-select2.version +wicket.version6.5.0/wicket.version +wicketstuff.version6.4.0/wicketstuff.version +wicket-select2.version2.1/wicket-select2.version docbkxGuideTitleApache Isis Wicket Viewer/docbkxGuideTitle docbkxGuideSubTitleCustomization, Configuration and Deployment Guide/docbkxGuideSubTitle @@ -79,6 +79,7 @@ exclude**/*.project/exclude exclude**/.classpath/exclude exclude**/.settings/**/exclude +exclude**/*.pdn/exclude /excludes /configuration /plugin http://git-wip-us.apache.org/repos/asf/isis/blob/fe860daa/component/viewer/wicket/tck/pom.xml -- diff --git a/component/viewer/wicket/tck/pom.xml b/component/viewer/wicket/tck/pom.xml index baac85a..ecc41cb 100644 --- a/component/viewer/wicket/tck/pom.xml +++ b/component/viewer/wicket/tck/pom.xml @@ -23,7 +23,7 @@ parent groupIdorg.apache.isis.core/groupId artifactIdisis-core-tck/artifactId -version1.1.0-SNAPSHOT/version +version1.1.0/version relativePath../../../../core/tck/pom.xml/relativePath /parent http://git-wip-us.apache.org/repos/asf/isis/blob/fe860daa/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/HeaderContributorProvider.java -- diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/HeaderContributorProvider.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/HeaderContributorProvider.java index 52fb859..dd09543 100644 --- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/HeaderContributorProvider.java +++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/HeaderContributorProvider.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
Git Push Summary
Updated Branches: refs/heads/prepare/isis-1.1.0-RC1 [deleted] d87b77f17
Git Push Summary
Updated Branches: refs/heads/prepare/isis-archetype-wrj-1.0.2-RC1 [deleted] 5db4ae5ab
Git Push Summary
Updated Branches: refs/heads/prepare/isis-objectstore-jdo-1.0.0-RC2 [deleted] 806408448
Git Push Summary
Updated Branches: refs/heads/prepare/isis-security-file-1.0.0-RC2 [deleted] cfa379289
Git Push Summary
Updated Branches: refs/heads/prepare/isis-security-shiro-1.1.0-RC1 [deleted] 776b357b5
Git Push Summary
Updated Branches: refs/heads/prepare/isis-viewer-restfulobjects-1.0.0-RC2 [deleted] 8cb39e371
Git Push Summary
Updated Branches: refs/heads/prepare/isis-viewer-wicket-1.1.0-RC1 [deleted] d990683d4
Git Push Summary
Updated Branches: refs/heads/prepare/quickstart_wrj-archetype-1.0.0-RC1 [deleted] fc3abcdd2
Git Push Summary
Updated Branches: refs/heads/prepare/quickstart_wrj-archetype-1.0.1-RC2 [deleted] 8e5d15bc2
[1/3] ISIS-323: first cut
)));
+}
+});
+
+transaction.addCommand(command);
+transaction.addCommand(command2);
+transaction.addCommand(command3);
+transaction.commit();
+}
+
+@Test
+public void commit_ignoresBothCreateAndDestroyCommandsWhenForSameObject()
throws Exception {
+
+command = createSaveCommand(persistentAdapter1, command 1);
+command2 = createSaveCommand(persistentAdapter2, command 2);
+command3 = createDestroyCommand(persistentAdapter1, command 3);
+
+context.checking(new Expectations() {
+{
+
one(mockObjectStore).execute(with(IsisMatchers.listContainingAll(command2)));
+}
+});
+
+transaction.addCommand(command);
+transaction.addCommand(command2);
+transaction.addCommand(command3);
+transaction.commit();
+}
+
+
+@Test
+public void commit_testNoCommands() throws Exception {
+context.checking(new Expectations() {
+{
+
one(mockObjectStore).execute(with(Collections.PersistenceCommandemptyList()));
+}
+});
+
+transaction.commit();
+}
+
+
+@Test(expected = IllegalStateException.class)
+public void
shouldThrowExceptionIfAttemptToAbortAnAlreadyAbortedTransaction() throws
Exception {
+transaction.abort();
+
+transaction.abort();
+}
+
+@Test(expected = IllegalStateException.class)
+public void
shouldThrowExceptionIfAttemptToCommitAnAlreadyAbortedTransaction() throws
Exception {
+transaction.abort();
+
+transaction.commit();
+}
+
+@Test(expected = IllegalStateException.class)
+public void
shouldThrowExceptionIfAttemptToAbortAnAlreadyCommitedTransaction() throws
Exception {
+context.checking(new Expectations() {
+{
+
one(mockObjectStore).execute(with(Collections.PersistenceCommandemptyList()));
+}
+});
+
+transaction.commit();
+
+transaction.abort();
+}
+
+@Test(expected = IllegalStateException.class)
+public void
shouldThrowExceptionIfAttemptToCommitAnAlreadyCommitedTransaction() throws
Exception {
+context.checking(new Expectations() {
+{
+
one(mockObjectStore).execute(with(Collections.PersistenceCommandemptyList()));
+}
+});
+transaction.commit();
+
+transaction.commit();
+}
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/1f558615/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItem.java
--
diff --git
a/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItem.java
b/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItem.java
index 8a750e7..0bc0671 100644
---
a/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItem.java
+++
b/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItem.java
@@ -31,6 +31,7 @@ import javax.jdo.annotations.VersionStrategy;
import javax.jdo.spi.PersistenceCapable;
import org.apache.isis.applib.DomainObjectContainer;
+import org.apache.isis.applib.annotation.Audited;
import org.apache.isis.applib.annotation.AutoComplete;
import org.apache.isis.applib.annotation.Bulk;
import org.apache.isis.applib.annotation.Disabled;
@@ -43,6 +44,8 @@ import org.apache.isis.applib.annotation.NotPersisted;
import org.apache.isis.applib.annotation.ObjectType;
import org.apache.isis.applib.annotation.Optional;
import org.apache.isis.applib.annotation.Programmatic;
+import org.apache.isis.applib.annotation.PublishedAction;
+import org.apache.isis.applib.annotation.PublishedObject;
import org.apache.isis.applib.annotation.RegEx;
import org.apache.isis.applib.annotation.Resolve;
import org.apache.isis.applib.annotation.Resolve.Type;
@@ -52,7 +55,6 @@ import org.apache.isis.applib.filter.Filter;
import org.apache.isis.applib.filter.Filters;
import org.apache.isis.applib.util.TitleBuffer;
import org.apache.isis.applib.value.Blob;
-import org.apache.isis.core.objectstore.jdo.applib.annotations.Auditable;
import org.joda.time.LocalDate;
import com.google.common.base.Objects;
@@ -79,7 +81,8 @@ import com.google.common.collect.Lists;
})
@javax.jdo.annotations.Version(strategy=VersionStrategy.VERSION_NUMBER,
column=VERSION)
@ObjectType(TODO)
-@Auditable
+@Audited
+@PublishedObject
@AutoComplete(repository=ToDoItems.class, action=autoComplete)
@MemberGroups({General, Detail})
public class ToDoItem implements ComparableToDoItem /*, Locatable*/ { //
GMAP3: uncomment to use https://github.com/danhaywood/isis-wicket-gmap3
@@ -243,6 +246,7 @@ public class ToDoItem implements ComparableToDoItem /*,
Locatable*/ { // GMAP3
// }}
// {{ completed (action)
+@PublishedAction
svn commit: r1441915 - /isis/site/trunk/content/getting-started/quickstart-archetype.md
Author: danhaywood Date: Sun Feb 3 14:35:11 2013 New Revision: 1441915 URL: http://svn.apache.org/viewvc?rev=1441915view=rev Log: isis site - updating version number for quickstart archetype page Modified: isis/site/trunk/content/getting-started/quickstart-archetype.md Modified: isis/site/trunk/content/getting-started/quickstart-archetype.md URL: http://svn.apache.org/viewvc/isis/site/trunk/content/getting-started/quickstart-archetype.md?rev=1441915r1=1441914r2=1441915view=diff == --- isis/site/trunk/content/getting-started/quickstart-archetype.md (original) +++ isis/site/trunk/content/getting-started/quickstart-archetype.md Sun Feb 3 14:35:11 2013 @@ -12,7 +12,7 @@ Then run the following command: mvn archetype:generate \ -D archetypeGroupId=org.apache.isis.archetype \ -D archetypeArtifactId=quickstart_wicket_restful_jdo-archetype \ --D archetypeVersion=1.0.1 \ +-D archetypeVersion=1.0.2 \ -D groupId=com.mycompany \ -D artifactId=myapp /pre
svn commit: r849248 - in /websites/production/isis: cgi-bin/ content/
Author: danhaywood Date: Sun Feb 3 14:40:18 2013 New Revision: 849248 Log: Publishing svnmucc operation to isis site by danhaywood Added: websites/production/isis/cgi-bin/ - copied from r849247, websites/staging/isis/trunk/cgi-bin/ websites/production/isis/content/ - copied from r849247, websites/staging/isis/trunk/content/
svn commit: r1442801 - in /isis/site/trunk/content/contributors: git-cookbook.md release-process.md
Author: danhaywood Date: Tue Feb 5 23:52:02 2013 New Revision: 1442801 URL: http://svn.apache.org/viewvc?rev=1442801view=rev Log: isis site: minor updates Modified: isis/site/trunk/content/contributors/git-cookbook.md isis/site/trunk/content/contributors/release-process.md Modified: isis/site/trunk/content/contributors/git-cookbook.md URL: http://svn.apache.org/viewvc/isis/site/trunk/content/contributors/git-cookbook.md?rev=1442801r1=1442800r2=1442801view=diff == --- isis/site/trunk/content/contributors/git-cookbook.md (original) +++ isis/site/trunk/content/contributors/git-cookbook.md Tue Feb 5 23:52:02 2013 @@ -291,4 +291,15 @@ git reset --hard ishaId/i # mov /pre +## If you've forgotten to prefix your commits (but not pushed) +One of our committers, Alexander Krasnukhin, has put together some git scripts to help his workflow. Using one of these, `git prefix`, you: + + can just commit with proper message without bothering about prefix and add prefix only in the end *before* the final push. + +For example, to prefix all not yet prefixed commits `master..isis/666` with `ISIS-666` prefix, use: +pre + git prefix ISIS-666 master..isis/666 +/pre + +You can grab this utility, and others, from [this repo](https://github.com/themalkolm/git-boots). Modified: isis/site/trunk/content/contributors/release-process.md URL: http://svn.apache.org/viewvc/isis/site/trunk/content/contributors/release-process.md?rev=1442801r1=1442800r2=1442801view=diff == --- isis/site/trunk/content/contributors/release-process.md (original) +++ isis/site/trunk/content/contributors/release-process.md Tue Feb 5 23:52:02 2013 @@ -946,7 +946,7 @@ If the core was updated, then you'll mos Next, do a sanity check that everything builds ok: pre -rm -rf ~/.m2/org/apache/isis +rm -rf ~/.m2/repository/org/apache/isis mvn clean install /pre
svn commit: r849530 - in /websites/production/isis: cgi-bin/ content/
Author: danhaywood Date: Tue Feb 5 23:55:54 2013 New Revision: 849530 Log: Publishing svnmucc operation to isis site by danhaywood Added: websites/production/isis/cgi-bin/ - copied from r849529, websites/staging/isis/trunk/cgi-bin/ websites/production/isis/content/ - copied from r849529, websites/staging/isis/trunk/content/
[19/24] ISIS-323: RO publishing done, but no xactn stuff yet
org.apache.isis.core.runtime.persistence.objectstore.transaction.PublishingServiceWithDefaultPayloadFactories;
import
org.apache.isis.core.runtime.persistence.objectstore.transaction.SaveObjectCommand;
import
org.apache.isis.core.runtime.persistence.objectstore.transaction.PojoAdapterBuilder.Persistence;
import org.apache.isis.core.runtime.system.persistence.AdapterManagerSpi;
@@ -103,7 +103,7 @@ public class PersistenceSessionObjectStoreTest {
@Mock
private AuditingService mockAuditingService;
@Mock
-private PublishingServiceWithCanonicalizers mockPublishingService;
+private PublishingServiceWithDefaultPayloadFactories mockPublishingService;
@Mock
private CreateObjectCommand createObjectCommand;
http://git-wip-us.apache.org/repos/asf/isis/blob/60575469/core/runtime/src/test/java/org/apache/isis/core/runtime/system/transaction/IsisTransactionTest.java
--
diff --git
a/core/runtime/src/test/java/org/apache/isis/core/runtime/system/transaction/IsisTransactionTest.java
b/core/runtime/src/test/java/org/apache/isis/core/runtime/system/transaction/IsisTransactionTest.java
index 699c44d..5320556 100644
---
a/core/runtime/src/test/java/org/apache/isis/core/runtime/system/transaction/IsisTransactionTest.java
+++
b/core/runtime/src/test/java/org/apache/isis/core/runtime/system/transaction/IsisTransactionTest.java
@@ -33,7 +33,7 @@ import
org.apache.isis.core.runtime.persistence.objectstore.transaction.DestroyO
import
org.apache.isis.core.runtime.persistence.objectstore.transaction.PersistenceCommand;
import
org.apache.isis.core.runtime.persistence.objectstore.transaction.PersistenceCommandContext;
import
org.apache.isis.core.runtime.persistence.objectstore.transaction.PojoAdapterBuilder;
-import
org.apache.isis.core.runtime.persistence.objectstore.transaction.PublishingServiceWithCanonicalizers;
+import
org.apache.isis.core.runtime.persistence.objectstore.transaction.PublishingServiceWithDefaultPayloadFactories;
import
org.apache.isis.core.runtime.persistence.objectstore.transaction.SaveObjectCommand;
import
org.apache.isis.core.runtime.persistence.objectstore.transaction.PojoAdapterBuilder.Persistence;
import org.apache.isis.core.runtime.system.transaction.IsisTransaction;
@@ -77,7 +77,7 @@ public class IsisTransactionTest {
@Mock
private AuditingService mockAuditingService;
@Mock
-private PublishingServiceWithCanonicalizers mockPublishingService;
+private PublishingServiceWithDefaultPayloadFactories mockPublishingService;
private PersistenceCommand command;
private PersistenceCommand command2;
http://git-wip-us.apache.org/repos/asf/isis/blob/60575469/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItem.java
--
diff --git
a/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItem.java
b/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItem.java
index 0bc0671..7a4e757 100644
---
a/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItem.java
+++
b/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItem.java
@@ -82,7 +82,7 @@ import com.google.common.collect.Lists;
@javax.jdo.annotations.Version(strategy=VersionStrategy.VERSION_NUMBER,
column=VERSION)
@ObjectType(TODO)
@Audited
-@PublishedObject
+@PublishedObject(ToDoItemChangedPayloadFactory.class)
@AutoComplete(repository=ToDoItems.class, action=autoComplete)
@MemberGroups({General, Detail})
public class ToDoItem implements ComparableToDoItem /*, Locatable*/ { //
GMAP3: uncomment to use https://github.com/danhaywood/isis-wicket-gmap3
@@ -296,6 +296,7 @@ public class ToDoItem implements ComparableToDoItem /*,
Locatable*/ { // GMAP3
// }}
// {{ add (action)
+@PublishedAction
@MemberOrder(name=dependencies, sequence = 3)
public ToDoItem add(final ToDoItem toDoItem) {
getDependencies().add(toDoItem);
http://git-wip-us.apache.org/repos/asf/isis/blob/60575469/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItemChangedPayloadFactory.java
--
diff --git
a/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItemChangedPayloadFactory.java
b/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItemChangedPayloadFactory.java
new file mode 100644
index 000..fd8415d
--- /dev/null
+++
b/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItemChangedPayloadFactory.java
@@ -0,0 +1,24 @@
+package dom.todo;
+
+import org.apache.isis.applib.annotation.PublishedObject.PayloadFactory;
+import org.apache.isis.applib.services.publish.EventPayload;
+import org.apache.isis.applib.services.publish.EventPayloadForChangedObject;
+
+public class
svn commit: r1444050 - /isis/site/trunk/content/core/publishing-service.md
Author: danhaywood
Date: Fri Feb 8 15:10:15 2013
New Revision: 1444050
URL: http://svn.apache.org/r1444050
Log:
isis site - adding docs on PublishingService
Modified:
isis/site/trunk/content/core/publishing-service.md
Modified: isis/site/trunk/content/core/publishing-service.md
URL:
http://svn.apache.org/viewvc/isis/site/trunk/content/core/publishing-service.md?rev=1444050r1=1444049r2=1444050view=diff
==
--- isis/site/trunk/content/core/publishing-service.md (original)
+++ isis/site/trunk/content/core/publishing-service.md Fri Feb 8 15:10:15 2013
@@ -24,7 +24,7 @@ public class ToDoItem {
@PublishedAction
public void completed() { ... }
...
-}
+}}
/pre
Similarly, to indicate that any changes to an object should be published, use
the `PublishedObject` annotation:
@@ -33,7 +33,7 @@ Similarly, to indicate that any changes
@PublishedObject
public class ToDoItem {
...
-}
+}}
/pre
Either or both of these annotations can be used.
@@ -53,7 +53,7 @@ public interface PublishingService {
public void publish(EventMetadata metadata, EventPayload payload);
void setEventSerializer(EventSerializer eventSerializer);
-}
+}}
/pre
Typically implementations will use the injected `EventSerializer` to convert
the metadata and payload into a form to be published:
@@ -63,7 +63,7 @@ package org.apache.isis.applib.services.
public interface EventSerializer {
public Object serialize(EventMetadata metadata, EventPayload payload);
-}
+}}
/pre
The serialized form returned by `EventSerializer` will typically be something
like JSON, XML or a string. The signature of `serialize(...)` returns an
object
@@ -92,7 +92,7 @@ public interface EventSerializer {
}
}
...
-}
+}}
/pre
A simple implementation of `PublishingService` (which must be configured as a
domain service) is also available; this simply writes to stderr is also
provided:
@@ -116,7 +116,7 @@ public interface PublishingService {
}
}
...
-}
+}}
/pre
Thus, to configure a very simple form of publishing, add the following to
`isis.properties`:
@@ -159,7 +159,7 @@ public @interface PublishedAction {
Object target, Listlt;Objectgt; arguments, Object result);
}
Classlt;? extends PayloadFactorygt; value() default
PayloadFactory.class;
-}
+}}
/pre
For objects, the interface to implement is `@PublishedObject.PayloadFactory`:
@@ -172,7 +172,7 @@ public @interface PublishedObject {
public EventPayload payloadFor(Object changed);
}
Classlt;? extends PayloadFactorygt; value() default
PayloadFactory.class;
-}
+}}
/pre
For example, the following will eagerly include the `ToDoItem`'s `description`
property whenever it is changed:
@@ -181,7 +181,7 @@ For example, the following will eagerly
@PublishedObject(ToDoItemPayloadFactory.class)
public class ToDoItem {
...
-}
+}}
/pre
where `ToDoItemPayloadFactory` is defined as:
@@ -204,8 +204,7 @@ public class ToDoItemChangedPayloadFacto
public EventPayload payloadFor(Object changedObject) {
return new ToDoItemPayload((ToDoItem) changedObject);
}
-
-}
+}}
/pre
### Class Diagram
svn commit: r1444057 - /isis/site/trunk/content/core/publishing-service.md
Author: danhaywood
Date: Fri Feb 8 15:14:26 2013
New Revision: 1444057
URL: http://svn.apache.org/r1444057
Log:
isis site - adding docs on PublishingService
Modified:
isis/site/trunk/content/core/publishing-service.md
Modified: isis/site/trunk/content/core/publishing-service.md
URL:
http://svn.apache.org/viewvc/isis/site/trunk/content/core/publishing-service.md?rev=1444057r1=1444056r2=1444057view=diff
==
--- isis/site/trunk/content/core/publishing-service.md (original)
+++ isis/site/trunk/content/core/publishing-service.md Fri Feb 8 15:14:26 2013
@@ -30,10 +30,10 @@ To indicate that an action should be pub
Similarly, to indicate that any changes to an object should be published, use
the `PublishedObject` annotation:
pre
-@PublishedObject
-public class ToDoItem {
+ @PublishedObject
+ public class ToDoItem {
...
-}}
+ }
/pre
Either or both of these annotations can be used.
@@ -45,25 +45,25 @@ As described further down in this articl
The `PublishingService` interface is:
pre
-package org.apache.isis.applib.services.publish;
+ package org.apache.isis.applib.services.publish;
-public interface PublishingService {
+ public interface PublishingService {
@Hidden
public void publish(EventMetadata metadata, EventPayload payload);
void setEventSerializer(EventSerializer eventSerializer);
-}}
+ }
/pre
Typically implementations will use the injected `EventSerializer` to convert
the metadata and payload into a form to be published:
pre
-package org.apache.isis.applib.services.publish;
+ package org.apache.isis.applib.services.publish;
-public interface EventSerializer {
+ public interface EventSerializer {
public Object serialize(EventMetadata metadata, EventPayload payload);
-}}
+ }
/pre
The serialized form returned by `EventSerializer` will typically be something
like JSON, XML or a string. The signature of `serialize(...)` returns an
object
@@ -76,47 +76,47 @@ lowest common denominator, but in some c
A default implementation of `EventSerializer` will be supplied to the
`PublishingService` if none has been specified as a domain service. This
default implementation simply concatenates the metadata and payload together
into a single string:
pre
-public interface EventSerializer {
+ public interface EventSerializer {
...
public static class Simple implements EventSerializer {
-@Programmatic
-@Override
-public Object serialize(EventMetadata metadata, EventPayload payload) {
-return PUBLISHED: \nmetadata: +
- metadata.getGuid() + : +
- metadata.getUser() + : +
- metadata.getTimestamp() +
- :payload:s\n +
- payload.toString();
-}
+ @Programmatic
+ @Override
+ public Object serialize(EventMetadata metadata, EventPayload payload) {
+ return PUBLISHED: \nmetadata: +
+metadata.getGuid() + : +
+metadata.getUser() + : +
+metadata.getTimestamp() +
+ :payload:s\n +
+payload.toString();
+ }
}
...
-}}
+ }
/pre
A simple implementation of `PublishingService` (which must be configured as a
domain service) is also available; this simply writes to stderr is also
provided:
pre
-public interface PublishingService {
-...
+ public interface PublishingService {
+ ...
public static class Stderr implements PublishingService {
private EventSerializer eventSerializer = new EventSerializer.Simple();
-@Hidden
-@Override
-public void publish(EventMetadata metadata, EventPayload payload) {
-Object serializedEvent = eventSerializer.serialize(
-metadata, payload);
-System.err.println(serializedEvent);
-}
-
-@Override
-public void setEventSerializer(EventSerializer eventSerializer) {
-this.eventSerializer = eventSerializer;
-}
+ @Hidden
+ @Override
+ public void publish(EventMetadata metadata, EventPayload payload) {
+Object serializedEvent = eventSerializer.serialize(
+ metadata, payload);
+System.err.println(serializedEvent);
+ }
+
+ @Override
+ public void setEventSerializer(EventSerializer eventSerializer) {
+this.eventSerializer = eventSerializer;
+ }
}
...
-}}
+ }
/pre
Thus, to configure a very simple form of publishing, add the following to
`isis.properties`:
@@ -150,61 +150,61 @@ In some circumstances, however, it may m
To accomplish this, an implementation of a `PayloadFactory` must be
specified in the annotation. For actions, implement
`@PublishedAction.PayloadFactory`:
pre
-public @interface PublishedAction {
+ public @interface
svn commit: r849894 - in /websites/production/isis: cgi-bin/ content/
Author: danhaywood Date: Fri Feb 8 15:17:45 2013 New Revision: 849894 Log: Publishing svnmucc operation to isis site by danhaywood Added: websites/production/isis/cgi-bin/ - copied from r849893, websites/staging/isis/trunk/cgi-bin/ websites/production/isis/content/ - copied from r849893, websites/staging/isis/trunk/content/
svn commit: r1444159 - in /isis/site/trunk/content/core: images/action-invocation-published-to-stderr.png images/changed-object-published-to-stderr.png publishing-service.md
Author: danhaywood
Date: Fri Feb 8 17:26:07 2013
New Revision: 1444159
URL: http://svn.apache.org/r1444159
Log:
isis site - configure baseUrl for publishing service, added screenshots
Added:
isis/site/trunk/content/core/images/action-invocation-published-to-stderr.png
(with props)
isis/site/trunk/content/core/images/changed-object-published-to-stderr.png
(with props)
Modified:
isis/site/trunk/content/core/publishing-service.md
Added:
isis/site/trunk/content/core/images/action-invocation-published-to-stderr.png
URL:
http://svn.apache.org/viewvc/isis/site/trunk/content/core/images/action-invocation-published-to-stderr.png?rev=1444159view=auto
==
Binary file - no diff available.
Propchange:
isis/site/trunk/content/core/images/action-invocation-published-to-stderr.png
--
svn:mime-type = application/octet-stream
Added:
isis/site/trunk/content/core/images/changed-object-published-to-stderr.png
URL:
http://svn.apache.org/viewvc/isis/site/trunk/content/core/images/changed-object-published-to-stderr.png?rev=1444159view=auto
==
Binary file - no diff available.
Propchange:
isis/site/trunk/content/core/images/changed-object-published-to-stderr.png
--
svn:mime-type = application/octet-stream
Modified: isis/site/trunk/content/core/publishing-service.md
URL:
http://svn.apache.org/viewvc/isis/site/trunk/content/core/publishing-service.md?rev=1444159r1=1444158r2=1444159view=diff
==
--- isis/site/trunk/content/core/publishing-service.md (original)
+++ isis/site/trunk/content/core/publishing-service.md Fri Feb 8 17:26:07 2013
@@ -73,29 +73,17 @@ lowest common denominator, but in some c
### Default Implementations
-A default implementation of `EventSerializer` will be supplied to the
`PublishingService` if none has been specified as a domain service. This
default implementation simply concatenates the metadata and payload together
into a single string:
-pre
- public interface EventSerializer {
-...
-public static class Simple implements EventSerializer {
+A simple implementation of `PublishingService` (which must be configured as a
domain service) is available; it simply writes to stderr.
- @Programmatic
- @Override
- public Object serialize(EventMetadata metadata, EventPayload payload) {
- return PUBLISHED: \nmetadata: +
-metadata.getGuid() + : +
-metadata.getUser() + : +
-metadata.getTimestamp() +
- :payload:s\n +
-payload.toString();
- }
-}
-...
- }
+To configure a very simple form of publishing, add the following to
`isis.properties`:
+
+pre
+isis.services=i...other services.../i,\
+org.apache.isis.applib.services.publish.PublishingService$StdErr
/pre
-A simple implementation of `PublishingService` (which must be configured as a
domain service) is also available; this simply writes to stderr is also
provided:
+The implementation is as follows:
pre
public interface PublishingService {
@@ -105,8 +93,7 @@ A simple implementation of `PublishingSe
@Hidden
@Override
public void publish(EventMetadata metadata, EventPayload payload) {
-Object serializedEvent = eventSerializer.serialize(
- metadata, payload);
+Object serializedEvent = eventSerializer.serialize(metadata, payload);
System.err.println(serializedEvent);
}
@@ -119,13 +106,31 @@ A simple implementation of `PublishingSe
}
/pre
-Thus, to configure a very simple form of publishing, add the following to
`isis.properties`:
+As can be seen, the above implementation in turn uses a default implementation
of `EventSerializer`, which simply concatenates the metadata and payload
together into a single string:
pre
-isis.services=i...other services.../i,\
-org.apache.isis.applib.services.publish.PublishingService$StdErr
+ public interface EventSerializer {
+...
+public static class Simple implements EventSerializer {
+
+ @Programmatic
+ @Override
+ public Object serialize(EventMetadata metadata, EventPayload payload) {
+ return PUBLISHED: \nmetadata: +
+metadata.getGuid() + : +
+metadata.getUser() + : +
+metadata.getTimestamp() +
+ :payload:s\n +
+payload.toString();
+ }
+}
+...
+ }
/pre
+The default `PublishingService` (or indeed any implementation) can be
configured to run with a different `EventSerializer` by configuring the
serializer
svn commit: r849925 - in /websites/production/isis: cgi-bin/ content/
Author: danhaywood Date: Fri Feb 8 17:27:19 2013 New Revision: 849925 Log: Publishing svnmucc operation to isis site by danhaywood Added: websites/production/isis/cgi-bin/ - copied from r849924, websites/staging/isis/trunk/cgi-bin/ websites/production/isis/content/ - copied from r849924, websites/staging/isis/trunk/content/
[31/32] git commit: ISIS-328: done
ISIS-328: done
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/e0fe2580
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/e0fe2580
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/e0fe2580
Branch: refs/heads/master
Commit: e0fe2580018817ea9026dfb205023bf88c0b55ba
Parents: ed11bc0
Author: Dan Haywood danhayw...@apache.org
Authored: Fri Feb 8 17:52:59 2013 +
Committer: Dan Haywood danhayw...@apache.org
Committed: Fri Feb 8 18:00:51 2013 +
--
.../wicket/viewer/IsisWicketApplication.java | 11 +++-
.../core/runtime/system/context/IsisContext.java | 22 +-
2 files changed, 30 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/isis/blob/e0fe2580/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
--
diff --git
a/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
b/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
index 79fcdf3..e1cebfe 100644
---
a/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
+++
b/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
@@ -29,6 +29,8 @@ import com.google.inject.Inject;
import com.google.inject.Injector;
import com.google.inject.Module;
+import net.sf.cglib.transform.impl.AddInitTransformer;
+
import org.apache.log4j.Logger;
import org.apache.wicket.Application;
import org.apache.wicket.ConverterLocator;
@@ -72,6 +74,7 @@ import
org.apache.isis.viewer.wicket.ui.pages.BookmarkedPagesModelProvider;
import org.apache.isis.viewer.wicket.ui.pages.PageClassList;
import org.apache.isis.viewer.wicket.ui.pages.PageClassRegistry;
import org.apache.isis.viewer.wicket.ui.pages.PageClassRegistryAccessor;
+import
org.apache.isis.viewer.wicket.viewer.integration.isis.IsisContextForWicket;
import org.apache.isis.viewer.wicket.viewer.integration.isis.WicketServer;
import
org.apache.isis.viewer.wicket.viewer.integration.isis.WicketServerPrototype;
import
org.apache.isis.viewer.wicket.viewer.integration.wicket.AuthenticatedWebSessionForIsis;
@@ -121,7 +124,6 @@ import
org.apache.isis.viewer.wicket.viewer.integration.wicket.WebRequestCycleFo
public class IsisWicketApplication extends AuthenticatedWebApplication
implements ComponentFactoryRegistryAccessor, PageClassRegistryAccessor,
AuthenticationSessionProvider, BookmarkedPagesModelProvider {
private static final long serialVersionUID = 1L;
-@SuppressWarnings(unused)
private static final Logger LOG =
Logger.getLogger(IsisWicketApplication.class);
/**
@@ -195,6 +197,13 @@ public class IsisWicketApplication extends
AuthenticatedWebApplication implement
this.bookmarkedPagesModel = new BookmarkedPagesModel();
initWicketComponentInjection(injector);
+
+}
+
+@Override
+protected void onDestroy() {
+IsisContext.shutdown();
+super.onDestroy();
}
protected IsisInjectModule newIsisModule(final DeploymentType
deploymentType, final IsisConfigurationBuilder isisConfigurationBuilder) {
http://git-wip-us.apache.org/repos/asf/isis/blob/e0fe2580/core/runtime/src/main/java/org/apache/isis/core/runtime/system/context/IsisContext.java
--
diff --git
a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/context/IsisContext.java
b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/context/IsisContext.java
index bc36b2a..640d7ad 100644
---
a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/context/IsisContext.java
+++
b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/context/IsisContext.java
@@ -19,8 +19,11 @@
package org.apache.isis.core.runtime.system.context;
+import java.lang.reflect.Method;
import java.util.List;
+import javax.annotation.PreDestroy;
+
import org.apache.log4j.Logger;
import org.apache.isis.applib.profiles.Localization;
@@ -33,6 +36,8 @@ import org.apache.isis.core.commons.debug.DebugList;
import org.apache.isis.core.commons.debug.DebuggableWithTitle;
import org.apache.isis.core.commons.exceptions.IsisException;
import org.apache.isis.core.metamodel.adapter.oid.OidMarshaller;
+import org.apache.isis.core.metamodel.adapter.util.InvokeUtils;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.SpecificationLoaderSpi;
import org.apache.isis.core.runtime.authentication.AuthenticationManager;
import
[30/32] git commit: ISIS-327: done
ISIS-327: done
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/ed11bc04
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/ed11bc04
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/ed11bc04
Branch: refs/heads/master
Commit: ed11bc0437b9fbca016324430446ccd4e4d9f7e6
Parents: 7b745ec
Author: Dan Haywood danhayw...@apache.org
Authored: Fri Feb 8 17:52:28 2013 +
Committer: Dan Haywood danhayw...@apache.org
Committed: Fri Feb 8 18:00:49 2013 +
--
.../EventSerializerRendererContext.java|6 +-
.../RestfulObjectsSpecEventSerializer.java | 24 ++-
core/pom.xml | 22 +-
.../system/session/IsisSessionFactoryAbstract.java | 125 +
...ssionFactoryAbstractTest_init_and_shutdown.java | 205 +++
.../src/main/webapp/WEB-INF/isis.properties|3 +
6 files changed, 369 insertions(+), 16 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/isis/blob/ed11bc04/component/viewer/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/eventserializer/EventSerializerRendererContext.java
--
diff --git
a/component/viewer/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/eventserializer/EventSerializerRendererContext.java
b/component/viewer/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/eventserializer/EventSerializerRendererContext.java
index 9cb2ee7..98b6711 100644
---
a/component/viewer/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/eventserializer/EventSerializerRendererContext.java
+++
b/component/viewer/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/eventserializer/EventSerializerRendererContext.java
@@ -12,15 +12,17 @@ import
org.apache.isis.viewer.restfulobjects.rendering.RendererContext;
public class EventSerializerRendererContext implements RendererContext {
+private final String baseUrl;
private final Where where;
-public EventSerializerRendererContext(Where where) {
+public EventSerializerRendererContext(String baseUrl, Where where) {
+this.baseUrl = baseUrl;
this.where = where;
}
@Override
public String urlFor(String url) {
-return [base]/ + url;
+return baseUrl + url;
}
@Override
http://git-wip-us.apache.org/repos/asf/isis/blob/ed11bc04/component/viewer/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/eventserializer/RestfulObjectsSpecEventSerializer.java
--
diff --git
a/component/viewer/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/eventserializer/RestfulObjectsSpecEventSerializer.java
b/component/viewer/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/eventserializer/RestfulObjectsSpecEventSerializer.java
index 8a23976..29e1b14 100644
---
a/component/viewer/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/eventserializer/RestfulObjectsSpecEventSerializer.java
+++
b/component/viewer/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/eventserializer/RestfulObjectsSpecEventSerializer.java
@@ -1,6 +1,10 @@
package org.apache.isis.viewer.restfulobjects.rendering.eventserializer;
import java.io.IOException;
+import java.util.Map;
+
+import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.applib.annotation.Where;
@@ -20,15 +24,29 @@ public class RestfulObjectsSpecEventSerializer implements
EventSerializer {
private final static JsonMapper jsonMapper = JsonMapper.instance();
private final static DomainObjectReprRenderer.Factory
objectRendererFactory = new DomainObjectReprRenderer.Factory();
-
+private final static String BASE_URL_KEY =
RestfulObjectsSpecEventSerializer.class.getName() + .baseUrl;
+private static final String BASE_URL_DEFAULT =
http://localhost:8080/restful/;;
+
+private String baseUrl;
+
+@PostConstruct
+public void init(MapString,String props) {
+final String baseUrlFromConfig = props.get(BASE_URL_KEY);
+baseUrl = baseUrlFromConfig != null? baseUrlFromConfig:
BASE_URL_DEFAULT;
+}
+
+@PreDestroy
+public void shutdown() {
+}
+
@Programmatic
@Override
public Object serialize(EventMetadata metadata, EventPayload payload) {
-final RendererContext rendererContext = new
[24/32] ISIS-323: RO publishing done, but no xactn stuff yet
org.apache.isis.core.runtime.persistence.objectstore.transaction.PublishingServiceWithDefaultPayloadFactories;
import
org.apache.isis.core.runtime.persistence.objectstore.transaction.SaveObjectCommand;
import
org.apache.isis.core.runtime.persistence.objectstore.transaction.PojoAdapterBuilder.Persistence;
import org.apache.isis.core.runtime.system.persistence.AdapterManagerSpi;
@@ -103,7 +103,7 @@ public class PersistenceSessionObjectStoreTest {
@Mock
private AuditingService mockAuditingService;
@Mock
-private PublishingServiceWithCanonicalizers mockPublishingService;
+private PublishingServiceWithDefaultPayloadFactories mockPublishingService;
@Mock
private CreateObjectCommand createObjectCommand;
http://git-wip-us.apache.org/repos/asf/isis/blob/7b745ecd/core/runtime/src/test/java/org/apache/isis/core/runtime/system/transaction/IsisTransactionTest.java
--
diff --git
a/core/runtime/src/test/java/org/apache/isis/core/runtime/system/transaction/IsisTransactionTest.java
b/core/runtime/src/test/java/org/apache/isis/core/runtime/system/transaction/IsisTransactionTest.java
index 699c44d..5320556 100644
---
a/core/runtime/src/test/java/org/apache/isis/core/runtime/system/transaction/IsisTransactionTest.java
+++
b/core/runtime/src/test/java/org/apache/isis/core/runtime/system/transaction/IsisTransactionTest.java
@@ -33,7 +33,7 @@ import
org.apache.isis.core.runtime.persistence.objectstore.transaction.DestroyO
import
org.apache.isis.core.runtime.persistence.objectstore.transaction.PersistenceCommand;
import
org.apache.isis.core.runtime.persistence.objectstore.transaction.PersistenceCommandContext;
import
org.apache.isis.core.runtime.persistence.objectstore.transaction.PojoAdapterBuilder;
-import
org.apache.isis.core.runtime.persistence.objectstore.transaction.PublishingServiceWithCanonicalizers;
+import
org.apache.isis.core.runtime.persistence.objectstore.transaction.PublishingServiceWithDefaultPayloadFactories;
import
org.apache.isis.core.runtime.persistence.objectstore.transaction.SaveObjectCommand;
import
org.apache.isis.core.runtime.persistence.objectstore.transaction.PojoAdapterBuilder.Persistence;
import org.apache.isis.core.runtime.system.transaction.IsisTransaction;
@@ -77,7 +77,7 @@ public class IsisTransactionTest {
@Mock
private AuditingService mockAuditingService;
@Mock
-private PublishingServiceWithCanonicalizers mockPublishingService;
+private PublishingServiceWithDefaultPayloadFactories mockPublishingService;
private PersistenceCommand command;
private PersistenceCommand command2;
http://git-wip-us.apache.org/repos/asf/isis/blob/7b745ecd/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItem.java
--
diff --git
a/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItem.java
b/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItem.java
index 0bc0671..7a4e757 100644
---
a/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItem.java
+++
b/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItem.java
@@ -82,7 +82,7 @@ import com.google.common.collect.Lists;
@javax.jdo.annotations.Version(strategy=VersionStrategy.VERSION_NUMBER,
column=VERSION)
@ObjectType(TODO)
@Audited
-@PublishedObject
+@PublishedObject(ToDoItemChangedPayloadFactory.class)
@AutoComplete(repository=ToDoItems.class, action=autoComplete)
@MemberGroups({General, Detail})
public class ToDoItem implements ComparableToDoItem /*, Locatable*/ { //
GMAP3: uncomment to use https://github.com/danhaywood/isis-wicket-gmap3
@@ -296,6 +296,7 @@ public class ToDoItem implements ComparableToDoItem /*,
Locatable*/ { // GMAP3
// }}
// {{ add (action)
+@PublishedAction
@MemberOrder(name=dependencies, sequence = 3)
public ToDoItem add(final ToDoItem toDoItem) {
getDependencies().add(toDoItem);
http://git-wip-us.apache.org/repos/asf/isis/blob/7b745ecd/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItemChangedPayloadFactory.java
--
diff --git
a/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItemChangedPayloadFactory.java
b/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItemChangedPayloadFactory.java
new file mode 100644
index 000..fd8415d
--- /dev/null
+++
b/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItemChangedPayloadFactory.java
@@ -0,0 +1,24 @@
+package dom.todo;
+
+import org.apache.isis.applib.annotation.PublishedObject.PayloadFactory;
+import org.apache.isis.applib.services.publish.EventPayload;
+import org.apache.isis.applib.services.publish.EventPayloadForChangedObject;
+
+public class
[23/32] git commit: ISIS-323: back to using javax.ws.rs.core.MediaType
ISIS-323: back to using javax.ws.rs.core.MediaType
... reversed decision to use guava's equivaelent.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/6002a903
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/6002a903
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/6002a903
Branch: refs/heads/master
Commit: 6002a903863541cb813820978233eba701317823
Parents: bb79d33
Author: Dan Haywood danhayw...@apache.org
Authored: Thu Feb 7 16:49:44 2013 +
Committer: Dan Haywood danhayw...@apache.org
Committed: Fri Feb 8 18:00:44 2013 +
--
.../viewer/restfulobjects/applib/MediaTypes.java | 10 ++--
.../restfulobjects/applib/RepresentationType.java | 18 ++--
.../restfulobjects/applib/RestfulResponse.java |2 +-
...RepresentationTypeTest_getMediaType_lookup.java |5 +-
.../restfulobjects/applib/util/ParserTest.java |9 ++--
.../restfulobjects/rendering/LinkBuilder.java |3 +-
.../rendering/RendererFactoryRegistry.java |3 +-
.../restfulobjects/server/ResourceContext.java | 33 +--
.../server/resources/ResourceAbstract.java |3 +-
...ceContextTest_ensureCompatibleAcceptHeader.java |9 ++--
...eTest_clientAcceptHeader_exceptionHandling.java |5 +-
.../home/HomePageResourceTest_accept.java | 14 +++
...ePageResourceTest_representationAndHeaders.java | 18
...DomainServiceResourceTest_serviceId_accept.java |5 +-
...rceTest_serviceId_representationAndHeaders.java |3 +-
.../DomainServiceResourceTest_services_accept.java | 14 +++
...urceTest_services_representationAndHeaders.java | 16 +++
.../resources/user/UserResourceTest_accept.java| 14 +++
.../UserResourceTest_representationAndHeaders.java | 18
.../version/VersionResourceTest_accept.java|5 +-
...rsionResourceTest_representationAndHeaders.java | 18
21 files changed, 94 insertions(+), 131 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/isis/blob/6002a903/component/viewer/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/MediaTypes.java
--
diff --git
a/component/viewer/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/MediaTypes.java
b/component/viewer/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/MediaTypes.java
index a90e187..d34fb45 100644
---
a/component/viewer/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/MediaTypes.java
+++
b/component/viewer/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/MediaTypes.java
@@ -7,11 +7,11 @@ import com.google.common.base.Function;
/**
* Convert between {@link com.google.common.net.MediaType guava MediaType} and
{@link javax.ws.rs.core.MediaType jax-rs MediaType}.
*/
-public final class MediaTypes {
+final class MediaTypes {
private MediaTypes(){}
-public static final Functionjavax.ws.rs.core.MediaType, ? extends
com.google.common.net.MediaType JAXRS_TO_GUAVA = new
Functionjavax.ws.rs.core.MediaType, com.google.common.net.MediaType() {
+private static final Functionjavax.ws.rs.core.MediaType, ? extends
com.google.common.net.MediaType JAXRS_TO_GUAVA = new
Functionjavax.ws.rs.core.MediaType, com.google.common.net.MediaType() {
@Override
public com.google.common.net.MediaType
apply(javax.ws.rs.core.MediaType input) {
@@ -19,7 +19,7 @@ public final class MediaTypes {
}
};
-public static final Functioncom.google.common.net.MediaType, MediaType
GUAVA_TO_JAXRS = new Functioncom.google.common.net.MediaType, MediaType() {
+private static final Functioncom.google.common.net.MediaType, MediaType
GUAVA_TO_JAXRS = new Functioncom.google.common.net.MediaType, MediaType() {
@Override
public MediaType apply(com.google.common.net.MediaType input) {
@@ -28,11 +28,11 @@ public final class MediaTypes {
};
-public static com.google.common.net.MediaType
jaxRsToGuava(javax.ws.rs.core.MediaType jaxRsMediaType) {
+private static com.google.common.net.MediaType
jaxRsToGuava(javax.ws.rs.core.MediaType jaxRsMediaType) {
return
com.google.common.net.MediaType.parse(jaxRsMediaType.toString());
}
-public static javax.ws.rs.core.MediaType
guavaToJaxRs(com.google.common.net.MediaType guavaMediaType) {
+private static javax.ws.rs.core.MediaType
guavaToJaxRs(com.google.common.net.MediaType guavaMediaType) {
return javax.ws.rs.core.MediaType.valueOf(guavaMediaType.toString());
}
[4/32] git commit: ISIS-323: getting unit tests to pass...
ISIS-323: getting unit tests to pass...
... and deleting some unused PersistAlgorithm implementations and ignored tests
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/8da1094b
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/8da1094b
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/8da1094b
Branch: refs/heads/master
Commit: 8da1094b3f432f51f89cf767ce08258830e1510b
Parents: 2f6223c
Author: Dan Haywood danhayw...@apache.org
Authored: Mon Feb 4 22:31:04 2013 +
Committer: Dan Haywood danhayw...@apache.org
Committed: Fri Feb 8 18:00:33 2013 +
--
.../PersistenceMechanismInstallerAbstract.java |3 -
.../algorithm/PersistAlgorithmTopDown.java | 108 --
.../algorithm/PersistAlgorithmTwoPass.java | 131
.../system/transaction/IsisTransaction.java|4 +-
.../system/transaction/IsisTransactionManager.java |9 +
.../PersistenceSessionObjectStoreTest.java | 16 +-
.../DefaultPersistAlgorithmContractTest.java | 32 ++
.../dflt/DefaultPersistAlgorithmContractTest.java | 33 --
.../dflt/DefaultPersistAlgorithmTest.java | 258 ---
.../TopDownPersistAlgorithmContractTest.java | 55 ---
.../TwoPassPersistAlgorithmContractTest.java | 55 ---
...StoreTransactionManager_EndTransactionTest.java | 15 +-
.../core/runtime/system/ObjectActionImplTest.java | 67 +
.../system/transaction/IsisTransactionTest.java| 13 +
14 files changed, 88 insertions(+), 711 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/isis/blob/8da1094b/core/runtime/src/main/java/org/apache/isis/core/runtime/installerregistry/installerapi/PersistenceMechanismInstallerAbstract.java
--
diff --git
a/core/runtime/src/main/java/org/apache/isis/core/runtime/installerregistry/installerapi/PersistenceMechanismInstallerAbstract.java
b/core/runtime/src/main/java/org/apache/isis/core/runtime/installerregistry/installerapi/PersistenceMechanismInstallerAbstract.java
index f5bfe2f..bfde110 100644
---
a/core/runtime/src/main/java/org/apache/isis/core/runtime/installerregistry/installerapi/PersistenceMechanismInstallerAbstract.java
+++
b/core/runtime/src/main/java/org/apache/isis/core/runtime/installerregistry/installerapi/PersistenceMechanismInstallerAbstract.java
@@ -97,9 +97,6 @@ public abstract class PersistenceMechanismInstallerAbstract
extends InstallerAbs
private static final String LOGGING_PROPERTY =
org.apache.isis.core.runtime.logging.Logger.PROPERTY_ROOT +
persistenceSession;
private static final Logger LOG =
Logger.getLogger(PersistenceMechanismInstallerAbstract.class);
-
-
-
private SystemDependencyInjector installerLookup;
public PersistenceMechanismInstallerAbstract(final String name) {
http://git-wip-us.apache.org/repos/asf/isis/blob/8da1094b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/objectstore/algorithm/PersistAlgorithmTopDown.java
--
diff --git
a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/objectstore/algorithm/PersistAlgorithmTopDown.java
b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/objectstore/algorithm/PersistAlgorithmTopDown.java
deleted file mode 100644
index 4759791..000
---
a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/objectstore/algorithm/PersistAlgorithmTopDown.java
+++ /dev/null
@@ -1,108 +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.runtime.persistence.objectstore.algorithm;
-
-import java.util.List;
-
-import org.apache.log4j.Logger;
-
-import org.apache.isis.core.commons.lang.ToString;
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.adapter.ResolveState;
-import
org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;
[8/32] ISIS-323: lots more refactoring of RO
http://git-wip-us.apache.org/repos/asf/isis/blob/bb79d33e/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/resources/object/DomainObjectResourceTest.java
--
diff --git
a/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/resources/object/DomainObjectResourceTest.java
b/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/resources/object/DomainObjectResourceTest.java
index 8cb5348..ae81893 100644
---
a/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/resources/object/DomainObjectResourceTest.java
+++
b/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/resources/object/DomainObjectResourceTest.java
@@ -44,20 +44,20 @@ import
org.apache.isis.core.tck.dom.refs.BidirWithSetChildEntity;
import org.apache.isis.core.tck.dom.scalars.ApplibValuedEntity;
import org.apache.isis.core.tck.dom.scalars.ApplibValuedEntityRepository;
import org.apache.isis.core.webserver.WebServer;
-import org.apache.isis.viewer.restfulobjects.applib.HttpMethod;
import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
import org.apache.isis.viewer.restfulobjects.applib.RestfulClient;
import org.apache.isis.viewer.restfulobjects.applib.RestfulRequest;
import org.apache.isis.viewer.restfulobjects.applib.RestfulResponse;
+import org.apache.isis.viewer.restfulobjects.applib.RoHttpMethod;
+import
org.apache.isis.viewer.restfulobjects.applib.domainobjects.ActionResultRepresentation;
+import
org.apache.isis.viewer.restfulobjects.applib.domainobjects.DomainObjectRepresentation;
+import
org.apache.isis.viewer.restfulobjects.applib.domainobjects.DomainObjectResource;
+import
org.apache.isis.viewer.restfulobjects.applib.domainobjects.ObjectActionRepresentation;
+import
org.apache.isis.viewer.restfulobjects.applib.domainobjects.ObjectPropertyRepresentation;
+import
org.apache.isis.viewer.restfulobjects.applib.domainobjects.ScalarValueRepresentation;
+import
org.apache.isis.viewer.restfulobjects.applib.domainobjects.ActionResultRepresentation.ResultType;
import org.apache.isis.viewer.restfulobjects.applib.links.LinkRepresentation;
import org.apache.isis.viewer.restfulobjects.applib.links.Rel;
-import
org.apache.isis.viewer.restfulobjects.domainobjects.ActionResultRepresentation;
-import
org.apache.isis.viewer.restfulobjects.domainobjects.DomainObjectRepresentation;
-import
org.apache.isis.viewer.restfulobjects.domainobjects.DomainObjectResource;
-import
org.apache.isis.viewer.restfulobjects.domainobjects.ObjectActionRepresentation;
-import
org.apache.isis.viewer.restfulobjects.domainobjects.ObjectPropertyRepresentation;
-import
org.apache.isis.viewer.restfulobjects.domainobjects.ScalarValueRepresentation;
-import
org.apache.isis.viewer.restfulobjects.domainobjects.ActionResultRepresentation.ResultType;
import org.apache.isis.viewer.restfulobjects.tck.IsisWebServerRule;
public class DomainObjectResourceTest {
@@ -97,8 +97,8 @@ public class DomainObjectResourceTest {
// then
final LinkRepresentation self = domainObjectRepr.getSelf();
-assertThat(self,
isLink().rel(Rel.SELF).href(matches(.+objects/OID:32)).httpMethod(HttpMethod.GET).type(MediaType.APPLICATION_JSON_TYPE).typeParameter(profile,
urn:org.restfulobjects/domainobject));
-assertThat(domainObjectRepr.getLinkWithRel(Rel.DESCRIBEDBY),
isLink().href(matches(.+ +
BidirWithSetChildEntity.class.getName())).httpMethod(HttpMethod.GET).type(MediaType.APPLICATION_JSON_TYPE).typeParameter(profile,
urn:org.restfulobjects/domaintype));
+assertThat(self,
isLink().rel(Rel.SELF).href(matches(.+objects/OID:32)).httpMethod(RoHttpMethod.GET).type(MediaType.APPLICATION_JSON_TYPE).typeParameter(profile,
urn:org.restfulobjects/domainobject));
+assertThat(domainObjectRepr.getLinkWithRel(Rel.DESCRIBEDBY),
isLink().href(matches(.+ +
BidirWithSetChildEntity.class.getName())).httpMethod(RoHttpMethod.GET).type(MediaType.APPLICATION_JSON_TYPE).typeParameter(profile,
urn:org.restfulobjects/domaintype));
assertThat(domainObjectRepr.getTitle(), is(parent 4 - child 2));
assertThat(domainObjectRepr.getOid(), is(OID:32));
@@ -112,7 +112,7 @@ public class DomainObjectResourceTest {
public void domainObjectRepresentationForTransient_hasNoSelf_andHasNoOid()
throws Exception {
// given, when
-final RestfulRequest request =
this.client.createRequest(HttpMethod.POST,
services/simples/actions/newTransientEntity/invoke);
+final RestfulRequest request =
this.client.createRequest(RoHttpMethod.POST,
services/simples/actions/newTransientEntity/invoke);
final RestfulResponseActionResultRepresentation response =
request.executeT();
final ActionResultRepresentation actionResultRepr =
[1/32] ISIS-323: first cut
)));
+}
+});
+
+transaction.addCommand(command);
+transaction.addCommand(command2);
+transaction.addCommand(command3);
+transaction.commit();
+}
+
+@Test
+public void commit_ignoresBothCreateAndDestroyCommandsWhenForSameObject()
throws Exception {
+
+command = createSaveCommand(persistentAdapter1, command 1);
+command2 = createSaveCommand(persistentAdapter2, command 2);
+command3 = createDestroyCommand(persistentAdapter1, command 3);
+
+context.checking(new Expectations() {
+{
+
one(mockObjectStore).execute(with(IsisMatchers.listContainingAll(command2)));
+}
+});
+
+transaction.addCommand(command);
+transaction.addCommand(command2);
+transaction.addCommand(command3);
+transaction.commit();
+}
+
+
+@Test
+public void commit_testNoCommands() throws Exception {
+context.checking(new Expectations() {
+{
+
one(mockObjectStore).execute(with(Collections.PersistenceCommandemptyList()));
+}
+});
+
+transaction.commit();
+}
+
+
+@Test(expected = IllegalStateException.class)
+public void
shouldThrowExceptionIfAttemptToAbortAnAlreadyAbortedTransaction() throws
Exception {
+transaction.abort();
+
+transaction.abort();
+}
+
+@Test(expected = IllegalStateException.class)
+public void
shouldThrowExceptionIfAttemptToCommitAnAlreadyAbortedTransaction() throws
Exception {
+transaction.abort();
+
+transaction.commit();
+}
+
+@Test(expected = IllegalStateException.class)
+public void
shouldThrowExceptionIfAttemptToAbortAnAlreadyCommitedTransaction() throws
Exception {
+context.checking(new Expectations() {
+{
+
one(mockObjectStore).execute(with(Collections.PersistenceCommandemptyList()));
+}
+});
+
+transaction.commit();
+
+transaction.abort();
+}
+
+@Test(expected = IllegalStateException.class)
+public void
shouldThrowExceptionIfAttemptToCommitAnAlreadyCommitedTransaction() throws
Exception {
+context.checking(new Expectations() {
+{
+
one(mockObjectStore).execute(with(Collections.PersistenceCommandemptyList()));
+}
+});
+transaction.commit();
+
+transaction.commit();
+}
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/2f6223c6/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItem.java
--
diff --git
a/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItem.java
b/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItem.java
index 8a750e7..0bc0671 100644
---
a/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItem.java
+++
b/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItem.java
@@ -31,6 +31,7 @@ import javax.jdo.annotations.VersionStrategy;
import javax.jdo.spi.PersistenceCapable;
import org.apache.isis.applib.DomainObjectContainer;
+import org.apache.isis.applib.annotation.Audited;
import org.apache.isis.applib.annotation.AutoComplete;
import org.apache.isis.applib.annotation.Bulk;
import org.apache.isis.applib.annotation.Disabled;
@@ -43,6 +44,8 @@ import org.apache.isis.applib.annotation.NotPersisted;
import org.apache.isis.applib.annotation.ObjectType;
import org.apache.isis.applib.annotation.Optional;
import org.apache.isis.applib.annotation.Programmatic;
+import org.apache.isis.applib.annotation.PublishedAction;
+import org.apache.isis.applib.annotation.PublishedObject;
import org.apache.isis.applib.annotation.RegEx;
import org.apache.isis.applib.annotation.Resolve;
import org.apache.isis.applib.annotation.Resolve.Type;
@@ -52,7 +55,6 @@ import org.apache.isis.applib.filter.Filter;
import org.apache.isis.applib.filter.Filters;
import org.apache.isis.applib.util.TitleBuffer;
import org.apache.isis.applib.value.Blob;
-import org.apache.isis.core.objectstore.jdo.applib.annotations.Auditable;
import org.joda.time.LocalDate;
import com.google.common.base.Objects;
@@ -79,7 +81,8 @@ import com.google.common.collect.Lists;
})
@javax.jdo.annotations.Version(strategy=VersionStrategy.VERSION_NUMBER,
column=VERSION)
@ObjectType(TODO)
-@Auditable
+@Audited
+@PublishedObject
@AutoComplete(repository=ToDoItems.class, action=autoComplete)
@MemberGroups({General, Detail})
public class ToDoItem implements ComparableToDoItem /*, Locatable*/ { //
GMAP3: uncomment to use https://github.com/danhaywood/isis-wicket-gmap3
@@ -243,6 +246,7 @@ public class ToDoItem implements ComparableToDoItem /*,
Locatable*/ { // GMAP3
// }}
// {{ completed (action)
+@PublishedAction
svn commit: r1445123 - /isis/site/trunk/content/getting-started/quickstart-archetype.md
Author: danhaywood Date: Tue Feb 12 12:13:57 2013 New Revision: 1445123 URL: http://svn.apache.org/r1445123 Log: CMS commit to isis by danhaywood Modified: isis/site/trunk/content/getting-started/quickstart-archetype.md Modified: isis/site/trunk/content/getting-started/quickstart-archetype.md URL: http://svn.apache.org/viewvc/isis/site/trunk/content/getting-started/quickstart-archetype.md?rev=1445123r1=1445122r2=1445123view=diff == --- isis/site/trunk/content/getting-started/quickstart-archetype.md (original) +++ isis/site/trunk/content/getting-started/quickstart-archetype.md Tue Feb 12 12:13:57 2013 @@ -1,91 +1,91 @@ -Title: Quickstart Archetype - -The quickest way to get started with Apache Isis is to run the quickstart archetype. This will generate a simple one-class domain model, for tracking to-do items. The intention is not to showcase all of Isis' capabilities; rather it is to allow you to very easily modify the generated app to your own domain. - -### Generating the App - -Create a new directory, and `cd` into that directory. - -Then run the following command: - -pre -mvn archetype:generate \ --D archetypeGroupId=org.apache.isis.archetype \ --D archetypeArtifactId=quickstart_wicket_restful_jdo-archetype \ --D archetypeVersion=1.0.2 \ --D groupId=com.mycompany \ --D artifactId=myapp -/pre -where: - -- `groupId` represents your own organization, and -- `artifactId` is a unique identifier for this app within your organization. - -You'll then be prompted for some further properties; you can generally leave these as the default: - -- enter a version, eg `1.0-SNAPSHOT` -- enter a package -- confirm the entry - -The archetype generation process will then run; it only takes a few seconds. - -### Building the App - -Switch into the root directory of your newly generated app, and build your app: - -pre -cd myapp -mvn clean install -/pre - -where `myapp` is the `artifactId` entered above. - -### Running the App - -The `quickstart_wicket_restful_jdo` archetype generates a single WAR file, configured to run both the [Wicket viewer](../components/viewers/wicket/about.html) and the [Restful Objects viewer](../components/viewers/wicket/about.html). The archetype also configures the [JDO Objectstore](../components/objectstores/jdo/about.html) to use an in-memory HSQLDB connection. - -Once you've built the app, you can run the WAR in a variety of ways. - -The recommended approach when getting started is to run the self-hosting version of the WAR, allowing Isis to run as a standalone app; for example: - -pre -java -jar viewer-wicket/target/myapp-viewer-wicket-1.0-SNAPSHOT-jetty-console.war -/pre - -This can also be accomplished using an embedded Ant target provided in the build script: - -pre -mvn antrun:run -/pre -The first is to simply deploying the generated WAR (`webapp/target/myapp-webapp-1.0-SNAPSHOT.war`) to a servlet container. - -Alternatively, you could run the WAR in a Maven-hosted Jetty instance, using: - -pre -mvn jetty:run -/pre - -If you do this, note that the context path changes; check the console output. - -Finally, you can also run the app by deploying to a standalone servlet container such as [Tomcat](http://tomcat.apache.org). - -### Using the App - -The archetype provides a welcome page that explains the classes and files generated, and provides detailed guidance and what to do next. - -The app itself is configured to run using shiro security, as configured in the `WEB-INF/shiro.ini` config file. To log in, use `sven/pass`. - -### App Structure - -As noted above, the generated app is a very simple application consisting of a single domain object for tracking to-do items. The intention is not to showcase all of Isis' capabilities; rather it is to allow you to very easily modify the generated application (eg rename `ToDoItem` to `Customer`) without having to waste time deleting lots of generated code. - -table -trthModule/ththDescription/th/tr -trtdmyapp/tdtdThe parent (aggregator) module/td/tr -trtdmyapp-dom/tdtdThe domain object model, consisting of ttToDoItem/tt and ttToDoItems/tt (repository) interface./td/tr -trtdmyapp-fixture/tdtdDomain object fixtures used for initializing the system when being demo'ed or for unit testing./td/tr -trtdmyapp-objstore-jdo/tdtdImplementation of ttToDoItems/tt repository, using JDO objectstore./td/tr -trtdmyapp-viewer-webapp/tdtdRun as a webapp (from ttweb.xml/tt) using either the Wicket viewer or the RestfulObjects viewer/td/tr -/table - -If you run into issues, please don't hesitate to ask for help on the [users mailing list](../support.html). +Title: Quickstart Archetype + +The quickest way to get started with Apache Isis is to run the quickstart archetype. This will generate a simple one-class domain model, for tracking to-do items. The intention is not to showcase all of Isis' capabilities; rather it is to allow
svn commit: r850332 - in /websites/production/isis: cgi-bin/ content/
Author: danhaywood Date: Tue Feb 12 12:14:30 2013 New Revision: 850332 Log: Publishing svnmucc operation to isis site by danhaywood Added: websites/production/isis/cgi-bin/ - copied from r850331, websites/staging/isis/trunk/cgi-bin/ websites/production/isis/content/ - copied from r850331, websites/staging/isis/trunk/content/
svn commit: r1445481 - /isis/site/trunk/content/support.md
Author: danhaywood Date: Wed Feb 13 06:46:00 2013 New Revision: 1445481 URL: http://svn.apache.org/r1445481 Log: isis site - adding sonar to support page Modified: isis/site/trunk/content/support.md Modified: isis/site/trunk/content/support.md URL: http://svn.apache.org/viewvc/isis/site/trunk/content/support.md?rev=1445481r1=1445480r2=1445481view=diff == --- isis/site/trunk/content/support.md (original) +++ isis/site/trunk/content/support.md Wed Feb 13 06:46:00 2013 @@ -35,12 +35,13 @@ The Markmail archives span both our curr - [Source code repo](download.html) - [JIRA](https://issues.apache.org/jira/browse/ISIS) +- [DOAP RDF file](doap_isis.rdf) (as per [Apache requirements](http://projects.apache.org/doap.html)) - [wiki](https://cwiki.apache.org/confluence/display/ISIS/Index) - [CI Builds](https://builds.apache.org/job/isis-framework-ubuntu) -- [Fisheye](https://fisheye6.atlassian.com/changelog/isis) -- [DOAP RDF file](doap_isis.rdf) (as per [Apache requirements](http://projects.apache.org/doap.html)) +- [Sonar (@Apache)](https://analysis.apache.org/dashboard/index/org.apache.isis.core:isis) +- [Sonar (3rd party)](http://nemo.sonarsource.org/dashboard/index/org.apache.isis:isis-all) +- [Fisheye](https://fisheye6.atlassian.com/changelog/isis) (broken sync?) !-- -- [Apache ML archives](http://mail-archives.apache.org/mod_mbox/incubator-isis-users/) - [Gmane](http://blog.gmane.org/gmane.comp.apache.incubator.isis.users) - [Isis extras](http://code.google.com/a/apache-extras.org/p/isis-extras/) --
svn commit: r850456 - in /websites/production/isis: cgi-bin/ content/
Author: danhaywood Date: Wed Feb 13 08:04:16 2013 New Revision: 850456 Log: Publishing svnmucc operation to isis site by danhaywood Added: websites/production/isis/cgi-bin/ - copied from r850455, websites/staging/isis/trunk/cgi-bin/ websites/production/isis/content/ - copied from r850455, websites/staging/isis/trunk/content/
[2/2] git commit: ISIS-331: adding project.build.sourceEncoding
Updated Branches: refs/heads/master 92a662421 - cd0eba11d ISIS-331: adding project.build.sourceEncoding Project: http://git-wip-us.apache.org/repos/asf/isis/repo Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/cd0eba11 Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/cd0eba11 Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/cd0eba11 Branch: refs/heads/master Commit: cd0eba11d3239433ad0f3e3b1dcf9c0f944a3e18 Parents: c4d2893 Author: Dan Haywood danhayw...@apache.org Authored: Wed Feb 13 10:24:46 2013 + Committer: Dan Haywood danhayw...@apache.org Committed: Wed Feb 13 10:24:46 2013 + -- core/pom.xml |2 ++ example/application/claims/pom.xml |3 +++ .../application/quickstart_dnd_junit_bdd/pom.xml |3 +++ example/application/quickstart_html_sql/pom.xml|3 +++ .../application/quickstart_scimpi_nosql/pom.xml|3 +++ .../quickstart_wicket_restful_jdo/pom.xml |3 +++ example/misc/metamodel/namefile/pom.xml|3 +++ 7 files changed, 20 insertions(+), 0 deletions(-) -- http://git-wip-us.apache.org/repos/asf/isis/blob/cd0eba11/core/pom.xml -- diff --git a/core/pom.xml b/core/pom.xml index 82b01aa..6c78612 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -38,6 +38,8 @@ inceptionYear2010/inceptionYear properties +project.build.sourceEncodingUTF-8/project.build.sourceEncoding + project.reporting.outputEncodingUTF-8/project.reporting.outputEncoding !-- override in each module (used by locate global resources) -- http://git-wip-us.apache.org/repos/asf/isis/blob/cd0eba11/example/application/claims/pom.xml -- diff --git a/example/application/claims/pom.xml b/example/application/claims/pom.xml index db3eaf7..745640f 100644 --- a/example/application/claims/pom.xml +++ b/example/application/claims/pom.xml @@ -23,6 +23,9 @@ packagingpom/packaging properties +project.build.sourceEncodingUTF-8/project.build.sourceEncoding + project.reporting.outputEncodingUTF-8/project.reporting.outputEncoding + isis.version1.1.1-SNAPSHOT/isis.version isis-objectstore-xml.version1.0.0-SNAPSHOT/isis-objectstore-xml.version isis-profilestore-xml.version1.0.0-SNAPSHOT/isis-profilestore-xml.version http://git-wip-us.apache.org/repos/asf/isis/blob/cd0eba11/example/application/quickstart_dnd_junit_bdd/pom.xml -- diff --git a/example/application/quickstart_dnd_junit_bdd/pom.xml b/example/application/quickstart_dnd_junit_bdd/pom.xml index 02f53b2..0f0004e 100644 --- a/example/application/quickstart_dnd_junit_bdd/pom.xml +++ b/example/application/quickstart_dnd_junit_bdd/pom.xml @@ -31,6 +31,9 @@ properties +project.build.sourceEncodingUTF-8/project.build.sourceEncoding + project.reporting.outputEncodingUTF-8/project.reporting.outputEncoding + isis.version1.1.1-SNAPSHOT/isis.version isis-objectstore-xml.version1.0.0-SNAPSHOT/isis-objectstore-xml.version isis-profilestore-xml.version1.0.0-SNAPSHOT/isis-profilestore-xml.version http://git-wip-us.apache.org/repos/asf/isis/blob/cd0eba11/example/application/quickstart_html_sql/pom.xml -- diff --git a/example/application/quickstart_html_sql/pom.xml b/example/application/quickstart_html_sql/pom.xml index d857eab..b2f3e61 100644 --- a/example/application/quickstart_html_sql/pom.xml +++ b/example/application/quickstart_html_sql/pom.xml @@ -30,6 +30,9 @@ packagingpom/packaging properties +project.build.sourceEncodingUTF-8/project.build.sourceEncoding + project.reporting.outputEncodingUTF-8/project.reporting.outputEncoding + isis.version1.1.1-SNAPSHOT/isis.version isis-objectstore-sql.version1.0.0-SNAPSHOT/isis-objectstore-sql.version isis-objectstore-xml.version1.0.0-SNAPSHOT/isis-objectstore-xml.version http://git-wip-us.apache.org/repos/asf/isis/blob/cd0eba11/example/application/quickstart_scimpi_nosql/pom.xml -- diff --git a/example/application/quickstart_scimpi_nosql/pom.xml b/example/application/quickstart_scimpi_nosql/pom.xml index 781a012..9f14098 100644 --- a/example/application/quickstart_scimpi_nosql/pom.xml +++ b/example/application/quickstart_scimpi_nosql/pom.xml @@ -30,6 +30,9 @@ packagingpom/packaging properties +project.build.sourceEncodingUTF-8/project.build.sourceEncoding +
[1/2] git commit: ISIS-330: call choices less often when rendering
ISIS-330: call choices less often when rendering
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/c4d2893e
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/c4d2893e
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/c4d2893e
Branch: refs/heads/master
Commit: c4d2893eecd5c9c82dc21223a30df4b8fd9a412c
Parents: 92a6624
Author: Dan Haywood danhayw...@apache.org
Authored: Wed Feb 13 08:13:38 2013 +
Committer: Dan Haywood danhayw...@apache.org
Committed: Wed Feb 13 08:13:38 2013 +
--
.../jdo/datanucleus/DataNucleusObjectStore.java|4 +-
.../viewer/wicket/model/models/ScalarModel.java| 24 +-
.../scalars/ComponentFactoryScalarAbstract.java|7 +++-
.../scalars/value/ValuePanelFactory.java |5 ++-
.../widgets/entitylink/EntityLinkSelect2Panel.java |9 --
.../ValueChoicesSelect2PanelComponentFactory.java |2 +-
.../spec/feature/ObjectActionParameter.java| 11 +++
.../metamodel/spec/feature/ObjectAssociation.java | 11 ---
.../specimpl/ObjectActionParameterAbstract.java|7
.../specimpl/OneToOneAssociationImpl.java |3 +-
10 files changed, 65 insertions(+), 18 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/isis/blob/c4d2893e/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/DataNucleusObjectStore.java
--
diff --git
a/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/DataNucleusObjectStore.java
b/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/DataNucleusObjectStore.java
index c1974cd..17ef5fe 100644
---
a/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/DataNucleusObjectStore.java
+++
b/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/DataNucleusObjectStore.java
@@ -250,7 +250,7 @@ public class DataNucleusObjectStore implements
ObjectStoreSpi {
}
public void abortTransaction() {
-rollbackJpaTransaction();
+rollbackJdoTransaction();
}
private void beginJdoTransaction() {
@@ -268,7 +268,7 @@ public class DataNucleusObjectStore implements
ObjectStoreSpi {
}
}
-private void rollbackJpaTransaction() {
+private void rollbackJdoTransaction() {
final javax.jdo.Transaction transaction =
getPersistenceManager().currentTransaction();
if (transaction.isActive()) {
transaction.rollback();
http://git-wip-us.apache.org/repos/asf/isis/blob/c4d2893e/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModel.java
--
diff --git
a/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModel.java
b/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModel.java
index f950771..d6bfa22 100644
---
a/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModel.java
+++
b/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModel.java
@@ -150,11 +150,18 @@ public class ScalarModel extends EntityModel {
public ListObjectAdapter getChoices(final ScalarModel
scalarModel) {
final PropertyMemento propertyMemento =
scalarModel.getPropertyMemento();
final OneToOneAssociation property =
propertyMemento.getProperty();
-final ObjectAdapter[] choices =
property.getChoices(scalarModel.parentObjectAdapterMemento.getObjectAdapter(ConcurrencyChecking.CHECK));
+final ObjectAdapter[] choices =
property.getChoices(scalarModel.parentObjectAdapterMemento.getObjectAdapter(ConcurrencyChecking.NO_CHECK));
return choicesAsList(choices);
}
@Override
+public boolean hasChoices(final ScalarModel scalarModel) {
+final PropertyMemento propertyMemento =
scalarModel.getPropertyMemento();
+final OneToOneAssociation property =
propertyMemento.getProperty();
+return property.hasChoices();
+}
+
+@Override
public void resetVersion(ScalarModel scalarModel) {
scalarModel.parentObjectAdapterMemento.resetVersion();
}
@@ -240,11 +247,18 @@ public class ScalarModel extends EntityModel {
public ListObjectAdapter getChoices(final ScalarModel
scalarModel) {
final
git commit: ISIS-332: adding scm url to root pom
Updated Branches: refs/heads/master cd0eba11d - 8c63f8238 ISIS-332: adding scm url to root pom Project: http://git-wip-us.apache.org/repos/asf/isis/repo Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/8c63f823 Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/8c63f823 Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/8c63f823 Branch: refs/heads/master Commit: 8c63f823803151143eeba5d06253d4afda16a709 Parents: cd0eba1 Author: Dan Haywood danhayw...@apache.org Authored: Wed Feb 13 10:29:35 2013 + Committer: Dan Haywood danhayw...@apache.org Committed: Wed Feb 13 10:29:35 2013 + -- pom.xml |7 +++ 1 files changed, 7 insertions(+), 0 deletions(-) -- http://git-wip-us.apache.org/repos/asf/isis/blob/8c63f823/pom.xml -- diff --git a/pom.xml b/pom.xml index ccd9ca3..c6aa17c 100644 --- a/pom.xml +++ b/pom.xml @@ -31,6 +31,13 @@ The parent POM of all modules is core/pom.xml /description +scm +connectionscm:git:http://git.apache.org/isis.git/connection + developerConnectionscm:git:https://git-wip-us.apache.org/repos/asf/isis.git/developerConnection +urlgit://git.apache.org/isis.git/url + tagHEAD/tag + /scm + modules modulecore/module
svn commit: r1446099 - /isis/site/trunk/content/support.md
Author: danhaywood Date: Thu Feb 14 10:20:23 2013 New Revision: 1446099 URL: http://svn.apache.org/r1446099 Log: isis site - updating sonar ref Modified: isis/site/trunk/content/support.md Modified: isis/site/trunk/content/support.md URL: http://svn.apache.org/viewvc/isis/site/trunk/content/support.md?rev=1446099r1=1446098r2=1446099view=diff == --- isis/site/trunk/content/support.md (original) +++ isis/site/trunk/content/support.md Thu Feb 14 10:20:23 2013 @@ -38,10 +38,10 @@ The Markmail archives span both our curr - [DOAP RDF file](doap_isis.rdf) (as per [Apache requirements](http://projects.apache.org/doap.html)) - [wiki](https://cwiki.apache.org/confluence/display/ISIS/Index) - [CI Builds](https://builds.apache.org/job/isis-framework-ubuntu) -- [Sonar (@Apache)](https://analysis.apache.org/dashboard/index/org.apache.isis.core:isis) - [Fisheye](https://fisheye6.atlassian.com/changelog/isis) (broken sync?) -!-- - [Sonar (3rd party)](http://nemo.sonarsource.org/dashboard/index/org.apache.isis:isis-all) +!-- +- [Sonar (@Apache)](https://analysis.apache.org/dashboard/index/org.apache.isis.core:isis) - [Gmane](http://blog.gmane.org/gmane.comp.apache.incubator.isis.users) - [Isis extras](http://code.google.com/a/apache-extras.org/p/isis-extras/) --
svn commit: r1446101 - /isis/site/trunk/content/learning-more/articles-and-presentations.md
Author: danhaywood Date: Thu Feb 14 10:21:09 2013 New Revision: 1446101 URL: http://svn.apache.org/r1446101 Log: isis site - updating articles page Modified: isis/site/trunk/content/learning-more/articles-and-presentations.md Modified: isis/site/trunk/content/learning-more/articles-and-presentations.md URL: http://svn.apache.org/viewvc/isis/site/trunk/content/learning-more/articles-and-presentations.md?rev=1446101r1=1446100r2=1446101view=diff == --- isis/site/trunk/content/learning-more/articles-and-presentations.md (original) +++ isis/site/trunk/content/learning-more/articles-and-presentations.md Thu Feb 14 10:21:09 2013 @@ -4,7 +4,7 @@ Some articles and presentations relating 2013 -* **Article, SDJournal : [Introducing Apache Isis](http://sdjournal.org/software-developers-journal-open-012013-2/)** +* **Article, SDJournal : [Introducing Isis](http://sdjournal.org/software-developers-journal-open-012013-2/)** * Article, SDJournal: [Restful Objects on Apache Isis](http://sdjournal.org/software-developers-journal-open-012013-2/) 2012
git commit: ISIS-336: reduce size of font in breadcrumbs in Wicket viewer.
Updated Branches:
refs/heads/master cd1897ea0 - 351682e12
ISIS-336: reduce size of font in breadcrumbs in Wicket viewer.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/351682e1
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/351682e1
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/351682e1
Branch: refs/heads/master
Commit: 351682e127a60bf9e84ad3c46a883029998244d0
Parents: cd1897e
Author: Dan Haywood danhayw...@apache.org
Authored: Thu Feb 14 13:59:44 2013 +
Committer: Dan Haywood danhayw...@apache.org
Committed: Thu Feb 14 13:59:44 2013 +
--
.../bookmarkedpages/BookmarkedPagesPanel.css | 16 +++---
1 files changed, 8 insertions(+), 8 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/isis/blob/351682e1/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanel.css
--
diff --git
a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanel.css
b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanel.css
index b067a7d..59fc1bb 100644
---
a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanel.css
+++
b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanel.css
@@ -18,12 +18,12 @@
*/
.bookmarkedPagesPanel {
- font-size: 0.9em;
+ font-size: 0.7em;
text-transform:uppercase;
font-weight:bold;
float:left;
width:100%;
- margin-bottom:10px;
+ margin-bottom:5px;
}
.bookmarkedPagesPanel .bookmarkedPagesList {
@@ -31,11 +31,11 @@
}
.bookmarkedPagesPanel .bookmarkedPagesList span.bookmarkedPageTitle {
- margin-right: 10px;
- margin-bottom:10px;
+ margin-right: 5px;
+ margin-bottom:5px;
float:left;
display:block;
- padding:8px;
+ padding:3px 6px 3px 6px;
border-radius:4px;
-moz-border-radius:4px;
-webkit-border-radius:4px;
@@ -69,8 +69,8 @@
display: block;
float: left;
font-style: normal !important;
- margin-bottom: 10px;
- margin-right: 10px;
- padding: 8px;
+ margin-bottom: 5px;
+ margin-right: 5px;
+padding:3px 8px 3px 8px;
text-indent: -999em;
}
\ No newline at end of file
git commit: ISIS-337: reduce font size of breadcrumbs in Wicket viewer
Updated Branches: refs/heads/master 351682e12 - a708270e2 ISIS-337: reduce font size of breadcrumbs in Wicket viewer * this is a dummy commit; * previous commit should have referenced ISIS-337, not ISIS-336 Project: http://git-wip-us.apache.org/repos/asf/isis/repo Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/a708270e Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/a708270e Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/a708270e Branch: refs/heads/master Commit: a708270e2c56b59f939ef794f172c05ec40bc2ad Parents: 351682e Author: Dan Haywood danhayw...@apache.org Authored: Thu Feb 14 14:01:46 2013 + Committer: Dan Haywood danhayw...@apache.org Committed: Thu Feb 14 14:01:46 2013 + -- .../bookmarkedpages/BookmarkedPagesPanel.css |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) -- http://git-wip-us.apache.org/repos/asf/isis/blob/a708270e/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanel.css -- diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanel.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanel.css index 59fc1bb..31d4550 100644 --- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanel.css +++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanel.css @@ -73,4 +73,4 @@ margin-right: 5px; padding:3px 8px 3px 8px; text-indent: -999em; -} \ No newline at end of file +}
git commit: ISIS-338: right align numeric fields in Wicket viewer
Updated Branches:
refs/heads/master cb84b9f43 - fad081ff9
ISIS-338: right align numeric fields in Wicket viewer
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/fad081ff
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/fad081ff
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/fad081ff
Branch: refs/heads/master
Commit: fad081ff987e1ed08f82dafd308c14cc7d597dc4
Parents: cb84b9f
Author: Dan Haywood danhayw...@apache.org
Authored: Thu Feb 14 14:21:00 2013 +
Committer: Dan Haywood danhayw...@apache.org
Committed: Thu Feb 14 14:21:00 2013 +
--
.../scalars/jdkmath/JavaMathBigDecimalPanel.css|3 +++
.../scalars/jdkmath/JavaMathBigIntegerPanel.css|3 +++
.../ui/components/scalars/primitive/BytePanel.css |3 +++
.../components/scalars/primitive/DoublePanel.css |3 +++
.../ui/components/scalars/primitive/FloatPanel.css |3 +++
.../components/scalars/primitive/IntegerPanel.css |3 +++
.../ui/components/scalars/primitive/LongPanel.css |3 +++
.../ui/components/scalars/primitive/ShortPanel.css |3 +++
8 files changed, 24 insertions(+), 0 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/isis/blob/fad081ff/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/JavaMathBigDecimalPanel.css
--
diff --git
a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/JavaMathBigDecimalPanel.css
b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/JavaMathBigDecimalPanel.css
index eaeea17..3a0e811 100644
---
a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/JavaMathBigDecimalPanel.css
+++
b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/JavaMathBigDecimalPanel.css
@@ -16,3 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
+.javaMathBigDecimalPanel input {
+ text-align: right;
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/fad081ff/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/JavaMathBigIntegerPanel.css
--
diff --git
a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/JavaMathBigIntegerPanel.css
b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/JavaMathBigIntegerPanel.css
index eaeea17..c122ee1 100644
---
a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/JavaMathBigIntegerPanel.css
+++
b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/JavaMathBigIntegerPanel.css
@@ -16,3 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
+.javaMathBigIntegerPanel input {
+text-align: right;
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/fad081ff/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BytePanel.css
--
diff --git
a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BytePanel.css
b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BytePanel.css
index eaeea17..0c2f940 100644
---
a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BytePanel.css
+++
b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BytePanel.css
@@ -16,3 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
+.bytePanel input {
+text-align: right;
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/fad081ff/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/DoublePanel.css
--
diff --git
a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/DoublePanel.css
b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/DoublePanel.css
index eaeea17..11631d2 100644
---
git commit: ISIS-339: autocomplete only fire if a character has been entered.
Updated Branches:
refs/heads/master fad081ff9 - 27c766e09
ISIS-339: autocomplete only fire if a character has been entered.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/27c766e0
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/27c766e0
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/27c766e0
Branch: refs/heads/master
Commit: 27c766e09e6cc058cc437b8ab28e04ee917fcc81
Parents: fad081f
Author: Dan Haywood danhayw...@apache.org
Authored: Thu Feb 14 15:41:44 2013 +
Committer: Dan Haywood danhayw...@apache.org
Committed: Thu Feb 14 15:41:44 2013 +
--
.../widgets/entitylink/EntityLinkSelect2Panel.java |5 ++-
.../dom/src/main/java/dom/todo/ToDoItem.java | 23 ++-
2 files changed, 26 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/isis/blob/27c766e0/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitylink/EntityLinkSelect2Panel.java
--
diff --git
a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitylink/EntityLinkSelect2Panel.java
b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitylink/EntityLinkSelect2Panel.java
index 6d2aa62..b5014c2 100644
---
a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitylink/EntityLinkSelect2Panel.java
+++
b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitylink/EntityLinkSelect2Panel.java
@@ -72,6 +72,8 @@ public class EntityLinkSelect2Panel extends
FormComponentPanelAbstractObjectAda
private static final String ID_ENTITY_CLEAR_LINK = entityClearLink;
private static final String ID_FEEDBACK = feedback;
+
+private static final int MIN_INPUT_LENGTH = 1;
private Select2ChoiceObjectAdapterMemento autoCompleteField;
private LinkString entityDetailsLink;
@@ -147,7 +149,7 @@ public class EntityLinkSelect2Panel extends
FormComponentPanelAbstractObjectAda
@Override
public String getInput() {
final ObjectAdapter pendingElseCurrentAdapter =
getEntityModel().getPendingElseCurrentAdapter();
-return pendingElseCurrentAdapter != null?
pendingElseCurrentAdapter.titleString(): [null];
+return pendingElseCurrentAdapter != null?
pendingElseCurrentAdapter.titleString(): (no object);
}
@Override
@@ -206,6 +208,7 @@ public class EntityLinkSelect2Panel extends
FormComponentPanelAbstractObjectAda
};
autoCompleteField = new
Select2ChoiceObjectAdapterMemento(ID_AUTO_COMPLETE, model, provider);
+
autoCompleteField.getSettings().setMinimumInputLength(MIN_INPUT_LENGTH);
addOrReplace(autoCompleteField);
// no need for link, since can see in drop-down
http://git-wip-us.apache.org/repos/asf/isis/blob/27c766e0/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItem.java
--
diff --git
a/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItem.java
b/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItem.java
index 7a4e757..efaa2d8 100644
---
a/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItem.java
+++
b/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItem.java
@@ -18,11 +18,13 @@
*/
package dom.todo;
+import java.math.BigDecimal;
import java.util.List;
import java.util.SortedSet;
import java.util.TreeSet;
import javax.jdo.JDOHelper;
+import javax.jdo.annotations.Column;
import javax.jdo.annotations.Element;
import javax.jdo.annotations.IdentityType;
import javax.jdo.annotations.Join;
@@ -77,7 +79,7 @@ import com.google.common.collect.Lists;
value=SELECT FROM dom.todo.ToDoItem WHERE ownedBy == :ownedBy
category == :category),
@javax.jdo.annotations.Query(
name=todo_autoComplete, language=JDOQL,
-value=SELECT FROM dom.todo.ToDoItem WHERE ownedBy == :ownedBy
description.startsWith(:description))
+value=SELECT FROM dom.todo.ToDoItem WHERE ownedBy == :ownedBy
description.indexOf(:description) = 0)
})
@javax.jdo.annotations.Version(strategy=VersionStrategy.VERSION_NUMBER,
column=VERSION)
@ObjectType(TODO)
@@ -463,6 +465,25 @@ public class ToDoItem implements ComparableToDoItem /*,
Locatable*/ { // GMAP3
}
// }}
+
+// {{ Cost (property)
+
+private BigDecimal cost;
+
+@Optional
+@Column(scale=4)
+@MemberOrder(sequence = 99)
+public
[2/2] git commit: ISIS-340: adding icon to bookmarks in Wicket viewer.
Updated Branches:
refs/heads/master 27c766e09 - 9e9765fe1
ISIS-340: adding icon to bookmarks in Wicket viewer.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/9e9765fe
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/9e9765fe
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/9e9765fe
Branch: refs/heads/master
Commit: 9e9765fe1e01725aac8862f7567f51ba4eeff12f
Parents: 3a323d7
Author: Dan Haywood danhayw...@apache.org
Authored: Thu Feb 14 18:04:07 2013 +
Committer: Dan Haywood danhayw...@apache.org
Committed: Thu Feb 14 18:04:07 2013 +
--
.../viewer/imagecache/ImageCacheClassPath.java | 24 --
.../wicket/model/models/BookmarkedPagesModel.java | 10 +++
.../wicket/model/models/ImageResourceCache.java|3 +
.../bookmarkedpages/BookmarkedPagesPanel.css | 42 +++---
.../bookmarkedpages/BookmarkedPagesPanel.html |7 ++-
.../bookmarkedpages/BookmarkedPagesPanel.java | 62 +--
6 files changed, 120 insertions(+), 28 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/isis/blob/9e9765fe/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/imagecache/ImageCacheClassPath.java
--
diff --git
a/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/imagecache/ImageCacheClassPath.java
b/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/imagecache/ImageCacheClassPath.java
index beed0ce..ecb7f53 100644
---
a/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/imagecache/ImageCacheClassPath.java
+++
b/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/imagecache/ImageCacheClassPath.java
@@ -50,14 +50,19 @@ public class ImageCacheClassPath implements
ImageResourceCache {
private static final String FALLBACK_IMAGE = Default.png;
private final MapObjectSpecification, ResourceReference
resourceReferenceBySpec = Maps.newHashMap();
+private PackageResourceReference fallbackResourceReference;
@Override
public ResourceReference resourceReferenceFor(ObjectAdapter adapter) {
-return resourceReferenceFor(adapter.getSpecification());
+return resourceReferenceForSpec(adapter.getSpecification());
}
-private ResourceReference resourceReferenceFor(final ObjectSpecification
spec) {
+@Override
+public ResourceReference resourceReferenceForSpec(final
ObjectSpecification spec) {
+if(spec == null) {
+return fallbackResourceReference();
+}
ResourceReference resourceReference =
resourceReferenceBySpec.get(spec);
if(resourceReference != null) {
return resourceReference;
@@ -81,11 +86,18 @@ public class ImageCacheClassPath implements
ImageResourceCache {
// search up hierarchy
final ObjectSpecification superSpec = spec.superclass();
if(superSpec != null) {
-return resourceReferenceFor(superSpec);
+return resourceReferenceForSpec(superSpec);
}
-
-// fallback
-return newPackageResourceReference(FALLBACK_IMAGE);
+
+return fallbackResourceReference();
+}
+
+
+private ResourceReference fallbackResourceReference() {
+if(fallbackResourceReference == null) {
+fallbackResourceReference =
newPackageResourceReference(FALLBACK_IMAGE);
+}
+return fallbackResourceReference;
}
private static ResourceReference resourceReferenceFor(final String
specName) {
http://git-wip-us.apache.org/repos/asf/isis/blob/9e9765fe/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkedPagesModel.java
--
diff --git
a/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkedPagesModel.java
b/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkedPagesModel.java
index 1e1a22a..097adf0 100644
---
a/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkedPagesModel.java
+++
b/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkedPagesModel.java
@@ -28,6 +28,8 @@ import com.google.common.collect.Lists;
import org.apache.wicket.request.mapper.parameter.PageParameters;
+import org.apache.isis.core.metamodel.adapter.oid.RootOid;
+import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.viewer.wicket.model.mementos.PageParameterNames;
@@ -76,6 +78,14 @@ public class BookmarkedPagesModel extends
git commit: ISIS-341: fixing stack trace when hit ok after empty search...
Updated Branches:
refs/heads/master 9e9765fe1 - 2bbc2a885
ISIS-341: fixing stack trace when hit ok after empty search...
... decided to simply remove the OK button; it isn't needed.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/2bbc2a88
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/2bbc2a88
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/2bbc2a88
Branch: refs/heads/master
Commit: 2bbc2a88565d9fdbcc0fb75f073065c5cfab3fb0
Parents: 9e9765f
Author: Dan Haywood danhayw...@apache.org
Authored: Thu Feb 14 18:29:48 2013 +
Committer: Dan Haywood danhayw...@apache.org
Committed: Thu Feb 14 18:29:48 2013 +
--
.../ui/components/empty/EmptyCollectionPanel.css |3 ---
.../ui/components/empty/EmptyCollectionPanel.html |3 ---
.../ui/components/empty/EmptyCollectionPanel.java | 14 +-
3 files changed, 1 insertions(+), 19 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/isis/blob/2bbc2a88/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/empty/EmptyCollectionPanel.css
--
diff --git
a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/empty/EmptyCollectionPanel.css
b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/empty/EmptyCollectionPanel.css
index 03c1cbb..eaeea17 100644
---
a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/empty/EmptyCollectionPanel.css
+++
b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/empty/EmptyCollectionPanel.css
@@ -16,6 +16,3 @@
* specific language governing permissions and limitations
* under the License.
*/
-.emptyCollectionPanel .buttons {
- margin-top: 1.5em;
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/2bbc2a88/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/empty/EmptyCollectionPanel.html
--
diff --git
a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/empty/EmptyCollectionPanel.html
b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/empty/EmptyCollectionPanel.html
index 7c2ee07..f835c98 100644
---
a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/empty/EmptyCollectionPanel.html
+++
b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/empty/EmptyCollectionPanel.html
@@ -28,9 +28,6 @@
div class=emptyCollectionPanel
form
pNo objects returned/p
- div class=buttons
- button type=submit
wicket:id=ok class=ok value=OKOK/button
- /div
/form
/div
/wicket:panel
http://git-wip-us.apache.org/repos/asf/isis/blob/2bbc2a88/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/empty/EmptyCollectionPanel.java
--
diff --git
a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/empty/EmptyCollectionPanel.java
b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/empty/EmptyCollectionPanel.java
index d20d34c..0bc44f3 100644
---
a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/empty/EmptyCollectionPanel.java
+++
b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/empty/EmptyCollectionPanel.java
@@ -19,9 +19,6 @@
package org.apache.isis.viewer.wicket.ui.components.empty;
-import org.apache.wicket.markup.html.form.Button;
-import org.apache.wicket.model.Model;
-
import org.apache.isis.viewer.wicket.model.models.ActionModel;
import org.apache.isis.viewer.wicket.ui.panels.PanelAbstract;
@@ -35,16 +32,7 @@ public class EmptyCollectionPanel extends
PanelAbstractActionModel {
}
private void buildGui(final String id) {
-final ActionModel model = getModel();
-addOrReplace(new Button(ok, Model.of(OK)) { // TODO: i18n
-
-private static final long serialVersionUID = 1L;
-
-@Override
-public void onSubmit() {
-model.getNoResultsHandler().onNoResults(this);
-}
-});
+// nothing to do...
}
}
[2/3] git commit: ISIS-327: changing order of publication, changing config param
ISIS-327: changing order of publication, changing config param
* publish action, then objects (cause and effect)
* config param now has prefix isis.viewer.restfulobjects
* building on ISIS-342, this config moved to viewer_restfulobjects.properties
in the example app.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/c41ee303
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/c41ee303
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/c41ee303
Branch: refs/heads/master
Commit: c41ee30363ce155b6a5059bad94e571b2af0a0b6
Parents: d1b1d0c
Author: Dan Haywood danhayw...@apache.org
Authored: Fri Feb 15 09:00:05 2013 +
Committer: Dan Haywood danhayw...@apache.org
Committed: Fri Feb 15 09:00:05 2013 +
--
.../RestfulObjectsSpecEventSerializer.java |3 +-
.../system/transaction/IsisTransaction.java| 34 ---
.../src/main/webapp/WEB-INF/isis.properties|2 +-
.../WEB-INF/viewer_restfulobjects.properties | 23 ++
4 files changed, 44 insertions(+), 18 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/isis/blob/c41ee303/component/viewer/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/eventserializer/RestfulObjectsSpecEventSerializer.java
--
diff --git
a/component/viewer/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/eventserializer/RestfulObjectsSpecEventSerializer.java
b/component/viewer/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/eventserializer/RestfulObjectsSpecEventSerializer.java
index 2a68fea..8e87490 100644
---
a/component/viewer/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/eventserializer/RestfulObjectsSpecEventSerializer.java
+++
b/component/viewer/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/eventserializer/RestfulObjectsSpecEventSerializer.java
@@ -26,7 +26,8 @@ public class RestfulObjectsSpecEventSerializer implements
EventSerializer {
private final static JsonMapper jsonMapper = JsonMapper.instance();
private final static DomainObjectReprRenderer.Factory
objectRendererFactory = new DomainObjectReprRenderer.Factory();
-private final static String BASE_URL_KEY =
RestfulObjectsSpecEventSerializer.class.getName() + .baseUrl;
+
+private final static String BASE_URL_KEY =
isis.viewer.restfulobjects.RestfulObjectsSpecEventSerializer.baseUrl;
private static final String BASE_URL_DEFAULT =
http://localhost:8080/restful/;;
private String baseUrl;
http://git-wip-us.apache.org/repos/asf/isis/blob/c41ee303/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/IsisTransaction.java
--
diff --git
a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/IsisTransaction.java
b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/IsisTransaction.java
index a23fe8c..c1d58f8 100644
---
a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/IsisTransaction.java
+++
b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/IsisTransaction.java
@@ -32,7 +32,7 @@ import java.util.Map.Entry;
import java.util.Set;
import java.util.UUID;
-import org.apache.isis.applib.annotation.PublishedAction.PayloadFactory;
+import org.apache.isis.applib.annotation.PublishedAction;
import org.apache.isis.applib.annotation.PublishedObject;
import org.apache.isis.applib.clock.Clock;
import org.apache.isis.applib.services.audit.AuditingService;
@@ -424,24 +424,13 @@ public class IsisTransaction implements
TransactionScopedComponent {
final String currentUser =
getTransactionManager().getAuthenticationSession().getUserName();
final long currentTimestampEpoch = currentTimestampEpoch();
-publishedChangedObjects(changedAdapters, currentUser,
currentTimestampEpoch);
publishActionIfRequired(currentUser, currentTimestampEpoch);
-}
-
-protected void publishedChangedObjects(final SetObjectAdapter
changedAdapters, final String currentUser, final long currentTimestampEpoch) {
-for (final ObjectAdapter changedAdapter : changedAdapters) {
-final PublishedObjectFacet publishedObjectFacet =
changedAdapter.getSpecification().getFacet(PublishedObjectFacet.class);
-if(publishedObjectFacet == null) {
-continue;
-}
-final PublishedObject.PayloadFactory payloadFactory =
publishedObjectFacet.value();
-final EventMetadata metadata = new
[1/3] git commit: ISIS-335, ISIS-342: length to abbreviate title to now configurable
ISIS-335, ISIS-342: length to abbreviate title to now configurable
* using isis.viewer.wicket.maxTitleLengthInTables config property
* this can go in isis.properties, or (as of ISIS-342 fix) can live in
viewer_wicket.properties,
(assuming have added appropriate isis.viewers context param in web.xml)
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/d1b1d0c9
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/d1b1d0c9
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/d1b1d0c9
Branch: refs/heads/master
Commit: d1b1d0c9fae88733c5a695d75cd2f908bc8e6920
Parents: 2bbc2a8
Author: Dan Haywood danhayw...@apache.org
Authored: Fri Feb 15 08:58:06 2013 +
Committer: Dan Haywood danhayw...@apache.org
Committed: Fri Feb 15 08:58:06 2013 +
--
.../wicket/viewer/IsisWicketApplication.java | 19 ++-
.../viewer/wicket/viewer/IsisWicketModule.java |9 +-
.../viewer/IsisWicketUnsecuredApplication.java |2 +-
.../viewer/imagecache/ImageCacheClassPath.java | 130 ---
.../imagecache/ImageResourceCacheClassPath.java| 130 +++
.../settings/WicketViewerSettingsDefault.java | 38 +
.../wicket/model/isis/ImageResourceCache.java | 33
.../wicket/model/isis/WicketViewerSettings.java| 26 +++
.../wicket/model/models/ImageResourceCache.java| 33
.../ui/components/actionlink/ActionLinkPanel.java |2 +-
.../bookmarkedpages/BookmarkedPagesPanel.java |2 +-
.../entity/header/EntityHeaderPanel.java |2 +-
.../entity/icontitle/EntityIconAndTitlePanel.java | 21 ++-
.../EntityIconAndTitlePanelTest_abbreviated.java | 34
.../isis/core/webapp/IsisWebAppBootstrapper.java | 17 +--
.../core/webapp/IsisWebAppBootstrapperUtil.java| 52 ++
.../main/webapp/WEB-INF/viewer_wicket.properties | 29
.../viewer-webapp/src/main/webapp/WEB-INF/web.xml | 11 +-
18 files changed, 392 insertions(+), 198 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/isis/blob/d1b1d0c9/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
--
diff --git
a/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
b/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
index e1cebfe..086b878 100644
---
a/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
+++
b/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
@@ -47,9 +47,11 @@ import
org.apache.wicket.settings.IRequestCycleSettings.RenderStrategy;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
import
org.apache.isis.core.commons.authentication.AuthenticationSessionProvider;
import
org.apache.isis.core.commons.authentication.AuthenticationSessionProviderAware;
+import org.apache.isis.core.commons.config.ConfigurationConstants;
import org.apache.isis.core.commons.config.IsisConfigurationBuilder;
import org.apache.isis.core.commons.config.IsisConfigurationBuilderPrimer;
import
org.apache.isis.core.commons.config.IsisConfigurationBuilderResourceStreams;
+import org.apache.isis.core.commons.config.NotFoundPolicy;
import org.apache.isis.core.commons.resource.ResourceStreamSource;
import org.apache.isis.core.commons.resource.ResourceStreamSourceComposite;
import
org.apache.isis.core.commons.resource.ResourceStreamSourceContextLoaderClassPath;
@@ -60,11 +62,13 @@ import org.apache.isis.core.runtime.runner.IsisInjectModule;
import org.apache.isis.core.runtime.system.DeploymentType;
import org.apache.isis.core.runtime.system.IsisSystem;
import org.apache.isis.core.runtime.system.context.IsisContext;
+import org.apache.isis.core.webapp.IsisWebAppBootstrapperUtil;
import org.apache.isis.core.webapp.WebAppConstants;
import org.apache.isis.core.webapp.config.ResourceStreamSourceForWebInf;
+import org.apache.isis.viewer.wicket.model.isis.ImageResourceCache;
+import org.apache.isis.viewer.wicket.model.isis.WicketViewerSettings;
import org.apache.isis.viewer.wicket.model.mementos.ObjectAdapterMemento;
import org.apache.isis.viewer.wicket.model.models.BookmarkedPagesModel;
-import org.apache.isis.viewer.wicket.model.models.ImageResourceCache;
import org.apache.isis.viewer.wicket.model.models.PageType;
import org.apache.isis.viewer.wicket.ui.ComponentFactory;
import org.apache.isis.viewer.wicket.ui.app.registry.ComponentFactoryRegistrar;
@@ -149,6 +153,12 @@ public class IsisWicketApplication extends
AuthenticatedWebApplication implement
* {@link Inject}ed when
[3/3] git commit: ISIS-314: use iconName() of object if available
Updated Branches:
refs/heads/master 2bbc2a885 - 74f30f466
ISIS-314: use iconName() of object if available
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/74f30f46
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/74f30f46
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/74f30f46
Branch: refs/heads/master
Commit: 74f30f4663595c0ab8923de526343290a89500f9
Parents: c41ee30
Author: Dan Haywood danhayw...@apache.org
Authored: Fri Feb 15 09:02:03 2013 +
Committer: Dan Haywood danhayw...@apache.org
Committed: Fri Feb 15 09:02:03 2013 +
--
.../imagecache/ImageResourceCacheClassPath.java|4
1 files changed, 4 insertions(+), 0 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/isis/blob/74f30f46/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/imagecache/ImageResourceCacheClassPath.java
--
diff --git
a/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/imagecache/ImageResourceCacheClassPath.java
b/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/imagecache/ImageResourceCacheClassPath.java
index 42d2293..e9d6940 100644
---
a/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/imagecache/ImageResourceCacheClassPath.java
+++
b/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/imagecache/ImageResourceCacheClassPath.java
@@ -55,6 +55,10 @@ public class ImageResourceCacheClassPath implements
ImageResourceCache {
@Override
public ResourceReference resourceReferenceFor(ObjectAdapter adapter) {
+String adapterIconName = adapter.getIconName();
+if (adapterIconName != null) {
+return resourceReferenceFor(adapter.getIconName());
+}
return resourceReferenceForSpec(adapter.getSpecification());
}
git commit: ISIS-335: fixing maxTitleLength setting in example app properties file
Updated Branches: refs/heads/master 74f30f466 - 33077ba43 ISIS-335: fixing maxTitleLength setting in example app properties file * accidentally left set to 3 instead of 12. Project: http://git-wip-us.apache.org/repos/asf/isis/repo Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/33077ba4 Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/33077ba4 Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/33077ba4 Branch: refs/heads/master Commit: 33077ba4346fd0b1a2b133cdec214bef9672faf1 Parents: 74f30f4 Author: Dan Haywood danhayw...@apache.org Authored: Fri Feb 15 09:30:11 2013 + Committer: Dan Haywood danhayw...@apache.org Committed: Fri Feb 15 09:30:11 2013 + -- .../main/webapp/WEB-INF/viewer_wicket.properties |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) -- http://git-wip-us.apache.org/repos/asf/isis/blob/33077ba4/example/application/quickstart_wicket_restful_jdo/viewer-webapp/src/main/webapp/WEB-INF/viewer_wicket.properties -- diff --git a/example/application/quickstart_wicket_restful_jdo/viewer-webapp/src/main/webapp/WEB-INF/viewer_wicket.properties b/example/application/quickstart_wicket_restful_jdo/viewer-webapp/src/main/webapp/WEB-INF/viewer_wicket.properties index 9deff07..ce4d72b 100644 --- a/example/application/quickstart_wicket_restful_jdo/viewer-webapp/src/main/webapp/WEB-INF/viewer_wicket.properties +++ b/example/application/quickstart_wicket_restful_jdo/viewer-webapp/src/main/webapp/WEB-INF/viewer_wicket.properties @@ -26,4 +26,4 @@ # For example, if set to 12, the title # Buy milk on 15-Feb-13 will be truncated to Buy milk ... # -isis.viewer.wicket.maxTitleLengthInTables=3 +isis.viewer.wicket.maxTitleLengthInTables=12
svn commit: r850679 - in /websites/production/isis: cgi-bin/ content/
Author: danhaywood Date: Fri Feb 15 10:33:58 2013 New Revision: 850679 Log: Publishing svnmucc operation to isis site by danhaywood Added: websites/production/isis/cgi-bin/ - copied from r850678, websites/staging/isis/trunk/cgi-bin/ websites/production/isis/content/ - copied from r850678, websites/staging/isis/trunk/content/
svn commit: r1446565 - in /isis/site/trunk/content: ./ components/objectstores/jdo/
Author: danhaywood
Date: Fri Feb 15 13:19:01 2013
New Revision: 1446565
URL: http://svn.apache.org/r1446565
Log:
isis site - using dates, blobs, lazy loading
Added:
isis/site/trunk/content/components/objectstores/jdo/dates-blobs-lazy-loading.md
isis/site/trunk/content/components/objectstores/jdo/maven-and-eclipse.md
- copied unchanged from r1445480,
isis/site/trunk/content/components/objectstores/jdo/hints-and-tips.md
Removed:
isis/site/trunk/content/components/objectstores/jdo/hints-and-tips.md
Modified:
isis/site/trunk/content/components/objectstores/jdo/about.md
isis/site/trunk/content/documentation.md
Modified: isis/site/trunk/content/components/objectstores/jdo/about.md
URL:
http://svn.apache.org/viewvc/isis/site/trunk/content/components/objectstores/jdo/about.md?rev=1446565r1=1446564r2=1446565view=diff
==
--- isis/site/trunk/content/components/objectstores/jdo/about.md (original)
+++ isis/site/trunk/content/components/objectstores/jdo/about.md Fri Feb 15
13:19:01 2013
@@ -4,7 +4,8 @@ The JDO objectstore enables the persiste
Hints and tips:
-- [Maven and Eclipse](hints-and-tips.html)
+- [Maven and Eclipse](maven-and-eclipse.html)
+- [Dates, Blobs and Lazy Loading](dates-blobs-lazy-loading.html)
### Releases
Added:
isis/site/trunk/content/components/objectstores/jdo/dates-blobs-lazy-loading.md
URL:
http://svn.apache.org/viewvc/isis/site/trunk/content/components/objectstores/jdo/dates-blobs-lazy-loading.md?rev=1446565view=auto
==
---
isis/site/trunk/content/components/objectstores/jdo/dates-blobs-lazy-loading.md
(added)
+++
isis/site/trunk/content/components/objectstores/jdo/dates-blobs-lazy-loading.md
Fri Feb 15 13:19:01 2013
@@ -0,0 +1,107 @@
+Title: Dates, Blobs and Lazy Loading
+
+### Joda Dates
+
+Isis' JDO objectstore bundles DataNucleus' [built-in
support](http://www.datanucleus.org/plugins/store.types.jodatime.html) for Joda
`LocalDate` and `LocalDateTime` datatypes, meaning that entity properties of
these types will be persisted as appropriate data types in the database tables.
+
+It is, however, necessary to annotate your properties with
`@javax.jdo.annotations.Persistent`, otherwise the data won't actually be
persisted. (See the [JDO docs](http://db.apache.org/jdo/field_types.html) for
more details on this).
+
+Moreover, these datatypes are *not* in the default fetch group, meaning that
JDO/DataNucleus will perform an additional `SELECT` query for each attribute.
To avoid this extra query, the annotation should indicate that the property is
in the default fetch group.
+
+For example, the `ToDoItem` (in the [wicket/restful/jdo
archetype](../../../getting-started/quickstart-archetype.html)) defines the
`dueBy` property as follows:
+
+pre
+public class ToDoItem ... {
+
+...
+
+// {{ DueBy (property)
+@javax.jdo.annotations.Persistent(defaultFetchGroup=true)
+private LocalDate dueBy;
+
+@MemberOrder(name=Detail, sequence = 3)
+@Optional
+public LocalDate getDueBy() {
+return dueBy;
+}
+
+public void setDueBy(final LocalDate dueBy) {
+this.dueBy = dueBy;
+}
+
+...
+}
+/pre
+
+{{{note
+In DataNucleus 3.2, it will no longer be necessary to specify the default
fetc group because this flag is [switched
on](http://datanucleus.svn.sourceforge.net/viewvc/datanucleus/platform/store.types.jodatime/trunk/plugin.xml?revision=16602content-type=text%2Fplain).
See [ISIS-303](https://issues.apache.org/jira/browse/ISIS-303) as to when
this is incorporated into Isis JDO Objectstore.
+}}}
+
+### Blobs and Clobs
+
+In addition to the support for JODA types, Isis also configures
JDO/DataNucleus so that the properties of type
`org.apache.isis.applib.value.Blob` and `org.apache.isis.applib.value.Clob` can
also be persisted.
+
+Again, this requires the `@javax.jdo.annotations.Persistent` annotation.
However, whereas for dates one would always expect this value to be retrieved
eagerly, for blobs and clobs it is not so clear cut.
+
+For example, in the `ToDoItem` (in the [wicket/restful/jdo
archetype](../../../getting-started/quickstart-archetype.html)) the
`attachment` property is as follows:
+
+pre
+public class ToDoItem ... {
+
+...
+// {{ Attachment (property)
+@javax.jdo.annotations.Persistent(defaultFetchGroup=false)
+private Blob attachment;
+
+@Optional
+@MemberOrder(name=Detail, sequence = 7)
+@Hidden(where=Where.STANDALONE_TABLES)
+public Blob getAttachment() {
+return attachment;
+}
+
+public void setAttachment(final Blob attachment) {
+this.attachment = attachment;
+}
+// }}
+
+...
+}
+/pre
+
+Here we can see that the property is hidden in standalone tables, and so
there's no need to retrieve it eagerly. The converse of this the object is
rendered
svn commit: r1446567 - /isis/site/trunk/content/components/objectstores/jdo/dates-blobs-lazy-loading.md
Author: danhaywood
Date: Fri Feb 15 13:19:51 2013
New Revision: 1446567
URL: http://svn.apache.org/r1446567
Log:
isis site - using dates, blobs, lazy loading
Modified:
isis/site/trunk/content/components/objectstores/jdo/dates-blobs-lazy-loading.md
Modified:
isis/site/trunk/content/components/objectstores/jdo/dates-blobs-lazy-loading.md
URL:
http://svn.apache.org/viewvc/isis/site/trunk/content/components/objectstores/jdo/dates-blobs-lazy-loading.md?rev=1446567r1=1446566r2=1446567view=diff
==
---
isis/site/trunk/content/components/objectstores/jdo/dates-blobs-lazy-loading.md
(original)
+++
isis/site/trunk/content/components/objectstores/jdo/dates-blobs-lazy-loading.md
Fri Feb 15 13:19:51 2013
@@ -33,9 +33,9 @@ public class ToDoItem ... {
}
/pre
-{{{note
+{note
In DataNucleus 3.2, it will no longer be necessary to specify the default
fetc group because this flag is [switched
on](http://datanucleus.svn.sourceforge.net/viewvc/datanucleus/platform/store.types.jodatime/trunk/plugin.xml?revision=16602content-type=text%2Fplain).
See [ISIS-303](https://issues.apache.org/jira/browse/ISIS-303) as to when
this is incorporated into Isis JDO Objectstore.
-}}}
+}
### Blobs and Clobs
@@ -104,4 +104,4 @@ public class ToDoItem ... {
}
/pre
-Even though `@Render(Type.EAGERLY)`, the `@javax.jdo.annotations.Persistent`
annotation leaves the `defaultFetchGroup` as its default, which for collections
is false.
\ No newline at end of file
+Even though `@Render(Type.EAGERLY)`, the `@javax.jdo.annotations.Persistent`
annotation leaves the `defaultFetchGroup` as its default, which for collections
is false.
svn commit: r1446569 - /isis/site/trunk/content/components/objectstores/jdo/dates-blobs-lazy-loading.md
Author: danhaywood
Date: Fri Feb 15 13:20:11 2013
New Revision: 1446569
URL: http://svn.apache.org/r1446569
Log:
isis site - using dates, blobs, lazy loading
Modified:
isis/site/trunk/content/components/objectstores/jdo/dates-blobs-lazy-loading.md
Modified:
isis/site/trunk/content/components/objectstores/jdo/dates-blobs-lazy-loading.md
URL:
http://svn.apache.org/viewvc/isis/site/trunk/content/components/objectstores/jdo/dates-blobs-lazy-loading.md?rev=1446569r1=1446568r2=1446569view=diff
==
---
isis/site/trunk/content/components/objectstores/jdo/dates-blobs-lazy-loading.md
(original)
+++
isis/site/trunk/content/components/objectstores/jdo/dates-blobs-lazy-loading.md
Fri Feb 15 13:20:11 2013
@@ -34,7 +34,7 @@ public class ToDoItem ... {
/pre
{note
-In DataNucleus 3.2, it will no longer be necessary to specify the default
fetc group because this flag is [switched
on](http://datanucleus.svn.sourceforge.net/viewvc/datanucleus/platform/store.types.jodatime/trunk/plugin.xml?revision=16602content-type=text%2Fplain).
See [ISIS-303](https://issues.apache.org/jira/browse/ISIS-303) as to when
this is incorporated into Isis JDO Objectstore.
+In DataNucleus 3.2, it will no longer be necessary to specify the default
fetch group because this flag is [switched
on](http://datanucleus.svn.sourceforge.net/viewvc/datanucleus/platform/store.types.jodatime/trunk/plugin.xml?revision=16602content-type=text%2Fplain).
See [ISIS-303](https://issues.apache.org/jira/browse/ISIS-303) as to when
this is incorporated into Isis JDO Objectstore.
}
### Blobs and Clobs
svn commit: r1446570 - /isis/site/trunk/content/components/objectstores/jdo/dates-blobs-lazy-loading.md
Author: danhaywood Date: Fri Feb 15 13:20:51 2013 New Revision: 1446570 URL: http://svn.apache.org/r1446570 Log: isis site - using dates, blobs, lazy loading Modified: isis/site/trunk/content/components/objectstores/jdo/dates-blobs-lazy-loading.md Modified: isis/site/trunk/content/components/objectstores/jdo/dates-blobs-lazy-loading.md URL: http://svn.apache.org/viewvc/isis/site/trunk/content/components/objectstores/jdo/dates-blobs-lazy-loading.md?rev=1446570r1=1446569r2=1446570view=diff == --- isis/site/trunk/content/components/objectstores/jdo/dates-blobs-lazy-loading.md (original) +++ isis/site/trunk/content/components/objectstores/jdo/dates-blobs-lazy-loading.md Fri Feb 15 13:20:51 2013 @@ -39,7 +39,7 @@ In DataNucleus 3.2, it will no longer be ### Blobs and Clobs -In addition to the support for JODA types, Isis also configures JDO/DataNucleus so that the properties of type `org.apache.isis.applib.value.Blob` and `org.apache.isis.applib.value.Clob` can also be persisted. +In addition to the support for Joda types, Isis also configures JDO/DataNucleus so that the properties of type `org.apache.isis.applib.value.Blob` and `org.apache.isis.applib.value.Clob` can also be persisted. Again, this requires the `@javax.jdo.annotations.Persistent` annotation. However, whereas for dates one would always expect this value to be retrieved eagerly, for blobs and clobs it is not so clear cut.
svn commit: r1446573 - /isis/site/trunk/content/components/objectstores/jdo/dates-blobs-lazy-loading.md
Author: danhaywood
Date: Fri Feb 15 13:24:47 2013
New Revision: 1446573
URL: http://svn.apache.org/r1446573
Log:
isis site - using dates, blobs, lazy loading
Modified:
isis/site/trunk/content/components/objectstores/jdo/dates-blobs-lazy-loading.md
Modified:
isis/site/trunk/content/components/objectstores/jdo/dates-blobs-lazy-loading.md
URL:
http://svn.apache.org/viewvc/isis/site/trunk/content/components/objectstores/jdo/dates-blobs-lazy-loading.md?rev=1446573r1=1446572r2=1446573view=diff
==
---
isis/site/trunk/content/components/objectstores/jdo/dates-blobs-lazy-loading.md
(original)
+++
isis/site/trunk/content/components/objectstores/jdo/dates-blobs-lazy-loading.md
Fri Feb 15 13:24:47 2013
@@ -11,20 +11,16 @@ Moreover, these datatypes are *not* in t
For example, the `ToDoItem` (in the [wicket/restful/jdo
archetype](../../../getting-started/quickstart-archetype.html)) defines the
`dueBy` property as follows:
pre
- public class ToDoItem ... {
-...
-@javax.jdo.annotations.Persistent(defaultFetchGroup=true)
-private LocalDate dueBy;
-
-@MemberOrder(name=Detail, sequence = 3)
-@Optional
-public LocalDate getDueBy() {
- return dueBy;
-}
-public void setDueBy(final LocalDate dueBy) {
- this.dueBy = dueBy;
-}
-...
+ @javax.jdo.annotations.Persistent(defaultFetchGroup=true)
+ private LocalDate dueBy;
+
+ @MemberOrder(name=Detail, sequence = 3)
+ @Optional
+ public LocalDate getDueBy() {
+return dueBy;
+ }
+ public void setDueBy(final LocalDate dueBy) {
+this.dueBy = dueBy;
}
/pre
@@ -41,22 +37,17 @@ Again, this requires the `@javax.jdo.ann
For example, in the `ToDoItem` (in the [wicket/restful/jdo
archetype](../../../getting-started/quickstart-archetype.html)) the
`attachment` property is as follows:
pre
- public class ToDoItem ... {
+ @javax.jdo.annotations.Persistent(defaultFetchGroup=false)
+ private Blob attachment;
-...
-@javax.jdo.annotations.Persistent(defaultFetchGroup=false)
-private Blob attachment;
-
-@Optional
-@MemberOrder(name=Detail, sequence = 7)
-@Hidden(where=Where.STANDALONE_TABLES)
-public Blob getAttachment() {
- return attachment;
-}
-public void setAttachment(final Blob attachment) {
- this.attachment = attachment;
-}
-...
+ @Optional
+ @MemberOrder(name=Detail, sequence = 7)
+ @Hidden(where=Where.STANDALONE_TABLES)
+ public Blob getAttachment() {
+return attachment;
+ }
+ public void setAttachment(final Blob attachment) {
+this.attachment = attachment;
}
/pre
@@ -71,24 +62,19 @@ However, even in the case of collections
For example, in the `ToDoItem` (in the [wicket/restful/jdo
archetype](../../../getting-started/quickstart-archetype.html)) the
`dependencies` collection is as follows:
pre
- public class ToDoItem ... {
-
-...
-@javax.jdo.annotations.Persistent(table=TODO_DEPENDENCIES)
-@javax.jdo.annotations.Join(column=DEPENDING_TODO_ID)
-@javax.jdo.annotations.Element(column=DEPENDENT_TODO_ID)
-private SortedSetToDoItem dependencies = new TreeSetToDoItem();
-
-@Disabled
-@MemberOrder(sequence = 1)
-@Render(Type.EAGERLY)
-public SortedSetToDoItem getDependencies() {
- return dependencies;
-}
-public void setDependencies(final SortedSetToDoItem dependencies) {
- this.dependencies = dependencies;
-}
-...
+ @javax.jdo.annotations.Persistent(table=TODO_DEPENDENCIES)
+ @javax.jdo.annotations.Join(column=DEPENDING_TODO_ID)
+ @javax.jdo.annotations.Element(column=DEPENDENT_TODO_ID)
+ private SortedSetToDoItem dependencies = new TreeSetToDoItem();
+
+ @Disabled
+ @MemberOrder(sequence = 1)
+ @Render(Type.EAGERLY)
+ public SortedSetToDoItem getDependencies() {
+return dependencies;
+ }
+ public void setDependencies(final SortedSetToDoItem dependencies) {
+this.dependencies = dependencies;
}
/pre
[2/2] git commit: ISIS-340, ISIS-343: bookmark icon size; applib docs
Updated Branches:
refs/heads/master 33077ba43 - e3f3e8ecc
ISIS-340, ISIS-343: bookmark icon size; applib docs
* changed icon size in Wicket viewer bookmarks to 16px
* added applib documentation on @Render
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/e3f3e8ec
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/e3f3e8ec
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/e3f3e8ec
Branch: refs/heads/master
Commit: e3f3e8ecc2d24fdf4527da5707201302d7ad
Parents: ff4ecbb
Author: Dan Haywood danhayw...@apache.org
Authored: Fri Feb 15 13:52:59 2013 +
Committer: Dan Haywood danhayw...@apache.org
Committed: Fri Feb 15 13:52:59 2013 +
--
.../bookmarkedpages/BookmarkedPagesPanel.css |5 +++-
.../bookmarkedpages/BookmarkedPagesPanel.html |2 +-
core/applib/src/docbkx/guide/isis-applib.xml | 21 ++
3 files changed, 20 insertions(+), 8 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/isis/blob/e3f3e8ec/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanel.css
--
diff --git
a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanel.css
b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanel.css
index ab43cbe..976e879 100644
---
a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanel.css
+++
b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanel.css
@@ -54,13 +54,16 @@
.bookmarkedPagesPanel .bookmarkedPagesList a img.bookmarkedPageImage {
float:left;
background-color: transparent;
+width: 16px;
+height: 16px;
+padding:3px 0px 0px 3px;
}
.bookmarkedPagesPanel .bookmarkedPagesList span.bookmarkedPageTitle {
float:left;
display:block;
font-style:normal !important;
-padding:3px 0px 0px 2px;
+padding:3px 0px 0px 3px;
}
.bookmarkedPagesPanel .bookmarkedPagesList a span.bookmarkedPageTitle {
http://git-wip-us.apache.org/repos/asf/isis/blob/e3f3e8ec/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanel.html
--
diff --git
a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanel.html
b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanel.html
index 4929f43..d3205f9 100644
---
a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanel.html
+++
b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanel.html
@@ -29,7 +29,7 @@
li wicket:id=bookmarkedPageItem
class=bookmarkedPageItem
a href=#
wicket:id=bookmarkedPageLink
span class=bookmarkedPageImageAndTitle
-img wicket:id=bookmarkedPageImage
class=bookmarkedPageImage width=24 height=24/
+img wicket:id=bookmarkedPageImage
class=bookmarkedPageImage/
span wicket:id=bookmarkedPageTitle
class=bookmarkedPageTitle[link title]/span
/span
/a
http://git-wip-us.apache.org/repos/asf/isis/blob/e3f3e8ec/core/applib/src/docbkx/guide/isis-applib.xml
--
diff --git a/core/applib/src/docbkx/guide/isis-applib.xml
b/core/applib/src/docbkx/guide/isis-applib.xml
index 8d52f72..9e6602e 100644
--- a/core/applib/src/docbkx/guide/isis-applib.xml
+++ b/core/applib/src/docbkx/guide/isis-applib.xml
@@ -6793,12 +6793,12 @@ y}/programlisting
/sect1
sect1
-title@Resolve/title
+title@Render/title
-paraThe classname@Resolve/classname annotation is a hint for
+paraThe classname@Render/classname annotation is a hint for
properties and collections to indicate that a value property should be
-resolved lazily (rather than eagerly, as usual), or that a reference
-property or collection should be resolved eagerly (rather than lazily,
+rendered lazily (rather than eagerly, as usual), or that a reference
+property or collection should be rendered eagerly (rather than lazily,
as
svn commit: r850722 - in /websites/production/isis: cgi-bin/ content/
Author: danhaywood Date: Fri Feb 15 16:10:29 2013 New Revision: 850722 Log: Publishing svnmucc operation to isis site by danhaywood Added: websites/production/isis/cgi-bin/ - copied from r850721, websites/staging/isis/trunk/cgi-bin/ websites/production/isis/content/ - copied from r850721, websites/staging/isis/trunk/content/
git commit: ISIS-344: implemented Where.REFERENCES_PARENT
Updated Branches:
refs/heads/master a88c33a54 - 05d31e6da
ISIS-344: implemented Where.REFERENCES_PARENT
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/05d31e6d
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/05d31e6d
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/05d31e6d
Branch: refs/heads/master
Commit: 05d31e6da39b35e173f80f3a814191ef5aef4e49
Parents: a88c33a
Author: Dan Haywood danhayw...@apache.org
Authored: Fri Feb 15 17:32:53 2013 +
Committer: Dan Haywood danhayw...@apache.org
Committed: Fri Feb 15 17:32:53 2013 +
--
.../CollectionContentsAsAjaxTablePanel.java| 33 ++-
.../org/apache/isis/applib/annotation/Where.java |8
.../ObjectAssociationFiltersTest_visibleWhere.java |4 ++
3 files changed, 44 insertions(+), 1 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/isis/blob/05d31e6d/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java
--
diff --git
a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java
b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java
index 00b172e..1788757 100644
---
a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java
+++
b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java
@@ -34,10 +34,13 @@ import
org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
import
org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider;
import org.apache.wicket.model.Model;
+import org.apache.isis.applib.annotation.When;
import org.apache.isis.applib.annotation.Where;
import org.apache.isis.applib.filter.Filter;
import org.apache.isis.applib.filter.Filters;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import
org.apache.isis.core.metamodel.adapter.mgr.AdapterManager.ConcurrencyChecking;
+import org.apache.isis.core.metamodel.facets.hide.HiddenFacet;
import org.apache.isis.core.metamodel.spec.ActionType;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
@@ -161,11 +164,17 @@ public class CollectionContentsAsAjaxTablePanel extends
PanelAbstractEntityColl
if (getModel().hasSelectionHandler()) {
return;
}
+
+final ObjectSpecification parentSpecIfAny =
+getModel().isParented()
+?
getModel().getParentObjectAdapterMemento().getObjectAdapter(ConcurrencyChecking.NO_CHECK).getSpecification()
+: null;
@SuppressWarnings(unchecked)
final FilterObjectAssociation filter = Filters.and(
ObjectAssociationFilters.PROPERTIES,
-
ObjectAssociationFilters.staticallyVisible(getModel().isParented()?
Where.PARENTED_TABLES: Where.STANDALONE_TABLES));
+
ObjectAssociationFilters.staticallyVisible(getModel().isParented()?
Where.PARENTED_TABLES: Where.STANDALONE_TABLES),
+associationDoesNotReferenceParent(parentSpecIfAny));
final List? extends ObjectAssociation propertyList =
typeOfSpec.getAssociations(filter);
for (final ObjectAssociation property : propertyList) {
final ColumnAbstractObjectAdapter nopc =
createObjectAdapterPropertyColumn(property);
@@ -173,6 +182,28 @@ public class CollectionContentsAsAjaxTablePanel extends
PanelAbstractEntityColl
}
}
+FilterObjectAssociation associationDoesNotReferenceParent(final
ObjectSpecification parentSpec) {
+if(parentSpec == null) {
+return Filters.any();
+}
+return new FilterObjectAssociation() {
+@Override
+public boolean accept(ObjectAssociation association) {
+final HiddenFacet facet =
association.getFacet(HiddenFacet.class);
+if(facet == null) {
+return true;
+}
+if (facet.where() != Where.REFERENCES_PARENT) {
+return true;
+}
+final ObjectSpecification assocSpec =
association.getSpecification();
+final boolean associationSpecIsOfParentSpec =
assocSpec.isOfType(parentSpec);
+final boolean isVisible =
svn commit: r850791 - in /websites/production/isis: cgi-bin/ content/
Author: danhaywood Date: Sat Feb 16 15:53:05 2013 New Revision: 850791 Log: Publishing svnmucc operation to isis site by danhaywood Added: websites/production/isis/cgi-bin/ - copied from r850790, websites/staging/isis/trunk/cgi-bin/ websites/production/isis/content/ - copied from r850790, websites/staging/isis/trunk/content/
[1/4] ISIS-233: working toward RO spec 1.0.0
http://git-wip-us.apache.org/repos/asf/isis/blob/e5093edb/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/resources/AnyResourceTest_serverSideException_exceptionHandling.java
--
diff --git
a/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/resources/AnyResourceTest_serverSideException_exceptionHandling.java
b/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/resources/AnyResourceTest_serverSideException_exceptionHandling.java
deleted file mode 100644
index 8aa79ff..000
---
a/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/resources/AnyResourceTest_serverSideException_exceptionHandling.java
+++ /dev/null
@@ -1,72 +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.viewer.restfulobjects.tck.resources;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
-import javax.ws.rs.core.MediaType;
-
-import org.jboss.resteasy.client.ClientRequest;
-import org.jboss.resteasy.client.ClientResponse;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-
-import org.apache.isis.core.webserver.WebServer;
-import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
-import org.apache.isis.viewer.restfulobjects.applib.RepresentationType;
-import org.apache.isis.viewer.restfulobjects.applib.RestfulHttpMethod;
-import org.apache.isis.viewer.restfulobjects.applib.client.RestfulClient;
-import org.apache.isis.viewer.restfulobjects.applib.client.RestfulRequest;
-import org.apache.isis.viewer.restfulobjects.applib.client.RestfulResponse;
-import
org.apache.isis.viewer.restfulobjects.applib.client.RestfulRequest.Header;
-import
org.apache.isis.viewer.restfulobjects.applib.client.RestfulResponse.HttpStatusCode;
-import
org.apache.isis.viewer.restfulobjects.applib.homepage.HomePageRepresentation;
-import org.apache.isis.viewer.restfulobjects.applib.util.Parser;
-import org.apache.isis.viewer.restfulobjects.tck.IsisWebServerRule;
-
-public class AnyResourceTest_serverSideException_exceptionHandling {
-
-@Rule
-public IsisWebServerRule webServerRule = new IsisWebServerRule();
-
-private RestfulClient client;
-
-@Before
-public void setUp() throws Exception {
-final WebServer webServer = webServerRule.getWebServer();
-client = new RestfulClient(webServer.getBase());
-}
-
-@Test
-public void runtimeException_isMapped() throws Exception {
-
-// given
-final RestfulRequest restfulReq =
client.createRequest(RestfulHttpMethod.GET, version);
-final HeaderBoolean header = new HeaderBoolean(X-FAIL,
Parser.forBoolean());
-restfulReq.withHeader(header, true);
-
-// when
-final RestfulResponseJsonRepresentation jsonResp =
restfulReq.execute();
-
-// then
-assertThat(jsonResp.getStatus(), is(HttpStatusCode.METHOD_FAILURE));
-}
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/e5093edb/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/resources/errorhandling/AnyResourceTest_serverSideException_exceptionHandling.java
--
diff --git
a/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/resources/errorhandling/AnyResourceTest_serverSideException_exceptionHandling.java
b/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/resources/errorhandling/AnyResourceTest_serverSideException_exceptionHandling.java
new file mode 100644
index 000..2ffc14a
--- /dev/null
+++
b/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/resources/errorhandling/AnyResourceTest_serverSideException_exceptionHandling.java
@@ -0,0 +1,72 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work
git commit: ISIS-233: more on RO spec
Updated Branches:
refs/heads/dan/ISIS-233-ro ee3241aca - a83bc29de
ISIS-233: more on RO spec
... working on the version resource.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/a83bc29d
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/a83bc29d
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/a83bc29d
Branch: refs/heads/dan/ISIS-233-ro
Commit: a83bc29de3f34b38c85ac6cc0dd17d0488bf1d91
Parents: ee3241a
Author: Dan Haywood danhayw...@apache.org
Authored: Wed Feb 20 08:08:21 2013 +
Committer: Dan Haywood danhayw...@apache.org
Committed: Wed Feb 20 08:08:21 2013 +
--
.../viewer/restfulobjects/applib/util/Parser.java |2 +-
.../applib/version/VersionRepresentation.java |6 +
...RepresentationTypeTest_getMediaType_lookup.java |2 +-
.../restfulobjects/applib/util/ParserTest.java |1 +
.../applib/util/PathNodeTest_equalsHashcode.java | 26 +--
.../server/RestfulObjectsApplication.java |2 +-
.../server/resources/VersionReprRenderer.java | 27 ++--
...ceContextTest_ensureCompatibleAcceptHeader.java | 33 +++-
component/viewer/restfulobjects/tck/pom.xml|5 +
.../isis/viewer/restfulobjects/tck/Dummy.java |6 +
.../user/UserResourceTest_get_accept.java |2 -
.../UserResourceTest_templated_representation.java | 13 --
.../version/VersionResourceTest_accept.java| 80
.../version/VersionResourceTest_get_accept.java| 111 +++
...rsionResourceTest_representationAndHeaders.java | 150 ---
...rsionResourceTest_templated_representation.java | 125
...sionResourceTest_templated_responseHeaders.java | 82
17 files changed, 387 insertions(+), 286 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/isis/blob/a83bc29d/component/viewer/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/util/Parser.java
--
diff --git
a/component/viewer/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/util/Parser.java
b/component/viewer/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/util/Parser.java
index 99503ad..706de82 100644
---
a/component/viewer/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/util/Parser.java
+++
b/component/viewer/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/util/Parser.java
@@ -236,7 +236,7 @@ public abstract class ParserT {
if (str == null) {
return Collections.emptyList();
}
-return PathNode.split(str);
+return Lists.newArrayList(Splitter.on(,).split(str));
}
@Override
http://git-wip-us.apache.org/repos/asf/isis/blob/a83bc29d/component/viewer/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/version/VersionRepresentation.java
--
diff --git
a/component/viewer/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/version/VersionRepresentation.java
b/component/viewer/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/version/VersionRepresentation.java
index 350abf3..a0f4792 100644
---
a/component/viewer/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/version/VersionRepresentation.java
+++
b/component/viewer/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/version/VersionRepresentation.java
@@ -19,6 +19,8 @@
package org.apache.isis.viewer.restfulobjects.applib.version;
import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
+import org.apache.isis.viewer.restfulobjects.applib.LinkRepresentation;
+import org.apache.isis.viewer.restfulobjects.applib.Rel;
import
org.apache.isis.viewer.restfulobjects.applib.domainobjects.DomainRepresentation;
import org.codehaus.jackson.JsonNode;
@@ -28,6 +30,10 @@ public class VersionRepresentation extends
DomainRepresentation {
super(jsonNode);
}
+public LinkRepresentation getUp() {
+return getLinkWithRel(Rel.UP);
+}
+
public JsonRepresentation getOptionalCapabilities() {
return getMap(optionalCapabilities);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/a83bc29d/component/viewer/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/RepresentationTypeTest_getMediaType_lookup.java
--
diff --git
git commit: ISIS-349, ISIS-350: jgrowl integration, error page for exceptions
Updated Branches:
refs/heads/master 4ad06ff04 - 345f22fbf
ISIS-349, ISIS-350: jgrowl integration, error page for exceptions
implemented.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/345f22fb
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/345f22fb
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/345f22fb
Branch: refs/heads/master
Commit: 345f22fbfb56de82b41721fbb49d4fc0fcdc7f23
Parents: 4ad06ff
Author: Dan Haywood danhayw...@apache.org
Authored: Thu Feb 21 19:30:10 2013 +
Committer: Dan Haywood danhayw...@apache.org
Committed: Thu Feb 21 19:30:10 2013 +
--
.../integration/wicket/WebRequestCycleForIsis.java | 38 +-
.../viewer/wicket/model/models/ActionModel.java| 29 ++-
.../ui/components/widgets/cssmenu/CssMenuItem.java |7 +-
.../viewer/wicket/ui/feedback/JGrowlBehavior.java | 101
.../isis/viewer/wicket/ui/pages/PageAbstract.css | 37 ++
.../isis/viewer/wicket/ui/pages/PageAbstract.html | 20 +-
.../isis/viewer/wicket/ui/pages/PageAbstract.java | 38 ++-
.../viewer/wicket/ui/pages/action/ActionPage.java |1 +
.../viewer/wicket/ui/pages/error/ErrorPage.css | 81
.../viewer/wicket/ui/pages/error/ErrorPage.html| 60 +++
.../viewer/wicket/ui/pages/error/ErrorPage.java| 71 +++
.../isis/viewer/wicket/ui/pages/jquery.jgrowl.css | 136 ++
.../isis/viewer/wicket/ui/pages/jquery.jgrowl.js | 352 +++
13 files changed, 934 insertions(+), 37 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/isis/blob/345f22fb/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/WebRequestCycleForIsis.java
--
diff --git
a/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/WebRequestCycleForIsis.java
b/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/WebRequestCycleForIsis.java
index a135449..debf3ff 100644
---
a/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/WebRequestCycleForIsis.java
+++
b/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/WebRequestCycleForIsis.java
@@ -19,16 +19,19 @@
package org.apache.isis.viewer.wicket.viewer.integration.wicket;
-import org.apache.log4j.Logger;
-import org.apache.wicket.protocol.http.WebSession;
-import org.apache.wicket.request.cycle.AbstractRequestCycleListener;
-import org.apache.wicket.request.cycle.RequestCycle;
-
import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.core.runtime.system.session.IsisSession;
import org.apache.isis.core.runtime.system.transaction.IsisTransaction;
import org.apache.isis.core.runtime.system.transaction.IsisTransactionManager;
+import org.apache.isis.viewer.wicket.ui.pages.error.ErrorPage;
+import org.apache.log4j.Logger;
+import org.apache.wicket.core.request.handler.PageProvider;
+import org.apache.wicket.core.request.handler.RenderPageRequestHandler;
+import org.apache.wicket.protocol.http.WebSession;
+import org.apache.wicket.request.IRequestHandler;
+import org.apache.wicket.request.cycle.AbstractRequestCycleListener;
+import org.apache.wicket.request.cycle.RequestCycle;
/**
* Isis-specific implementation of the Wicket's {@link WebRequestCycle},
@@ -39,18 +42,6 @@ public class WebRequestCycleForIsis /*extends
WebRequestCycle*/ extends Abstract
private static final Logger LOG =
Logger.getLogger(WebRequestCycleForIsis.class);
-//public WebRequestCycleForIsis(final WebApplication application, final
WebRequest request, final Response response) {
-//super(application, request, response);
-//}
-//
-///**
-// * Convenience, downcasts.
-// */
-//@Override
-//public AuthenticatedWebSessionForIsis getWebSession() {
-//return (AuthenticatedWebSessionForIsis) super.getWebSession();
-//}
-
private AuthenticatedWebSessionForIsis getWebSession() {
return (AuthenticatedWebSessionForIsis) WebSession.get();
}
@@ -82,7 +73,6 @@ public class WebRequestCycleForIsis /*extends
WebRequestCycle*/ extends Abstract
commitTransactionIfAny();
getIsisContext().closeSessionInstance();
}
-//super.onEndRequest();
}
private void commitTransactionIfAny() {
@@ -96,6 +86,11 @@ public class WebRequestCycleForIsis /*extends
WebRequestCycle*/ extends Abstract
}
}
+@Override
+public IRequestHandler onException(RequestCycle cycle, Exception ex) {
+return new
git commit: ISIS-349, 350: further improvements
Updated Branches:
refs/heads/master 345f22fbf - 0d9216c2d
ISIS-349, 350: further improvements
* rendering of the error page is prettier
* had forgotten to remove debug buttons at bottom of PageAbstract
* force JQuery to always be loaded
* inline JGrowlBehaviour instead into PageAbstract
* enhanced ToDo app to demonstrate this stuff.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/0d9216c2
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/0d9216c2
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/0d9216c2
Branch: refs/heads/master
Commit: 0d9216c2d29c1c093c90417aea00310d99637ee4
Parents: 345f22f
Author: Dan Haywood danhayw...@apache.org
Authored: Fri Feb 22 00:54:40 2013 +
Committer: Dan Haywood danhayw...@apache.org
Committed: Fri Feb 22 00:54:40 2013 +
--
.../ui/components/widgets/cssmenu/CssMenuItem.java |2 -
.../viewer/wicket/ui/feedback/JGrowlBehavior.java | 101 ---
.../isis/viewer/wicket/ui/pages/PageAbstract.html |7 +-
.../isis/viewer/wicket/ui/pages/PageAbstract.java | 75 +++
.../viewer/wicket/ui/pages/error/ErrorPage.css | 28 -
.../viewer/wicket/ui/pages/error/ErrorPage.html| 14 +--
.../viewer/wicket/ui/pages/error/ErrorPage.java| 74 +--
.../viewer/wicket/ui/pages/error/div-toggle.js |7 +
.../dom/src/main/java/dom/todo/ToDoItem.java |1 +
.../dom/src/main/java/dom/todo/ToDoItems.java | 23
.../main/java/objstore/jdo/todo/ToDoItemsJdo.java |5 +-
11 files changed, 172 insertions(+), 165 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/isis/blob/0d9216c2/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuItem.java
--
diff --git
a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuItem.java
b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuItem.java
index 3a1e3f0..3ddacba 100644
---
a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuItem.java
+++
b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuItem.java
@@ -230,8 +230,6 @@ public class CssMenuItem implements Serializable {
final LinkAndLabel linkAndLabel = cssMenuLinkFactory.newLink(null,
objectAction, PageAbstract.ID_MENU_LINK);
-linkAndLabel.getLink().add(new JGrowlBehavior());
-
final AbstractLink link = linkAndLabel.getLink();
final String actionLabel = linkAndLabel.getLabel();
http://git-wip-us.apache.org/repos/asf/isis/blob/0d9216c2/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/feedback/JGrowlBehavior.java
--
diff --git
a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/feedback/JGrowlBehavior.java
b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/feedback/JGrowlBehavior.java
deleted file mode 100644
index 24fdb98..000
---
a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/feedback/JGrowlBehavior.java
+++ /dev/null
@@ -1,101 +0,0 @@
-package org.apache.isis.viewer.wicket.ui.feedback;
-
-import org.apache.commons.lang.StringUtils;
-import org.apache.isis.core.runtime.system.context.IsisContext;
-import org.apache.isis.viewer.wicket.model.models.ActionModel;
-import org.apache.wicket.Component;
-import org.apache.wicket.ajax.AbstractDefaultAjaxBehavior;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.feedback.FeedbackMessage;
-import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
-
-/**
- * Attach to any component to display jGrowl messages.
- *
- * Displays only session-level messages. If you need component-level messages,
- * see http://pastebin.com/f6db2ec0e for an example. Basically, instead of
- * Session.get().getFeedbackMessages(), you would call
- * getComponent().getFeedbackMessage().
- *
- * Requires the following be included: jquery.js, jquery.ui.all.js,
- * jquery.jgrowl.js, jquery.jgrowl.css. These can be downloaded from
- * http://plugins.jquery.com/files/jGrowl-1.2.0.tgz.
- *
- * @author jsinai Based on an example by Alex Objelean, see the above link.
- */
-public class JGrowlBehavior extends AbstractDefaultAjaxBehavior {
-
-private static final long serialVersionUID = 1L;
-
-/**
- * Displays an info message that is sticky. The default is non-sticky.
- * Sample usage:
git commit: ISIS-351: now rendering recognized exceptions on action panel
Updated Branches:
refs/heads/master b2b72fe09 - eef7356aa
ISIS-351: now rendering recognized exceptions on action panel
* if the runtime exception is recognized, then will be rendered on the action
panel's feedback
rather than the fallback ErrorPage
* also ensured call abortTransaction if an application exception is thrown.
* moved the threadlocal logic for notifications from ActionModel and into
ActionPanel.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/eef7356a
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/eef7356a
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/eef7356a
Branch: refs/heads/master
Commit: eef7356aa18208c1c3d1fb4b63c7c72e05158ef2
Parents: b2b72fe
Author: Dan Haywood danhayw...@apache.org
Authored: Fri Feb 22 13:11:28 2013 +
Committer: Dan Haywood danhayw...@apache.org
Committed: Fri Feb 22 13:11:28 2013 +
--
.../ComponentFactoryRegistrarDefault.java |2 +-
.../viewer/wicket/model/models/ActionExecutor.java |4 +-
.../viewer/wicket/model/models/ActionModel.java| 22 +--
.../actions/params/ActionParametersFormPanel.css | 19 --
.../actions/params/ActionParametersFormPanel.html | 39
.../actions/params/ActionParametersFormPanel.java | 134 ---
.../params/ActionParametersFormPanelFactory.java | 52 -
.../wicket/ui/components/actions/ActionPanel.java | 173 --
.../actions/ActionParametersFormPanel.css | 19 ++
.../actions/ActionParametersFormPanel.html | 39
.../actions/ActionParametersFormPanel.java | 136 +++
.../actions/ActionParametersFormPanelFactory.java | 52 +
.../isis/viewer/wicket/ui/pages/PageAbstract.java |5 +-
13 files changed, 405 insertions(+), 291 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/isis/blob/eef7356a/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/components/ComponentFactoryRegistrarDefault.java
--
diff --git
a/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/components/ComponentFactoryRegistrarDefault.java
b/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/components/ComponentFactoryRegistrarDefault.java
index 8f55d0b..1de840b 100644
---
a/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/components/ComponentFactoryRegistrarDefault.java
+++
b/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/components/ComponentFactoryRegistrarDefault.java
@@ -24,12 +24,12 @@ import java.util.ServiceLoader;
import com.google.inject.Singleton;
import org.apache.isis.viewer.wicket.ui.ComponentFactory;
-import
org.apache.isis.viewer.wicket.ui.actions.params.ActionParametersFormPanelFactory;
import org.apache.isis.viewer.wicket.ui.app.registry.ComponentFactoryRegistrar;
import org.apache.isis.viewer.wicket.ui.components.about.AboutPanelFactory;
import
org.apache.isis.viewer.wicket.ui.components.actionlink.ActionLinkPanelFactory;
import
org.apache.isis.viewer.wicket.ui.components.actions.ActionInfoPanelFactory;
import org.apache.isis.viewer.wicket.ui.components.actions.ActionPanelFactory;
+import
org.apache.isis.viewer.wicket.ui.components.actions.ActionParametersFormPanelFactory;
import
org.apache.isis.viewer.wicket.ui.components.appactions.cssmenu.AppActionsCssMenuFactory;
import
org.apache.isis.viewer.wicket.ui.components.bookmarkedpages.BookmarkedPagesPanelFactory;
import
org.apache.isis.viewer.wicket.ui.components.collection.CollectionPanelFactory;
http://git-wip-us.apache.org/repos/asf/isis/blob/eef7356a/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionExecutor.java
--
diff --git
a/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionExecutor.java
b/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionExecutor.java
index 7869182..ec73fcd 100644
---
a/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionExecutor.java
+++
b/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionExecutor.java
@@ -21,12 +21,14 @@ package org.apache.isis.viewer.wicket.model.models;
import java.io.Serializable;
+import org.apache.wicket.MarkupContainer;
+
/**
* Decouples the {@link ActionModel}, which needs to delegate the actual
* execution of an action, from its implementor.
*/
public interface ActionExecutor extends Serializable {
-void
[1/24] git commit: ISIS-162: Editing the config to let the IDE launcher at least launch
ISIS-162: Editing the config to let the IDE launcher at least launch Project: http://git-wip-us.apache.org/repos/asf/isis/repo Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/65d18239 Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/65d18239 Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/65d18239 Branch: refs/heads/dan/ISIS-233-ro Commit: 65d182393507f0800f386efb421af9b1d403fdd5 Parents: a1a7317 Author: Kevin Meyer ke...@apache.org Authored: Sun Feb 17 20:38:24 2013 +0100 Committer: Kevin Meyer ke...@apache.org Committed: Sun Feb 17 20:38:24 2013 +0100 -- .../webapp/WEB-INF/authentication_file.passwords | 20 +++ .../main/webapp/WEB-INF/security_file.passwords| 20 --- .../eclipse/launch/quickstart-viewer-scimpi.launch |3 +- .../src/main/webapp/WEB-INF/isis.properties|2 +- 4 files changed, 23 insertions(+), 22 deletions(-) -- http://git-wip-us.apache.org/repos/asf/isis/blob/65d18239/example/application/claims/viewer-html/src/main/webapp/WEB-INF/authentication_file.passwords -- diff --git a/example/application/claims/viewer-html/src/main/webapp/WEB-INF/authentication_file.passwords b/example/application/claims/viewer-html/src/main/webapp/WEB-INF/authentication_file.passwords new file mode 100644 index 000..7f07af5 --- /dev/null +++ b/example/application/claims/viewer-html/src/main/webapp/WEB-INF/authentication_file.passwords @@ -0,0 +1,20 @@ +# 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. +sven:pass +dick:pass +bob:pass +joe:pass http://git-wip-us.apache.org/repos/asf/isis/blob/65d18239/example/application/claims/viewer-html/src/main/webapp/WEB-INF/security_file.passwords -- diff --git a/example/application/claims/viewer-html/src/main/webapp/WEB-INF/security_file.passwords b/example/application/claims/viewer-html/src/main/webapp/WEB-INF/security_file.passwords deleted file mode 100644 index 7f07af5..000 --- a/example/application/claims/viewer-html/src/main/webapp/WEB-INF/security_file.passwords +++ /dev/null @@ -1,20 +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. -sven:pass -dick:pass -bob:pass -joe:pass http://git-wip-us.apache.org/repos/asf/isis/blob/65d18239/example/application/quickstart_scimpi_nosql/viewer-scimpi/ide/eclipse/launch/quickstart-viewer-scimpi.launch -- diff --git a/example/application/quickstart_scimpi_nosql/viewer-scimpi/ide/eclipse/launch/quickstart-viewer-scimpi.launch b/example/application/quickstart_scimpi_nosql/viewer-scimpi/ide/eclipse/launch/quickstart-viewer-scimpi.launch index dad3dee..53f6647 100644 --- a/example/application/quickstart_scimpi_nosql/viewer-scimpi/ide/eclipse/launch/quickstart-viewer-scimpi.launch +++ b/example/application/quickstart_scimpi_nosql/viewer-scimpi/ide/eclipse/launch/quickstart-viewer-scimpi.launch @@ -12,7 +12,8 @@ /mapAttribute stringAttribute key=org.eclipse.debug.core.source_locator_id value=org.eclipse.jdt.launching.sourceLocator.JavaSourceLookupDirector/ booleanAttribute key=org.eclipse.jdt.debug.ui.INCLUDE_EXTERNAL_JARS value=true/ +stringAttribute
[16/24] git commit: ISIS-233: more on RO spec
ISIS-233: more on RO spec
... working on the version resource.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/2cdfd52b
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/2cdfd52b
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/2cdfd52b
Branch: refs/heads/dan/ISIS-233-ro
Commit: 2cdfd52bc7e36b078595bf254291904ac7ca6bd7
Parents: 3490ada
Author: Dan Haywood danhayw...@apache.org
Authored: Wed Feb 20 08:08:21 2013 +
Committer: Dan Haywood danhayw...@apache.org
Committed: Mon Feb 25 07:58:24 2013 +
--
.../viewer/restfulobjects/applib/util/Parser.java |2 +-
.../applib/version/VersionRepresentation.java |6 +
...RepresentationTypeTest_getMediaType_lookup.java |2 +-
.../restfulobjects/applib/util/ParserTest.java |1 +
.../applib/util/PathNodeTest_equalsHashcode.java | 26 +--
.../server/RestfulObjectsApplication.java |2 +-
.../server/resources/VersionReprRenderer.java | 27 ++--
...ceContextTest_ensureCompatibleAcceptHeader.java | 33 +++-
component/viewer/restfulobjects/tck/pom.xml|5 +
.../isis/viewer/restfulobjects/tck/Dummy.java |6 +
.../user/UserResourceTest_get_accept.java |2 -
.../UserResourceTest_templated_representation.java | 13 --
.../version/VersionResourceTest_accept.java| 80
.../version/VersionResourceTest_get_accept.java| 111 +++
...rsionResourceTest_representationAndHeaders.java | 150 ---
...rsionResourceTest_templated_representation.java | 125
...sionResourceTest_templated_responseHeaders.java | 82
17 files changed, 387 insertions(+), 286 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/isis/blob/2cdfd52b/component/viewer/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/util/Parser.java
--
diff --git
a/component/viewer/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/util/Parser.java
b/component/viewer/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/util/Parser.java
index 99503ad..706de82 100644
---
a/component/viewer/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/util/Parser.java
+++
b/component/viewer/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/util/Parser.java
@@ -236,7 +236,7 @@ public abstract class ParserT {
if (str == null) {
return Collections.emptyList();
}
-return PathNode.split(str);
+return Lists.newArrayList(Splitter.on(,).split(str));
}
@Override
http://git-wip-us.apache.org/repos/asf/isis/blob/2cdfd52b/component/viewer/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/version/VersionRepresentation.java
--
diff --git
a/component/viewer/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/version/VersionRepresentation.java
b/component/viewer/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/version/VersionRepresentation.java
index 350abf3..a0f4792 100644
---
a/component/viewer/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/version/VersionRepresentation.java
+++
b/component/viewer/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/version/VersionRepresentation.java
@@ -19,6 +19,8 @@
package org.apache.isis.viewer.restfulobjects.applib.version;
import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
+import org.apache.isis.viewer.restfulobjects.applib.LinkRepresentation;
+import org.apache.isis.viewer.restfulobjects.applib.Rel;
import
org.apache.isis.viewer.restfulobjects.applib.domainobjects.DomainRepresentation;
import org.codehaus.jackson.JsonNode;
@@ -28,6 +30,10 @@ public class VersionRepresentation extends
DomainRepresentation {
super(jsonNode);
}
+public LinkRepresentation getUp() {
+return getLinkWithRel(Rel.UP);
+}
+
public JsonRepresentation getOptionalCapabilities() {
return getMap(optionalCapabilities);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/2cdfd52b/component/viewer/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/RepresentationTypeTest_getMediaType_lookup.java
--
diff --git
[5/24] git commit: ISIS-349: removing JGrowlBehaviour from imports.
ISIS-349: removing JGrowlBehaviour from imports.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/e58012de
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/e58012de
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/e58012de
Branch: refs/heads/dan/ISIS-233-ro
Commit: e58012de191732c11f37ddd4174c158e2d86d3bc
Parents: 0d9216c
Author: Dan Haywood danhayw...@apache.org
Authored: Fri Feb 22 00:56:15 2013 +
Committer: Dan Haywood danhayw...@apache.org
Committed: Fri Feb 22 00:56:15 2013 +
--
.../ui/components/widgets/cssmenu/CssMenuItem.java | 25 ++
.../isis/viewer/wicket/ui/pages/PageAbstract.java |6 ---
.../viewer/wicket/ui/pages/action/ActionPage.java | 10 ++
3 files changed, 14 insertions(+), 27 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/isis/blob/e58012de/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuItem.java
--
diff --git
a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuItem.java
b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuItem.java
index 3ddacba..f5cd679 100644
---
a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuItem.java
+++
b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuItem.java
@@ -25,18 +25,6 @@ import java.io.Serializable;
import java.util.Collections;
import java.util.List;
-import com.google.common.collect.Lists;
-
-import org.apache.wicket.Application;
-import org.apache.wicket.AttributeModifier;
-import org.apache.wicket.Component;
-import org.apache.wicket.MarkupContainer;
-import org.apache.wicket.Page;
-import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.form.SubmitLink;
-import org.apache.wicket.markup.html.link.AbstractLink;
-import org.apache.wicket.model.Model;
-
import org.apache.isis.applib.annotation.Where;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
import
org.apache.isis.core.commons.authentication.AuthenticationSessionProvider;
@@ -45,13 +33,22 @@ import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import
org.apache.isis.core.metamodel.adapter.mgr.AdapterManager.ConcurrencyChecking;
import org.apache.isis.core.metamodel.consent.Consent;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
-import org.apache.isis.core.progmodel.facets.actions.bulk.BulkFacet;
import org.apache.isis.viewer.wicket.model.links.LinkAndLabel;
import org.apache.isis.viewer.wicket.model.mementos.ObjectAdapterMemento;
-import org.apache.isis.viewer.wicket.ui.feedback.JGrowlBehavior;
import org.apache.isis.viewer.wicket.ui.pages.PageAbstract;
import org.apache.isis.viewer.wicket.ui.util.Components;
import org.apache.isis.viewer.wicket.ui.util.CssClassAppender;
+import org.apache.wicket.Application;
+import org.apache.wicket.AttributeModifier;
+import org.apache.wicket.Component;
+import org.apache.wicket.MarkupContainer;
+import org.apache.wicket.Page;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.form.SubmitLink;
+import org.apache.wicket.markup.html.link.AbstractLink;
+import org.apache.wicket.model.Model;
+
+import com.google.common.collect.Lists;
public class CssMenuItem implements Serializable {
http://git-wip-us.apache.org/repos/asf/isis/blob/e58012de/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
--
diff --git
a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
index b663e7e..66e10b6 100644
---
a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
+++
b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
@@ -38,16 +38,11 @@ import org.apache.isis.viewer.wicket.ui.ComponentFactory;
import org.apache.isis.viewer.wicket.ui.ComponentType;
import org.apache.isis.viewer.wicket.ui.app.registry.ComponentFactoryRegistry;
import
org.apache.isis.viewer.wicket.ui.app.registry.ComponentFactoryRegistryAccessor;
-import org.apache.isis.viewer.wicket.ui.feedback.JGrowlBehavior;
import org.apache.isis.viewer.wicket.ui.pages.about.AboutPage;
import org.apache.isis.viewer.wicket.ui.pages.login.WicketSignInPage;
import org.apache.log4j.Logger;
import
[10/24] ISIS-233: working toward RO spec 1.0.0
http://git-wip-us.apache.org/repos/asf/isis/blob/b5041f0b/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/resources/AnyResourceTest_serverSideException_exceptionHandling.java
--
diff --git
a/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/resources/AnyResourceTest_serverSideException_exceptionHandling.java
b/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/resources/AnyResourceTest_serverSideException_exceptionHandling.java
deleted file mode 100644
index 8aa79ff..000
---
a/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/resources/AnyResourceTest_serverSideException_exceptionHandling.java
+++ /dev/null
@@ -1,72 +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.viewer.restfulobjects.tck.resources;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
-import javax.ws.rs.core.MediaType;
-
-import org.jboss.resteasy.client.ClientRequest;
-import org.jboss.resteasy.client.ClientResponse;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-
-import org.apache.isis.core.webserver.WebServer;
-import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
-import org.apache.isis.viewer.restfulobjects.applib.RepresentationType;
-import org.apache.isis.viewer.restfulobjects.applib.RestfulHttpMethod;
-import org.apache.isis.viewer.restfulobjects.applib.client.RestfulClient;
-import org.apache.isis.viewer.restfulobjects.applib.client.RestfulRequest;
-import org.apache.isis.viewer.restfulobjects.applib.client.RestfulResponse;
-import
org.apache.isis.viewer.restfulobjects.applib.client.RestfulRequest.Header;
-import
org.apache.isis.viewer.restfulobjects.applib.client.RestfulResponse.HttpStatusCode;
-import
org.apache.isis.viewer.restfulobjects.applib.homepage.HomePageRepresentation;
-import org.apache.isis.viewer.restfulobjects.applib.util.Parser;
-import org.apache.isis.viewer.restfulobjects.tck.IsisWebServerRule;
-
-public class AnyResourceTest_serverSideException_exceptionHandling {
-
-@Rule
-public IsisWebServerRule webServerRule = new IsisWebServerRule();
-
-private RestfulClient client;
-
-@Before
-public void setUp() throws Exception {
-final WebServer webServer = webServerRule.getWebServer();
-client = new RestfulClient(webServer.getBase());
-}
-
-@Test
-public void runtimeException_isMapped() throws Exception {
-
-// given
-final RestfulRequest restfulReq =
client.createRequest(RestfulHttpMethod.GET, version);
-final HeaderBoolean header = new HeaderBoolean(X-FAIL,
Parser.forBoolean());
-restfulReq.withHeader(header, true);
-
-// when
-final RestfulResponseJsonRepresentation jsonResp =
restfulReq.execute();
-
-// then
-assertThat(jsonResp.getStatus(), is(HttpStatusCode.METHOD_FAILURE));
-}
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/b5041f0b/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/resources/errorhandling/AnyResourceTest_serverSideException_exceptionHandling.java
--
diff --git
a/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/resources/errorhandling/AnyResourceTest_serverSideException_exceptionHandling.java
b/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/resources/errorhandling/AnyResourceTest_serverSideException_exceptionHandling.java
new file mode 100644
index 000..2ffc14a
--- /dev/null
+++
b/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/resources/errorhandling/AnyResourceTest_serverSideException_exceptionHandling.java
@@ -0,0 +1,72 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work
[9/24] git commit: ISIS-351: improving exception handling for no-arg actions
ISIS-351: improving exception handling for no-arg actions
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/0eb84d54
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/0eb84d54
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/0eb84d54
Branch: refs/heads/dan/ISIS-233-ro
Commit: 0eb84d54a0d86b58a9a75414b7b57c93b8e46eaf
Parents: 70111da
Author: Dan Haywood danhayw...@apache.org
Authored: Sat Feb 23 12:59:23 2013 +
Committer: Dan Haywood danhayw...@apache.org
Committed: Sat Feb 23 12:59:23 2013 +
--
.../wicket/ui/components/actions/ActionPanel.java | 105 +--
1 files changed, 62 insertions(+), 43 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/isis/blob/0eb84d54/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionPanel.java
--
diff --git
a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionPanel.java
b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionPanel.java
index e6be696..24057d4 100644
---
a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionPanel.java
+++
b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionPanel.java
@@ -53,7 +53,6 @@ import org.apache.isis.viewer.wicket.model.models.ValueModel;
import org.apache.isis.viewer.wicket.ui.ComponentType;
import org.apache.isis.viewer.wicket.ui.app.registry.ComponentFactoryRegistry;
import org.apache.isis.viewer.wicket.ui.pages.BookmarkedPagesModelProvider;
-import org.apache.isis.viewer.wicket.ui.pages.PageAbstract;
import org.apache.isis.viewer.wicket.ui.pages.entity.EntityPage;
import org.apache.isis.viewer.wicket.ui.panels.PanelAbstract;
@@ -133,58 +132,66 @@ public class ActionPanel extends
PanelAbstractActionModel implements ActionExe
ObjectAdapter targetAdapter = null;
boolean clearArgs = true;
try {
+try {
+targetAdapter = getModel().getTargetAdapter();
-targetAdapter = getModel().getTargetAdapter();
-
-// no concurrency exception, so continue...
-clearArgs = executeActionOnTargetAndProcessResults(targetAdapter,
feedbackForm);
+// no concurrency exception, so continue...
+clearArgs =
executeActionOnTargetAndProcessResults(targetAdapter, feedbackForm);
-} catch (ConcurrencyException ex) {
+} catch (ConcurrencyException ex) {
-// second attempt should succeed, because the Oid would have
-// been updated in the attempt
-if (targetAdapter == null) {
-targetAdapter = getModel().getTargetAdapter();
-}
+// second attempt should succeed, because the Oid would have
+// been updated in the attempt
+if (targetAdapter == null) {
+targetAdapter = getModel().getTargetAdapter();
+}
-// forward onto the target page with the concurrency exception
-final ResultType resultType =
ResultType.determineFor(targetAdapter);
-resultType.addResults(this, targetAdapter, ex);
+
+// forward onto the target page with the concurrency exception
+
+// REVIEW: doesn't seem to get rendered
+ResultType.OBJECT.addResults(this, targetAdapter, ex);
-return;
-
+getMessageBroker().addWarning(ex.getMessage());
+return;
+}
} finally {
if(clearArgs) {
getActionModel().clearArguments();
}
+
}
}
-/**
- * @return - whether action arguments should be cleared or not.
- */
-private boolean executeActionOnTargetAndProcessResults(ObjectAdapter
targetAdapter, MarkupContainer feedbackOwner) {
+private boolean executeActionOnTargetAndProcessResults(ObjectAdapter
targetAdapter, MarkupContainer feedbackForm) {
// validate the action parameters (if any)
final ActionModel actionModel = getActionModel();
final String invalidReasonIfAny = actionModel.getReasonInvalidIfAny();
if (invalidReasonIfAny != null) {
-feedbackOwner.error(invalidReasonIfAny);
+feedbackForm.error(invalidReasonIfAny);
return false;
-}
-
+}
// the object store could raise an exception (eg uniqueness constraint)
// so we handle it here.
try {
// could be programmatic
[17/24] ISIS-233: more on user, version, services list
http://git-wip-us.apache.org/repos/asf/isis/blob/6b9d42a5/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/resources/version/VersionResourceTest_get_accept.java
--
diff --git
a/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/resources/version/VersionResourceTest_get_accept.java
b/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/resources/version/VersionResourceTest_get_accept.java
deleted file mode 100644
index 25347ee..000
---
a/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/resources/version/VersionResourceTest_get_accept.java
+++ /dev/null
@@ -1,111 +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.viewer.restfulobjects.tck.resources.version;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
-import javax.ws.rs.core.MediaType;
-
-import org.jboss.resteasy.client.ClientRequest;
-import org.jboss.resteasy.client.ClientResponse;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-
-import org.apache.isis.core.webserver.WebServer;
-import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
-import org.apache.isis.viewer.restfulobjects.applib.RepresentationType;
-import org.apache.isis.viewer.restfulobjects.applib.RestfulHttpMethod;
-import org.apache.isis.viewer.restfulobjects.applib.client.RestfulClient;
-import org.apache.isis.viewer.restfulobjects.applib.client.RestfulRequest;
-import org.apache.isis.viewer.restfulobjects.applib.client.RestfulResponse;
-import
org.apache.isis.viewer.restfulobjects.applib.client.RestfulResponse.HttpStatusCode;
-import org.apache.isis.viewer.restfulobjects.applib.user.UserRepresentation;
-import
org.apache.isis.viewer.restfulobjects.applib.version.VersionRepresentation;
-import org.apache.isis.viewer.restfulobjects.tck.IsisWebServerRule;
-
-public class VersionResourceTest_get_accept {
-
-@Rule
-public IsisWebServerRule webServerRule = new IsisWebServerRule();
-
-private RestfulClient client;
-
-@Before
-public void setUp() throws Exception {
-client = webServerRule.getClient();
-}
-
-@Test
-public void applicationJson_noProfile_returns200() throws Exception {
-
-final RestfulRequest request =
client.createRequest(RestfulHttpMethod.GET,
version).withHeader(RestfulRequest.Header.ACCEPT,
MediaType.APPLICATION_JSON_TYPE);
-final RestfulResponseVersionRepresentation restfulResponse =
request.executeT();
-
-assertThat(restfulResponse.getStatus(), is(HttpStatusCode.OK));
-
assertThat(restfulResponse.getHeader(RestfulResponse.Header.CONTENT_TYPE),
is(RepresentationType.VERSION.getMediaType()));
-}
-
-
-@Test
-public void applicationJson_profileVersion_returns200() throws Exception {
-
-final RestfulRequest request =
client.createRequest(RestfulHttpMethod.GET,
version).withHeader(RestfulRequest.Header.ACCEPT,
RepresentationType.VERSION.getMediaType());
-final RestfulResponseVersionRepresentation restfulResponse =
request.executeT();
-
-assertThat(restfulResponse.getStatus(), is(HttpStatusCode.OK));
-}
-
-@Test
-public void missingHeader_returns200() throws Exception {
-// given
-final RestfulRequest restfulReq =
client.createRequest(RestfulHttpMethod.GET, version);
-
-// when
-final RestfulResponseVersionRepresentation restfulResp =
restfulReq.executeT();
-
-// then
-assertThat(restfulResp.getStatus(), is(HttpStatusCode.OK));
-}
-
-@Test
-public void applicationJson_profileIncorrect_returns406() throws Exception
{
-
-final RestfulRequest request =
client.createRequest(RestfulHttpMethod.GET,
version).withHeader(RestfulRequest.Header.ACCEPT,
RepresentationType.USER.getMediaType());
-final RestfulResponseVersionRepresentation restfulResponse =
request.executeT();
-
-assertThat(restfulResponse.getStatus(),
[8/24] git commit: ISIS-350: making raised messages persistent across interactions.
ISIS-350: making raised messages persistent across interactions.
* ... by associating MessageBroker with AuthenticationSession rather than
IsisTransaction
(this means in effect moving it from core-runtime to core-metamodel)
also:
* got rid of the hacky thread local for application errors (in Wicket viewer),
and instead have extended MessageBroker to hold the app error along with the
info and warning messages.
* got rid of unnecessary abortTran calls in wicket's ActionPanel
* added missing logging bootstrapping for wicket viewer.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/70111da9
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/70111da9
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/70111da9
Branch: refs/heads/dan/ISIS-233-ro
Commit: 70111da9b6b3d4d4bd980f23895c62eed51b0208
Parents: eef7356
Author: Dan Haywood danhayw...@apache.org
Authored: Fri Feb 22 18:08:55 2013 +
Committer: Dan Haywood danhayw...@apache.org
Committed: Fri Feb 22 18:08:55 2013 +
--
.../wicket/viewer/IsisWicketApplication.java | 10 +++
.../integration/wicket/WebRequestCycleForIsis.java | 17 +++--
.../wicket/ui/components/actions/ActionPanel.java | 28 -
.../isis/viewer/wicket/ui/pages/PageAbstract.java | 26 +
.../apache/isis/applib/ApplicationException.java | 11 +---
.../commons/authentication/AnonymousSession.java |2 +
.../authentication/AuthenticationSession.java | 12
.../AuthenticationSessionAbstract.java | 15 +
.../core/commons/authentication/MessageBroker.java | 44 +++
.../core/runtime/system/context/IsisContext.java |2 +-
.../system/transaction/IsisTransaction.java| 13 +++--
.../system/transaction/IsisTransactionManager.java | 15 ++---
.../runtime/system/transaction/MessageBroker.java | 22 ++--
.../system/transaction/MessageBrokerDefault.java | 38 +
.../PersistenceSessionObjectStoreTest.java |7 ++
...StoreTransactionManager_EndTransactionTest.java |9 ++-
...oreTransactionManager_StartTransactionTest.java | 19 ++-
.../dom/src/main/java/dom/todo/ToDoItems.java |2 +-
.../src/main/webapp/WEB-INF/logging.properties |2 -
19 files changed, 211 insertions(+), 83 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/isis/blob/70111da9/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
--
diff --git
a/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
b/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
index d75fee7..f62e71d 100644
---
a/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
+++
b/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
@@ -58,6 +58,7 @@ import
org.apache.isis.core.commons.resource.ResourceStreamSourceContextLoaderCl
import
org.apache.isis.core.commons.resource.ResourceStreamSourceCurrentClassClassPath;
import org.apache.isis.core.commons.resource.ResourceStreamSourceFileSystem;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.runtime.logging.IsisLoggingConfigurer;
import org.apache.isis.core.runtime.runner.IsisInjectModule;
import org.apache.isis.core.runtime.system.DeploymentType;
import org.apache.isis.core.runtime.system.IsisSystem;
@@ -128,8 +129,11 @@ import
org.apache.isis.viewer.wicket.viewer.integration.wicket.WebRequestCycleFo
public class IsisWicketApplication extends AuthenticatedWebApplication
implements ComponentFactoryRegistryAccessor, PageClassRegistryAccessor,
AuthenticationSessionProvider, BookmarkedPagesModelProvider {
private static final long serialVersionUID = 1L;
+
private static final Logger LOG =
Logger.getLogger(IsisWicketApplication.class);
+private final IsisLoggingConfigurer loggingConfigurer = new
IsisLoggingConfigurer();
+
/**
* Convenience locator, downcasts inherited functionality.
*/
@@ -146,12 +150,14 @@ public class IsisWicketApplication extends
AuthenticatedWebApplication implement
/**
* {@link Inject}ed when {@link #init() initialized}.
*/
+@SuppressWarnings(unused)
@Inject
private ImageResourceCache imageCache;
/**
* {@link Inject}ed when {@link #init() initialized}.
*/
+@SuppressWarnings(unused)
@Inject
private WicketViewerSettings wicketViewerSettings;
@@ -165,6 +171,7 @@ public class IsisWicketApplication extends
AuthenticatedWebApplication
[4/24] git commit: ISIS-349, 350: further improvements
ISIS-349, 350: further improvements
* rendering of the error page is prettier
* had forgotten to remove debug buttons at bottom of PageAbstract
* force JQuery to always be loaded
* inline JGrowlBehaviour instead into PageAbstract
* enhanced ToDo app to demonstrate this stuff.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/0d9216c2
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/0d9216c2
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/0d9216c2
Branch: refs/heads/dan/ISIS-233-ro
Commit: 0d9216c2d29c1c093c90417aea00310d99637ee4
Parents: 345f22f
Author: Dan Haywood danhayw...@apache.org
Authored: Fri Feb 22 00:54:40 2013 +
Committer: Dan Haywood danhayw...@apache.org
Committed: Fri Feb 22 00:54:40 2013 +
--
.../ui/components/widgets/cssmenu/CssMenuItem.java |2 -
.../viewer/wicket/ui/feedback/JGrowlBehavior.java | 101 ---
.../isis/viewer/wicket/ui/pages/PageAbstract.html |7 +-
.../isis/viewer/wicket/ui/pages/PageAbstract.java | 75 +++
.../viewer/wicket/ui/pages/error/ErrorPage.css | 28 -
.../viewer/wicket/ui/pages/error/ErrorPage.html| 14 +--
.../viewer/wicket/ui/pages/error/ErrorPage.java| 74 +--
.../viewer/wicket/ui/pages/error/div-toggle.js |7 +
.../dom/src/main/java/dom/todo/ToDoItem.java |1 +
.../dom/src/main/java/dom/todo/ToDoItems.java | 23
.../main/java/objstore/jdo/todo/ToDoItemsJdo.java |5 +-
11 files changed, 172 insertions(+), 165 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/isis/blob/0d9216c2/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuItem.java
--
diff --git
a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuItem.java
b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuItem.java
index 3a1e3f0..3ddacba 100644
---
a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuItem.java
+++
b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuItem.java
@@ -230,8 +230,6 @@ public class CssMenuItem implements Serializable {
final LinkAndLabel linkAndLabel = cssMenuLinkFactory.newLink(null,
objectAction, PageAbstract.ID_MENU_LINK);
-linkAndLabel.getLink().add(new JGrowlBehavior());
-
final AbstractLink link = linkAndLabel.getLink();
final String actionLabel = linkAndLabel.getLabel();
http://git-wip-us.apache.org/repos/asf/isis/blob/0d9216c2/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/feedback/JGrowlBehavior.java
--
diff --git
a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/feedback/JGrowlBehavior.java
b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/feedback/JGrowlBehavior.java
deleted file mode 100644
index 24fdb98..000
---
a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/feedback/JGrowlBehavior.java
+++ /dev/null
@@ -1,101 +0,0 @@
-package org.apache.isis.viewer.wicket.ui.feedback;
-
-import org.apache.commons.lang.StringUtils;
-import org.apache.isis.core.runtime.system.context.IsisContext;
-import org.apache.isis.viewer.wicket.model.models.ActionModel;
-import org.apache.wicket.Component;
-import org.apache.wicket.ajax.AbstractDefaultAjaxBehavior;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.feedback.FeedbackMessage;
-import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
-
-/**
- * Attach to any component to display jGrowl messages.
- *
- * Displays only session-level messages. If you need component-level messages,
- * see http://pastebin.com/f6db2ec0e for an example. Basically, instead of
- * Session.get().getFeedbackMessages(), you would call
- * getComponent().getFeedbackMessage().
- *
- * Requires the following be included: jquery.js, jquery.ui.all.js,
- * jquery.jgrowl.js, jquery.jgrowl.css. These can be downloaded from
- * http://plugins.jquery.com/files/jGrowl-1.2.0.tgz.
- *
- * @author jsinai Based on an example by Alex Objelean, see the above link.
- */
-public class JGrowlBehavior extends AbstractDefaultAjaxBehavior {
-
-private static final long serialVersionUID = 1L;
-
-/**
- * Displays an info message that is sticky. The default is non-sticky.
- * Sample usage: session.getFeedbackMessages().add(new
FeedbackMessage(null,
- * my message,
svn commit: r1450430 - /isis/site/trunk/content/getting-started/screenshots.md
Author: danhaywood
Date: Tue Feb 26 21:22:33 2013
New Revision: 1450430
URL: http://svn.apache.org/r1450430
Log:
isis site: minor edit
Modified:
isis/site/trunk/content/getting-started/screenshots.md
Modified: isis/site/trunk/content/getting-started/screenshots.md
URL:
http://svn.apache.org/viewvc/isis/site/trunk/content/getting-started/screenshots.md?rev=1450430r1=1450429r2=1450430view=diff
==
--- isis/site/trunk/content/getting-started/screenshots.md (original)
+++ isis/site/trunk/content/getting-started/screenshots.md Tue Feb 26 21:22:33
2013
@@ -81,7 +81,7 @@ public class ToDoItem {
}
...
}}
-/prenb: 1.0.1-SNAPSHOT of the quickstart app/td
+/pre/td
td
img src=resources/screencast-08-collection-action.png width=525
height=349/img
/td
[1/5] ISIS-233-ro: more on domainservice.serviceId
http://git-wip-us.apache.org/repos/asf/isis/blob/92079917/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/zzztodo/domainservice/actioninvoke/DomainServiceTest_invoke_TOREFACTOR.java
--
diff --git
a/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/zzztodo/domainservice/actioninvoke/DomainServiceTest_invoke_TOREFACTOR.java
b/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/zzztodo/domainservice/actioninvoke/DomainServiceTest_invoke_TOREFACTOR.java
new file mode 100644
index 000..5626aa7
--- /dev/null
+++
b/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/zzztodo/domainservice/actioninvoke/DomainServiceTest_invoke_TOREFACTOR.java
@@ -0,0 +1,265 @@
+/*
+ * 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.restfulobjects.tck.zzztodo.domainservice.actioninvoke;
+
+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.io.IOException;
+
+import javax.ws.rs.core.Response;
+
+import org.codehaus.jackson.JsonParseException;
+import org.codehaus.jackson.map.JsonMappingException;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Rule;
+import org.junit.Test;
+
+import org.apache.isis.core.webserver.WebServer;
+import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
+import org.apache.isis.viewer.restfulobjects.applib.LinkRepresentation;
+import org.apache.isis.viewer.restfulobjects.applib.RestfulHttpMethod;
+import org.apache.isis.viewer.restfulobjects.applib.client.RestfulClient;
+import org.apache.isis.viewer.restfulobjects.applib.client.RestfulRequest;
+import org.apache.isis.viewer.restfulobjects.applib.client.RestfulResponse;
+import
org.apache.isis.viewer.restfulobjects.applib.client.RestfulRequest.RequestParameter;
+import
org.apache.isis.viewer.restfulobjects.applib.client.RestfulResponse.HttpStatusCode;
+import
org.apache.isis.viewer.restfulobjects.applib.domainobjects.DomainObjectRepresentation;
+import
org.apache.isis.viewer.restfulobjects.applib.domainobjects.DomainServiceResource;
+import
org.apache.isis.viewer.restfulobjects.applib.domainobjects.ListRepresentation;
+import
org.apache.isis.viewer.restfulobjects.applib.domainobjects.ObjectActionRepresentation;
+import
org.apache.isis.viewer.restfulobjects.applib.domainobjects.ScalarValueRepresentation;
+import org.apache.isis.viewer.restfulobjects.tck.IsisWebServerRule;
+
+public class DomainServiceTest_invoke_TOREFACTOR {
+
+@Rule
+public IsisWebServerRule webServerRule = new IsisWebServerRule();
+
+private RestfulClient client;
+
+@SuppressWarnings(unused)
+private DomainServiceResource resource;
+
+@Before
+public void setUp() throws Exception {
+final WebServer webServer = webServerRule.getWebServer();
+client = new RestfulClient(webServer.getBase());
+
+resource = client.getDomainServiceResource();
+}
+
+@Ignore(TODO - fix broken test resulting from introduction of
actionresult repr)
+@Test
+public void invokeQueryOnly_noArg_usingClientFollow() throws Exception {
+
+// given
+final JsonRepresentation givenAction = givenAction(simples, list);
+final ObjectActionRepresentation actionRepr =
givenAction.as(ObjectActionRepresentation.class);
+
+// when
+final LinkRepresentation invokeLink = actionRepr.getInvoke();
+
+// then
+assertThat(invokeLink, is(not(nullValue(;
+final RestfulResponseListRepresentation restfulResponse =
client.followT(invokeLink);
+final ListRepresentation listRepr = restfulResponse.getEntity();
+
+assertThat(listRepr.getValue().size(), is(5));
+}
+
+@Ignore(TODO - fix broken test resulting from introduction of
actionresult repr)
+@Test
+public void invokeIdempotent_withArgs_usingClientFollow() throws Exception
{
+
+// given
git commit: ISIS-352: adding a README.md for github mirror
Updated Branches: refs/heads/master 0eb84d54a - 607f86c83 ISIS-352: adding a README.md for github mirror Project: http://git-wip-us.apache.org/repos/asf/isis/repo Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/607f86c8 Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/607f86c8 Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/607f86c8 Branch: refs/heads/master Commit: 607f86c830da6c2d3e1f610111bc01e593811eba Parents: 0eb84d5 Author: Dan Haywood danhayw...@apache.org Authored: Wed Feb 27 07:44:00 2013 + Committer: Dan Haywood danhayw...@apache.org Committed: Wed Feb 27 07:44:00 2013 + -- README.md | 55 +++ 1 files changed, 55 insertions(+), 0 deletions(-) -- http://git-wip-us.apache.org/repos/asf/isis/blob/607f86c8/README.md -- diff --git a/README.md b/README.md new file mode 100644 index 000..00a7472 --- /dev/null +++ b/README.md @@ -0,0 +1,55 @@ +apache-isis +=== + +*[Apache Isis]((http://isis.apache.org))⢠software is a framework for rapidly developing domain-driven apps in Java. Write your business logic in entities, domain services and repositories, and the framework dynamically generates a representation of that domain model as a webapp or a RESTful API. Use for prototyping or production.* + +To see Isis in action, watch these [screencasts](http://isis.apache.org/getting-started/screencasts.html). + +Get started yourself using the [Maven archetype](http://isis.apache.org/getting-started/quickstart-archetype.html). + +For help and support, join the [mailing lists](http://isis.apache.org/support.html). + +## Screenshots + +The following are taken from the [screenshots](http://isis.apache.org/getting-started/screenshots.html) page on the Isis website. That page also shows the code from which these pages are dynamically generated. + +A list of objects returned from a domain service action: + + + +A domain object: + + + +Invoking an action: + + + +The REST API for a domain object: + + + +## Extensions + +The Wicket viewer is extensible; a number of extensions (hosted on github) are available integrating [google maps](https://github.com/danhaywood/isis-wicket-gmap3), [charting](https://github.com/danhaywood/isis-wicket-wickedcharts), and also a [calendar](https://github.com/danhaywood/isis-wicket-fullcalendar). + + Google maps v3 integration + +A list of objects returned from a domain service action (with additional button to view in a map): + + + +List of objects rendered in a map: + + + +Integration of maps on the object page: + + + + Wicked Charts integration + +An action that returns a [WickedChart](wicked-charts.googlecode.com). + + +
[1/2] git commit: ISIS-352: fixing typo in README.md
ISIS-352: fixing typo in README.md Project: http://git-wip-us.apache.org/repos/asf/isis/repo Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/c4ff489e Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/c4ff489e Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/c4ff489e Branch: refs/heads/master Commit: c4ff489e10575024556f3467a13a86461d43f180 Parents: 607f86c Author: Dan Haywood danhayw...@apache.org Authored: Thu Feb 28 13:47:52 2013 + Committer: Dan Haywood danhayw...@apache.org Committed: Thu Feb 28 13:47:52 2013 + -- README.md |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) -- http://git-wip-us.apache.org/repos/asf/isis/blob/c4ff489e/README.md -- diff --git a/README.md b/README.md index 00a7472..f9fc8a5 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ apache-isis === -*[Apache Isis]((http://isis.apache.org))⢠software is a framework for rapidly developing domain-driven apps in Java. Write your business logic in entities, domain services and repositories, and the framework dynamically generates a representation of that domain model as a webapp or a RESTful API. Use for prototyping or production.* +*[Apache Isis](http://isis.apache.org)⢠software is a framework for rapidly developing domain-driven apps in Java. Write your business logic in entities, domain services and repositories, and the framework dynamically generates a representation of that domain model as a webapp or a RESTful API. Use for prototyping or production.* To see Isis in action, watch these [screencasts](http://isis.apache.org/getting-started/screencasts.html).
[2/2] git commit: ISIS-351: improving exception handling...
Updated Branches:
refs/heads/master 607f86c83 - d52c407f1
ISIS-351: improving exception handling...
... looking into the case when hit an DB exception (unique constraint
violation) on an edit.
Noticed that the version was being bumped anyway even though change not
actually committed to DB.
After some experimentation, determined that if the transaction is aborted
during the first phase,
then the version is not bumped up, but if the transaction is aborted during the
second phase (by inspecting
for any abort causes on the IsisTransaction, then the version got bumped up.
Moved WebRequestCycleForIsis#onEndRequest logic instead into the
#onRequestHandlerExecuted callback
which is executed before
Also reworked and simplified a little of the IsisTransaction and
IsisTransactionManager code (in particular
the IsisTransactionManager#endTransaction method).
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/d52c407f
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/d52c407f
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/d52c407f
Branch: refs/heads/master
Commit: d52c407f1a39380df79fe71c00b3db7635d20642
Parents: c4ff489
Author: Dan Haywood danhayw...@apache.org
Authored: Thu Feb 28 13:52:30 2013 +
Committer: Dan Haywood danhayw...@apache.org
Committed: Thu Feb 28 13:52:30 2013 +
--
.../jdo/datanucleus/DataNucleusObjectStore.java| 26 +++-
.../persistence/FrameworkSynchronizer.java |2 +-
.../integration/wicket/WebRequestCycleForIsis.java | 42 ---
.../apache/isis/applib/DomainObjectContainer.java | 12 ++-
.../core/commons/exceptions/IsisException.java | 68 +-
.../system/transaction/IsisTransaction.java| 103 +--
.../transaction/IsisTransactionFlushException.java | 43 ++
.../system/transaction/IsisTransactionManager.java | 102 +--
.../IsisTransactionManagerCommitException.java | 43 ++
...IsisTransactionManagerDomCallbackException.java | 43 ++
...sTransactionManagerResourceCommitException.java | 43 ++
.../system/transaction/IsisTransactionTest.java| 10 +-
.../WEB-INF/persistor_datanucleus.properties |1 +
13 files changed, 333 insertions(+), 205 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/isis/blob/d52c407f/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/DataNucleusObjectStore.java
--
diff --git
a/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/DataNucleusObjectStore.java
b/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/DataNucleusObjectStore.java
index 17ef5fe..f8016ea 100644
---
a/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/DataNucleusObjectStore.java
+++
b/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/DataNucleusObjectStore.java
@@ -173,8 +173,12 @@ public class DataNucleusObjectStore implements
ObjectStoreSpi {
ensureThatState(persistenceManager, is(notNullValue()));
final IsisTransaction currentTransaction =
getTransactionManager().getTransaction();
-if (currentTransaction != null
currentTransaction.getState().canCommit()) {
-getTransactionManager().endTransaction();
+if (currentTransaction != null
!currentTransaction.getState().isComplete()) {
+if(currentTransaction.getState().canCommit()) {
+getTransactionManager().endTransaction();
+} else if(currentTransaction.getState().canAbort()) {
+getTransactionManager().abortTransaction();
+}
}
persistenceManager.close();
@@ -341,15 +345,23 @@ public class DataNucleusObjectStore implements
ObjectStoreSpi {
}
private void executeCommands(final ListPersistenceCommand commands) {
-try {
+
+// there's no need to do any exception handling here, because we are
called
+// from IsisTransaction.flush() that will catch exceptions and set its
abortCause
+// if need be.
+
+//try {
for (final PersistenceCommand command : commands) {
command.execute(null);
}
getPersistenceManager().flush();
-} catch (final RuntimeException e) {
-LOG.warn(Failure during execution, e);
-throw e;
-}
+//} catch (final RuntimeException e) {
+//LOG.warn(Failure during execution - aborting transaction and
rethrowing, e);
+//
+//abortTransaction();
+//
git commit: ISIS-351: fixing action page handling...
Updated Branches:
refs/heads/master d52c407f1 - 1e84d8507
ISIS-351: fixing action page handling...
... the previous edit page handling had broken the action page handling.
sad face.
Still, design is improved. Now have the concept that the IsisTransaction lets
the
abortCause (set if a flush(...) triggers a violation error) to be cleared.
This allows
the UI (eg Wicket) to take responsibility for rendering the error. If it is
not cleared, then the error handling in WebRequestCycleForIsis kicks in.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/1e84d850
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/1e84d850
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/1e84d850
Branch: refs/heads/master
Commit: 1e84d85076bc9d9a08bdeaeb994b0d9804da1848
Parents: d52c407
Author: Dan Haywood danhayw...@apache.org
Authored: Thu Feb 28 15:43:40 2013 +
Committer: Dan Haywood danhayw...@apache.org
Committed: Thu Feb 28 15:43:40 2013 +
--
.../integration/wicket/WebRequestCycleForIsis.java | 44 ---
.../wicket/ui/components/actions/ActionPanel.java |6 +-
.../viewer/wicket/ui/pages/error/ErrorPage.java|6 ++-
.../system/transaction/IsisTransaction.java| 24 +++-
.../system/transaction/IsisTransactionManager.java | 17 --
5 files changed, 77 insertions(+), 20 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/isis/blob/1e84d850/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/WebRequestCycleForIsis.java
--
diff --git
a/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/WebRequestCycleForIsis.java
b/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/WebRequestCycleForIsis.java
index 680a8bb..f5d7b0e 100644
---
a/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/WebRequestCycleForIsis.java
+++
b/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/WebRequestCycleForIsis.java
@@ -38,6 +38,7 @@ import org.apache.wicket.RestartResponseException;
import org.apache.wicket.Session;
import org.apache.wicket.core.request.handler.PageProvider;
import org.apache.wicket.core.request.handler.RenderPageRequestHandler;
+import
org.apache.wicket.core.request.handler.RenderPageRequestHandler.RedirectPolicy;
import org.apache.wicket.protocol.http.WebSession;
import org.apache.wicket.request.IRequestHandler;
import org.apache.wicket.request.cycle.AbstractRequestCycleListener;
@@ -74,13 +75,15 @@ public class WebRequestCycleForIsis /*extends
WebRequestCycle*/ extends Abstract
getTransactionManager().startTransaction();
}
-@Override
-public synchronized void onEndRequest(RequestCycle cycle) {
-}
-
-
+
+/**
+ * Is called prior to {@link #onEndRequest(RequestCycle)}, and offers the
opportunity to
+ * throw an exception.
+ */
@Override
public void onRequestHandlerExecuted(RequestCycle cycle, IRequestHandler
handler) {
+LOG.info(onRequestHandlerExecuted: handler: + handler);
+
final IsisSession session = getIsisContext().getSessionInstance();
if (session != null) {
try {
@@ -88,17 +91,40 @@ public class WebRequestCycleForIsis /*extends
WebRequestCycle*/ extends Abstract
// an abort will cause the exception to be thrown.
getTransactionManager().endTransaction();
} catch(Exception ex) {
-throw new RestartResponseException(errorPageFor(ex));
+throw new RestartResponseException(errorPageProviderFor(ex),
RedirectPolicy.ALWAYS_REDIRECT);
+}
+}
+}
+
+/**
+ * It is not possible to throw exceptions here, hence use of {@link
#onRequestHandlerExecuted(RequestCycle, IRequestHandler)}.
+ */
+@Override
+public synchronized void onEndRequest(RequestCycle cycle) {
+final IsisSession session = getIsisContext().getSessionInstance();
+if (session != null) {
+try {
+// belt and braces
+getTransactionManager().endTransaction();
} finally {
getIsisContext().closeSessionInstance();
}
}
}
-
+
+
@Override
public IRequestHandler onException(RequestCycle cycle, Exception ex) {
-final ErrorPage page = errorPageFor(ex);
-return new RenderPageRequestHandler(new PageProvider(page));
+// previously we had a handler in here. However, it seems to be
sufficient to just
+// use the exception
