You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@causeway.apache.org by da...@apache.org on 2023/09/28 14:56:22 UTC
[causeway] branch CAUSEWAY-3591 updated (ca57b73794 -> f9ce00959b)
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a change to branch CAUSEWAY-3591
in repository https://gitbox.apache.org/repos/asf/causeway.git
omit ca57b73794 CAUSEWAY-3591: fixes module-info.java
omit be86d0c75e CAUSEWAY-3591: moves classes, is all
add 9cce2a820c CAUSEWAY-3613: moves excel download classes into correct package
add 1ca79f7ced Merge pull request #1911 from apache/CAUSEWAY-3613
new 4bf813a9dc CAUSEWAY-3591: moves classes, is all
new f9ce00959b CAUSEWAY-3591: fixes module-info.java
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (ca57b73794)
\
N -- N -- N refs/heads/CAUSEWAY-3591 (f9ce00959b)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../wkt}/ui/CausewayModuleExtExcelDownloadWicketUi.java | 4 ++--
.../components => exceldownload/wkt/ui/viewer}/CellStyleProvider.java | 2 +-
.../wkt/ui/viewer}/CollectionContentsAsExcelFactory.java | 2 +-
.../wkt/ui/viewer}/ExcelFileDownloadLink.java | 2 +-
.../ui/components => exceldownload/wkt/ui/viewer}/ExcelFileModel.java | 2 +-
.../components => exceldownload/wkt/ui/viewer}/_TimeConversion.java | 2 +-
6 files changed, 7 insertions(+), 7 deletions(-)
rename extensions/vw/exceldownload/wicket-ui/src/main/java/org/apache/causeway/extensions/{viewer/wicket/exceldownload => exceldownload/wkt}/ui/CausewayModuleExtExcelDownloadWicketUi.java (85%)
rename extensions/vw/exceldownload/wicket-ui/src/main/java/org/apache/causeway/extensions/{viewer/wicket/exceldownload/ui/components => exceldownload/wkt/ui/viewer}/CellStyleProvider.java (97%)
rename extensions/vw/exceldownload/wicket-ui/src/main/java/org/apache/causeway/extensions/{viewer/wicket/exceldownload/ui/components => exceldownload/wkt/ui/viewer}/CollectionContentsAsExcelFactory.java (97%)
rename extensions/vw/exceldownload/wicket-ui/src/main/java/org/apache/causeway/extensions/{viewer/wicket/exceldownload/ui/components => exceldownload/wkt/ui/viewer}/ExcelFileDownloadLink.java (97%)
rename extensions/vw/exceldownload/wicket-ui/src/main/java/org/apache/causeway/extensions/{viewer/wicket/exceldownload/ui/components => exceldownload/wkt/ui/viewer}/ExcelFileModel.java (99%)
rename extensions/vw/exceldownload/wicket-ui/src/main/java/org/apache/causeway/extensions/{viewer/wicket/exceldownload/ui/components => exceldownload/wkt/ui/viewer}/_TimeConversion.java (94%)
[causeway] 01/02: CAUSEWAY-3591: moves classes, is all
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch CAUSEWAY-3591
in repository https://gitbox.apache.org/repos/asf/causeway.git
commit 4bf813a9dc8e2df97987c8963350f0c7f86e1c70
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Thu Sep 28 14:50:22 2023 +0100
CAUSEWAY-3591: moves classes, is all
---
persistence/commons/src/main/java/module-info.java | 1 +
.../persistence/commons/CausewayModulePersistenceCommons.java | 4 ++--
.../integration/changetracking/EntityChangeTrackerDefault.java | 2 +-
.../changetracking/PreAndPostValueEvaluatorService.java | 2 +-
.../changetracking/PreAndPostValueEvaluatorServiceDefault.java | 2 +-
.../integration/changetracking/_ChangingEntitiesFactory.java | 2 +-
.../integration/changetracking/_SimpleChangingEntities.java | 2 +-
.../{jpa => commons}/integration/changetracking/_Xray.java | 2 +-
.../jdo/adoc/modules/ROOT/pages/setup-and-configuration.adoc | 9 ++++-----
.../changetracking/PreAndPostValueEvaluatorServiceJdo.java | 2 +-
10 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/persistence/commons/src/main/java/module-info.java b/persistence/commons/src/main/java/module-info.java
index 981355e018..902f285934 100644
--- a/persistence/commons/src/main/java/module-info.java
+++ b/persistence/commons/src/main/java/module-info.java
@@ -20,6 +20,7 @@ module org.apache.causeway.persistence.commons {
exports org.apache.causeway.persistence.jpa.integration.changetracking;
exports org.apache.causeway.persistence.commons;
exports org.apache.causeway.persistence.commons.metamodel.facets.prop.column;
+ exports org.apache.causeway.persistence.commons.integration.changetracking;
requires java.annotation;
requires java.desktop;
diff --git a/persistence/commons/src/main/java/org/apache/causeway/persistence/commons/CausewayModulePersistenceCommons.java b/persistence/commons/src/main/java/org/apache/causeway/persistence/commons/CausewayModulePersistenceCommons.java
index 7fbecfce00..58d7f24b6e 100644
--- a/persistence/commons/src/main/java/org/apache/causeway/persistence/commons/CausewayModulePersistenceCommons.java
+++ b/persistence/commons/src/main/java/org/apache/causeway/persistence/commons/CausewayModulePersistenceCommons.java
@@ -22,8 +22,8 @@ import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
import org.apache.causeway.core.runtime.CausewayModuleCoreRuntime;
-import org.apache.causeway.persistence.jpa.integration.changetracking.EntityChangeTrackerDefault;
-import org.apache.causeway.persistence.jpa.integration.changetracking.PreAndPostValueEvaluatorServiceDefault;
+import org.apache.causeway.persistence.commons.integration.changetracking.EntityChangeTrackerDefault;
+import org.apache.causeway.persistence.commons.integration.changetracking.PreAndPostValueEvaluatorServiceDefault;
@Configuration
@Import({
diff --git a/persistence/commons/src/main/java/org/apache/causeway/persistence/jpa/integration/changetracking/EntityChangeTrackerDefault.java b/persistence/commons/src/main/java/org/apache/causeway/persistence/commons/integration/changetracking/EntityChangeTrackerDefault.java
similarity index 99%
rename from persistence/commons/src/main/java/org/apache/causeway/persistence/jpa/integration/changetracking/EntityChangeTrackerDefault.java
rename to persistence/commons/src/main/java/org/apache/causeway/persistence/commons/integration/changetracking/EntityChangeTrackerDefault.java
index a57dbe071c..6a404701eb 100644
--- a/persistence/commons/src/main/java/org/apache/causeway/persistence/jpa/integration/changetracking/EntityChangeTrackerDefault.java
+++ b/persistence/commons/src/main/java/org/apache/causeway/persistence/commons/integration/changetracking/EntityChangeTrackerDefault.java
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.causeway.persistence.jpa.integration.changetracking;
+package org.apache.causeway.persistence.commons.integration.changetracking;
import java.util.Map;
import java.util.Objects;
diff --git a/persistence/commons/src/main/java/org/apache/causeway/persistence/jpa/integration/changetracking/PreAndPostValueEvaluatorService.java b/persistence/commons/src/main/java/org/apache/causeway/persistence/commons/integration/changetracking/PreAndPostValueEvaluatorService.java
similarity index 93%
rename from persistence/commons/src/main/java/org/apache/causeway/persistence/jpa/integration/changetracking/PreAndPostValueEvaluatorService.java
rename to persistence/commons/src/main/java/org/apache/causeway/persistence/commons/integration/changetracking/PreAndPostValueEvaluatorService.java
index 41af99d31b..6795bb43ae 100644
--- a/persistence/commons/src/main/java/org/apache/causeway/persistence/jpa/integration/changetracking/PreAndPostValueEvaluatorService.java
+++ b/persistence/commons/src/main/java/org/apache/causeway/persistence/commons/integration/changetracking/PreAndPostValueEvaluatorService.java
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.causeway.persistence.jpa.integration.changetracking;
+package org.apache.causeway.persistence.commons.integration.changetracking;
import org.apache.causeway.core.metamodel.services.objectlifecycle.PreAndPostValue;
diff --git a/persistence/commons/src/main/java/org/apache/causeway/persistence/jpa/integration/changetracking/PreAndPostValueEvaluatorServiceDefault.java b/persistence/commons/src/main/java/org/apache/causeway/persistence/commons/integration/changetracking/PreAndPostValueEvaluatorServiceDefault.java
similarity index 95%
rename from persistence/commons/src/main/java/org/apache/causeway/persistence/jpa/integration/changetracking/PreAndPostValueEvaluatorServiceDefault.java
rename to persistence/commons/src/main/java/org/apache/causeway/persistence/commons/integration/changetracking/PreAndPostValueEvaluatorServiceDefault.java
index 5b6274ca78..211c828368 100644
--- a/persistence/commons/src/main/java/org/apache/causeway/persistence/jpa/integration/changetracking/PreAndPostValueEvaluatorServiceDefault.java
+++ b/persistence/commons/src/main/java/org/apache/causeway/persistence/commons/integration/changetracking/PreAndPostValueEvaluatorServiceDefault.java
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.causeway.persistence.jpa.integration.changetracking;
+package org.apache.causeway.persistence.commons.integration.changetracking;
import javax.annotation.Priority;
import javax.inject.Inject;
diff --git a/persistence/commons/src/main/java/org/apache/causeway/persistence/jpa/integration/changetracking/_ChangingEntitiesFactory.java b/persistence/commons/src/main/java/org/apache/causeway/persistence/commons/integration/changetracking/_ChangingEntitiesFactory.java
similarity index 98%
rename from persistence/commons/src/main/java/org/apache/causeway/persistence/jpa/integration/changetracking/_ChangingEntitiesFactory.java
rename to persistence/commons/src/main/java/org/apache/causeway/persistence/commons/integration/changetracking/_ChangingEntitiesFactory.java
index 9c74e5c4b8..2d211a9599 100644
--- a/persistence/commons/src/main/java/org/apache/causeway/persistence/jpa/integration/changetracking/_ChangingEntitiesFactory.java
+++ b/persistence/commons/src/main/java/org/apache/causeway/persistence/commons/integration/changetracking/_ChangingEntitiesFactory.java
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.causeway.persistence.jpa.integration.changetracking;
+package org.apache.causeway.persistence.commons.integration.changetracking;
import java.util.HashMap;
import java.util.Map;
diff --git a/persistence/commons/src/main/java/org/apache/causeway/persistence/jpa/integration/changetracking/_SimpleChangingEntities.java b/persistence/commons/src/main/java/org/apache/causeway/persistence/commons/integration/changetracking/_SimpleChangingEntities.java
similarity index 97%
rename from persistence/commons/src/main/java/org/apache/causeway/persistence/jpa/integration/changetracking/_SimpleChangingEntities.java
rename to persistence/commons/src/main/java/org/apache/causeway/persistence/commons/integration/changetracking/_SimpleChangingEntities.java
index 00040ed38e..66c708d4de 100644
--- a/persistence/commons/src/main/java/org/apache/causeway/persistence/jpa/integration/changetracking/_SimpleChangingEntities.java
+++ b/persistence/commons/src/main/java/org/apache/causeway/persistence/commons/integration/changetracking/_SimpleChangingEntities.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.causeway.persistence.jpa.integration.changetracking;
+package org.apache.causeway.persistence.commons.integration.changetracking;
import java.sql.Timestamp;
import java.util.UUID;
diff --git a/persistence/commons/src/main/java/org/apache/causeway/persistence/jpa/integration/changetracking/_Xray.java b/persistence/commons/src/main/java/org/apache/causeway/persistence/commons/integration/changetracking/_Xray.java
similarity index 98%
rename from persistence/commons/src/main/java/org/apache/causeway/persistence/jpa/integration/changetracking/_Xray.java
rename to persistence/commons/src/main/java/org/apache/causeway/persistence/commons/integration/changetracking/_Xray.java
index e6f3792e0d..558cade334 100644
--- a/persistence/commons/src/main/java/org/apache/causeway/persistence/jpa/integration/changetracking/_Xray.java
+++ b/persistence/commons/src/main/java/org/apache/causeway/persistence/commons/integration/changetracking/_Xray.java
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.causeway.persistence.jpa.integration.changetracking;
+package org.apache.causeway.persistence.commons.integration.changetracking;
import java.awt.Color;
diff --git a/persistence/jdo/adoc/modules/ROOT/pages/setup-and-configuration.adoc b/persistence/jdo/adoc/modules/ROOT/pages/setup-and-configuration.adoc
index 9a81b97e72..a79b883f5d 100644
--- a/persistence/jdo/adoc/modules/ROOT/pages/setup-and-configuration.adoc
+++ b/persistence/jdo/adoc/modules/ROOT/pages/setup-and-configuration.adoc
@@ -60,18 +60,17 @@ It is also possible to programmatically define a `DataSource`; see the link:http
== Create Schema
It's good practice to use link:https://crate.io/docs/sql-99/en/latest/chapters/17.html#create-schema-statement[SQL schemas] as a way to organise database tables into groups.
-We recommend all the entities within a module use the same schema, and moreover that the xref:refguide:applib:index/annotation/DomainObject.adoc#logicalTypeName[logical type name] also follows the same pattern.
+We recommend all the entities within a module use the same schema, and moreover that the logical type name (as defined using `@Named`) also follows the same pattern.
For example:
[source,java]
----
-@javax.persistence.Entity
-@javax.persistence.Table(
- schema="SIMPLE", // <.>
+@PersistenceCapable(
+ schema="SIMPLE", // <.>
...
)
-@Named("simple.SimpleObject") // <.>
+@Named("simple.SimpleObject") // <.>
...
public class SimpleObject ... {
diff --git a/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/changetracking/PreAndPostValueEvaluatorServiceJdo.java b/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/changetracking/PreAndPostValueEvaluatorServiceJdo.java
index 48509818b4..8a9c4304cb 100644
--- a/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/changetracking/PreAndPostValueEvaluatorServiceJdo.java
+++ b/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/changetracking/PreAndPostValueEvaluatorServiceJdo.java
@@ -36,7 +36,7 @@ import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.core.metamodel.services.objectlifecycle.PreAndPostValue;
import org.apache.causeway.core.metamodel.services.objectlifecycle.PropertyValuePlaceholder;
import org.apache.causeway.persistence.jdo.datanucleus.entities.DnOidStoreAndRecoverHelper;
-import org.apache.causeway.persistence.jpa.integration.changetracking.PreAndPostValueEvaluatorService;
+import org.apache.causeway.persistence.commons.integration.changetracking.PreAndPostValueEvaluatorService;
import lombok.RequiredArgsConstructor;
import lombok.extern.log4j.Log4j2;
[causeway] 02/02: CAUSEWAY-3591: fixes module-info.java
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch CAUSEWAY-3591
in repository https://gitbox.apache.org/repos/asf/causeway.git
commit f9ce00959bb40c7f7392da2148b086e37c60e77f
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Thu Sep 28 15:13:34 2023 +0100
CAUSEWAY-3591: fixes module-info.java
---
persistence/commons/src/main/java/module-info.java | 1 -
1 file changed, 1 deletion(-)
diff --git a/persistence/commons/src/main/java/module-info.java b/persistence/commons/src/main/java/module-info.java
index 902f285934..ddc1bccd1e 100644
--- a/persistence/commons/src/main/java/module-info.java
+++ b/persistence/commons/src/main/java/module-info.java
@@ -17,7 +17,6 @@
* under the License.
*/
module org.apache.causeway.persistence.commons {
- exports org.apache.causeway.persistence.jpa.integration.changetracking;
exports org.apache.causeway.persistence.commons;
exports org.apache.causeway.persistence.commons.metamodel.facets.prop.column;
exports org.apache.causeway.persistence.commons.integration.changetracking;