This is an automated email from the ASF dual-hosted git repository. danhaywood pushed a commit to branch jdo-SNAPSHOT in repository https://gitbox.apache.org/repos/asf/causeway-app-helloworld.git
commit 17a2bb35a17289314cd2ca646772912fa182f686 Author: danhaywood <[email protected]> AuthorDate: Sun Jan 29 18:14:30 2023 +0000 reorg imports. --- .../domainapp/modules/hello/dom/hwo/HelloWorldObject.java | 15 ++++----------- .../modules/hello/dom/hwo/HelloWorldObjects.java | 14 +++----------- src/main/java/domainapp/modules/hello/types/Notes.java | 8 +------- src/main/java/domainapp/webapp/AppManifest.java | 10 +++++----- src/main/java/domainapp/webapp/HelloWorldApp.java | 4 ++-- src/main/resources/menubars.layout.xml | 6 +++++- 6 files changed, 20 insertions(+), 37 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 b698c0a..4b100db 100644 --- a/src/main/java/domainapp/modules/hello/dom/hwo/HelloWorldObject.java +++ b/src/main/java/domainapp/modules/hello/dom/hwo/HelloWorldObject.java @@ -1,27 +1,20 @@ package domainapp.modules.hello.dom.hwo; +import domainapp.modules.hello.types.Name; +import domainapp.modules.hello.types.Notes; + import java.util.Comparator; import javax.inject.Inject; import javax.inject.Named; import javax.jdo.annotations.*; -import org.apache.causeway.applib.annotation.Action; -import org.apache.causeway.applib.annotation.ActionLayout; -import org.apache.causeway.applib.annotation.DomainObject; -import org.apache.causeway.applib.annotation.DomainObjectLayout; -import org.apache.causeway.applib.annotation.PropertyLayout; -import org.apache.causeway.applib.annotation.Publishing; -import org.apache.causeway.applib.annotation.SemanticsOf; -import org.apache.causeway.applib.annotation.Title; +import org.apache.causeway.applib.annotation.*; import org.apache.causeway.applib.layout.LayoutConstants; import org.apache.causeway.applib.services.message.MessageService; import org.apache.causeway.applib.services.repository.RepositoryService; import org.apache.causeway.applib.services.title.TitleService; -import domainapp.modules.hello.types.Name; -import domainapp.modules.hello.types.Notes; - @PersistenceCapable( schema = "hello", identityType = IdentityType.DATASTORE diff --git a/src/main/java/domainapp/modules/hello/dom/hwo/HelloWorldObjects.java b/src/main/java/domainapp/modules/hello/dom/hwo/HelloWorldObjects.java index 2a1405f..4a330dd 100644 --- a/src/main/java/domainapp/modules/hello/dom/hwo/HelloWorldObjects.java +++ b/src/main/java/domainapp/modules/hello/dom/hwo/HelloWorldObjects.java @@ -1,25 +1,17 @@ package domainapp.modules.hello.dom.hwo; +import domainapp.modules.hello.types.Name; + import java.util.List; import javax.annotation.Priority; import javax.inject.Inject; import javax.inject.Named; -import org.apache.causeway.applib.annotation.Action; -import org.apache.causeway.applib.annotation.ActionLayout; -import org.apache.causeway.applib.annotation.DomainService; -import org.apache.causeway.applib.annotation.NatureOfService; -import org.apache.causeway.applib.annotation.PriorityPrecedence; -import org.apache.causeway.applib.annotation.PromptStyle; -import org.apache.causeway.applib.annotation.RestrictTo; -import org.apache.causeway.applib.annotation.SemanticsOf; +import org.apache.causeway.applib.annotation.*; import org.apache.causeway.applib.query.Query; import org.apache.causeway.applib.services.repository.RepositoryService; - -import domainapp.modules.hello.types.Name; - @Named("hello.HelloWorldObjects") @DomainService(nature = NatureOfService.VIEW) @Priority(PriorityPrecedence.EARLY) diff --git a/src/main/java/domainapp/modules/hello/types/Notes.java b/src/main/java/domainapp/modules/hello/types/Notes.java index 8998c94..0b69233 100644 --- a/src/main/java/domainapp/modules/hello/types/Notes.java +++ b/src/main/java/domainapp/modules/hello/types/Notes.java @@ -5,13 +5,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import org.apache.causeway.applib.annotation.Editing; -import org.apache.causeway.applib.annotation.Optionality; -import org.apache.causeway.applib.annotation.Parameter; -import org.apache.causeway.applib.annotation.ParameterLayout; -import org.apache.causeway.applib.annotation.Property; -import org.apache.causeway.applib.annotation.PropertyLayout; -import org.apache.causeway.applib.annotation.Where; +import org.apache.causeway.applib.annotation.*; @javax.jdo.annotations.Column(length = Notes.MAX_LEN, allowsNull = "true") @Property(editing = Editing.ENABLED, maxLength = Notes.MAX_LEN, optionality = Optionality.OPTIONAL) diff --git a/src/main/java/domainapp/webapp/AppManifest.java b/src/main/java/domainapp/webapp/AppManifest.java index 3c0f0d3..612c1c9 100644 --- a/src/main/java/domainapp/webapp/AppManifest.java +++ b/src/main/java/domainapp/webapp/AppManifest.java @@ -1,10 +1,5 @@ package domainapp.webapp; -import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.Import; -import org.springframework.context.annotation.PropertySource; -import org.springframework.context.annotation.PropertySources; - import org.apache.causeway.applib.CausewayModuleApplibChangeAndExecutionLoggers; import org.apache.causeway.applib.CausewayModuleApplibMixins; import org.apache.causeway.core.config.presets.CausewayPresets; @@ -16,6 +11,11 @@ import org.apache.causeway.viewer.restfulobjects.jaxrsresteasy.CausewayModuleVie import org.apache.causeway.viewer.wicket.applib.CausewayModuleViewerWicketApplibMixins; import org.apache.causeway.viewer.wicket.viewer.CausewayModuleViewerWicketViewer; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Import; +import org.springframework.context.annotation.PropertySource; +import org.springframework.context.annotation.PropertySources; + import domainapp.modules.hello.HelloWorldModule; @Configuration diff --git a/src/main/java/domainapp/webapp/HelloWorldApp.java b/src/main/java/domainapp/webapp/HelloWorldApp.java index 9ad441f..e9e35aa 100644 --- a/src/main/java/domainapp/webapp/HelloWorldApp.java +++ b/src/main/java/domainapp/webapp/HelloWorldApp.java @@ -1,12 +1,12 @@ package domainapp.webapp; +import org.apache.causeway.core.config.presets.CausewayPresets; + import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; import org.springframework.context.annotation.Import; -import org.apache.causeway.core.config.presets.CausewayPresets; - @SpringBootApplication @Import({ AppManifest.class, diff --git a/src/main/resources/menubars.layout.xml b/src/main/resources/menubars.layout.xml index 5575dc4..24f94d9 100644 --- a/src/main/resources/menubars.layout.xml +++ b/src/main/resources/menubars.layout.xml @@ -1,5 +1,9 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<mb3:menuBars xsi:schemaLocation="http://causeway.apache.org/applib/layout/menubars/bootstrap3 http://causeway.apache.org/applib/layout/menubars/bootstrap3/menubars.xsd http://causeway.apache.org/applib/layout/component http://causeway.apache.org/applib/layout/component/component.xsd http://causeway.apache.org/applib/layout/links http://causeway.apache.org/applib/layout/links/links.xsd"; xmlns:cpt="http://causeway.apache.org/applib/layout/component"; xmlns:lnk="http://causeway.apache.org/a [...] +<mb3:menuBars + xsi:schemaLocation="http://causeway.apache.org/applib/layout/menubars/bootstrap3 http://causeway.apache.org/applib/layout/menubars/bootstrap3/menubars.xsd http://causeway.apache.org/applib/layout/component http://causeway.apache.org/applib/layout/component/component.xsd"; + xmlns:cpt="http://causeway.apache.org/applib/layout/component"; + xmlns:mb3="http://causeway.apache.org/applib/layout/menubars/bootstrap3"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> <mb3:primary> <mb3:menu> <mb3:named>Hello World Objects</mb3:named>
