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 2021/03/12 19:24:09 UTC
[isis-app-helloworld] branch jpa updated (4295697 -> cc3e4dd)
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a change to branch jpa
in repository https://gitbox.apache.org/repos/asf/isis-app-helloworld.git.
from 4295697 ISIS-2512: fixes datasource conf
add 38076a9 making name of pom.xml consistent
new cc3e4dd reconciling with 'jdo' version
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
pom.xml | 2 +-
src/main/java/domainapp/modules/hello/dom/hwo/HelloWorldObject.java | 1 -
src/main/java/domainapp/modules/hello/types/Name.java | 1 -
src/main/java/domainapp/webapp/AppManifest.java | 4 +++-
4 files changed, 4 insertions(+), 4 deletions(-)
[isis-app-helloworld] 01/01: reconciling with 'jdo' version
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch jpa
in repository https://gitbox.apache.org/repos/asf/isis-app-helloworld.git
commit cc3e4ddeb13e11133bb4b4ebc596c6c44e8d4a38
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Mar 12 19:23:56 2021 +0000
reconciling with 'jdo' version
---
src/main/java/domainapp/modules/hello/dom/hwo/HelloWorldObject.java | 1 -
src/main/java/domainapp/modules/hello/types/Name.java | 1 -
src/main/java/domainapp/webapp/AppManifest.java | 4 +++-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/domainapp/modules/hello/dom/hwo/HelloWorldObject.java b/src/main/java/domainapp/modules/hello/dom/hwo/HelloWorldObject.java
index 94766d1..6395911 100644
--- a/src/main/java/domainapp/modules/hello/dom/hwo/HelloWorldObject.java
+++ b/src/main/java/domainapp/modules/hello/dom/hwo/HelloWorldObject.java
@@ -9,7 +9,6 @@ import org.apache.isis.applib.annotation.ActionLayout;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.DomainObjectLayout;
import org.apache.isis.applib.annotation.MemberOrder;
-import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.applib.annotation.Publishing;
import org.apache.isis.applib.annotation.SemanticsOf;
import org.apache.isis.applib.services.message.MessageService;
diff --git a/src/main/java/domainapp/modules/hello/types/Name.java b/src/main/java/domainapp/modules/hello/types/Name.java
index 553813e..ce9d6f9 100644
--- a/src/main/java/domainapp/modules/hello/types/Name.java
+++ b/src/main/java/domainapp/modules/hello/types/Name.java
@@ -5,7 +5,6 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.applib.annotation.Parameter;
import org.apache.isis.applib.annotation.ParameterLayout;
import org.apache.isis.applib.annotation.Property;
diff --git a/src/main/java/domainapp/webapp/AppManifest.java b/src/main/java/domainapp/webapp/AppManifest.java
index 1baba37..87a5213 100644
--- a/src/main/java/domainapp/webapp/AppManifest.java
+++ b/src/main/java/domainapp/webapp/AppManifest.java
@@ -26,6 +26,8 @@ import domainapp.modules.hello.HelloWorldModule;
IsisModuleTestingH2ConsoleUi.class,
HelloWorldModule.class
})
-@PropertySource(IsisPresets.NoTranslations)
+@PropertySources({
+ @PropertySource(IsisPresets.NoTranslations),
+})
public class AppManifest {
}