This is an automated email from the ASF dual-hosted git repository. danhaywood pushed a commit to branch CAUSEWAY-3866 in repository https://gitbox.apache.org/repos/asf/causeway.git
commit 972c31c087a21675868d1876c6a09701aaf3efe2 Author: Dan Haywood <[email protected]> AuthorDate: Fri Oct 17 12:58:25 2025 +0100 CAUSEWAY-3866: removes more jdo, datanucleus and resteasy references --- .../hooks/ObjectContracts_examples-and-usage.adoc | 79 ---- .../collections.adoc | 1 - .../modules/ROOT/partials/view-models/_intro.adoc | 2 +- .../queryresultscache/QueryResultsCache.java | 2 +- core/adoc/modules/_overview/pages/about.adoc | 400 ++------------------- core/config/generateConfigDocs.groovy | 13 - .../adoc/modules/config/pages/sections/_nav.adoc | 2 - .../modules/config/pages/sections/datanucleus.adoc | 196 ---------- .../core/config/presets/CausewayPresets.java | 3 +- ...s => DebugInteractionScopedServices.properties} | 12 +- .../config/presets/DebugPersistence.properties | 20 -- .../DebugTransactionScopedServices.properties | 8 +- .../additional-spring-configuration-metadata.json | 24 +- .../classsubstitutor/ClassSubstitutorDefault.java | 5 - .../confmenu/ConfigurationViewServiceDefault.java | 4 +- .../bootstrapping/builtin-domain-services.list | 1 - .../bootstrapping/builtin-requestscoped.list | 2 - .../bootstrapping/builtin-domain-services.list | 1 - .../bootstrapping/builtin-requestscoped.list | 1 - 19 files changed, 54 insertions(+), 722 deletions(-) diff --git a/antora/components/refguide-index/modules/applib/pages/index/util/hooks/ObjectContracts_examples-and-usage.adoc b/antora/components/refguide-index/modules/applib/pages/index/util/hooks/ObjectContracts_examples-and-usage.adoc index 39bf9b29d7a..fb62301bbbb 100644 --- a/antora/components/refguide-index/modules/applib/pages/index/util/hooks/ObjectContracts_examples-and-usage.adoc +++ b/antora/components/refguide-index/modules/applib/pages/index/util/hooks/ObjectContracts_examples-and-usage.adoc @@ -48,83 +48,4 @@ There are a number of deprecated methods that identify property names as strings These should _not_ be use, as they use are not type-safe and also use reflection heavily and so impose a performance hit. ==== -== Usage Notes - -=== Be aware of ORM loading issues - -`ObjectContracts` implementation can cause DataNucleus to recursively rehydrate a larger number of associated entities (More detail below). - -We therefore recommend that you disable -xref:refguide:config:sections/datanucleus.adoc#datanucleus.persistence-by-reachability-at-commit[persistence-by-reachability] by adding: - -[source,ini] -.application.properties ----- -datanucleus.persistenceByReachabilityAtCommit=false ----- - -[plantuml] ----- -hide empty members - -class Party -class AgreementRole -class Agreement - -Party <-r-> "0.*" AgreementRole -AgreementRole "0..*" <-r-> Agreement ----- - -In the course of a transaction, the `Agreement` entity is loaded into memory (not necessarily modified), and then new ``AgreementRole``s are associated to it. - -All these entities implement `Comparable` using `ObjectContracts`, so that the implementation of ``AgreementRole``'s (simplified) is: - -[source,java] ----- -public class AgreementRole { - ... - public int compareTo(AgreementRole other) { - return ObjectContracts.compareTo(this, other, "agreement","startDate","party"); - } - ... -} ----- - -while ``Agreement``'s is implemented as: - -[source,java] ----- - public class Agreement { - ... - public int compareTo(Agreement other) { - return ObjectContracts.compareTo(this, other, "reference"); - } - ... - } ----- - -and ``Party``'s is similarly implemented as: - -[source,java] ----- -public class Party { - ... - public int compareTo(Party other) { - return ObjectContracts.compareTo(this, other, "reference"); - } - ... -} ----- - -DataNucleus's persistence-by-reachability algorithm adds the ``AgreementRole``s into a `SortedSet`, which causes `AgreementRole#compareTo()` to fire: - -* the evaluation of the "agreement" property delegates back to the `Agreement`, whose own `Agreement#compareTo()` uses the scalar `reference` property. -As the `Agreement` is already in-memory, this does not trigger any further database queries - -* the evaluation of the "startDate" property is just a scalar property of the `AgreementRole`, so will already in-memory - -* the evaluation of the "party" property delegates back to the `Party`, whose own `Party#compareTo()` requires the uses the scalar `reference` property. -However, since the `Party` is not yet in-memory, using the `reference` property triggers a database query to "rehydrate" the `Party` instance. - -In other words, figuring out whether `AgreementRole` is comparable requires the persistence-by-reachability algorithm to run, causing the adjacent associated entity `Party` to also be retrieved. diff --git a/antora/components/userguide/modules/ROOT/partials/properties-collections-actions/collections.adoc b/antora/components/userguide/modules/ROOT/partials/properties-collections-actions/collections.adoc index 7410a6cf757..7a9ef5442cf 100644 --- a/antora/components/userguide/modules/ROOT/partials/properties-collections-actions/collections.adoc +++ b/antora/components/userguide/modules/ROOT/partials/properties-collections-actions/collections.adoc @@ -32,7 +32,6 @@ For example, a `placeOrder(...)` action will likely add an `Order` to the `Custo Since writing getter and setter methods adds quite a bit of boilerplate, it's common to use link:https://projectlombok.org/[Project Lombok] to code generate these methods at compile time (using Java's annotation processor) simply by adding the `@lombok.Getter` and `@lombok.Setter` annotations to the field. -TIP: see the DataNucleus http://www.datanucleus.org:15080/products/accessplatform_5_0/jdo/mapping.html[Mapping Guide] for more in-depth coverage of this topic. == Mapping bidir 1:m diff --git a/antora/components/userguide/modules/ROOT/partials/view-models/_intro.adoc b/antora/components/userguide/modules/ROOT/partials/view-models/_intro.adoc index d5569f88778..97961e598f9 100644 --- a/antora/components/userguide/modules/ROOT/partials/view-models/_intro.adoc +++ b/antora/components/userguide/modules/ROOT/partials/view-models/_intro.adoc @@ -145,6 +145,6 @@ Or, rather than marshalling state, the view model could hold a reference to the A third option is to define an RDBMS view, and then map a "non-durable" entity to that view. The RDBMS view then becomes the public API that must be preserved. -ORMs such as DataNucleus link:http://www.datanucleus.org:15080/products/accessplatform_5_1/jdo/mapping.html#schema_rdbms_views[support this]. +ORMs such as xref:pjpa:ROOT:about.adoc[JPA/Eclipselink] support this. diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/queryresultscache/QueryResultsCache.java b/api/applib/src/main/java/org/apache/causeway/applib/services/queryresultscache/QueryResultsCache.java index cd7b98d8af2..ac3a9b79682 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/services/queryresultscache/QueryResultsCache.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/services/queryresultscache/QueryResultsCache.java @@ -193,7 +193,7 @@ private <T> T executeWithCaching(final Callable<T> callable, final Key cacheKey) // (it is possible that the callable just invoked might also have updated the cache, eg if there was // some sort of recursion. However, Map#put(...) is idempotent, so valid to call more than once. // - // note: there's no need for thread-safety synchronization... remember that QueryResultsCache is @RequestScoped + // note: there's no need for thread-safety synchronization... remember that QueryResultsCache is @InteractionScoped put(cacheKey, result); return result; diff --git a/core/adoc/modules/_overview/pages/about.adoc b/core/adoc/modules/_overview/pages/about.adoc index 3995f31c01d..b031474d8df 100644 --- a/core/adoc/modules/_overview/pages/about.adoc +++ b/core/adoc/modules/_overview/pages/about.adoc @@ -44,7 +44,7 @@ rectangle "App\n<size:10>[Software System]</size>" <<App>> { .Projects/Modules (App) [cols="3a,5a", options="header"] |=== -|Coordinates |Description +|Coordinates |Description |Apache Causeway Starter Parent [source,yaml] @@ -107,7 +107,7 @@ Mavendeps.ApacheCausewayMavenDeps .[#707070,thickness=2].> Mavendeps.ApacheCause .Projects/Modules (Mavendeps) [cols="3a,5a", options="header"] |=== -|Coordinates |Description +|Coordinates |Description |Apache Causeway Maven Deps [source,yaml] @@ -331,7 +331,7 @@ Testing.ApacheCausewayTstUnitTestSupportparent .[#707070,thickness=2].> Testing. .Projects/Modules (Testing) [cols="3a,5a", options="header"] |=== -|Coordinates |Description +|Coordinates |Description |Apache Causeway Testing [source,yaml] @@ -369,7 +369,6 @@ org.apache.causeway.commons:causeway-commons:jar:<managed> + org.apache.causeway.core:causeway-applib:jar:<managed> + org.apache.causeway.persistence:causeway-persistence-jdo-integration:jar:<managed> + org.apache.causeway.persistence:causeway-persistence-jpa-integration:jar:<managed> + -org.datanucleus:javax.jdo:jar:<managed> + org.slf4j:slf4j-api:jar:<managed> + org.springframework:spring-test:jar:<managed> + org.springframework.boot:spring-boot-starter-test:jar:<managed> + @@ -444,7 +443,6 @@ Directory: /testing/fakedata/integtests ---- |.Dependencies **** -org.apache.causeway.persistence:causeway-persistence-jdo-datanucleus:jar:<managed> + org.apache.causeway.testing:causeway-testing-fakedata-applib:jar:<managed> + org.apache.causeway.testing:causeway-testing-fakedata-fixtures:jar:<managed> + org.apache.causeway.testing:causeway-testing-fixtures-applib:jar:<managed> + @@ -652,7 +650,6 @@ jakarta.xml.ws:jakarta.xml.ws-api:jar:<managed> + org.apache.causeway.commons:causeway-commons:jar:<managed> + org.apache.causeway.core:causeway-applib:jar:<managed> + org.apache.causeway.core:causeway-core-codegen-bytebuddy:jar:<managed> + -org.datanucleus:javax.jdo:jar:<managed> + org.jmock:jmock:jar:<managed> + org.jmock:jmock-junit5:jar:<managed> + org.picocontainer:picocontainer:jar:<managed> + @@ -733,7 +730,7 @@ Root.ApacheCausewayAggregator .[#707070,thickness=2].> Root.ApacheCauseway : "<c .Projects/Modules (Root) [cols="3a,5a", options="header"] |=== -|Coordinates |Description +|Coordinates |Description |Apache Causeway (Aggregator) [source,yaml] @@ -824,7 +821,7 @@ rectangle "Commons\n<size:10>[Software System]</size>" <<Commons>> { .Projects/Modules (Commons) [cols="3a,5a", options="header"] |=== -|Coordinates |Description +|Coordinates |Description |Apache Causeway Commons [source,yaml] @@ -1013,7 +1010,7 @@ Core.ApacheCausewayCore .[#707070,thickness=2].> Core.ApacheCausewayApiSchemas : .Projects/Modules (Core) [cols="3a,5a", options="header"] |=== -|Coordinates |Description +|Coordinates |Description |Apache Causeway Core [source,yaml] @@ -1175,7 +1172,6 @@ Directory: /core/internaltestsupport net.bytebuddy:byte-buddy-agent:jar:<managed> + org.apache.causeway.commons:causeway-commons:jar:<managed> + org.apache.causeway.core:causeway-core-codegen-bytebuddy:jar:<managed> + -org.datanucleus:javax.jdo:jar:<managed> + org.hamcrest:hamcrest-library:jar:<managed> + org.junit.jupiter:junit-jupiter-api:jar:<managed> + org.junit.jupiter:junit-jupiter-engine:jar:<managed> + @@ -1588,7 +1584,7 @@ Persistence.ApacheCausewayPersistenceQueryDSL .[#707070,thickness=2].> Persisten .Projects/Modules (Persistence) [cols="3a,5a", options="header"] |=== -|Coordinates |Description +|Coordinates |Description |Apache Causeway Persistence - JDBC [source,yaml] @@ -1639,7 +1635,6 @@ org.apache.causeway.commons:causeway-commons:jar:<managed> + org.apache.causeway.core:causeway-applib:jar:<managed> + org.apache.causeway.core:causeway-core-internaltestsupport:jar:<managed> + org.apache.causeway.core:causeway-core-metamodel:jar:<managed> + -org.datanucleus:javax.jdo:jar:<managed> + **** .Document Index Entries @@ -1815,7 +1810,7 @@ rectangle "Persistence Commons\n<size:10>[Software System]</size>" <<Persistence .Projects/Modules (Persistence Commons) [cols="3a,5a", options="header"] |=== -|Coordinates |Description +|Coordinates |Description |Apache Causeway Persistence - Commons [source,yaml] @@ -1851,281 +1846,6 @@ xref:refguide:persistence:index/commons/integration/changetracking/EntityChangeT **** |=== -=== JDO - -[plantuml,JDO,svg] ----- -@startuml -set separator none -title JDO - Containers - -left to right direction - -skinparam { - arrowFontSize 10 - defaultTextAlignment center - wrapWidth 200 - maxMessageSize 100 -} - -hide stereotype - -skinparam rectangle<<JDO.ApacheCausewayPersistenceJDO>> { - BackgroundColor #438dd5 - FontColor #fffffe - BorderColor #2e6295 - shadowing false -} -skinparam rectangle<<JDO.ApacheCausewayPersistenceJDOSpring>> { - BackgroundColor #438dd5 - FontColor #fffffe - BorderColor #2e6295 - shadowing false -} -skinparam rectangle<<JDO.ApacheCausewayPersistenceJDOapplib>> { - BackgroundColor #438dd5 - FontColor #fffffe - BorderColor #2e6295 - shadowing false -} -skinparam rectangle<<JDO.ApacheCausewayPersistenceJDOintegration>> { - BackgroundColor #438dd5 - FontColor #fffffe - BorderColor #2e6295 - shadowing false -} -skinparam rectangle<<JDO.ApacheCausewayPersistenceJDOmetamodel>> { - BackgroundColor #438dd5 - FontColor #fffffe - BorderColor #2e6295 - shadowing false -} -skinparam rectangle<<JDO.ApacheCausewayPersistenceJDOprovider>> { - BackgroundColor #438dd5 - FontColor #fffffe - BorderColor #2e6295 - shadowing false -} -skinparam rectangle<<JDO.ApacheCausewayPersistenceJDOProviderDataNucleus>> { - BackgroundColor #438dd5 - FontColor #fffffe - BorderColor #2e6295 - shadowing false -} -skinparam rectangle<<JDO>> { - BorderColor #9a9a9a - FontColor #9a9a9a - shadowing false -} - -rectangle "JDO\n<size:10>[Software System]</size>" <<JDO>> { - rectangle "==Apache Causeway Persistence - JDO\n<size:10>[Container: packaging: pom]</size>" <<JDO.ApacheCausewayPersistenceJDO>> as JDO.ApacheCausewayPersistenceJDO - rectangle "==Apache Causeway Persistence - JDO (applib)\n<size:10>[Container: packaging: jar]</size>" <<JDO.ApacheCausewayPersistenceJDOapplib>> as JDO.ApacheCausewayPersistenceJDOapplib - rectangle "==Apache Causeway Persistence - JDO Provider (DataNucleus)\n<size:10>[Container: packaging: jar]</size>" <<JDO.ApacheCausewayPersistenceJDOProviderDataNucleus>> as JDO.ApacheCausewayPersistenceJDOProviderDataNucleus - rectangle "==Apache Causeway Persistence - JDO (integration)\n<size:10>[Container: packaging: jar]</size>" <<JDO.ApacheCausewayPersistenceJDOintegration>> as JDO.ApacheCausewayPersistenceJDOintegration - rectangle "==Apache Causeway Persistence - JDO (metamodel)\n<size:10>[Container: packaging: jar]</size>" <<JDO.ApacheCausewayPersistenceJDOmetamodel>> as JDO.ApacheCausewayPersistenceJDOmetamodel - rectangle "==Apache Causeway Persistence - JDO (provider)\n<size:10>[Container: packaging: jar]</size>" <<JDO.ApacheCausewayPersistenceJDOprovider>> as JDO.ApacheCausewayPersistenceJDOprovider - rectangle "==Apache Causeway Persistence - JDO (Spring)\n<size:10>[Container: packaging: jar]</size>" <<JDO.ApacheCausewayPersistenceJDOSpring>> as JDO.ApacheCausewayPersistenceJDOSpring -} - -JDO.ApacheCausewayPersistenceJDO .[#707070,thickness=2].> JDO.ApacheCausewayPersistenceJDOProviderDataNucleus : "<color:#707070>" -JDO.ApacheCausewayPersistenceJDO .[#707070,thickness=2].> JDO.ApacheCausewayPersistenceJDOintegration : "<color:#707070>" -JDO.ApacheCausewayPersistenceJDO .[#707070,thickness=2].> JDO.ApacheCausewayPersistenceJDOmetamodel : "<color:#707070>" -JDO.ApacheCausewayPersistenceJDO .[#707070,thickness=2].> JDO.ApacheCausewayPersistenceJDOprovider : "<color:#707070>" -JDO.ApacheCausewayPersistenceJDO .[#707070,thickness=2].> JDO.ApacheCausewayPersistenceJDOSpring : "<color:#707070>" -JDO.ApacheCausewayPersistenceJDO .[#707070,thickness=2].> JDO.ApacheCausewayPersistenceJDOapplib : "<color:#707070>" -@enduml ----- - -.Projects/Modules (JDO) -[cols="3a,5a", options="header"] -|=== -|Coordinates |Description - -|Apache Causeway Persistence - JDO -[source,yaml] ----- -Group: org.apache.causeway.persistence -Artifact: causeway-persistence-jdo -Type: pom -Directory: /persistence/jdo ----- -|Supplementary applib for JDO persistence - -|Apache Causeway Persistence - JDO (applib) -[source,yaml] ----- -Group: org.apache.causeway.persistence -Artifact: causeway-persistence-jdo-applib -Type: jar -Directory: /persistence/jdo/applib ----- -|Supplementary applib for JDO persistence - -.Dependencies -**** -org.apache.causeway.commons:causeway-commons:jar:<managed> + -org.apache.causeway.core:causeway-applib:jar:<managed> + -org.datanucleus:datanucleus-rdbms:jar:<managed> + -org.datanucleus:javax.jdo:jar:<managed> + -**** - -.Document Index Entries -**** -xref:refguide:persistence:index/jdo/applib/CausewayModulePersistenceJdoApplib.adoc[CausewayModulePersistenceJdoApplib], xref:refguide:persistence:index/jdo/applib/services/JdoSupportService.adoc[JdoSupportService], xref:refguide:persistence:index/jdo/applib/types/AddressLine.adoc[AddressLine], xref:refguide:persistence:index/jdo/applib/types/Description.adoc[Description], xref:refguide:persistence:index/jdo/applib/types/Email.adoc[Email], xref:refguide:persistence:index/jdo/applib/types/ [...] -**** - -|Apache Causeway Persistence - JDO Provider (DataNucleus) -[source,yaml] ----- -Group: org.apache.causeway.persistence -Artifact: causeway-persistence-jdo-datanucleus -Type: jar -Directory: /persistence/jdo/datanucleus ----- -|JDO Implementation (powered by DataNucleus) - -.Components -**** -o.a.i.persistence.jdo.datanucleus.changetracking.PreAndPostValueEvaluatorServiceJdo + -o.a.i.persistence.jdo.datanucleus.entities.DnEntityStateProvider + -o.a.i.persistence.jdo.datanucleus.exrecog.JdoObjectNotFoundRecognizer + -o.a.i.persistence.jdo.datanucleus.jdosupport.JdoSupportServiceDefault + -o.a.i.persistence.jdo.datanucleus.valuetypes.DnByteIdValueSemantics + -o.a.i.persistence.jdo.datanucleus.valuetypes.DnCharIdValueSemantics + -o.a.i.persistence.jdo.datanucleus.valuetypes.DnDatastoreIdImplValueSemantics + -o.a.i.persistence.jdo.datanucleus.valuetypes.DnDatastoreUniqueLongIdValueSemantics + -o.a.i.persistence.jdo.datanucleus.valuetypes.DnIntIdValueSemantics + -o.a.i.persistence.jdo.datanucleus.valuetypes.DnLongIdValueSemantics + -o.a.i.persistence.jdo.datanucleus.valuetypes.DnObjectIdValueSemantics + -o.a.i.persistence.jdo.datanucleus.valuetypes.DnScoidValueSemantics + -o.a.i.persistence.jdo.datanucleus.valuetypes.DnShortIdValueSemantics + -o.a.i.persistence.jdo.datanucleus.valuetypes.DnStringIdValueSemantics + -o.a.i.persistence.jdo.datanucleus.valuetypes.JdoByteIdentityValueSemantics + -o.a.i.persistence.jdo.datanucleus.valuetypes.JdoCharIdentityValueSemantics + -o.a.i.persistence.jdo.datanucleus.valuetypes.JdoDatastoreIdValueSemantics + -o.a.i.persistence.jdo.datanucleus.valuetypes.JdoIntIdentityValueSemantics + -o.a.i.persistence.jdo.datanucleus.valuetypes.JdoLongIdentityValueSemantics + -o.a.i.persistence.jdo.datanucleus.valuetypes.JdoObjectIdentityValueSemantics + -o.a.i.persistence.jdo.datanucleus.valuetypes.JdoShortIdentityValueSemantics + -o.a.i.persistence.jdo.datanucleus.valuetypes.JdoStringIdentityValueSemantics + -**** - -.Dependencies -**** -com.h2database:h2:jar:<managed> + -org.apache.causeway.core:causeway-core-internaltestsupport:jar:<managed> + -org.apache.causeway.core:causeway-core-runtime:jar:<managed> + -org.apache.causeway.persistence:causeway-persistence-jdo-integration:jar:<managed> + -org.apache.causeway.persistence:causeway-persistence-jdo-provider:jar:<managed> + -org.datanucleus:datanucleus-api-jdo:jar:<managed> + -org.datanucleus:datanucleus-core:jar:<managed> + -org.datanucleus:datanucleus-jdo-query:jar:<managed> + -org.datanucleus:datanucleus-jodatime:jar:<managed> + -org.datanucleus:datanucleus-rdbms:jar:<managed> + -org.springframework.boot:spring-boot-starter-jdbc:jar:<managed> + -**** - -.Document Index Entries -**** -xref:refguide:persistence:index/jdo/datanucleus/CausewayModulePersistenceJdoDatanucleus.adoc[CausewayModulePersistenceJdoDatanucleus], xref:refguide:persistence:index/jdo/datanucleus/CausewayModulePersistenceJdoDatanucleusMixins.adoc[CausewayModulePersistenceJdoDatanucleusMixins], xref:refguide:persistence:index/jdo/datanucleus/changetracking/JdoLifecycleListener.adoc[JdoLifecycleListener], xref:refguide:persistence:index/jdo/datanucleus/dialect/DnJdoDialect.adoc[DnJdoDialect], xref:refg [...] -**** - -|Apache Causeway Persistence - JDO (integration) -[source,yaml] ----- -Group: org.apache.causeway.persistence -Artifact: causeway-persistence-jdo-integration -Type: jar -Directory: /persistence/jdo/integration ----- -|JDO Integration (powered by DataNucleus) - -.Dependencies -**** -org.apache.causeway.commons:causeway-commons:jar:<managed> + -org.apache.causeway.core:causeway-applib:jar:<managed> + -org.apache.causeway.core:causeway-core-internaltestsupport:jar:<managed> + -org.apache.causeway.core:causeway-core-runtime:jar:<managed> + -org.apache.causeway.persistence:causeway-persistence-commons:jar:<managed> + -org.apache.causeway.persistence:causeway-persistence-jdo-applib:jar:<managed> + -org.apache.causeway.persistence:causeway-persistence-jdo-metamodel:jar:<managed> + -org.apache.causeway.persistence:causeway-persistence-jdo-spring:jar:<managed> + -**** - -|Apache Causeway Persistence - JDO (metamodel) -[source,yaml] ----- -Group: org.apache.causeway.persistence -Artifact: causeway-persistence-jdo-metamodel -Type: jar -Directory: /persistence/jdo/metamodel ----- -|JDO Metamodel Facets / Programming Model - -.Components -**** -o.a.i.persistence.jdo.metamodel.JdoProgrammingModel + -**** - -.Dependencies -**** -org.apache.causeway.core:causeway-core-internaltestsupport:jar:<managed> + -org.apache.causeway.core:causeway-core-runtime:jar:<managed> + -org.apache.causeway.persistence:causeway-persistence-commons:jar:<managed> + -org.apache.causeway.persistence:causeway-persistence-jdo-applib:jar:<managed> + -org.apache.causeway.persistence:causeway-persistence-jdo-provider:jar:<managed> + -**** - -|Apache Causeway Persistence - JDO (provider) -[source,yaml] ----- -Group: org.apache.causeway.persistence -Artifact: causeway-persistence-jdo-provider -Type: jar -Directory: /persistence/jdo/provider ----- -|JDO Provider to be implemented by any actual JDO provider eg. DataNucleus. - -.Dependencies -**** -org.apache.causeway.core:causeway-core-metamodel:jar:<managed> + -org.apache.causeway.persistence:causeway-persistence-jdo-applib:jar:<managed> + -org.datanucleus:datanucleus-rdbms:jar:<managed> + -**** - -|Apache Causeway Persistence - JDO (Spring) -[source,yaml] ----- -Group: org.apache.causeway.persistence -Artifact: causeway-persistence-jdo-spring -Type: jar -Directory: /persistence/jdo/spring ----- -|JDO Spring integration. - -This is a fork of the Spring ORM JDO sources at github, -for which support had been dropped back in 2016 [1]. - -Credits to the original authors. See also docs [2]. - -[1] https://github.com/spring-projects/spring-framework/issues/18702 -[2] https://docs.spring.io/spring-framework/docs/3.0.0.RC2/reference/html/ch13s04.html - -.Dependencies -**** -jakarta.servlet:jakarta.servlet-api:jar:<managed> + -org.apache.causeway.commons:causeway-commons:jar:<managed> + -org.apache.causeway.core:causeway-applib:jar:<managed> + -org.apache.causeway.core:causeway-core-config:jar:<managed> + -org.apache.causeway.core:causeway-core-internaltestsupport:jar:<managed> + -org.apache.causeway.persistence:causeway-persistence-jdo-applib:jar:<managed> + -org.apache.causeway.persistence:causeway-persistence-jdo-provider:jar:<managed> + -org.springframework:spring-jdbc:jar:<managed> + -org.springframework:spring-web:jar:<managed> + -**** -|=== - === JPA [plantuml,JPA,svg] @@ -2199,7 +1919,7 @@ JPA.ApacheCausewayPersistenceJPA .[#707070,thickness=2].> JPA.ApacheCausewayPers .Projects/Modules (JPA) [cols="3a,5a", options="header"] |=== -|Coordinates |Description +|Coordinates |Description |Apache Causeway Persistence - JPA [source,yaml] @@ -2360,7 +2080,7 @@ rectangle "Security\n<size:10>[Software System]</size>" <<Security>> { .Projects/Modules (Security) [cols="3a,5a", options="header"] |=== -|Coordinates |Description +|Coordinates |Description |Apache Causeway Security - Simple [source,yaml] @@ -2431,7 +2151,7 @@ rectangle "Bypass\n<size:10>[Software System]</size>" <<Bypass>> { .Projects/Modules (Bypass) [cols="3a,5a", options="header"] |=== -|Coordinates |Description +|Coordinates |Description |Apache Causeway Security - Bypass [source,yaml] @@ -2499,7 +2219,7 @@ rectangle "Keycloak\n<size:10>[Software System]</size>" <<Keycloak>> { .Projects/Modules (Keycloak) [cols="3a,5a", options="header"] |=== -|Coordinates |Description +|Coordinates |Description |Apache Causeway Security - Keycloak [source,yaml] @@ -2576,7 +2296,7 @@ rectangle "Shiro\n<size:10>[Software System]</size>" <<Shiro>> { .Projects/Modules (Shiro) [cols="3a,5a", options="header"] |=== -|Coordinates |Description +|Coordinates |Description |Apache Causeway Security - Shiro [source,yaml] @@ -2652,7 +2372,7 @@ rectangle "Spring\n<size:10>[Software System]</size>" <<Spring>> { .Projects/Modules (Spring) [cols="3a,5a", options="header"] |=== -|Coordinates |Description +|Coordinates |Description |Apache Causeway Security - Spring [source,yaml] @@ -2762,7 +2482,7 @@ ViewerCommons.ApacheCausewayViewerCommons .[#707070,thickness=2].> ViewerCommons .Projects/Modules (Viewer Commons) [cols="3a,5a", options="header"] |=== -|Coordinates |Description +|Coordinates |Description |Apache Causeway Viewer - Commons [source,yaml] @@ -2944,7 +2664,7 @@ GraphQL.ApacheCausewayViewerGraphQL .[#707070,thickness=2].> GraphQL.ApacheCause .Projects/Modules (GraphQL) [cols="3a,5a", options="header"] |=== -|Coordinates |Description +|Coordinates |Description |Apache Causeway Viewer - GraphQL [source,yaml] @@ -3165,12 +2885,6 @@ skinparam rectangle<<RestfulObjects.ApacheCausewayViewerROClient>> { BorderColor #2e6295 shadowing false } -skinparam rectangle<<RestfulObjects.ApacheCausewayViewerROJAXRSResteasy>> { - BackgroundColor #438dd5 - FontColor #fffffe - BorderColor #2e6295 - shadowing false -} skinparam rectangle<<RestfulObjects.ApacheCausewayViewerRORendering>> { BackgroundColor #438dd5 FontColor #fffffe @@ -3205,7 +2919,6 @@ rectangle "Restful Objects\n<size:10>[Software System]</size>" <<RestfulObjects> rectangle "==Apache Causeway Viewer - RO\n<size:10>[Container: packaging: pom]</size>" <<RestfulObjects.ApacheCausewayViewerRO>> as RestfulObjects.ApacheCausewayViewerRO rectangle "==Apache Causeway Viewer - RO (AppLib)\n<size:10>[Container: packaging: jar]</size>" <<RestfulObjects.ApacheCausewayViewerROAppLib>> as RestfulObjects.ApacheCausewayViewerROAppLib rectangle "==Apache Causeway Viewer - RO (Client)\n<size:10>[Container: packaging: jar]</size>" <<RestfulObjects.ApacheCausewayViewerROClient>> as RestfulObjects.ApacheCausewayViewerROClient - rectangle "==Apache Causeway Viewer - RO (JAX-RS Resteasy)\n<size:10>[Container: packaging: jar]</size>" <<RestfulObjects.ApacheCausewayViewerROJAXRSResteasy>> as RestfulObjects.ApacheCausewayViewerROJAXRSResteasy rectangle "==Apache Causeway Viewer - RO (Rendering)\n<size:10>[Container: packaging: jar]</size>" <<RestfulObjects.ApacheCausewayViewerRORendering>> as RestfulObjects.ApacheCausewayViewerRORendering rectangle "==Apache Causeway Viewer - RO (Test)\n<size:10>[Container: packaging: jar]</size>" <<RestfulObjects.ApacheCausewayViewerROTest>> as RestfulObjects.ApacheCausewayViewerROTest rectangle "==Apache Causeway Viewer - RO (Testing)\n<size:10>[Container: packaging: jar]</size>" <<RestfulObjects.ApacheCausewayViewerROTesting>> as RestfulObjects.ApacheCausewayViewerROTesting @@ -3214,7 +2927,6 @@ rectangle "Restful Objects\n<size:10>[Software System]</size>" <<RestfulObjects> RestfulObjects.ApacheCausewayViewerRO .[#707070,thickness=2].> RestfulObjects.ApacheCausewayViewerROAppLib : "<color:#707070>" RestfulObjects.ApacheCausewayViewerRO .[#707070,thickness=2].> RestfulObjects.ApacheCausewayViewerROClient : "<color:#707070>" -RestfulObjects.ApacheCausewayViewerRO .[#707070,thickness=2].> RestfulObjects.ApacheCausewayViewerROJAXRSResteasy : "<color:#707070>" RestfulObjects.ApacheCausewayViewerRO .[#707070,thickness=2].> RestfulObjects.ApacheCausewayViewerRORendering : "<color:#707070>" RestfulObjects.ApacheCausewayViewerRO .[#707070,thickness=2].> RestfulObjects.ApacheCausewayViewerROTest : "<color:#707070>" RestfulObjects.ApacheCausewayViewerRO .[#707070,thickness=2].> RestfulObjects.ApacheCausewayViewerROTesting : "<color:#707070>" @@ -3225,7 +2937,7 @@ RestfulObjects.ApacheCausewayViewerRO .[#707070,thickness=2].> RestfulObjects.Ap .Projects/Modules (Restful Objects) [cols="3a,5a", options="header"] |=== -|Coordinates |Description +|Coordinates |Description |Apache Causeway Viewer - RO [source,yaml] @@ -3281,39 +2993,26 @@ org.springframework:spring-context:jar:<managed> + xref:refguide:viewer:index/restfulobjects/client/ActionParameterListBuilder.adoc[ActionParameterListBuilder], xref:refguide:viewer:index/restfulobjects/client/RestfulClient.adoc[RestfulClient], xref:refguide:viewer:index/restfulobjects/client/RestfulClientConfig.adoc[RestfulClientConfig], xref:refguide:viewer:index/restfulobjects/client/auth/AuthFilter.adoc[AuthFilter], xref:refguide:viewer:index/restfulobjects/client/log/ClientConversationFilter.adoc[ClientConversationFilter], xref:refg [...] **** -|Apache Causeway Viewer - RO (JAX-RS Resteasy) +|Apache Causeway Viewer - RO [source,yaml] ---- Group: org.apache.causeway.viewer -Artifact: causeway-viewer-restfulobjects-jaxrsresteasy +Artifact: causeway-viewer-restfulobjects-viewer Type: jar -Directory: /viewers/restfulobjects/jaxrs-resteasy +Directory: /viewers/restfulobjects/viewer ---- -|JAX-RS plugin using jboss resteasy. +|JAX-RS plugin using Spring REST API. -.Components -**** -o.a.i.viewer.restfulobjects.jaxrsresteasy.conneg.RestfulObjectsJaxbWriterForXml + -o.a.i.viewer.restfulobjects.jaxrsresteasy.webmodule.WebModuleJaxrsResteasy + -**** .Dependencies **** org.apache.causeway.viewer:causeway-viewer-restfulobjects-rendering:jar:<managed> + org.apache.causeway.viewer:causeway-viewer-restfulobjects-testing:jar:<managed> + org.apache.causeway.viewer:causeway-viewer-restfulobjects-viewer:jar:<managed> + -org.datanucleus:javax.jdo:jar:<managed> + -org.jboss.resteasy:resteasy-client:jar:${resteasy.version} + -org.jboss.resteasy:resteasy-jackson2-provider:jar:${resteasy.version} + -org.jboss.resteasy:resteasy-jaxb-provider:jar:<managed> + -org.jboss.resteasy:resteasy-servlet-initializer:jar:${resteasy.version} + -org.jboss.resteasy:resteasy-spring-boot-starter:jar:<managed> + -org.jboss.resteasy.spring:resteasy-spring:jar:<managed> + **** .Document Index Entries **** -xref:refguide:viewer:index/restfulobjects/jaxrsresteasy/CausewayModuleViewerRestfulObjectsJaxrsResteasy.adoc[CausewayModuleViewerRestfulObjectsJaxrsResteasy], xref:refguide:viewer:index/restfulobjects/jaxrsresteasy/conneg/RestfulObjectsJaxbWriterForXml.adoc[RestfulObjectsJaxbWriterForXml], xref:refguide:viewer:index/restfulobjects/jaxrsresteasy/webmodule/WebModuleJaxrsResteasy.adoc[WebModuleJaxrsResteasy] **** |Apache Causeway Viewer - RO (Rendering) @@ -3378,7 +3077,6 @@ org.apache.causeway.security:causeway-security-bypass:jar:<managed> + org.apache.causeway.testing:causeway-testing-fixtures-applib:jar:<managed> + org.apache.causeway.viewer:causeway-viewer-commons-services:jar:<managed> + org.apache.causeway.viewer:causeway-viewer-restfulobjects-client:jar:<managed> + -org.apache.causeway.viewer:causeway-viewer-restfulobjects-jaxrsresteasy:jar:<managed> + org.apache.causeway.viewer:causeway-viewer-restfulobjects-rendering:jar:<managed> + org.apache.causeway.viewer:causeway-viewer-restfulobjects-viewer:jar:<managed> + org.glassfish.jersey.core:jersey-client:jar:<managed> + @@ -3522,7 +3220,7 @@ Wicket.ApacheCausewayViewerWicket .[#707070,thickness=2].> Wicket.ApacheCauseway .Projects/Modules (Wicket) [cols="3a,5a", options="header"] |=== -|Coordinates |Description +|Coordinates |Description |Apache Causeway Viewer - Wicket [source,yaml] @@ -3606,7 +3304,6 @@ org.apache.wicket:wicket-auth-roles:jar:<managed> + org.apache.wicket:wicket-devutils:jar:<managed> + org.apache.wicket:wicket-extensions:jar:<managed> + org.apache.wicket:wicket-spring:jar:<managed> + -org.datanucleus:javax.jdo:jar:<managed> + org.ow2.asm:asm-util:jar:<managed> + org.slf4j:slf4j-api:jar:<managed> + org.webjars:datatables:jar:<managed> + @@ -3740,7 +3437,7 @@ Valuetypes.ApacheCausewayValJodaTimeparent .[#707070,thickness=2].> Valuetypes.A .Projects/Modules (Valuetypes) [cols="3a,5a", options="header"] |=== -|Coordinates |Description +|Coordinates |Description |Apache Causeway Value types [source,yaml] @@ -3914,7 +3611,7 @@ Asciidoc.ApacheCausewayValAsciidoctorui .[#707070,thickness=2].> Asciidoc.Apache .Projects/Modules (Asciidoc) [cols="3a,5a", options="header"] |=== -|Coordinates |Description +|Coordinates |Description |Apache Causeway Val - Asciidoctor (parent) [source,yaml] @@ -4011,7 +3708,6 @@ Directory: /valuetypes/asciidoc/persistence-jdo **** org.apache.causeway.core:causeway-core-metamodel:jar:<managed> + org.apache.causeway.valuetypes:causeway-valuetypes-asciidoc-applib:jar:<managed> + -org.datanucleus:datanucleus-core:jar:<managed> + **** .Document Index Entries @@ -4172,7 +3868,7 @@ Markdown.ApacheCausewayValMarkdownparent .[#707070,thickness=2].> Markdown.Apach .Projects/Modules (Markdown) [cols="3a,5a", options="header"] |=== -|Coordinates |Description +|Coordinates |Description |Apache Causeway Val - Markdown (parent) [source,yaml] @@ -4240,7 +3936,6 @@ Directory: /valuetypes/markdown/persistence-jdo **** org.apache.causeway.core:causeway-core-metamodel:jar:<managed> + org.apache.causeway.valuetypes:causeway-valuetypes-markdown-applib:jar:<managed> + -org.datanucleus:datanucleus-core:jar:<managed> + **** .Document Index Entries @@ -4398,7 +4093,7 @@ Vega.ApacheCausewayValVegaparent .[#707070,thickness=2].> Vega.ApacheCausewayVal .Projects/Modules (Vega) [cols="3a,5a", options="header"] |=== -|Coordinates |Description +|Coordinates |Description |Apache Causeway Val - Vega (parent) [source,yaml] @@ -4465,7 +4160,6 @@ Directory: /valuetypes/vega/persistence-jdo **** org.apache.causeway.core:causeway-core-metamodel:jar:<managed> + org.apache.causeway.valuetypes:causeway-valuetypes-vega-applib:jar:<managed> + -org.datanucleus:datanucleus-core:jar:<managed> + **** .Document Index Entries @@ -4892,7 +4586,7 @@ Extensions.ApacheCausewayExtTitleCache .[#707070,thickness=2].> Extensions.Apach .Projects/Modules (Extensions) [cols="3a,5a", options="header"] |=== -|Coordinates |Description +|Coordinates |Description |Apache Causeway Extensions [source,yaml] @@ -4961,7 +4655,6 @@ o.a.i.extensions.audittrail.jdo.dom.AuditTrailEntryRepository + org.apache.causeway.core:causeway-core-runtime:jar:<managed> + org.apache.causeway.extensions:causeway-extensions-audittrail-applib:jar:<managed> + org.apache.causeway.extensions:causeway-extensions-audittrail-applib:test-jar:<managed> + -org.apache.causeway.persistence:causeway-persistence-jdo-datanucleus:jar:<managed> + org.apache.causeway.testing:causeway-testing-fixtures-applib:jar:<managed> + org.apache.causeway.testing:causeway-testing-integtestsupport-applib:jar:<managed> + **** @@ -5460,7 +5153,6 @@ o.a.i.extensions.secman.jdo.util.RegexReplacer + org.apache.causeway.core:causeway-core-runtime:jar:<managed> + org.apache.causeway.extensions:causeway-extensions-secman-applib:test-jar:<managed> + org.apache.causeway.extensions:causeway-extensions-secman-integration:jar:<managed> + -org.apache.causeway.persistence:causeway-persistence-jdo-datanucleus:jar:<managed> + org.apache.causeway.testing:causeway-testing-fixtures-applib:jar:<managed> + org.apache.causeway.testing:causeway-testing-integtestsupport-applib:jar:<managed> + **** @@ -5558,7 +5250,6 @@ o.a.i.extensions.sessionlog.jdo.dom.SessionLogEntryRepository + org.apache.causeway.core:causeway-core-runtime:jar:<managed> + org.apache.causeway.extensions:causeway-extensions-sessionlog-applib:jar:<managed> + org.apache.causeway.extensions:causeway-extensions-sessionlog-applib:test-jar:<managed> + -org.apache.causeway.persistence:causeway-persistence-jdo-datanucleus:jar:<managed> + org.apache.causeway.testing:causeway-testing-fixtures-applib:jar:<managed> + org.apache.causeway.testing:causeway-testing-integtestsupport-applib:jar:<managed> + **** @@ -5825,7 +5516,7 @@ ApplibExcel.ApacheCausewayExtExcelparent .[#707070,thickness=2].> ApplibExcel.Ap .Projects/Modules (Applib: Excel) [cols="3a,5a", options="header"] |=== -|Coordinates |Description +|Coordinates |Description |Apache Causeway Ext - Excel (parent) [source,yaml] @@ -5879,7 +5570,6 @@ Directory: /extensions/core/excel/fixture org.apache.causeway.core:causeway-applib:jar:<managed> + org.apache.causeway.extensions:causeway-extensions-excel-applib:jar:<managed> + org.apache.causeway.extensions:causeway-extensions-excel-testing:jar:<managed> + -org.apache.causeway.persistence:causeway-persistence-jdo-datanucleus:jar:<managed> + org.apache.causeway.testing:causeway-testing-fixtures-applib:jar:<managed> + **** @@ -5894,7 +5584,6 @@ Directory: /extensions/core/excel/integtests |.Dependencies **** org.apache.causeway.extensions:causeway-extensions-excel-fixtures:jar:<managed> + -org.apache.causeway.persistence:causeway-persistence-jdo-datanucleus:jar:<managed> + org.apache.causeway.testing:causeway-testing-fakedata-applib:jar:<managed> + org.apache.causeway.testing:causeway-testing-fixtures-applib:jar:<managed> + org.apache.causeway.testing:causeway-testing-integtestsupport-applib:jar:<managed> + @@ -5988,7 +5677,7 @@ CoreCommandLog.ApacheCausewayExtCommandLog .[#707070,thickness=2].> CoreCommandL .Projects/Modules (Core: Command Log) [cols="3a,5a", options="header"] |=== -|Coordinates |Description +|Coordinates |Description |Apache Causeway Ext - Command Log [source,yaml] @@ -6052,7 +5741,6 @@ o.a.i.extensions.commandlog.jdo.dom.CommandLogEntryRepository + **** org.apache.causeway.extensions:causeway-extensions-commandlog-applib:jar:<managed> + org.apache.causeway.extensions:causeway-extensions-commandlog-applib:test-jar:<managed> + -org.apache.causeway.persistence:causeway-persistence-jdo-datanucleus:jar:<managed> + org.apache.causeway.testing:causeway-testing-integtestsupport-applib:jar:<managed> + org.apache.causeway.testing:causeway-testing-unittestsupport-applib:jar:<managed> + **** @@ -6141,7 +5829,7 @@ CoreDocGen.ApacheCausewayExtDocgen .[#707070,thickness=2].> CoreDocGen.ApacheCau .Projects/Modules (Core: DocGen) [cols="3a,5a", options="header"] |=== -|Coordinates |Description +|Coordinates |Description |Apache Causeway Ext - Docgen [source,yaml] @@ -6250,7 +5938,7 @@ CoreExecutionLog.ApacheCausewayExtExecutionLog .[#707070,thickness=2].> CoreExec .Projects/Modules (Core: Execution Log) [cols="3a,5a", options="header"] |=== -|Coordinates |Description +|Coordinates |Description |Apache Causeway Ext - Execution Log [source,yaml] @@ -6309,7 +5997,6 @@ o.a.i.extensions.executionlog.jdo.dom.ExecutionLogEntryRepository + **** org.apache.causeway.extensions:causeway-extensions-executionlog-applib:jar:<managed> + org.apache.causeway.extensions:causeway-extensions-executionlog-applib:test-jar:<managed> + -org.apache.causeway.persistence:causeway-persistence-jdo-datanucleus:jar:<managed> + org.apache.causeway.testing:causeway-testing-integtestsupport-applib:jar:<managed> + org.apache.causeway.testing:causeway-testing-unittestsupport-applib:jar:<managed> + **** @@ -6421,7 +6108,7 @@ CoreExecutionOutbox.ApacheCausewayExtExecutionOutbox .[#707070,thickness=2].> Co .Projects/Modules (Core: Execution Outbox) [cols="3a,5a", options="header"] |=== -|Coordinates |Description +|Coordinates |Description |Apache Causeway Ext - Execution Outbox [source,yaml] @@ -6481,7 +6168,6 @@ o.a.i.extensions.executionoutbox.jdo.dom.ExecutionOutboxEntryRepository + **** org.apache.causeway.extensions:causeway-extensions-executionoutbox-applib:jar:<managed> + org.apache.causeway.extensions:causeway-extensions-executionoutbox-applib:test-jar:<managed> + -org.apache.causeway.persistence:causeway-persistence-jdo-datanucleus:jar:<managed> + org.apache.causeway.testing:causeway-testing-integtestsupport-applib:jar:<managed> + org.apache.causeway.testing:causeway-testing-unittestsupport-applib:jar:<managed> + **** @@ -6540,7 +6226,6 @@ org.apache.causeway.mavendeps:causeway-mavendeps-webapp:pom:<managed> + org.apache.causeway.security:causeway-security-bypass:jar:<managed> + org.apache.causeway.testing:causeway-testing-fixtures-applib:jar:<managed> + org.apache.causeway.viewer:causeway-viewer-restfulobjects-client:jar:<managed> + -org.apache.causeway.viewer:causeway-viewer-restfulobjects-jaxrsresteasy:jar:<managed> + **** .Document Index Entries @@ -6598,7 +6283,7 @@ CoreExecutionRepublisher.ApacheCausewayExtExecutionRepublisher .[#707070,thickne .Projects/Modules (Core: Execution Republisher) [cols="3a,5a", options="header"] |=== -|Coordinates |Description +|Coordinates |Description |Apache Causeway Ext - Execution Republisher [source,yaml] @@ -6682,7 +6367,7 @@ CoreFlyway.ApacheCausewayExtFlyway .[#707070,thickness=2].> CoreFlyway.ApacheCau .Projects/Modules (Core: Flyway) [cols="3a,5a", options="header"] |=== -|Coordinates |Description +|Coordinates |Description |Apache Causeway Ext - Flyway [source,yaml] @@ -6777,7 +6462,7 @@ CoreTabular.ApacheCausewayExtTabularparent .[#707070,thickness=2].> CoreTabular. .Projects/Modules (Core: Tabular) [cols="3a,5a", options="header"] |=== -|Coordinates |Description +|Coordinates |Description |Apache Causeway Ext - Tabular (parent) [source,yaml] @@ -7111,7 +6796,7 @@ RegressionTests.ApacheCausewayRegressionTestsCmdExecAuditSession .[#707070,thick .Projects/Modules (Regression Tests) [cols="3a,5a", options="header"] |=== -|Coordinates |Description +|Coordinates |Description |Apache Causeway Regression Tests [source,yaml] @@ -7147,14 +6832,12 @@ org.apache.causeway.extensions:causeway-extensions-secman-integration:jar:<manag org.apache.causeway.extensions:causeway-extensions-sse-metamodel:jar:<managed> + org.apache.causeway.mavendeps:causeway-mavendeps-webapp:pom:<managed> + org.apache.causeway.persistence:causeway-persistence-commons:jar:<managed> + -org.apache.causeway.persistence:causeway-persistence-jdo-datanucleus:jar:<managed> + org.apache.causeway.persistence:causeway-persistence-jpa-eclipselink:jar:<managed> + org.apache.causeway.testing:causeway-testing-fixtures-applib:jar:<managed> + org.apache.causeway.valuetypes:causeway-valuetypes-asciidoc-metamodel:jar:<managed> + org.apache.causeway.valuetypes:causeway-valuetypes-markdown-metamodel:jar:<managed> + org.apache.causeway.valuetypes:causeway-valuetypes-vega-metamodel:jar:<managed> + org.apache.causeway.viewer:causeway-viewer-restfulobjects-client:jar:<managed> + -org.apache.causeway.viewer:causeway-viewer-restfulobjects-jaxrsresteasy:jar:<managed> + org.apache.causeway.viewer:causeway-viewer-wicket-viewer:jar:<managed> + org.apache.wicket:wicket-tester:jar:<managed> + **** @@ -7173,7 +6856,6 @@ org.apache.causeway.extensions:causeway-extensions-secman-persistence-jdo:jar:<m org.apache.causeway.mavendeps:causeway-mavendeps-webapp:pom:<managed> + org.apache.causeway.regressiontests:causeway-regressiontests-base:jar:<managed> + org.apache.causeway.viewer:causeway-viewer-restfulobjects-client:jar:<managed> + -org.apache.causeway.viewer:causeway-viewer-restfulobjects-jaxrsresteasy:jar:<managed> + org.apache.causeway.viewer:causeway-viewer-wicket-viewer:jar:<managed> + **** @@ -7193,7 +6875,6 @@ org.apache.causeway.persistence:causeway-persistence-jpa-eclipselink:jar:<manage org.apache.causeway.regressiontests:causeway-regressiontests-base:jar:<managed> + org.apache.causeway.testing:causeway-testing-fixtures-applib:jar:<managed> + org.apache.causeway.viewer:causeway-viewer-restfulobjects-client:jar:<managed> + -org.apache.causeway.viewer:causeway-viewer-restfulobjects-jaxrsresteasy:jar:<managed> + org.apache.causeway.viewer:causeway-viewer-wicket-viewer:jar:<managed> + **** @@ -7256,7 +6937,6 @@ org.apache.causeway.extensions:causeway-extensions-commandlog-persistence-jdo:ja org.apache.causeway.extensions:causeway-extensions-executionlog-persistence-jdo:jar:<managed> + org.apache.causeway.extensions:causeway-extensions-executionoutbox-persistence-jdo:jar:<managed> + org.apache.causeway.extensions:causeway-extensions-sessionlog-persistence-jdo:jar:<managed> + -org.apache.causeway.persistence:causeway-persistence-jdo-datanucleus:jar:<managed> + org.apache.causeway.regressiontests:causeway-regressiontests-cmdexecauditsess-generic:jar:<managed> + org.apache.causeway.security:causeway-security-bypass:jar:<managed> + **** @@ -7306,7 +6986,6 @@ Directory: /regressiontests/core-wrapperfactory ---- |.Dependencies **** -org.apache.causeway.persistence:causeway-persistence-jdo-datanucleus:jar:<managed> + org.apache.causeway.regressiontests:causeway-regressiontests-base:jar:<managed> + org.apache.causeway.testing:causeway-testing-fixtures-applib:jar:<managed> + **** @@ -7456,7 +7135,6 @@ org.apache.causeway.mavendeps:causeway-mavendeps-webapp:pom:<managed> + org.apache.causeway.regressiontests:causeway-regressiontests-base-jdo:jar:<managed> + org.apache.causeway.testing:causeway-testing-fixtures-applib:jar:<managed> + org.apache.causeway.viewer:causeway-viewer-restfulobjects-client:jar:<managed> + -org.apache.causeway.viewer:causeway-viewer-restfulobjects-jaxrsresteasy:jar:<managed> + **** |Apache Causeway Regression Tests - Rest JPA @@ -7475,7 +7153,6 @@ org.apache.causeway.persistence:causeway-persistence-jpa-eclipselink:jar:<manage org.apache.causeway.regressiontests:causeway-regressiontests-base-jpa:jar:<managed> + org.apache.causeway.testing:causeway-testing-fixtures-applib:jar:<managed> + org.apache.causeway.viewer:causeway-viewer-restfulobjects-client:jar:<managed> + -org.apache.causeway.viewer:causeway-viewer-restfulobjects-jaxrsresteasy:jar:<managed> + **** |Apache Causeway Regression Tests - Value Types @@ -7582,7 +7259,7 @@ rectangle "Kroviz Client\n<size:10>[Software System]</size>" <<KrovizClient>> { .Projects/Modules (Kroviz Client) [cols="3a,5a", options="header"] |=== -|Coordinates |Description +|Coordinates |Description |Apache Causeway Incubator - Client kroViz [source,yaml] @@ -7652,7 +7329,7 @@ CommandReplay.ApacheCausewayIncCoreCommandReplay .[#707070,thickness=2].> Comman .Projects/Modules (Command Replay) [cols="3a,5a", options="header"] |=== -|Coordinates |Description +|Coordinates |Description |Apache Causeway Inc - Core Command Replay [source,yaml] @@ -7708,7 +7385,6 @@ org.apache.causeway.core:causeway-schema:jar:<managed> + org.apache.causeway.extensions:causeway-extensions-commandlog-applib:jar:<managed> + org.apache.causeway.testing:causeway-testing-fixtures-applib:jar:<managed> + org.apache.causeway.viewer:causeway-viewer-restfulobjects-client:jar:<managed> + -org.apache.causeway.viewer:causeway-viewer-restfulobjects-jaxrsresteasy:jar:<managed> + org.glassfish.jersey.ext:jersey-spring6:jar:<managed> + org.springframework.boot:spring-boot-starter-quartz:jar:<managed> + **** diff --git a/core/config/generateConfigDocs.groovy b/core/config/generateConfigDocs.groovy index 0c6fbe460a3..d452bb411cc 100644 --- a/core/config/generateConfigDocs.groovy +++ b/core/config/generateConfigDocs.groovy @@ -183,25 +183,12 @@ groups+= new PropertyGroup() {{ searchOrder = 501 }} -groups+= new PropertyGroup() {{ - prefix = "datanucleus" - name = "DataNucleus Configuration" - properties: [] - searchOrder = 100 -}} - groups+= new PropertyGroup() {{ prefix = "eclipselink" name = "Eclipselink Configuration" searchOrder = 501 }} -groups+= new PropertyGroup() {{ - prefix = "resteasy" - name = "RestEasy Configuration" - searchOrder = 501 -}} - groups+= new PropertyGroup() {{ prefix = "spring" name = "Spring Configuration" diff --git a/core/config/src/main/adoc/modules/config/pages/sections/_nav.adoc b/core/config/src/main/adoc/modules/config/pages/sections/_nav.adoc index 4ac647d4127..818efac76a1 100644 --- a/core/config/src/main/adoc/modules/config/pages/sections/_nav.adoc +++ b/core/config/src/main/adoc/modules/config/pages/sections/_nav.adoc @@ -15,9 +15,7 @@ ** xref:refguide:config:sections/causeway.viewer.graphql.adoc[GraphQL API] ** xref:refguide:config:sections/causeway.viewer.restfulobjects.adoc[REST API (Restful Objects Viewer)] ** xref:refguide:config:sections/causeway.viewer.wicket.adoc[Wicket Viewer] -** xref:refguide:config:sections/datanucleus.adoc[DataNucleus Configuration] ** xref:refguide:config:sections/eclipselink.adoc[Eclipselink Configuration] -** xref:refguide:config:sections/resteasy.adoc[RestEasy Configuration] ** xref:refguide:config:sections/causeway.extensions.adoc[Extensions] ** xref:refguide:config:sections/causeway.value-types.adoc[Value types] ** xref:refguide:config:sections/causeway.testing.adoc[Testing] diff --git a/core/config/src/main/adoc/modules/config/pages/sections/datanucleus.adoc b/core/config/src/main/adoc/modules/config/pages/sections/datanucleus.adoc deleted file mode 100644 index 75e038e9e6e..00000000000 --- a/core/config/src/main/adoc/modules/config/pages/sections/datanucleus.adoc +++ /dev/null @@ -1,196 +0,0 @@ -= DataNucleus Configuration -:page-role: -toc -narrow - - -:Notice: 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 ag [...] - -include::../section-hooks/datanucleus~pre.adoc[] - -[cols="3a,2a,5a", options="header"] -|=== -|Property -|Default -|Description -| -[[datanucleus.cache.level2.mode]] -datanucleus.cache.level2.mode - -| unspecified -| The mode of operation of the L2 cache, deciding which entities are cached. - -The default (UNSPECIFIED) is the same as DISABLE++_++SELECTIVE. - -For more details, see https://www.datanucleus.org/products/accessplatform_6_0/jdo/persistence.html#pmf_properties[DataNucleus Config Property docs] and the https://www.datanucleus.org/products/accessplatform_6_0/jdo/persistence.html#cache_level2[DataNucleus Cache docs]. - - -| -[[datanucleus.cache.level2.type]] -datanucleus.cache.level2.type - -| soft -| Name of the type of Level 2 Cache to use. - -Can be used to interface with external caching products. Use "none" to turn off L2 caching; other values include "soft", "weak", "javax.cache". - -For more details, see https://www.datanucleus.org/products/accessplatform_6_0/jdo/persistence.html#pmf_properties[DataNucleus Config Property docs] and the https://www.datanucleus.org/products/accessplatform_6_0/jdo/persistence.html#cache_level2[DataNucleus Cache docs]. - - -| -[[datanucleus.identifier.case]] -datanucleus.identifier.case - -| -| Which case to use in generated table/column identifier names. See also the Datastore Identifier Guide. RDBMS defaults to UPPERCASE. - - -| -[[datanucleus.manage-relationships]] -datanucleus.manage-relationships - -| true -| Whether DataNucleus will try to manage bidirectional relations, correcting the input objects so that all relations are consistent. - -This process runs when flush()/commit() is called. You can set it to false if you always set both sides of a relation when persisting/updating. - -For more details, see https://www.datanucleus.org/products/accessplatform_6_0/jdo/persistence.html#pmf_properties[DataNucleus Config Property docs]. - - -| -[[datanucleus.persistence-by-reachability-at-commit]] -datanucleus. + -persistence-by-reachability-at- + -commit - -| true -| Whether to run the "persistence-by-reachability" algorithm at commit time. - -This means that objects that were reachable at a call to makePersistent() but that are no longer persistent will be removed from persistence. For performance improvements, consider turning this off. - -For more details, see https://www.datanucleus.org/products/accessplatform_6_0/jdo/persistence.html#pmf_properties[DataNucleus Config Property docs]. - - -| -[[datanucleus.schema.auto-create-all]] -datanucleus.schema.auto-create-all - -| -| Whether to automatically (but lazily) generate any schema, tables, columns, constraints that don’t exist. - -For integration testing, it's generally better to use datanucleus.schema.generateDatabase.mode, which will eagerly create all tables on startup. - -For more details, see https://www.datanucleus.org/products/accessplatform_6_0/jdo/persistence.html#pmf_properties[DataNucleus Config Property docs] and the https://www.datanucleus.org/products/accessplatform_6_0/jdo/persistence.html#schema[DataNucleus Schema Guide]. - -@see #setAutoCreateColumns(boolean) @see #setAutoCreateConstraints(boolean) @see #setAutoCreateTables(boolean) @see GenerateDatabase#setMode(String) - - -| -[[datanucleus.schema.auto-create-columns]] -datanucleus.schema. + -auto-create-columns - -| -| Whether to automatically generate any columns that don’t exist. - -For more details, see https://www.datanucleus.org/products/accessplatform_6_0/jdo/persistence.html#pmf_properties[DataNucleus Config Property docs] and the https://www.datanucleus.org/products/accessplatform_6_0/jdo/persistence.html#schema[DataNucleus Schema Guide]. - -@see #setAutoCreateAll(boolean) @see #setAutoCreateConstraints(boolean) @see #setAutoCreateTables(boolean) @see GenerateDatabase#setMode(String) - - -| -[[datanucleus.schema.auto-create-constraints]] -datanucleus.schema. + -auto-create-constraints - -| -| Whether to automatically generate any constraints that don’t exist. - -For more details, see https://www.datanucleus.org/products/accessplatform_6_0/jdo/persistence.html#pmf_properties[DataNucleus Config Property docs] and the https://www.datanucleus.org/products/accessplatform_6_0/jdo/persistence.html#schema[DataNucleus Schema Guide]. - -@see #setAutoCreateAll(boolean) @see #setAutoCreateColumns(boolean) @see #setAutoCreateTables(boolean) @see GenerateDatabase#setMode(String) - - -| -[[datanucleus.schema.auto-create-database]] -datanucleus.schema. + -auto-create-database - -| -| Whether to automatically generate any database (catalog/schema) that doesn’t exist. This depends very much on whether the datastore in question supports this operation. - -For more details, see https://www.datanucleus.org/products/accessplatform_6_0/jdo/persistence.html#pmf_properties[DataNucleus Config Property docs] and the https://www.datanucleus.org/products/accessplatform_6_0/jdo/persistence.html#schema[DataNucleus Schema Guide]. - - -| -[[datanucleus.schema.auto-create-tables]] -datanucleus.schema. + -auto-create-tables - -| -| Whether to automatically generate any tables that don’t exist. - -For more details, see https://www.datanucleus.org/products/accessplatform_6_0/jdo/persistence.html#pmf_properties[DataNucleus Config Property docs] and the https://www.datanucleus.org/products/accessplatform_6_0/jdo/persistence.html#schema[DataNucleus Schema Guide]. - -@see #setAutoCreateAll(boolean) @see #setAutoCreateColumns(boolean) @see #setAutoCreateConstraints(boolean) @see GenerateDatabase#setMode(String) - - -| -[[datanucleus.schema.generate-database.mode]] -datanucleus.schema. + -generate-database.mode - -| none -| Whether to eagerly create all tables at startup. - -For integration testing, this is generally preferred to using datanucleus.schema.autoCreateAll, because the `autoCreateAll` will only create tables lazily, when first persisted to. While lazily initialization is potentially quicker, it can cause issues (eg with rollup mapping to super class tables). - -Valid values: *`none`*, `create`, `drop-and-create`, `drop`. - -For more details, see https://www.datanucleus.org/products/accessplatform_6_0/jdo/persistence.html#pmf_properties[DataNucleus Config Property docs] and the https://www.datanucleus.org/products/accessplatform_6_0/jdo/persistence.html#schema[DataNucleus Schema Guide]. - - -| -[[datanucleus.schema.validate-all]] -datanucleus.schema.validate-all - -| -| Alias for defining `validateTables`, `validateColumns` and `validateConstraints` as true. - -For more details, see https://www.datanucleus.org/products/accessplatform_6_0/jdo/persistence.html#pmf_properties[DataNucleus Config Property docs] and the https://www.datanucleus.org/products/accessplatform_6_0/jdo/persistence.html#schema[DataNucleus Schema Guide]. - - -| -[[datanucleus.schema.validate-columns]] -datanucleus.schema. + -validate-columns - -| -| Whether to validate columns against the persistence definition. This refers to the column detail structure and NOT to whether the column exists or not. - -For more details, see https://www.datanucleus.org/products/accessplatform_6_0/jdo/persistence.html#pmf_properties[DataNucleus Config Property docs] and the https://www.datanucleus.org/products/accessplatform_6_0/jdo/persistence.html#schema[DataNucleus Schema Guide]. - - -| -[[datanucleus.schema.validate-constraints]] -datanucleus.schema. + -validate-constraints - -| -| Whether to validate table constraints against the persistence definition. - -For more details, see https://www.datanucleus.org/products/accessplatform_6_0/jdo/persistence.html#pmf_properties[DataNucleus Config Property docs] and the https://www.datanucleus.org/products/accessplatform_6_0/jdo/persistence.html#schema[DataNucleus Schema Guide]. - - -| -[[datanucleus.schema.validate-tables]] -datanucleus.schema.validate-tables - -| -| Whether to validate tables against the persistence definition. - -For more details, see https://www.datanucleus.org/products/accessplatform_6_0/jdo/persistence.html#pmf_properties[DataNucleus Config Property docs] and the https://www.datanucleus.org/products/accessplatform_6_0/jdo/persistence.html#schema[DataNucleus Schema Guide]. - - - -|=== - -include::../section-hooks/datanucleus~post.adoc[] diff --git a/core/config/src/main/java/org/apache/causeway/core/config/presets/CausewayPresets.java b/core/config/src/main/java/org/apache/causeway/core/config/presets/CausewayPresets.java index 1a3ef08d82f..b6cfc73569f 100644 --- a/core/config/src/main/java/org/apache/causeway/core/config/presets/CausewayPresets.java +++ b/core/config/src/main/java/org/apache/causeway/core/config/presets/CausewayPresets.java @@ -32,9 +32,8 @@ public final class CausewayPresets { public static final String IntrospectLazily = "classpath:/org/apache/causeway/core/config/presets/IntrospectLazily.properties"; public static final String IntrospectFully = "classpath:/org/apache/causeway/core/config/presets/IntrospectFully.properties"; - public static final String DebugPersistence = "classpath:/org/apache/causeway/core/config/presets/DebugPersistence.properties"; - public static final String DebugRequestScopedServices = "classpath:/org/apache/causeway/core/config/presets/DebugRequestScopedServices.properties"; public static final String DebugTransactionScopedServices = "classpath:/org/apache/causeway/core/config/presets/DebugTransactionScopedServices.properties"; + public static final String DebugInteractionScopedServices = "classpath:/org/apache/causeway/core/config/presets/DebugInteractionScopedServices.properties"; public static final String DebugDiscovery = "classpath:/org/apache/causeway/core/config/presets/DebugDiscovery.properties"; diff --git a/core/config/src/main/java/org/apache/causeway/core/config/presets/DebugRequestScopedServices.properties b/core/config/src/main/java/org/apache/causeway/core/config/presets/DebugInteractionScopedServices.properties similarity index 54% rename from core/config/src/main/java/org/apache/causeway/core/config/presets/DebugRequestScopedServices.properties rename to core/config/src/main/java/org/apache/causeway/core/config/presets/DebugInteractionScopedServices.properties index a2c9a6f64c9..ab612d577b6 100644 --- a/core/config/src/main/java/org/apache/causeway/core/config/presets/DebugRequestScopedServices.properties +++ b/core/config/src/main/java/org/apache/causeway/core/config/presets/DebugInteractionScopedServices.properties @@ -15,8 +15,10 @@ # specific language governing permissions and limitations # under the License. -# -- framework internal request scoped -- -logging.level.org.apache.causeway.viewer.restfulobjects.rendering.service.acceptheader.AcceptHeaderServiceForRest = DEBUG -logging.level.org.apache.causeway.applib.services.iactn.InteractionProvider = DEBUG -logging.level.org.apache.causeway.applib.services.scratchpad.Scratchpad = DEBUG -logging.level.org.apache.causeway.core.runtimeservices.publish.PublisherDispatchServiceDefault = DEBUG +# -- framework interaction scoped -- +logging.level.org.apache.causeway.applib.services.queryresultscache.QueryResultsCache = DEBUG +logging.level.org.apache.causeway.core.runtimeservices.publish.ExecutionPublisherDefault = DEBUG +logging.level.org.apache.causeway.extensions.secman.integration.authorizor.AuthorizorSecman.PermissionCache = DEBUG +logging.level.org.apache.causeway.extensions.secman.integration.spiimpl.ImpersonateMenuAdvisorForSecman.Cache = DEBUG +logging.level.org.apache.causeway.persistence.commons.integration.changetracking.PreAndPostValueEvaluatorServiceDefault = DEBUG +logging.level.org.apache.causeway.core.runtimeservices.scratchpad.ScratchpadDefault = DEBUG \ No newline at end of file diff --git a/core/config/src/main/java/org/apache/causeway/core/config/presets/DebugPersistence.properties b/core/config/src/main/java/org/apache/causeway/core/config/presets/DebugPersistence.properties deleted file mode 100644 index ca113b80991..00000000000 --- a/core/config/src/main/java/org/apache/causeway/core/config/presets/DebugPersistence.properties +++ /dev/null @@ -1,20 +0,0 @@ -# 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. - -logging.level.org.apache.causeway.persistence.jdo.datanucleus.persistence.CausewayPlatformTransactionManagerForJdo = DEBUG -logging.level.org.apache.causeway.persistence.jdo.datanucleus.persistence.PersistenceSession5 = DEBUG -logging.level.org.apache.causeway.persistence.jdo.datanucleus.persistence.CausewayTransactionJdo = DEBUG diff --git a/core/config/src/main/java/org/apache/causeway/core/config/presets/DebugTransactionScopedServices.properties b/core/config/src/main/java/org/apache/causeway/core/config/presets/DebugTransactionScopedServices.properties index 86400f3e56d..94d9ecbd42f 100644 --- a/core/config/src/main/java/org/apache/causeway/core/config/presets/DebugTransactionScopedServices.properties +++ b/core/config/src/main/java/org/apache/causeway/core/config/presets/DebugTransactionScopedServices.properties @@ -15,7 +15,7 @@ # specific language governing permissions and limitations # under the License. -# -- framework internal transaction scoped -- -logging.level.org.apache.causeway.persistence.jdo.datanucleus.metrics.MetricsServiceForJdo = DEBUG -logging.level.org.apache.causeway.applib.services.queryresultscache.QueryResultsCache = DEBUG -logging.level.org.apache.causeway.core.runtime.persistence.transaction.ChangedObjectsService = DEBUG +# -- framework transaction scoped -- +logging.level.org.apache.causeway.persistence.commons.integration.changetracking.EntityChangeTrackerDefault = DEBUG +logging.level.org.apache.causeway.core.transaction.scope.NoopTransactionSynchronizationService = DEBUG +logging.level.org.apache.causeway.core.runtimeservices.publish.ObjectLifecyclePublisherDefault = DEBUG diff --git a/core/config/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/core/config/src/main/resources/META-INF/additional-spring-configuration-metadata.json index b5de8019982..e70737e3f43 100644 --- a/core/config/src/main/resources/META-INF/additional-spring-configuration-metadata.json +++ b/core/config/src/main/resources/META-INF/additional-spring-configuration-metadata.json @@ -1,10 +1,5 @@ { "properties": [ - { - "name": "datanucleus.identifier.case", - "type": "org.apache.causeway.core.config.DatanucleusConfiguration.Identifier.Case", - "description": "Which case to use in generated table/column identifier names. See also the Datastore Identifier Guide. RDBMS defaults to UPPERCASE." - }, { "name": "causeway.value-types.temporal.editing.date-pattern", "type": "java.lang.String", @@ -99,7 +94,7 @@ } }] }, - + { "name": "causeway.viewer.wicket.themes.provider", "providers": [{ @@ -232,23 +227,6 @@ "value": "None" } ] - }, - { - "name": "datanucleus.schema.generate-database.mode", - "values": [ - { - "value": "none" - }, - { - "value": "create" - }, - { - "value": "drop-and-create" - }, - { - "value": "drop" - } - ] } ] } diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/classsubstitutor/ClassSubstitutorDefault.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/classsubstitutor/ClassSubstitutorDefault.java index 6805c4f0fc3..0bccbb6e227 100644 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/classsubstitutor/ClassSubstitutorDefault.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/classsubstitutor/ClassSubstitutorDefault.java @@ -37,7 +37,6 @@ public ClassSubstitutorDefault() { ignoreApacheCausewayInternals(); ignoreSpringFramework(); ignoreJacksonAndGson(); - skipDataNucleusProxy(); } protected void ignoreCglib() { @@ -66,8 +65,4 @@ protected void ignoreJacksonAndGson() { ignorePackage("com.google.gson."); } - protected void skipDataNucleusProxy() { - skipProxyPackage("org.datanucleus."); - } - } diff --git a/core/webapp/src/main/java/org/apache/causeway/core/webapp/confmenu/ConfigurationViewServiceDefault.java b/core/webapp/src/main/java/org/apache/causeway/core/webapp/confmenu/ConfigurationViewServiceDefault.java index fe69d64ca70..21eb852923f 100644 --- a/core/webapp/src/main/java/org/apache/causeway/core/webapp/confmenu/ConfigurationViewServiceDefault.java +++ b/core/webapp/src/main/java/org/apache/causeway/core/webapp/confmenu/ConfigurationViewServiceDefault.java @@ -133,10 +133,8 @@ private List<Map<String, ConfigurationProperty>> loadConfiguration() { var env = loadEnvironment(); var primary = loadPrimary(List.of( "causeway.", - "resteasy.", - "datanucleus.", "eclipselink.")); - // we dont't want any duplicates to appear in secondary + // we don't want any duplicates to appear in secondary var secondary = loadSecondary(Stream.concat(env.keySet().stream(), primary.keySet().stream()) .distinct() .collect(Collectors.toSet())); diff --git a/regressiontests/bootstrapping/src/test/resources/org/apache/causeway/testdomain/bootstrapping/builtin-domain-services.list b/regressiontests/bootstrapping/src/test/resources/org/apache/causeway/testdomain/bootstrapping/builtin-domain-services.list index 8157404bdfa..29a2fb9ab87 100644 --- a/regressiontests/bootstrapping/src/test/resources/org/apache/causeway/testdomain/bootstrapping/builtin-domain-services.list +++ b/regressiontests/bootstrapping/src/test/resources/org/apache/causeway/testdomain/bootstrapping/builtin-domain-services.list @@ -29,7 +29,6 @@ org.apache.causeway.core.runtimeservices.urlencoding.UrlEncodingServiceWithCompr org.apache.causeway.extensions.fixtures.fixturescripts.FixtureScripts ServiceRegistryDefault UserServiceDefault$SudoServiceSpi -org.apache.causeway.persistence.jdo.datanucleus.metrics.MetricsServiceForJdo CommandDtoFactoryDefault org.apache.causeway.core.runtimeservices.confmenu.ConfigurationViewServiceDefault org.apache.causeway.core.runtimeservices.email.EmailServiceDefault diff --git a/regressiontests/bootstrapping/src/test/resources/org/apache/causeway/testdomain/bootstrapping/builtin-requestscoped.list b/regressiontests/bootstrapping/src/test/resources/org/apache/causeway/testdomain/bootstrapping/builtin-requestscoped.list index 688ad5b3b28..9f44dd2c336 100644 --- a/regressiontests/bootstrapping/src/test/resources/org/apache/causeway/testdomain/bootstrapping/builtin-requestscoped.list +++ b/regressiontests/bootstrapping/src/test/resources/org/apache/causeway/testdomain/bootstrapping/builtin-requestscoped.list @@ -20,6 +20,4 @@ org.apache.causeway.applib.services.iactn.InteractionProvider org.apache.causeway.applib.services.queryresultscache.QueryResultsCacheInternal org.apache.causeway.applib.services.scratchpad.Scratchpad org.apache.causeway.core.runtimeservices.changes.ChangedObjectsServiceInternal -org.apache.causeway.core.runtimeservices.metrics.MetricsServiceForJdo PublisherDispatchServiceDefault -org.apache.causeway.objectstore.jdo.datanucleus.service.support.TimestampService diff --git a/regressiontests/rest-jpa/src/test/resources/org/apache/causeway/testdomain/bootstrapping/builtin-domain-services.list b/regressiontests/rest-jpa/src/test/resources/org/apache/causeway/testdomain/bootstrapping/builtin-domain-services.list index 8157404bdfa..29a2fb9ab87 100644 --- a/regressiontests/rest-jpa/src/test/resources/org/apache/causeway/testdomain/bootstrapping/builtin-domain-services.list +++ b/regressiontests/rest-jpa/src/test/resources/org/apache/causeway/testdomain/bootstrapping/builtin-domain-services.list @@ -29,7 +29,6 @@ org.apache.causeway.core.runtimeservices.urlencoding.UrlEncodingServiceWithCompr org.apache.causeway.extensions.fixtures.fixturescripts.FixtureScripts ServiceRegistryDefault UserServiceDefault$SudoServiceSpi -org.apache.causeway.persistence.jdo.datanucleus.metrics.MetricsServiceForJdo CommandDtoFactoryDefault org.apache.causeway.core.runtimeservices.confmenu.ConfigurationViewServiceDefault org.apache.causeway.core.runtimeservices.email.EmailServiceDefault diff --git a/regressiontests/rest-jpa/src/test/resources/org/apache/causeway/testdomain/bootstrapping/builtin-requestscoped.list b/regressiontests/rest-jpa/src/test/resources/org/apache/causeway/testdomain/bootstrapping/builtin-requestscoped.list index 688ad5b3b28..04973f800fe 100644 --- a/regressiontests/rest-jpa/src/test/resources/org/apache/causeway/testdomain/bootstrapping/builtin-requestscoped.list +++ b/regressiontests/rest-jpa/src/test/resources/org/apache/causeway/testdomain/bootstrapping/builtin-requestscoped.list @@ -22,4 +22,3 @@ org.apache.causeway.applib.services.scratchpad.Scratchpad org.apache.causeway.core.runtimeservices.changes.ChangedObjectsServiceInternal org.apache.causeway.core.runtimeservices.metrics.MetricsServiceForJdo PublisherDispatchServiceDefault -org.apache.causeway.objectstore.jdo.datanucleus.service.support.TimestampService
