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/04/13 21:04:05 UTC
[isis-app-simpleapp] 02/02: Merge branch 'jdo' into jpa
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-simpleapp.git
commit 2e9b1512b9e71ef771338cac3907343f921659b2
Merge: bb7d2d9 3f170ae
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Apr 13 22:01:40 2021 +0100
Merge branch 'jdo' into jpa
webapp-tests/pom.xml | 66 +--
.../domainapp/webapp/bdd/CucumberTestAbstract.java | 34 --
.../domainapp/webapp/bdd/specs/CucumberTest.java | 36 --
.../webapp/bdd/stepdefs/BddStepDefsModule.java | 13 -
.../bdd/stepdefs/domain/SimpleObjectsContext.java | 21 -
.../domain/SimpleObjectsGivenThenStepDef.java | 54 --
.../stepdefs/domain/SimpleObjectsWhenStepDef.java | 41 --
.../stepdefs/fixtures/DomainAppDemoStepDef.java | 21 -
.../stepdefs/infrastructure/BootstrapStepDef.java | 14 -
.../infrastructure/TransactionalStepDef.java | 50 --
.../webapp/integtests/WebAppIntegTestAbstract.java | 2 -
.../SimpleObjectSpec_listAllAndCreate.feature | 14 -
.../bdd/specs/SimpleObjectSpec_updateName.feature | 16 -
webapp/src/main/webapp/WEB-INF/translations-es.po | 594 ---------------------
webapp/src/main/webapp/WEB-INF/translations.po | 594 ---------------------
15 files changed, 1 insertion(+), 1569 deletions(-)
diff --cc webapp-tests/pom.xml
index d823f01,8890541..6110fb2
--- a/webapp-tests/pom.xml
+++ b/webapp-tests/pom.xml
@@@ -8,11 -8,11 +8,11 @@@
<version>1.0.0-SNAPSHOT</version>
</parent>
- <artifactId>simpleapp-jdo-webapp-tests</artifactId>
- <name>SimpleApp (JDO) - Webapp (tests)</name>
+ <artifactId>simpleapp-jpa-webapp-tests</artifactId>
+ <name>SimpleApp (JPA) - Webapp (tests)</name>
<description>
- Integ tests and BDD specs for entire app.
+ Integ tests for entire app.
</description>
<packaging>jar</packaging>