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 2019/12/02 23:02:12 UTC
[isis-app-simpleapp] 04/09: moves domainapp.application to
domainapp.webapp.application
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis-app-simpleapp.git
commit 9f7c75c05d54aa522c831257ea6442f4948f1e53
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Mon Dec 2 11:30:01 2019 +0000
moves domainapp.application to domainapp.webapp.application
---
webapp/pom.xml | 2 +-
webapp/src/main/java/domainapp/webapp/SimpleApp.java | 4 ++--
.../{ => webapp}/application/ApplicationModule.java | 2 +-
.../DomainAppFixtureScriptsSpecificationProvider.java | 4 ++--
.../application/fixture/scenarios/DomainAppDemo.java | 2 +-
.../webapp/{ => application}/layout/menubars.layout.xml | 0
.../services/health/HealthCheckServiceImpl.java | 2 +-
.../application/services/homepage/HomePageService.java | 2 +-
.../application/services/homepage/HomePageViewModel.java | 4 ++--
.../services/homepage/HomePageViewModel.layout.xml | 0
.../application/services/homepage/HomePageViewModel.png | Bin
webapp/src/main/resources/application.yml | 2 +-
.../application/integtests/mml/received/.gitignore | 0
.../{ => webapp}/application/bdd/RunIntegBddSpecs.java | 2 +-
.../application/bdd/glue/SimpleObjectsStepDef.java | 7 +++----
.../bdd/specs/SimpleObjectSpec_listAllAndCreate.feature | 0
.../integtests/ApplicationIntegTestAbstract.java | 4 ++--
.../application/integtests/mml/DomainModel_IntegTest.java | 4 ++--
.../integtests/mml/MetaModelService_IntegTest.java | 4 ++--
...ixture.DomainAppFixtureScriptsSpecificationProvider.xml | 0
....application.services.health.HealthCheckServiceImpl.xml | 0
...app.application.services.homepage.HomePageViewModel.xml | 13 ++++++++-----
.../domainapp.modules.simple.dom.impl.SimpleObject.xml | 0
.../domainapp.modules.simple.dom.impl.SimpleObjects.xml | 0
.../application/integtests/mml/received/.gitignore | 0
.../application/integtests/smoke/Smoke_IntegTest.java | 4 ++--
.../domainapp/webapp/lockdown/{ => received}/.gitignore | 0
27 files changed, 32 insertions(+), 30 deletions(-)
diff --git a/webapp/pom.xml b/webapp/pom.xml
index 1e5f3e2..e95c743 100644
--- a/webapp/pom.xml
+++ b/webapp/pom.xml
@@ -238,7 +238,7 @@
<jvmFlags>
<jvmFlag>-Xmx512m</jvmFlag>
</jvmFlags>
- <mainClass>domainapp.application.HelloWorldApp</mainClass>
+ <mainClass>domainapp.webapp.HelloWorldApp</mainClass>
<ports>
<port>8080</port>
</ports>
diff --git a/webapp/src/main/java/domainapp/webapp/SimpleApp.java b/webapp/src/main/java/domainapp/webapp/SimpleApp.java
index e4396e0..72a203b 100644
--- a/webapp/src/main/java/domainapp/webapp/SimpleApp.java
+++ b/webapp/src/main/java/domainapp/webapp/SimpleApp.java
@@ -18,8 +18,8 @@
*/
package domainapp.webapp;
-import domainapp.application.ApplicationModule;
-import domainapp.application.fixture.scenarios.DomainAppDemo;
+import domainapp.webapp.application.ApplicationModule;
+import domainapp.webapp.application.fixture.scenarios.DomainAppDemo;
import org.apache.isis.extensions.fixtures.IsisExtFixturesModule;
import org.apache.isis.jdo.IsisBootDataNucleus;
diff --git a/webapp/src/main/java/domainapp/application/ApplicationModule.java b/webapp/src/main/java/domainapp/webapp/application/ApplicationModule.java
similarity index 96%
rename from webapp/src/main/java/domainapp/application/ApplicationModule.java
rename to webapp/src/main/java/domainapp/webapp/application/ApplicationModule.java
index 684e332..bb98c45 100644
--- a/webapp/src/main/java/domainapp/application/ApplicationModule.java
+++ b/webapp/src/main/java/domainapp/webapp/application/ApplicationModule.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package domainapp.application;
+package domainapp.webapp.application;
import org.apache.isis.extensions.fixtures.modules.Module;
import org.springframework.context.annotation.ComponentScan;
diff --git a/webapp/src/main/java/domainapp/application/fixture/DomainAppFixtureScriptsSpecificationProvider.java b/webapp/src/main/java/domainapp/webapp/application/fixture/DomainAppFixtureScriptsSpecificationProvider.java
similarity index 94%
rename from webapp/src/main/java/domainapp/application/fixture/DomainAppFixtureScriptsSpecificationProvider.java
rename to webapp/src/main/java/domainapp/webapp/application/fixture/DomainAppFixtureScriptsSpecificationProvider.java
index f51acff..68eb5d5 100644
--- a/webapp/src/main/java/domainapp/application/fixture/DomainAppFixtureScriptsSpecificationProvider.java
+++ b/webapp/src/main/java/domainapp/webapp/application/fixture/DomainAppFixtureScriptsSpecificationProvider.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package domainapp.application.fixture;
+package domainapp.webapp.application.fixture;
import org.apache.isis.applib.annotation.DomainService;
import org.apache.isis.applib.annotation.NatureOfService;
@@ -24,7 +24,7 @@ import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScripts;
import org.apache.isis.extensions.fixtures.fixturespec.FixtureScriptsSpecification;
import org.apache.isis.extensions.fixtures.fixturespec.FixtureScriptsSpecificationProvider;
-import domainapp.application.fixture.scenarios.DomainAppDemo;
+import domainapp.webapp.application.fixture.scenarios.DomainAppDemo;
/**
* Specifies where to find fixtures, and other settings.
diff --git a/webapp/src/main/java/domainapp/application/fixture/scenarios/DomainAppDemo.java b/webapp/src/main/java/domainapp/webapp/application/fixture/scenarios/DomainAppDemo.java
similarity index 96%
rename from webapp/src/main/java/domainapp/application/fixture/scenarios/DomainAppDemo.java
rename to webapp/src/main/java/domainapp/webapp/application/fixture/scenarios/DomainAppDemo.java
index 1c2dccc..6d27b9d 100644
--- a/webapp/src/main/java/domainapp/application/fixture/scenarios/DomainAppDemo.java
+++ b/webapp/src/main/java/domainapp/webapp/application/fixture/scenarios/DomainAppDemo.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package domainapp.application.fixture.scenarios;
+package domainapp.webapp.application.fixture.scenarios;
import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScript;
import org.apache.isis.extensions.fixtures.legacy.teardown.TeardownFixtureAbstract2;
diff --git a/webapp/src/main/java/domainapp/webapp/layout/menubars.layout.xml b/webapp/src/main/java/domainapp/webapp/application/layout/menubars.layout.xml
similarity index 100%
rename from webapp/src/main/java/domainapp/webapp/layout/menubars.layout.xml
rename to webapp/src/main/java/domainapp/webapp/application/layout/menubars.layout.xml
diff --git a/webapp/src/main/java/domainapp/application/services/health/HealthCheckServiceImpl.java b/webapp/src/main/java/domainapp/webapp/application/services/health/HealthCheckServiceImpl.java
similarity index 96%
rename from webapp/src/main/java/domainapp/application/services/health/HealthCheckServiceImpl.java
rename to webapp/src/main/java/domainapp/webapp/application/services/health/HealthCheckServiceImpl.java
index 329b973..c6de00e 100644
--- a/webapp/src/main/java/domainapp/application/services/health/HealthCheckServiceImpl.java
+++ b/webapp/src/main/java/domainapp/webapp/application/services/health/HealthCheckServiceImpl.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package domainapp.application.services.health;
+package domainapp.webapp.application.services.health;
import javax.inject.Inject;
diff --git a/webapp/src/main/java/domainapp/application/services/homepage/HomePageService.java b/webapp/src/main/java/domainapp/webapp/application/services/homepage/HomePageService.java
similarity index 96%
rename from webapp/src/main/java/domainapp/application/services/homepage/HomePageService.java
rename to webapp/src/main/java/domainapp/webapp/application/services/homepage/HomePageService.java
index d3a4719..1f84380 100644
--- a/webapp/src/main/java/domainapp/application/services/homepage/HomePageService.java
+++ b/webapp/src/main/java/domainapp/webapp/application/services/homepage/HomePageService.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package domainapp.application.services.homepage;
+package domainapp.webapp.application.services.homepage;
import javax.inject.Inject;
import javax.inject.Named;
diff --git a/webapp/src/main/java/domainapp/application/services/homepage/HomePageViewModel.java b/webapp/src/main/java/domainapp/webapp/application/services/homepage/HomePageViewModel.java
similarity index 92%
rename from webapp/src/main/java/domainapp/application/services/homepage/HomePageViewModel.java
rename to webapp/src/main/java/domainapp/webapp/application/services/homepage/HomePageViewModel.java
index 952ab03..5d05ee6 100644
--- a/webapp/src/main/java/domainapp/application/services/homepage/HomePageViewModel.java
+++ b/webapp/src/main/java/domainapp/webapp/application/services/homepage/HomePageViewModel.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package domainapp.application.services.homepage;
+package domainapp.webapp.application.services.homepage;
import java.util.List;
@@ -31,7 +31,7 @@ import domainapp.modules.simple.dom.impl.SimpleObjects;
@DomainObject(
nature = Nature.VIEW_MODEL,
- objectType = "domainapp.application.services.homepage.HomePageViewModel"
+ objectType = "domainapp.HomePageViewModel"
)
public class HomePageViewModel {
diff --git a/webapp/src/main/java/domainapp/application/services/homepage/HomePageViewModel.layout.xml b/webapp/src/main/java/domainapp/webapp/application/services/homepage/HomePageViewModel.layout.xml
similarity index 100%
rename from webapp/src/main/java/domainapp/application/services/homepage/HomePageViewModel.layout.xml
rename to webapp/src/main/java/domainapp/webapp/application/services/homepage/HomePageViewModel.layout.xml
diff --git a/webapp/src/main/java/domainapp/application/services/homepage/HomePageViewModel.png b/webapp/src/main/java/domainapp/webapp/application/services/homepage/HomePageViewModel.png
similarity index 100%
rename from webapp/src/main/java/domainapp/application/services/homepage/HomePageViewModel.png
rename to webapp/src/main/java/domainapp/webapp/application/services/homepage/HomePageViewModel.png
diff --git a/webapp/src/main/resources/application.yml b/webapp/src/main/resources/application.yml
index cb8143a..94e008f 100644
--- a/webapp/src/main/resources/application.yml
+++ b/webapp/src/main/resources/application.yml
@@ -95,7 +95,7 @@ isis:
viewer:
wicket:
application:
- menubarsLayoutXml: domainapp/webapp/layout/menubars.layout.xml
+ menubarsLayoutXml: domainapp/webapp/application/layout/menubars.layout.xml
brandLogoHeader: /images/apache-isis/logo-48x48.png
faviconUrl: /images/favicon.png
name: Simple App
diff --git a/webapp/src/test/java/domainapp/application/integtests/mml/received/.gitignore b/webapp/src/test/java/domainapp/webapp./application/integtests/mml/received/.gitignore
similarity index 100%
copy from webapp/src/test/java/domainapp/application/integtests/mml/received/.gitignore
copy to webapp/src/test/java/domainapp/webapp./application/integtests/mml/received/.gitignore
diff --git a/webapp/src/test/java/domainapp/application/bdd/RunIntegBddSpecs.java b/webapp/src/test/java/domainapp/webapp/application/bdd/RunIntegBddSpecs.java
similarity index 97%
rename from webapp/src/test/java/domainapp/application/bdd/RunIntegBddSpecs.java
rename to webapp/src/test/java/domainapp/webapp/application/bdd/RunIntegBddSpecs.java
index a50b050..c9093ba 100644
--- a/webapp/src/test/java/domainapp/application/bdd/RunIntegBddSpecs.java
+++ b/webapp/src/test/java/domainapp/webapp/application/bdd/RunIntegBddSpecs.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package domainapp.application.bdd;
+package domainapp.webapp.application.bdd;
import io.cucumber.junit.Cucumber;
import io.cucumber.junit.CucumberOptions;
diff --git a/webapp/src/test/java/domainapp/application/bdd/glue/SimpleObjectsStepDef.java b/webapp/src/test/java/domainapp/webapp/application/bdd/glue/SimpleObjectsStepDef.java
similarity index 94%
rename from webapp/src/test/java/domainapp/application/bdd/glue/SimpleObjectsStepDef.java
rename to webapp/src/test/java/domainapp/webapp/application/bdd/glue/SimpleObjectsStepDef.java
index 70efd86..459596a 100644
--- a/webapp/src/test/java/domainapp/application/bdd/glue/SimpleObjectsStepDef.java
+++ b/webapp/src/test/java/domainapp/webapp/application/bdd/glue/SimpleObjectsStepDef.java
@@ -16,14 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
-package domainapp.application.bdd.glue;
+package domainapp.webapp.application.bdd.glue;
import java.util.List;
import java.util.UUID;
import javax.inject.Inject;
-import org.junit.Ignore;
import org.springframework.transaction.PlatformTransactionManager;
import org.springframework.transaction.support.TransactionTemplate;
@@ -32,8 +31,8 @@ import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScripts;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
-import domainapp.application.fixture.scenarios.DomainAppDemo;
-import domainapp.application.integtests.ApplicationIntegTestAbstract;
+import domainapp.webapp.application.fixture.scenarios.DomainAppDemo;
+import domainapp.webapp.application.integtests.ApplicationIntegTestAbstract;
import domainapp.modules.simple.dom.impl.SimpleObject;
import domainapp.modules.simple.dom.impl.SimpleObjects;
import domainapp.modules.simple.fixture.SimpleObject_persona;
diff --git a/webapp/src/test/java/domainapp/application/bdd/specs/SimpleObjectSpec_listAllAndCreate.feature b/webapp/src/test/java/domainapp/webapp/application/bdd/specs/SimpleObjectSpec_listAllAndCreate.feature
similarity index 100%
rename from webapp/src/test/java/domainapp/application/bdd/specs/SimpleObjectSpec_listAllAndCreate.feature
rename to webapp/src/test/java/domainapp/webapp/application/bdd/specs/SimpleObjectSpec_listAllAndCreate.feature
diff --git a/webapp/src/test/java/domainapp/application/integtests/ApplicationIntegTestAbstract.java b/webapp/src/test/java/domainapp/webapp/application/integtests/ApplicationIntegTestAbstract.java
similarity index 95%
rename from webapp/src/test/java/domainapp/application/integtests/ApplicationIntegTestAbstract.java
rename to webapp/src/test/java/domainapp/webapp/application/integtests/ApplicationIntegTestAbstract.java
index b059ff0..adcff47 100644
--- a/webapp/src/test/java/domainapp/application/integtests/ApplicationIntegTestAbstract.java
+++ b/webapp/src/test/java/domainapp/webapp/application/integtests/ApplicationIntegTestAbstract.java
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package domainapp.application.integtests;
+package domainapp.webapp.application.integtests;
-import domainapp.application.ApplicationModule;
+import domainapp.webapp.application.ApplicationModule;
import org.apache.isis.config.IsisPresets;
import org.apache.isis.extensions.fixtures.IsisExtFixturesModule;
diff --git a/webapp/src/test/java/domainapp/application/integtests/mml/DomainModel_IntegTest.java b/webapp/src/test/java/domainapp/webapp/application/integtests/mml/DomainModel_IntegTest.java
similarity index 91%
rename from webapp/src/test/java/domainapp/application/integtests/mml/DomainModel_IntegTest.java
rename to webapp/src/test/java/domainapp/webapp/application/integtests/mml/DomainModel_IntegTest.java
index 04c1dfa..4c46b3a 100644
--- a/webapp/src/test/java/domainapp/application/integtests/mml/DomainModel_IntegTest.java
+++ b/webapp/src/test/java/domainapp/webapp/application/integtests/mml/DomainModel_IntegTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package domainapp.application.integtests.mml;
+package domainapp.webapp.application.integtests.mml;
import javax.inject.Inject;
@@ -26,7 +26,7 @@ import org.junit.jupiter.api.Test;
import org.apache.isis.integtestsupport.validate.ValidateDomainModel;
import org.apache.isis.metamodel.specloader.SpecificationLoader;
-import domainapp.application.integtests.ApplicationIntegTestAbstract;
+import domainapp.webapp.application.integtests.ApplicationIntegTestAbstract;
class DomainModel_IntegTest extends ApplicationIntegTestAbstract {
diff --git a/webapp/src/test/java/domainapp/application/integtests/mml/MetaModelService_IntegTest.java b/webapp/src/test/java/domainapp/webapp/application/integtests/mml/MetaModelService_IntegTest.java
similarity index 97%
rename from webapp/src/test/java/domainapp/application/integtests/mml/MetaModelService_IntegTest.java
rename to webapp/src/test/java/domainapp/webapp/application/integtests/mml/MetaModelService_IntegTest.java
index 4fc7d4d..4cd94ca 100644
--- a/webapp/src/test/java/domainapp/application/integtests/mml/MetaModelService_IntegTest.java
+++ b/webapp/src/test/java/domainapp/webapp/application/integtests/mml/MetaModelService_IntegTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package domainapp.application.integtests.mml;
+package domainapp.webapp.application.integtests.mml;
import java.io.File;
import java.util.List;
@@ -41,7 +41,7 @@ import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.notNullValue;
import static org.junit.Assume.assumeThat;
-import domainapp.application.integtests.ApplicationIntegTestAbstract;
+import domainapp.webapp.application.integtests.ApplicationIntegTestAbstract;
class MetaModelService_IntegTest extends ApplicationIntegTestAbstract {
diff --git a/webapp/src/test/java/domainapp/application/integtests/mml/approved/domainapp.application.fixture.DomainAppFixtureScriptsSpecificationProvider.xml b/webapp/src/test/java/domainapp/webapp/application/integtests/mml/approved/domainapp.application.fixture.DomainAppFixtureScriptsSpecificationProvider.xml
similarity index 100%
rename from webapp/src/test/java/domainapp/application/integtests/mml/approved/domainapp.application.fixture.DomainAppFixtureScriptsSpecificationProvider.xml
rename to webapp/src/test/java/domainapp/webapp/application/integtests/mml/approved/domainapp.application.fixture.DomainAppFixtureScriptsSpecificationProvider.xml
diff --git a/webapp/src/test/java/domainapp/application/integtests/mml/approved/domainapp.application.services.health.HealthCheckServiceImpl.xml b/webapp/src/test/java/domainapp/webapp/application/integtests/mml/approved/domainapp.application.services.health.HealthCheckServiceImpl.xml
similarity index 100%
rename from webapp/src/test/java/domainapp/application/integtests/mml/approved/domainapp.application.services.health.HealthCheckServiceImpl.xml
rename to webapp/src/test/java/domainapp/webapp/application/integtests/mml/approved/domainapp.application.services.health.HealthCheckServiceImpl.xml
diff --git a/webapp/src/test/java/domainapp/application/integtests/mml/approved/domainapp.application.services.homepage.HomePageViewModel.xml b/webapp/src/test/java/domainapp/webapp/application/integtests/mml/approved/domainapp.application.services.homepage.HomePageViewModel.xml
similarity index 98%
rename from webapp/src/test/java/domainapp/application/integtests/mml/approved/domainapp.application.services.homepage.HomePageViewModel.xml
rename to webapp/src/test/java/domainapp/webapp/application/integtests/mml/approved/domainapp.application.services.homepage.HomePageViewModel.xml
index 867f66a..c176172 100644
--- a/webapp/src/test/java/domainapp/application/integtests/mml/approved/domainapp.application.services.homepage.HomePageViewModel.xml
+++ b/webapp/src/test/java/domainapp/webapp/application/integtests/mml/approved/domainapp.application.services.homepage.HomePageViewModel.xml
@@ -39,7 +39,7 @@
</mml:facet>
<mml:facet id="org.apache.isis.metamodel.facets.object.objectspecid.ObjectSpecIdFacet" fqcn="org.apache.isis.metamodel.facets.object.domainobject.objectspecid.ObjectSpecIdFacetForDomainObjectAnnotation">
<mml:attr name="underlyingFacet">org.apache.isis.metamodel.facets.object.objectspecid.classname.ObjectSpecIdFacetDerivedFromClassName</mml:attr>
- <mml:attr name="value">domainapp.application.services.homepage.HomePageViewModel</mml:attr>
+ <mml:attr name="value">domainapp.webapp.application.services.homepage.HomePageViewModel</mml:attr>
</mml:facet>
<mml:facet id="org.apache.isis.metamodel.facets.object.objectvalidprops.ObjectValidPropertiesFacet" fqcn="org.apache.isis.metamodel.facets.object.objectvalidprops.impl.ObjectValidPropertiesFacetImpl">
<mml:attr name="validating">true</mml:attr>
@@ -54,7 +54,8 @@
</mml:facet>
<mml:facet id="org.apache.isis.metamodel.facets.object.title.TitleFacet" fqcn="org.apache.isis.metamodel.facets.object.title.methods.TitleFacetViaTitleMethod">
<mml:attr name="intent.title">UI_HINT</mml:attr>
- <mml:attr name="methods">public org.apache.isis.applib.services.i18n.TranslatableString domainapp.application.services.homepage.HomePageViewModel.title()</mml:attr>
+ <mml:attr name="methods">public org.apache.isis.applib.services.i18n.TranslatableString
+ domainapp.webapp.application.services.homepage.HomePageViewModel.title()</mml:attr>
</mml:facet>
<mml:facet id="org.apache.isis.metamodel.facets.object.viewmodel.ViewModelFacet" fqcn="org.apache.isis.metamodel.facets.object.domainobject.recreatable.RecreatableObjectFacetForDomainObjectAnnotation">
<mml:attr name="recreationMechanism">INITIALIZES</mml:attr>
@@ -242,7 +243,8 @@
</mml:facet>
<mml:facet id="org.apache.isis.metamodel.facets.collections.modify.CollectionClearFacet" fqcn="org.apache.isis.metamodel.facets.collections.clear.CollectionClearFacetViaAccessor">
<mml:attr name="intent.getObjects">ACCESSOR</mml:attr>
- <mml:attr name="methods">public java.util.List<domainapp.modules.simple.dom.impl.SimpleObject> domainapp.application.services.homepage.HomePageViewModel.getObjects()</mml:attr>
+ <mml:attr name="methods">public java.util.List<domainapp.modules.simple.dom.impl.SimpleObject>
+ domainapp.webapp.application.services.homepage.HomePageViewModel.getObjects()</mml:attr>
</mml:facet>
<mml:facet id="org.apache.isis.metamodel.facets.collections.modify.CollectionRemoveFromFacet" fqcn="org.apache.isis.metamodel.facets.collections.collection.modify.CollectionRemoveFromFacetForDomainEventFromDefault">
<mml:attr name="collectionRemoveFromFacet">org.apache.isis.metamodel.facets.collections.modify.CollectionRemoveFromFacetViaAccessor</mml:attr>
@@ -265,8 +267,9 @@
</mml:facet>
<mml:facet id="org.apache.isis.metamodel.facets.propcoll.accessor.PropertyOrCollectionAccessorFacet" fqcn="org.apache.isis.metamodel.facets.collections.accessor.CollectionAccessorFacetViaAccessor">
<mml:attr name="intent.getObjects">ACCESSOR</mml:attr>
- <mml:attr name="methods">public java.util.List<domainapp.modules.simple.dom.impl.SimpleObject> domainapp.application.services.homepage.HomePageViewModel.getObjects()</mml:attr>
- <mml:attr name="onType">domainapp.application.services.homepage.HomePageViewModel</mml:attr>
+ <mml:attr name="methods">public java.util.List<domainapp.modules.simple.dom.impl.SimpleObject>
+ domainapp.webapp.application.services.homepage.HomePageViewModel.getObjects()</mml:attr>
+ <mml:attr name="onType">domainapp.webapp.application.services.homepage.HomePageViewModel</mml:attr>
</mml:facet>
</mml:facets>
<mml:type>domainapp.modules.simple.dom.impl.SimpleObject</mml:type>
diff --git a/webapp/src/test/java/domainapp/application/integtests/mml/approved/domainapp.modules.simple.dom.impl.SimpleObject.xml b/webapp/src/test/java/domainapp/webapp/application/integtests/mml/approved/domainapp.modules.simple.dom.impl.SimpleObject.xml
similarity index 100%
rename from webapp/src/test/java/domainapp/application/integtests/mml/approved/domainapp.modules.simple.dom.impl.SimpleObject.xml
rename to webapp/src/test/java/domainapp/webapp/application/integtests/mml/approved/domainapp.modules.simple.dom.impl.SimpleObject.xml
diff --git a/webapp/src/test/java/domainapp/application/integtests/mml/approved/domainapp.modules.simple.dom.impl.SimpleObjects.xml b/webapp/src/test/java/domainapp/webapp/application/integtests/mml/approved/domainapp.modules.simple.dom.impl.SimpleObjects.xml
similarity index 100%
rename from webapp/src/test/java/domainapp/application/integtests/mml/approved/domainapp.modules.simple.dom.impl.SimpleObjects.xml
rename to webapp/src/test/java/domainapp/webapp/application/integtests/mml/approved/domainapp.modules.simple.dom.impl.SimpleObjects.xml
diff --git a/webapp/src/test/java/domainapp/application/integtests/mml/received/.gitignore b/webapp/src/test/java/domainapp/webapp/application/integtests/mml/received/.gitignore
similarity index 100%
rename from webapp/src/test/java/domainapp/application/integtests/mml/received/.gitignore
rename to webapp/src/test/java/domainapp/webapp/application/integtests/mml/received/.gitignore
diff --git a/webapp/src/test/java/domainapp/application/integtests/smoke/Smoke_IntegTest.java b/webapp/src/test/java/domainapp/webapp/application/integtests/smoke/Smoke_IntegTest.java
similarity index 95%
rename from webapp/src/test/java/domainapp/application/integtests/smoke/Smoke_IntegTest.java
rename to webapp/src/test/java/domainapp/webapp/application/integtests/smoke/Smoke_IntegTest.java
index 559c36c..228abbd 100644
--- a/webapp/src/test/java/domainapp/application/integtests/smoke/Smoke_IntegTest.java
+++ b/webapp/src/test/java/domainapp/webapp/application/integtests/smoke/Smoke_IntegTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package domainapp.application.integtests.smoke;
+package domainapp.webapp.application.integtests.smoke;
import java.util.List;
@@ -29,7 +29,7 @@ import org.apache.isis.applib.services.xactn.TransactionService;
import static org.assertj.core.api.Assertions.assertThat;
-import domainapp.application.integtests.ApplicationIntegTestAbstract;
+import domainapp.webapp.application.integtests.ApplicationIntegTestAbstract;
import domainapp.modules.simple.dom.impl.SimpleObject;
import domainapp.modules.simple.dom.impl.SimpleObjects;
diff --git a/webapp/src/test/java/domainapp/webapp/lockdown/.gitignore b/webapp/src/test/java/domainapp/webapp/lockdown/received/.gitignore
similarity index 100%
rename from webapp/src/test/java/domainapp/webapp/lockdown/.gitignore
rename to webapp/src/test/java/domainapp/webapp/lockdown/received/.gitignore