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/12/05 16:23:31 UTC
[08/11] isis git commit: ISIS-964: recreating simpleapp archetype
ISIS-964: 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/b5cb55e1
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/b5cb55e1
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/b5cb55e1
Branch: refs/heads/master
Commit: b5cb55e1993e3d411dadf9fe27231b4667a91adc
Parents: 1e17f11
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Fri Dec 5 11:55:23 2014 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Fri Dec 5 11:55:23 2014 +0000
----------------------------------------------------------------------
.../src/main/java/dom/simple/SimpleObjects.java | 4 +-
.../simple/SimpleObjectsFixturesService.java | 6 +--
.../webapp/src/main/webapp/css/application.css | 52 --------------------
.../projects/basic/archetype.properties | 2 +-
4 files changed, 6 insertions(+), 58 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/b5cb55e1/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/main/java/dom/simple/SimpleObjects.java
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/main/java/dom/simple/SimpleObjects.java b/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/main/java/dom/simple/SimpleObjects.java
index 9243652..753f385 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/main/java/dom/simple/SimpleObjects.java
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/main/java/dom/simple/SimpleObjects.java
@@ -28,7 +28,7 @@ import org.apache.isis.applib.annotation.ActionSemantics.Of;
import org.apache.isis.applib.annotation.Bookmarkable;
import org.apache.isis.applib.annotation.DomainService;
import org.apache.isis.applib.annotation.MemberOrder;
-import org.apache.isis.applib.annotation.Named;
+import org.apache.isis.applib.annotation.ParameterLayout;
@DomainService(menuOrder = "10", repositoryFor = SimpleObject.class)
public class SimpleObjects {
@@ -47,7 +47,7 @@ public class SimpleObjects {
//region > create (action)
@MemberOrder(sequence = "2")
public SimpleObject create(
- final @Named("Name") String name) {
+ final @ParameterLayout(named="Name") String name) {
final SimpleObject obj = container.newTransientInstance(SimpleObject.class);
obj.setName(name);
container.persistIfNotAlready(obj);
http://git-wip-us.apache.org/repos/asf/isis/blob/b5cb55e1/example/archetype/simpleapp/src/main/resources/archetype-resources/fixture/src/main/java/fixture/simple/SimpleObjectsFixturesService.java
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/fixture/src/main/java/fixture/simple/SimpleObjectsFixturesService.java b/example/archetype/simpleapp/src/main/resources/archetype-resources/fixture/src/main/java/fixture/simple/SimpleObjectsFixturesService.java
index 5852a31..f7f1813 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/fixture/src/main/java/fixture/simple/SimpleObjectsFixturesService.java
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/fixture/src/main/java/fixture/simple/SimpleObjectsFixturesService.java
@@ -24,9 +24,9 @@ package fixture.simple;
import fixture.simple.scenario.SimpleObjectsFixture;
import java.util.List;
+import org.apache.isis.applib.annotation.ClassLayout;
import org.apache.isis.applib.annotation.DomainService;
import org.apache.isis.applib.annotation.MemberOrder;
-import org.apache.isis.applib.annotation.Named;
import org.apache.isis.applib.annotation.Prototype;
import org.apache.isis.applib.fixturescripts.FixtureResult;
import org.apache.isis.applib.fixturescripts.FixtureScript;
@@ -36,8 +36,8 @@ import org.apache.isis.applib.fixturescripts.SimpleFixtureScript;
/**
* Enables fixtures to be installed from the application.
*/
-@Named("Prototyping")
-@DomainService(menuOrder = "20")
+@ClassLayout(named="Prototyping")
+@DomainService(menuBar= DomainService.MenuBar.SECONDARY, menuOrder = "20")
public class SimpleObjectsFixturesService extends FixtureScripts {
public SimpleObjectsFixturesService() {
http://git-wip-us.apache.org/repos/asf/isis/blob/b5cb55e1/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/css/application.css
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/css/application.css b/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/css/application.css
index 8aac50a..9f1612a 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/css/application.css
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/css/application.css
@@ -17,55 +17,3 @@
* under the License.
*/
-/*
-uncomment to add a logo (in an ../images directory relative to this file)
-
-#header {
- height: 48px;
- background-image: url("../images/logo.png");
- background-repeat: no-repeat;
-}
-
-#header h1 {
- display: none;
-}
-*/
-
-/*
-example: uncomment to hide the icon
-
-.entityIconAndTitlePanel a img {
- display: none;
-}
-*/
-
-/*
-example: uncomment to hide the sliding bookmark panel
-
-#bookmarkedPagesSlidingDiv {
- display: none;
-}
-.showPanelTab {
- display: none;
-}
-*/
-
-
-.entityActions .cssMenuPanel .menuh li.x-caution a,
-li.x-caution a {
- background-color: #C94316;
-}
-.entityActions .cssMenuPanel .menuh li.x-caution a:hover {
- background-color:#20B5C2;
-}
-
-/*.entityActions .cssMenuPanel .menuh a:hover*/
-
-.entityActions .cssMenuPanel .menuh li.x-highlight a,
-li.x-highlight a {
- background-color: #51A95C;
-}
-
-div.x-key span.scalarName {
- color: red;
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/b5cb55e1/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 ce363b1..5957bd5 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 @@
-#Sat Nov 29 07:58:38 GMT 2014
+#Fri Dec 05 11:55:17 GMT 2014
package=it.pkg
version=0.1-SNAPSHOT
groupId=archetype.it