updates for stricter metamodel validation

dom/pom.xml

@@ -60,7 +60,7 @@ language governing permissions and limitations under the License.
         <compileSource>1.7</compileSource>
         <compileTarget>1.7</compileTarget>
 
-        <isis.version>1.13.0</isis.version>
+        <isis.version>1.13.2.20170214-2237</isis.version>
 
         <poi.version>3.9</poi.version>
 

dom/src/main/java/org/isisaddons/module/excel/dom/ExcelFixture.java

@@ -32,6 +32,7 @@
 
 import org.datanucleus.enhancement.Persistable;
 
+import org.apache.isis.applib.annotation.DomainObject;
 import org.apache.isis.applib.annotation.MemberOrder;
 import org.apache.isis.applib.annotation.Programmatic;
 import org.apache.isis.applib.fixturescripts.FixtureResultList;
@@ -51,6 +52,9 @@
  * This class should be executed using {@link FixtureScripts.MultipleExecutionStrategy#EXECUTE_ONCE_BY_VALUE} (it
  * has value semantics).
  */
+@DomainObject(
+        objectType = "isisexcel.ExcelFixture"
+)
 public class ExcelFixture extends FixtureScript {
 
     private final List<Class> classes;

fixture/src/main/java/org/isisaddons/module/excel/fixture/app/ExcelModuleDemoToDoItemBulkUpdateLineItem.java

@@ -17,11 +17,9 @@
 package org.isisaddons.module.excel.fixture.app;
 
 import java.math.BigDecimal;
-import org.isisaddons.module.excel.fixture.dom.ExcelModuleDemoToDoItem;
-import org.isisaddons.module.excel.fixture.dom.ExcelModuleDemoToDoItem.Category;
-import org.isisaddons.module.excel.fixture.dom.ExcelModuleDemoToDoItem.Subcategory;
-import org.isisaddons.module.excel.fixture.dom.ExcelModuleDemoToDoItems;
+
 import org.joda.time.LocalDate;
+
 import org.apache.isis.applib.AbstractViewModel;
 import org.apache.isis.applib.annotation.Action;
 import org.apache.isis.applib.annotation.BookmarkPolicy;
@@ -32,7 +30,14 @@
 import org.apache.isis.applib.annotation.SemanticsOf;
 import org.apache.isis.applib.services.actinvoc.ActionInvocationContext;
 
-@DomainObject
+import org.isisaddons.module.excel.fixture.dom.ExcelModuleDemoToDoItem;
+import org.isisaddons.module.excel.fixture.dom.ExcelModuleDemoToDoItem.Category;
+import org.isisaddons.module.excel.fixture.dom.ExcelModuleDemoToDoItem.Subcategory;
+import org.isisaddons.module.excel.fixture.dom.ExcelModuleDemoToDoItems;
+
+@DomainObject(
+        objectType = "org.isisaddons.module.excel.fixture.app.ExcelModuleDemoToDoItemBulkUpdateLineItem"
+)
 @DomainObjectLayout(
         named = "Bulk update line item",
         bookmarking = BookmarkPolicy.AS_ROOT

fixture/src/main/java/org/isisaddons/module/excel/fixture/app/ExcelModuleDemoToDoItemBulkUpdateManager.java

@@ -48,7 +48,8 @@
 import lombok.Setter;
 
 @DomainObject(
-        nature = Nature.VIEW_MODEL
+        nature = Nature.VIEW_MODEL,
+        objectType = "org.isisaddons.module.excel.fixture.app.ExcelModuleDemoToDoItemBulkUpdateManager"
 )
 @DomainObjectLayout(
         named ="Import/export manager",

fixture/src/main/java/org/isisaddons/module/excel/fixture/app/ExcelModuleDemoToDoItemBulkUpdateMenu.java

@@ -26,6 +26,7 @@
 import org.apache.isis.applib.annotation.Action;
 import org.apache.isis.applib.annotation.DomainService;
 import org.apache.isis.applib.annotation.MemberOrder;
+import org.apache.isis.applib.annotation.NatureOfService;
 import org.apache.isis.applib.annotation.SemanticsOf;
 import org.apache.isis.applib.services.bookmark.Bookmark;
 import org.apache.isis.applib.services.bookmark.BookmarkService;
@@ -37,7 +38,10 @@
 import org.isisaddons.module.excel.fixture.dom.ExcelModuleDemoToDoItem.Category;
 import org.isisaddons.module.excel.fixture.dom.ExcelModuleDemoToDoItem.Subcategory;
 
-@DomainService
+@DomainService(
+        nature = NatureOfService.VIEW_MENU_ONLY,
+        objectType = "org.isisaddons.module.excel.fixture.app.ExcelModuleDemoToDoItemBulkUpdateMenu"
+)
 public class ExcelModuleDemoToDoItemBulkUpdateMenu {
 
     public ExcelModuleDemoToDoItemBulkUpdateMenu() {

fixture/src/main/java/org/isisaddons/module/excel/fixture/app/ExcelModuleDemoToDoItemPivotDemoMenu.java

@@ -25,14 +25,18 @@
 import org.apache.isis.applib.annotation.Action;
 import org.apache.isis.applib.annotation.DomainService;
 import org.apache.isis.applib.annotation.MemberOrder;
+import org.apache.isis.applib.annotation.NatureOfService;
 import org.apache.isis.applib.annotation.SemanticsOf;
 import org.apache.isis.applib.value.Blob;
 
 import org.isisaddons.module.excel.dom.ExcelService;
 import org.isisaddons.module.excel.fixture.dom.ExcelModuleDemoToDoItem;
 import org.isisaddons.module.excel.fixture.viewmodels.ExcelModuleDemoPivot;
 
-@DomainService
+@DomainService(
+        nature = NatureOfService.VIEW_MENU_ONLY,
+        objectType = "org.isisaddons.module.excel.fixture.app.ExcelModuleDemoToDoItemPivotDemoMenu"
+)
 public class ExcelModuleDemoToDoItemPivotDemoMenu {
 
     public ExcelModuleDemoToDoItemPivotDemoMenu() {

fixture/src/main/java/org/isisaddons/module/excel/fixture/app/ExcelModuleDemoUploadService.java

@@ -19,8 +19,15 @@
 import org.isisaddons.module.excel.fixture.scripts.ExcelModuleDemoToDoItemRowHandler;
 import org.isisaddons.module.excel.fixture.viewmodels.ExcelModuleDemoProfessionalImp;
 
-@DomainService(nature = NatureOfService.VIEW_MENU_ONLY)
-@DomainServiceLayout(menuBar = DomainServiceLayout.MenuBar.SECONDARY, named = "Prototyping", menuOrder = "900")
+@DomainService(
+        nature = NatureOfService.VIEW_MENU_ONLY,
+        objectType = "org.isisaddons.module.excel.fixture.app.ExcelModuleDemoUploadService"
+)
+@DomainServiceLayout(
+        menuBar = DomainServiceLayout.MenuBar.SECONDARY,
+        named = "Prototyping",
+        menuOrder = "900"
+)
 public class ExcelModuleDemoUploadService {
 
     public List<FixtureResult> uploadSpreadsheet(

fixture/src/main/java/org/isisaddons/module/excel/fixture/dom/ExcelModuleDemoToDoItem.java

@@ -24,7 +24,6 @@
 import java.util.SortedSet;
 import java.util.TreeSet;
 
-import javax.jdo.JDOHelper;
 import javax.jdo.annotations.IdentityType;
 import javax.jdo.annotations.VersionStrategy;
 
@@ -442,7 +441,7 @@ public List<ExcelModuleDemoToDoItem> autoComplete0Add(final @MinLength(2) String
         return list;
     }
 
-    public String disableAdd(final ExcelModuleDemoToDoItem toDoItem) {
+    public String disableAdd() {
         if(isComplete()) {
             return "Cannot add dependencies for items that are complete";
         }
@@ -467,7 +466,7 @@ public ExcelModuleDemoToDoItem remove(
         return this;
     }
     // disable action dependent on state of object
-    public String disableRemove(final ExcelModuleDemoToDoItem toDoItem) {
+    public String disableRemove() {
         if(isComplete()) {
             return "Cannot remove dependencies for items that are complete";
         }

fixture/src/main/java/org/isisaddons/module/excel/fixture/dom/ExcelModuleDemoToDoItems.java

@@ -29,6 +29,7 @@
 import org.apache.isis.applib.annotation.DomainService;
 import org.apache.isis.applib.annotation.DomainServiceLayout;
 import org.apache.isis.applib.annotation.MemberOrder;
+import org.apache.isis.applib.annotation.NatureOfService;
 import org.apache.isis.applib.annotation.Optionality;
 import org.apache.isis.applib.annotation.Parameter;
 import org.apache.isis.applib.annotation.ParameterLayout;
@@ -40,7 +41,10 @@
 import org.isisaddons.module.excel.fixture.dom.ExcelModuleDemoToDoItem.Category;
 import org.isisaddons.module.excel.fixture.dom.ExcelModuleDemoToDoItem.Subcategory;
 
-@DomainService
+@DomainService(
+        nature = NatureOfService.VIEW_MENU_ONLY,
+        objectType = "org.isisaddons.module.excel.fixture.dom.ExcelModuleDemoToDoItems"
+)
 @DomainServiceLayout(
         named = "ToDos"
 )

fixture/src/main/java/org/isisaddons/module/excel/fixture/scripts/ExcelModuleDemoFixtureScriptsSpecificationProvider.java

@@ -18,11 +18,14 @@
 
 import org.apache.isis.applib.annotation.DomainService;
 import org.apache.isis.applib.annotation.DomainServiceLayout;
+import org.apache.isis.applib.annotation.NatureOfService;
 import org.apache.isis.applib.fixturescripts.FixtureScripts;
 import org.apache.isis.applib.services.fixturespec.FixtureScriptsSpecification;
 import org.apache.isis.applib.services.fixturespec.FixtureScriptsSpecificationProvider;
 
-@DomainService
+@DomainService(
+        nature = NatureOfService.DOMAIN
+)
 @DomainServiceLayout(
         named = "Prototyping",
         menuBar = DomainServiceLayout.MenuBar.SECONDARY,

pom.xml

@@ -32,7 +32,7 @@ language governing permissions and limitations under the License.
 
     <properties>
 
-        <isis.version>1.13.0</isis.version>
+        <isis.version>1.13.2.20170214-2237</isis.version>
 
         <isis-module-excel.version>1.14.0-SNAPSHOT</isis-module-excel.version>
 

webapp/src/main/webapp/WEB-INF/isis.properties

@@ -15,23 +15,14 @@
 
 isis.appManifest=org.isisaddons.module.excel.app.ExcelAppManifest
 
-isis.authentication=shiro
-isis.authorization=shiro
-
-# as used by @Title of a date
-isis.value.format.date=dd-MM-yyyy
-
-
 isis.reflector.validator.allowDeprecated=false
+isis.reflector.validator.explicitObjectType=true
+isis.reflector.validator.serviceActionsOnly=true
+isis.reflector.validator.mixinsOnly=true
+isis.reflector.validator.noParamsOnly=true
 
 
 
-#
-#force read translations, even if running in prototype mode
-#
-#isis.services.translation.po.mode=read
-
-