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:10 UTC
[isis-app-simpleapp] 02/09: combines application and webapp modules
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 4c95924c1a288e9c3f98dbd3d5799b46b7fb79fe
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Mon Dec 2 10:53:35 2019 +0000
combines application and webapp modules
---
application/.gitignore | 1 -
application/pom.xml | 133 ---------------------
pom.xml | 1 -
{application => webapp}/log4j2-test.xml | 0
webapp/pom.xml | 68 +++++++----
.../domainapp/application/ApplicationModule.java | 0
...mainAppFixtureScriptsSpecificationProvider.java | 0
.../fixture/scenarios/DomainAppDemo.java | 0
.../services/health/HealthCheckServiceImpl.java | 0
.../services/homepage/HomePageService.java | 0
.../services/homepage/HomePageViewModel.java | 0
.../services/homepage/HomePageViewModel.layout.xml | 0
.../services/homepage/HomePageViewModel.png | Bin
.../src/main/resources/log4j2-spring.xml | 0
.../application/bdd/RunIntegBddSpecs.java | 0
.../application/bdd/glue/SimpleObjectsStepDef.java | 0
.../SimpleObjectSpec_listAllAndCreate.feature | 0
.../integtests/ApplicationIntegTestAbstract.java | 0
.../integtests/mml/DomainModel_IntegTest.java | 0
.../integtests/mml/MetaModelService_IntegTest.java | 0
...omainAppFixtureScriptsSpecificationProvider.xml | 0
...tion.services.health.HealthCheckServiceImpl.xml | 0
...ication.services.homepage.HomePageViewModel.xml | 0
...ainapp.modules.simple.dom.impl.SimpleObject.xml | 0
...inapp.modules.simple.dom.impl.SimpleObjects.xml | 0
.../application/integtests/mml/received/.gitignore | 0
.../integtests/smoke/Smoke_IntegTest.java | 0
.../webapp/lockdown/.gitignore | 0
.../webapp/lockdown/LockDownMavenDeps_Test.java | 2 +-
.../LockDownMavenDeps_Test.list.approved.txt | 0
.../LockDownMavenDeps_Test.tree.approved.txt | 0
31 files changed, 46 insertions(+), 159 deletions(-)
diff --git a/application/.gitignore b/application/.gitignore
deleted file mode 100644
index c71ea97..0000000
--- a/application/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/.apt_generated/
diff --git a/application/pom.xml b/application/pom.xml
deleted file mode 100644
index ee571d5..0000000
--- a/application/pom.xml
+++ /dev/null
@@ -1,133 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.isis.examples.apps</groupId>
- <artifactId>simpleapp</artifactId>
- <version>2.0.0-M3-SNAPSHOT</version>
- </parent>
-
- <artifactId>simpleapp-application</artifactId>
- <name>Apache Isis App - SimpleApp Application</name>
-
- <description>This defines the application (manifest) and runs application-level fixtures and integration (smoke) tests</description>
-
- <packaging>jar</packaging>
-
- <properties>
- <maven-cucumber-reporting.version>4.11.2</maven-cucumber-reporting.version>
- </properties>
-
- <build>
- <resources>
- <resource>
- <filtering>false</filtering>
- <directory>src/main/resources</directory>
- </resource>
- <resource>
- <filtering>false</filtering>
- <directory>src/main/java</directory>
- <includes>
- <include>**</include>
- </includes>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </resource>
- </resources>
- <testResources>
- <testResource>
- <filtering>false</filtering>
- <directory>src/test/resources</directory>
- </testResource>
- <testResource>
- <filtering>false</filtering>
- <directory>src/test/java</directory>
- </testResource>
- </testResources>
- <plugins>
- <plugin>
- <groupId>net.masterthought</groupId>
- <artifactId>maven-cucumber-reporting</artifactId>
- <version>${maven-cucumber-reporting.version}</version>
- <executions>
- <execution>
- <id>execution</id>
- <phase>verify</phase>
- <goals>
- <goal>generate</goal>
- </goals>
- <configuration>
- <projectName>SimpleApp</projectName>
- <outputDirectory>${project.build.directory}</outputDirectory>
- <inputDirectory>${project.build.directory}</inputDirectory>
- <jsonFiles>
- <param>**/*.json</param>
- </jsonFiles>
- <skip>${skipBSs}</skip>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>simpleapp-module-simple</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.isis.mavendeps</groupId>
- <artifactId>isis-mavendeps-webapp</artifactId>
- <type>pom</type>
- </dependency>
-
- <dependency>
- <groupId>org.apache.isis.mavendeps</groupId>
- <artifactId>isis-mavendeps-jdk11</artifactId>
- <type>pom</type>
- </dependency>
-
- <dependency>
- <groupId>com.h2database</groupId>
- <artifactId>h2</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.isis.mavendeps</groupId>
- <artifactId>isis-mavendeps-testing</artifactId>
- <type>pom</type>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- </dependencies>
-
-</project>
diff --git a/pom.xml b/pom.xml
index 1f56c56..4740549 100644
--- a/pom.xml
+++ b/pom.xml
@@ -74,7 +74,6 @@
<modules>
<module>module-simple</module>
- <module>application</module>
<module>webapp</module>
</modules>
diff --git a/application/log4j2-test.xml b/webapp/log4j2-test.xml
similarity index 100%
rename from application/log4j2-test.xml
rename to webapp/log4j2-test.xml
diff --git a/webapp/pom.xml b/webapp/pom.xml
index a3758f8..c1d8d22 100644
--- a/webapp/pom.xml
+++ b/webapp/pom.xml
@@ -34,7 +34,10 @@
<packaging>jar</packaging>
<properties>
+<!--
<maven-war-plugin.warName>${project.parent.artifactId}</maven-war-plugin.warName>
+-->
+ <maven-cucumber-reporting.version>4.11.2</maven-cucumber-reporting.version>
</properties>
<build>
@@ -54,14 +57,48 @@
</excludes>
</resource>
</resources>
+ <testResources>
+ <testResource>
+ <filtering>false</filtering>
+ <directory>src/test/resources</directory>
+ </testResource>
+ <testResource>
+ <filtering>false</filtering>
+ <directory>src/test/java</directory>
+ </testResource>
+ </testResources>
+ <plugins>
+ <plugin>
+ <groupId>net.masterthought</groupId>
+ <artifactId>maven-cucumber-reporting</artifactId>
+ <version>${maven-cucumber-reporting.version}</version>
+ <executions>
+ <execution>
+ <id>execution</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ <configuration>
+ <projectName>SimpleApp</projectName>
+ <outputDirectory>${project.build.directory}</outputDirectory>
+ <inputDirectory>${project.build.directory}</inputDirectory>
+ <jsonFiles>
+ <param>**/*.json</param>
+ </jsonFiles>
+ <skip>${skipBSs}</skip>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
</build>
<dependencies>
- <!-- this app -->
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>simpleapp-application</artifactId>
+ <artifactId>simpleapp-module-simple</artifactId>
</dependency>
<!-- isis -->
@@ -72,6 +109,12 @@
</dependency>
<dependency>
+ <groupId>org.apache.isis.mavendeps</groupId>
+ <artifactId>isis-mavendeps-jdk11</artifactId>
+ <type>pom</type>
+ </dependency>
+
+ <dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
</dependency>
@@ -131,27 +174,6 @@
</profile>
<profile>
- <id>jdbc-logging</id>
- <activation>
- <property>
- <name>jdbc-logging</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.lazyluke</groupId>
- <artifactId>log4jdbc-remix</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- </dependencies>
- </profile>
-
- <profile>
<id>lockdown</id>
<activation>
<property>
diff --git a/application/src/main/java/domainapp/application/ApplicationModule.java b/webapp/src/main/java/domainapp/application/ApplicationModule.java
similarity index 100%
rename from application/src/main/java/domainapp/application/ApplicationModule.java
rename to webapp/src/main/java/domainapp/application/ApplicationModule.java
diff --git a/application/src/main/java/domainapp/application/fixture/DomainAppFixtureScriptsSpecificationProvider.java b/webapp/src/main/java/domainapp/application/fixture/DomainAppFixtureScriptsSpecificationProvider.java
similarity index 100%
rename from application/src/main/java/domainapp/application/fixture/DomainAppFixtureScriptsSpecificationProvider.java
rename to webapp/src/main/java/domainapp/application/fixture/DomainAppFixtureScriptsSpecificationProvider.java
diff --git a/application/src/main/java/domainapp/application/fixture/scenarios/DomainAppDemo.java b/webapp/src/main/java/domainapp/application/fixture/scenarios/DomainAppDemo.java
similarity index 100%
rename from application/src/main/java/domainapp/application/fixture/scenarios/DomainAppDemo.java
rename to webapp/src/main/java/domainapp/application/fixture/scenarios/DomainAppDemo.java
diff --git a/application/src/main/java/domainapp/application/services/health/HealthCheckServiceImpl.java b/webapp/src/main/java/domainapp/application/services/health/HealthCheckServiceImpl.java
similarity index 100%
rename from application/src/main/java/domainapp/application/services/health/HealthCheckServiceImpl.java
rename to webapp/src/main/java/domainapp/application/services/health/HealthCheckServiceImpl.java
diff --git a/application/src/main/java/domainapp/application/services/homepage/HomePageService.java b/webapp/src/main/java/domainapp/application/services/homepage/HomePageService.java
similarity index 100%
rename from application/src/main/java/domainapp/application/services/homepage/HomePageService.java
rename to webapp/src/main/java/domainapp/application/services/homepage/HomePageService.java
diff --git a/application/src/main/java/domainapp/application/services/homepage/HomePageViewModel.java b/webapp/src/main/java/domainapp/application/services/homepage/HomePageViewModel.java
similarity index 100%
rename from application/src/main/java/domainapp/application/services/homepage/HomePageViewModel.java
rename to webapp/src/main/java/domainapp/application/services/homepage/HomePageViewModel.java
diff --git a/application/src/main/java/domainapp/application/services/homepage/HomePageViewModel.layout.xml b/webapp/src/main/java/domainapp/application/services/homepage/HomePageViewModel.layout.xml
similarity index 100%
rename from application/src/main/java/domainapp/application/services/homepage/HomePageViewModel.layout.xml
rename to webapp/src/main/java/domainapp/application/services/homepage/HomePageViewModel.layout.xml
diff --git a/application/src/main/java/domainapp/application/services/homepage/HomePageViewModel.png b/webapp/src/main/java/domainapp/application/services/homepage/HomePageViewModel.png
similarity index 100%
rename from application/src/main/java/domainapp/application/services/homepage/HomePageViewModel.png
rename to webapp/src/main/java/domainapp/application/services/homepage/HomePageViewModel.png
diff --git a/application/src/main/resources/log4j2-spring.xml b/webapp/src/main/resources/log4j2-spring.xml
similarity index 100%
rename from application/src/main/resources/log4j2-spring.xml
rename to webapp/src/main/resources/log4j2-spring.xml
diff --git a/application/src/test/java/domainapp/application/bdd/RunIntegBddSpecs.java b/webapp/src/test/java/domainapp/application/bdd/RunIntegBddSpecs.java
similarity index 100%
rename from application/src/test/java/domainapp/application/bdd/RunIntegBddSpecs.java
rename to webapp/src/test/java/domainapp/application/bdd/RunIntegBddSpecs.java
diff --git a/application/src/test/java/domainapp/application/bdd/glue/SimpleObjectsStepDef.java b/webapp/src/test/java/domainapp/application/bdd/glue/SimpleObjectsStepDef.java
similarity index 100%
rename from application/src/test/java/domainapp/application/bdd/glue/SimpleObjectsStepDef.java
rename to webapp/src/test/java/domainapp/application/bdd/glue/SimpleObjectsStepDef.java
diff --git a/application/src/test/java/domainapp/application/bdd/specs/SimpleObjectSpec_listAllAndCreate.feature b/webapp/src/test/java/domainapp/application/bdd/specs/SimpleObjectSpec_listAllAndCreate.feature
similarity index 100%
rename from application/src/test/java/domainapp/application/bdd/specs/SimpleObjectSpec_listAllAndCreate.feature
rename to webapp/src/test/java/domainapp/application/bdd/specs/SimpleObjectSpec_listAllAndCreate.feature
diff --git a/application/src/test/java/domainapp/application/integtests/ApplicationIntegTestAbstract.java b/webapp/src/test/java/domainapp/application/integtests/ApplicationIntegTestAbstract.java
similarity index 100%
rename from application/src/test/java/domainapp/application/integtests/ApplicationIntegTestAbstract.java
rename to webapp/src/test/java/domainapp/application/integtests/ApplicationIntegTestAbstract.java
diff --git a/application/src/test/java/domainapp/application/integtests/mml/DomainModel_IntegTest.java b/webapp/src/test/java/domainapp/application/integtests/mml/DomainModel_IntegTest.java
similarity index 100%
rename from application/src/test/java/domainapp/application/integtests/mml/DomainModel_IntegTest.java
rename to webapp/src/test/java/domainapp/application/integtests/mml/DomainModel_IntegTest.java
diff --git a/application/src/test/java/domainapp/application/integtests/mml/MetaModelService_IntegTest.java b/webapp/src/test/java/domainapp/application/integtests/mml/MetaModelService_IntegTest.java
similarity index 100%
rename from application/src/test/java/domainapp/application/integtests/mml/MetaModelService_IntegTest.java
rename to webapp/src/test/java/domainapp/application/integtests/mml/MetaModelService_IntegTest.java
diff --git a/application/src/test/java/domainapp/application/integtests/mml/approved/domainapp.application.fixture.DomainAppFixtureScriptsSpecificationProvider.xml b/webapp/src/test/java/domainapp/application/integtests/mml/approved/domainapp.application.fixture.DomainAppFixtureScriptsSpecificationProvider.xml
similarity index 100%
rename from application/src/test/java/domainapp/application/integtests/mml/approved/domainapp.application.fixture.DomainAppFixtureScriptsSpecificationProvider.xml
rename to webapp/src/test/java/domainapp/application/integtests/mml/approved/domainapp.application.fixture.DomainAppFixtureScriptsSpecificationProvider.xml
diff --git a/application/src/test/java/domainapp/application/integtests/mml/approved/domainapp.application.services.health.HealthCheckServiceImpl.xml b/webapp/src/test/java/domainapp/application/integtests/mml/approved/domainapp.application.services.health.HealthCheckServiceImpl.xml
similarity index 100%
rename from application/src/test/java/domainapp/application/integtests/mml/approved/domainapp.application.services.health.HealthCheckServiceImpl.xml
rename to webapp/src/test/java/domainapp/application/integtests/mml/approved/domainapp.application.services.health.HealthCheckServiceImpl.xml
diff --git a/application/src/test/java/domainapp/application/integtests/mml/approved/domainapp.application.services.homepage.HomePageViewModel.xml b/webapp/src/test/java/domainapp/application/integtests/mml/approved/domainapp.application.services.homepage.HomePageViewModel.xml
similarity index 100%
rename from application/src/test/java/domainapp/application/integtests/mml/approved/domainapp.application.services.homepage.HomePageViewModel.xml
rename to webapp/src/test/java/domainapp/application/integtests/mml/approved/domainapp.application.services.homepage.HomePageViewModel.xml
diff --git a/application/src/test/java/domainapp/application/integtests/mml/approved/domainapp.modules.simple.dom.impl.SimpleObject.xml b/webapp/src/test/java/domainapp/application/integtests/mml/approved/domainapp.modules.simple.dom.impl.SimpleObject.xml
similarity index 100%
rename from application/src/test/java/domainapp/application/integtests/mml/approved/domainapp.modules.simple.dom.impl.SimpleObject.xml
rename to webapp/src/test/java/domainapp/application/integtests/mml/approved/domainapp.modules.simple.dom.impl.SimpleObject.xml
diff --git a/application/src/test/java/domainapp/application/integtests/mml/approved/domainapp.modules.simple.dom.impl.SimpleObjects.xml b/webapp/src/test/java/domainapp/application/integtests/mml/approved/domainapp.modules.simple.dom.impl.SimpleObjects.xml
similarity index 100%
rename from application/src/test/java/domainapp/application/integtests/mml/approved/domainapp.modules.simple.dom.impl.SimpleObjects.xml
rename to webapp/src/test/java/domainapp/application/integtests/mml/approved/domainapp.modules.simple.dom.impl.SimpleObjects.xml
diff --git a/application/src/test/java/domainapp/application/integtests/mml/received/.gitignore b/webapp/src/test/java/domainapp/application/integtests/mml/received/.gitignore
similarity index 100%
rename from application/src/test/java/domainapp/application/integtests/mml/received/.gitignore
rename to webapp/src/test/java/domainapp/application/integtests/mml/received/.gitignore
diff --git a/application/src/test/java/domainapp/application/integtests/smoke/Smoke_IntegTest.java b/webapp/src/test/java/domainapp/application/integtests/smoke/Smoke_IntegTest.java
similarity index 100%
rename from application/src/test/java/domainapp/application/integtests/smoke/Smoke_IntegTest.java
rename to webapp/src/test/java/domainapp/application/integtests/smoke/Smoke_IntegTest.java
diff --git a/webapp/src/test/java/domain/webapp/lockdown/.gitignore b/webapp/src/test/java/domainapp/webapp/lockdown/.gitignore
similarity index 100%
rename from webapp/src/test/java/domain/webapp/lockdown/.gitignore
rename to webapp/src/test/java/domainapp/webapp/lockdown/.gitignore
diff --git a/webapp/src/test/java/domain/webapp/lockdown/LockDownMavenDeps_Test.java b/webapp/src/test/java/domainapp/webapp/lockdown/LockDownMavenDeps_Test.java
similarity index 97%
rename from webapp/src/test/java/domain/webapp/lockdown/LockDownMavenDeps_Test.java
rename to webapp/src/test/java/domainapp/webapp/lockdown/LockDownMavenDeps_Test.java
index 600ce9e..f64caf2 100644
--- a/webapp/src/test/java/domain/webapp/lockdown/LockDownMavenDeps_Test.java
+++ b/webapp/src/test/java/domainapp/webapp/lockdown/LockDownMavenDeps_Test.java
@@ -1,4 +1,4 @@
-package domain.webapp.lockdown;
+package domainapp.webapp.lockdown;
import java.io.IOException;
import java.net.URL;
diff --git a/webapp/src/test/java/domain/webapp/lockdown/LockDownMavenDeps_Test.list.approved.txt b/webapp/src/test/java/domainapp/webapp/lockdown/LockDownMavenDeps_Test.list.approved.txt
similarity index 100%
rename from webapp/src/test/java/domain/webapp/lockdown/LockDownMavenDeps_Test.list.approved.txt
rename to webapp/src/test/java/domainapp/webapp/lockdown/LockDownMavenDeps_Test.list.approved.txt
diff --git a/webapp/src/test/java/domain/webapp/lockdown/LockDownMavenDeps_Test.tree.approved.txt b/webapp/src/test/java/domainapp/webapp/lockdown/LockDownMavenDeps_Test.tree.approved.txt
similarity index 100%
rename from webapp/src/test/java/domain/webapp/lockdown/LockDownMavenDeps_Test.tree.approved.txt
rename to webapp/src/test/java/domainapp/webapp/lockdown/LockDownMavenDeps_Test.tree.approved.txt