You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2014/11/29 11:42:07 UTC
[1/3] isis git commit: ISIS-537: fixing CSS issues for
AdditionalLinksPanel; fixing alignment of label=top or label=none divs.
Repository: isis
Updated Branches:
refs/heads/master 0a447948a -> f8b8fad97
ISIS-537: fixing CSS issues for AdditionalLinksPanel; fixing alignment of label=top or label=none divs.
For AdditionalLinksPanel, fixed by moving its CSS into bootstrap-overrides.css and removing per component CSS from FormAbstract. (Other subclass of FormAbstract, namely SimpleClipboardModalWindowForm's CSS also moved, to PageAbstract.css).
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/582cad4b
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/582cad4b
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/582cad4b
Branch: refs/heads/master
Commit: 582cad4b05d96e87151cd4e772c1c41b293f7018
Parents: 0a44794
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Sat Nov 29 07:41:59 2014 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Sat Nov 29 07:41:59 2014 +0000
----------------------------------------------------------------------
.../additionallinks/AdditionalLinksPanel.css | 41 -------------------
.../additionallinks/AdditionalLinksPanel.java | 12 ------
.../zclip/SimpleClipboardModalWindowForm.css | 42 --------------------
.../viewer/wicket/ui/pages/PageAbstract.css | 30 ++++++++++++++
.../wicket/ui/pages/bootstrap-overrides.css | 41 +++++++++++++++++++
.../viewer/wicket/ui/panels/FormAbstract.java | 23 -----------
6 files changed, 71 insertions(+), 118 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/582cad4b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/additionallinks/AdditionalLinksPanel.css
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/additionallinks/AdditionalLinksPanel.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/additionallinks/AdditionalLinksPanel.css
deleted file mode 100644
index accd5ac..0000000
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/additionallinks/AdditionalLinksPanel.css
+++ /dev/null
@@ -1,41 +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.
- */
-
-span .fa {
- padding-right: 2px;
-}
-
-.additionalLinkList {
- float:left;
- margin:0;
- padding:0;
- list-style:none;
-}
-
-ul.additionalLinkList,
-div.additionalLinkList {
- padding-bottom: 10px;
-}
-
-.standaloneCollectionPanel div.additionalLinkList,
-.standaloneCollectionPanel ul.additionalLinkList,
-.entityCollectionsPanel div.additionalLinkList,
-.entityCollectionsPanel ul.additionalLinkList {
- padding-bottom: 0px;
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/582cad4b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/additionallinks/AdditionalLinksPanel.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/additionallinks/AdditionalLinksPanel.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/additionallinks/AdditionalLinksPanel.java
index 68f4df5..b5f2b23 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/additionallinks/AdditionalLinksPanel.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/additionallinks/AdditionalLinksPanel.java
@@ -23,7 +23,6 @@ import java.util.List;
import com.google.common.base.Strings;
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.behavior.AttributeAppender;
-import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.link.AbstractLink;
@@ -32,9 +31,7 @@ import org.apache.wicket.markup.html.list.ListView;
import org.apache.isis.core.commons.lang.StringExtensions;
import org.apache.isis.viewer.wicket.model.links.LinkAndLabel;
import org.apache.isis.viewer.wicket.model.links.ListOfLinksModel;
-import org.apache.isis.viewer.wicket.ui.ComponentFactory;
import org.apache.isis.viewer.wicket.ui.panels.PanelAbstract;
-import org.apache.isis.viewer.wicket.ui.panels.PanelUtil;
import org.apache.isis.viewer.wicket.ui.util.Components;
import org.apache.isis.viewer.wicket.ui.util.CssClassAppender;
@@ -148,14 +145,5 @@ public class AdditionalLinksPanel extends PanelAbstract<ListOfLinksModel> {
return null;
}
- /**
- * Because there is no {@link ComponentFactory} for this component,
- * its CSS must be contributed in this way instead (also meaning its CSS is not bundled).
- */
- @Override
- public void renderHead(final IHeaderResponse response) {
- PanelUtil.renderHead(response, this.getClass());
- }
-
}
http://git-wip-us.apache.org/repos/asf/isis/blob/582cad4b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/SimpleClipboardModalWindowForm.css
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/SimpleClipboardModalWindowForm.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/SimpleClipboardModalWindowForm.css
deleted file mode 100644
index 7745cbc..0000000
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/SimpleClipboardModalWindowForm.css
+++ /dev/null
@@ -1,42 +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.
- */
-
-.simpleClipboardPanel form {
- margin: 20px;
- background-color: white;
-}
-
-.simpleClipboardPanel div.inner {
- margin: 20px;
- width:640px;
-}
-
-.simpleClipboardPanel div.inner p.scalarName {
- padding-top: 40px;
- padding-bottom: 10px;
-}
-
-.simpleClipboardPanel form input.textField {
- width:600px;
- margin-bottom: 60px;
-}
-
-.simpleClipboardPanel form input.ok {
- margin-bottom: 20px;
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/582cad4b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.css
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.css
index 78b9e82..601ad57 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.css
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.css
@@ -17,6 +17,34 @@
* under the License.
*/
+
+.simpleClipboardPanel form {
+ margin: 20px;
+ background-color: white;
+}
+
+.simpleClipboardPanel div.inner {
+ margin: 20px;
+ width:640px;
+}
+
+.simpleClipboardPanel div.inner p.scalarName {
+ padding-top: 40px;
+ padding-bottom: 10px;
+}
+
+.simpleClipboardPanel form input.textField {
+ width:600px;
+ margin-bottom: 60px;
+}
+
+.simpleClipboardPanel form input.ok {
+ margin-bottom: 20px;
+}
+
+
+
+
.mandatory.scalarName:after,
.mandatory.collectionName:after {
content: "*";
@@ -28,3 +56,5 @@
.navbar .powered-by {
margin-right: 0px;
}
+
+
http://git-wip-us.apache.org/repos/asf/isis/blob/582cad4b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides.css
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides.css
index ce753b7..77b9315 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides.css
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides.css
@@ -71,6 +71,40 @@
}
+
+/* from additionalLinksPanel.css */
+
+span .fa {
+ padding-right: 2px;
+}
+
+.additionalLinkList {
+ float:left;
+ margin:0;
+ padding:0;
+ list-style:none;
+}
+
+ul.additionalLinkList,
+div.additionalLinkList {
+ padding-bottom: 10px;
+}
+
+.standaloneCollectionPanel div.additionalLinkList,
+.standaloneCollectionPanel ul.additionalLinkList,
+.entityCollectionsPanel div.additionalLinkList,
+.entityCollectionsPanel ul.additionalLinkList {
+ padding-bottom: 0px;
+}
+
+
+
+
+
+
+
+
+
.entityPropertiesPanel .additionalLinks,
.entityCollectionsPanel .additionalLinksAndSelectorDropDown {
margin-top: -4px;
@@ -105,6 +139,7 @@ th > a > div > strong {
margin-bottom: 0;
}
+
div.label-left.form-group {
width: 100%;
}
@@ -187,6 +222,12 @@ div.label-left .choicesPlaceholder {
margin-right: -25px;
}
+.form-horizontal.inputForm .form-group.label-none,
+.form-horizontal.inputForm .form-group.label-top {
+ margin-left: -10px;
+}
+
+
.modal-body textarea {
resize: none;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/582cad4b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormAbstract.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormAbstract.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormAbstract.java
index c98db31..2b8260d 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormAbstract.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormAbstract.java
@@ -52,29 +52,6 @@ public abstract class FormAbstract<T> extends Form<T> implements IHeaderContribu
super(id, model);
}
- // ///////////////////////////////////////////////////////////////////
- // IHeaderContributor
- // ///////////////////////////////////////////////////////////////////
-
- /**
- * Automatically reference any corresponding CSS.
- */
- @Override
- public void renderHead(final IHeaderResponse response) {
- super.renderHead(response);
- renderHead(response, this.getClass());
- }
-
- /**
- * Factored out to allow non-concrete subclasses to additionally render
- * their own CSS if required.
- */
- protected void renderHead(final IHeaderResponse response, final Class<?> cls) {
- final String url = cls.getSimpleName() + ".css";
- //response.renderCSSReference(new PackageResourceReference(cls, url));
- response.render(CssHeaderItem.forReference(new CssResourceReference(cls, url)));
- }
-
// ///////////////////////////////////////////////////////////////////
// process() override
[2/3] isis git commit: ISIS-928: recreating simpleapp archetype
Posted by da...@apache.org.
ISIS-928: recreating simpleapp archetype
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/834014f4
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/834014f4
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/834014f4
Branch: refs/heads/master
Commit: 834014f484522bd478be650ebe3a45f92a3d753f
Parents: 582cad4
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Sat Nov 29 07:58:45 2014 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Sat Nov 29 07:58:45 2014 +0000
----------------------------------------------------------------------
.../src/main/webapp/WEB-INF/isis.properties | 28 +++++++++++++++++---
.../projects/basic/archetype.properties | 2 +-
2 files changed, 25 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/834014f4/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/isis.properties
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/isis.properties b/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/isis.properties
index cd3a6ad..eae9e91 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/isis.properties
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/isis.properties
@@ -102,17 +102,37 @@ ${symbol_pound}
${symbol_pound} patterns for applying CssClassFa facet (font-awesome icons) to member names
${symbol_pound}
isis.reflector.facet.cssClassFa.patterns=${symbol_escape}
+ new.*:fa-plus,${symbol_escape}
+ add.*:fa-plus-square,${symbol_escape}
create.*:fa-plus,${symbol_escape}
update.*:fa-edit,${symbol_escape}
- add.*:fa-plus-square,${symbol_escape}
+ change.*:fa-edit,${symbol_escape}
remove.*:fa-minus-square,${symbol_escape}
move.*:fa-exchange,${symbol_escape}
first.*:fa-star,${symbol_escape}
find.*:fa-search,${symbol_escape}
+ lookup.*:fa-search,${symbol_escape}
clear.*:fa-remove,${symbol_escape}
previous.*:fa-step-backward,${symbol_escape}
next.*:fa-step-forward,${symbol_escape}
- list.*:fa-list
+ list.*:fa-list, ${symbol_escape}
+ all.*:fa-list, ${symbol_escape}
+ download.*:fa-download, ${symbol_escape}
+ upload.*:fa-upload, ${symbol_escape}
+ execute.*:fa-bolt, ${symbol_escape}
+ run.*:fa-bolt, ${symbol_escape}
+ calculate.*:fa-calculator, ${symbol_escape}
+ verify.*:fa-check-circle, ${symbol_escape}
+ refresh.*:fa-refresh, ${symbol_escape}
+ install.*:fa-wrench
+
+
+isis.reflector.facet.cssClass.patterns=${symbol_escape}
+ update.*:btn-default,${symbol_escape}
+ delete.*:btn-warning,${symbol_escape}
+ .*:btn-primary
+
+
${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbo
l_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}
${symbol_pound}
@@ -209,5 +229,5 @@ ${symbol_pound}isis.viewers.paged.standalone=30
${symbol_pound}isis.viewers.paged.parented=10
-${symbol_pound}isis.viewers.labelAt.property=LEFT
-${symbol_pound}isis.viewers.labelAt.parameter=LEFT
+${symbol_pound}isis.viewers.propertyLayout.labelPosition=LEFT
+${symbol_pound}isis.viewers.parameterLayout.labelPosition=LEFT
http://git-wip-us.apache.org/repos/asf/isis/blob/834014f4/example/archetype/simpleapp/src/test/resources/projects/basic/archetype.properties
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/test/resources/projects/basic/archetype.properties b/example/archetype/simpleapp/src/test/resources/projects/basic/archetype.properties
index 7fa9f64..ce363b1 100644
--- a/example/archetype/simpleapp/src/test/resources/projects/basic/archetype.properties
+++ b/example/archetype/simpleapp/src/test/resources/projects/basic/archetype.properties
@@ -1,4 +1,4 @@
-#Thu Nov 20 12:17:20 CET 2014
+#Sat Nov 29 07:58:38 GMT 2014
package=it.pkg
version=0.1-SNAPSHOT
groupId=archetype.it
[3/3] isis git commit: ISIS-928: recreating todoapp archetype
Posted by da...@apache.org.
ISIS-928: recreating todoapp archetype
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/f8b8fad9
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/f8b8fad9
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/f8b8fad9
Branch: refs/heads/master
Commit: f8b8fad97d6fee6147a792cd4ba9c92add4bc039
Parents: 834014f
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Sat Nov 29 08:01:52 2014 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Sat Nov 29 08:01:52 2014 +0000
----------------------------------------------------------------------
.../src/main/java/dom/todo/ToDoItem.layout.json | 19 +++++-----
.../integration/tests/ToDoItemIntegTest.java | 37 +++++++++-----------
.../src/main/webapp/WEB-INF/isis.properties | 25 ++++++++++---
.../projects/basic/archetype.properties | 2 +-
4 files changed, 49 insertions(+), 34 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/f8b8fad9/example/archetype/todoapp/src/main/resources/archetype-resources/dom/src/main/java/dom/todo/ToDoItem.layout.json
----------------------------------------------------------------------
diff --git a/example/archetype/todoapp/src/main/resources/archetype-resources/dom/src/main/java/dom/todo/ToDoItem.layout.json b/example/archetype/todoapp/src/main/resources/archetype-resources/dom/src/main/java/dom/todo/ToDoItem.layout.json
index 9f8fb30..0619d46 100644
--- a/example/archetype/todoapp/src/main/resources/archetype-resources/dom/src/main/java/dom/todo/ToDoItem.layout.json
+++ b/example/archetype/todoapp/src/main/resources/archetype-resources/dom/src/main/java/dom/todo/ToDoItem.layout.json
@@ -23,13 +23,13 @@
"members": {
"description": {
"typicalLength": { "value": 50 },
- "labelAt": { "value": "TOP" }
+ "propertyLayout": { "labelPosition": "TOP" }
},
"category": {
- "labelAt": { "value": "TOP" }
+ "propertyLayout": { "labelPosition": "TOP" }
},
"subcategory": {
- "labelAt": { "value": "NONE" },
+ "propertyLayout": { "labelPosition": "NONE" },
"actions": {
"updateCategory": {
"named": {
@@ -37,9 +37,8 @@
}
},
"analyseCategory": {
- "cssClassFa": {
- "value": "fa fa-pie-chart"
- }
+ "cssClass": { "value": "btn-default" },
+ "cssClassFa": { "value": "fa fa-pie-chart" }
}
}
},
@@ -53,6 +52,7 @@
"describedAs": {
"value": "Update this todo item as complete"
},
+ "cssClass": { "value": "btn-success" },
"cssClassFa": { "value": "fa fa-thumbs-up" }
},
"notYetCompleted": {
@@ -60,6 +60,7 @@
"describedAs": {
"value": "Update this todo item as not yet complete"
},
+ "cssClass": { "value": "btn-info" },
"cssClassFa": { "value": "fa fa-thumbs-down" }
},
"scheduleExplicitly": {
@@ -125,7 +126,7 @@
"hidden": {
"where": "ALL_TABLES"
},
- "labelAt": { "value": "TOP" }
+ "propertyLayout": { "labelPosition": "TOP" }
},
"attachment": {
"hidden": {
@@ -151,10 +152,11 @@
"disabled": {},
"actions": {
"add":{
+ "cssClass": { "value": "btn-default" },
"cssClassFa": { "value": "fa fa-plus-square" }
},
"remove": {
- "cssClass": { "value": "x-caution btn-danger" },
+ "cssClass": { "value": "x-caution btn-default" },
"cssClassFa": { "value": "fa fa-minus-square" }
}
},
@@ -190,6 +192,7 @@
"describedAs": {
"value": "Create a new todo item from this one"
},
+ "cssClass": { "value": "btn-default" },
"cssClassFa": { "value": "fa fa-copy fa-lg" }
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/f8b8fad9/example/archetype/todoapp/src/main/resources/archetype-resources/integtests/src/test/java/integration/tests/ToDoItemIntegTest.java
----------------------------------------------------------------------
diff --git a/example/archetype/todoapp/src/main/resources/archetype-resources/integtests/src/test/java/integration/tests/ToDoItemIntegTest.java b/example/archetype/todoapp/src/main/resources/archetype-resources/integtests/src/test/java/integration/tests/ToDoItemIntegTest.java
index 68c2619..0d1c904 100644
--- a/example/archetype/todoapp/src/main/resources/archetype-resources/integtests/src/test/java/integration/tests/ToDoItemIntegTest.java
+++ b/example/archetype/todoapp/src/main/resources/archetype-resources/integtests/src/test/java/integration/tests/ToDoItemIntegTest.java
@@ -61,7 +61,6 @@ import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.CoreMatchers.notNullValue;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
public class ToDoItemIntegTest extends AbstractToDoIntegTest {
@@ -269,17 +268,16 @@ public class ToDoItemIntegTest extends AbstractToDoIntegTest {
}
@Test
- public void subscriberThrowingOtherExceptionIsIgnored() throws Exception {
+ public void subscriberVetoesEventWithAnyOtherException() throws Exception {
// given
toDoItemSubscriptions.subscriberBehaviour(ToDoItemSubscriptions.Behaviour.AnyExecuteVetoWithOtherException);
+ // then
+ expectedExceptions.expect(RuntimeException.class);
+
// when
toDoItem.completed();
-
- // then
- // (no expectedExceptions setup, expect to continue)
- assertTrue(true);
}
}
@@ -572,17 +570,16 @@ public class ToDoItemIntegTest extends AbstractToDoIntegTest {
}
@Test
- public void subscriberThrowingOtherExceptionIsIgnored() throws Exception {
+ public void subscriberVetoesEventWithAnyOtherException() throws Exception {
// given
toDoItemSubscriptions.subscriberBehaviour(ToDoItemSubscriptions.Behaviour.AnyExecuteVetoWithOtherException);
+ // then
+ expectedExceptions.expect(RuntimeException.class);
+
// when
toDoItem.add(otherToDoItem);
-
- // then
- // (no expectedExceptions setup, expect to continue)
- assertTrue(true);
}
}
public static class Remove extends ToDoItemIntegTest {
@@ -670,17 +667,16 @@ public class ToDoItemIntegTest extends AbstractToDoIntegTest {
}
@Test
- public void subscriberThrowingOtherExceptionIsIgnored() throws Exception {
+ public void subscriberVetoesEventWithAnyOtherException() throws Exception {
// given
toDoItemSubscriptions.subscriberBehaviour(ToDoItemSubscriptions.Behaviour.AnyExecuteVetoWithOtherException);
+ // then
+ expectedExceptions.expect(RuntimeException.class);
+
// when
toDoItem.remove(otherToDoItem);
-
- // then
- // (no expectedExceptions setup, expect to continue)
- assertTrue(true);
}
}
}
@@ -911,17 +907,16 @@ public class ToDoItemIntegTest extends AbstractToDoIntegTest {
@Test
- public void subscriberThrowingOtherExceptionIsIgnored() throws Exception {
+ public void subscriberVetoesEventWithAnyOtherException() throws Exception {
// given
toDoItemSubscriptions.subscriberBehaviour(ToDoItemSubscriptions.Behaviour.AnyExecuteVetoWithOtherException);
+ // then
+ expectedExceptions.expect(RuntimeException.class);
+
// when
toDoItem.setDescription("Buy bread and butter");
-
- // then
- // (no expectedExceptions setup, expect to continue)
- assertTrue(true);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/f8b8fad9/example/archetype/todoapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/isis.properties
----------------------------------------------------------------------
diff --git a/example/archetype/todoapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/isis.properties b/example/archetype/todoapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/isis.properties
index f91fa59..6375e06 100644
--- a/example/archetype/todoapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/isis.properties
+++ b/example/archetype/todoapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/isis.properties
@@ -102,17 +102,34 @@ ${symbol_pound}
${symbol_pound} patterns for applying CssClassFa facet (font-awesome icons) to member names
${symbol_pound}
isis.reflector.facet.cssClassFa.patterns=${symbol_escape}
+ new.*:fa-plus,${symbol_escape}
+ add.*:fa-plus-square,${symbol_escape}
create.*:fa-plus,${symbol_escape}
update.*:fa-edit,${symbol_escape}
- add.*:fa-plus-square,${symbol_escape}
+ change.*:fa-edit,${symbol_escape}
remove.*:fa-minus-square,${symbol_escape}
move.*:fa-exchange,${symbol_escape}
first.*:fa-star,${symbol_escape}
find.*:fa-search,${symbol_escape}
+ lookup.*:fa-search,${symbol_escape}
clear.*:fa-remove,${symbol_escape}
previous.*:fa-step-backward,${symbol_escape}
next.*:fa-step-forward,${symbol_escape}
- list.*:fa-list
+ list.*:fa-list, ${symbol_escape}
+ all.*:fa-list, ${symbol_escape}
+ download.*:fa-download, ${symbol_escape}
+ upload.*:fa-upload, ${symbol_escape}
+ execute.*:fa-bolt, ${symbol_escape}
+ run.*:fa-bolt, ${symbol_escape}
+ calculate.*:fa-calculator, ${symbol_escape}
+ verify.*:fa-check-circle, ${symbol_escape}
+ refresh.*:fa-refresh, ${symbol_escape}
+ install.*:fa-wrench
+
+isis.reflector.facet.cssClass.patterns=${symbol_escape}
+ delete.*:btn-warning,${symbol_escape}
+ .*:btn-primary
+
${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbo
l_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}
${symbol_pound}
@@ -212,5 +229,5 @@ ${symbol_pound}
${symbol_pound}isis.viewers.paged.standalone=30
${symbol_pound}isis.viewers.paged.parented=10
-${symbol_pound}isis.viewers.labelAt.property=LEFT
-${symbol_pound}isis.viewers.labelAt.parameter=LEFT
+${symbol_pound}isis.viewers.propertyLayout.labelPosition=LEFT
+${symbol_pound}isis.viewers.parameterLayout.labelPosition=LEFT
http://git-wip-us.apache.org/repos/asf/isis/blob/f8b8fad9/example/archetype/todoapp/src/test/resources/projects/basic/archetype.properties
----------------------------------------------------------------------
diff --git a/example/archetype/todoapp/src/test/resources/projects/basic/archetype.properties b/example/archetype/todoapp/src/test/resources/projects/basic/archetype.properties
index 16ccd95..7a99f8b 100644
--- a/example/archetype/todoapp/src/test/resources/projects/basic/archetype.properties
+++ b/example/archetype/todoapp/src/test/resources/projects/basic/archetype.properties
@@ -1,4 +1,4 @@
-#Thu Nov 20 12:18:13 CET 2014
+#Sat Nov 29 08:01:46 GMT 2014
package=it.pkg
version=0.1-SNAPSHOT
groupId=archetype.it