This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch spring6
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/spring6 by this push:
new 71382ca77a ISIS-3275: post merge fixes
71382ca77a is described below
commit 71382ca77a2417f228e17f4fd9e335163c6e2024
Author: Andi Huber <[email protected]>
AuthorDate: Tue Nov 29 16:39:21 2022 +0100
ISIS-3275: post merge fixes
---
extensions/vw/pdfjs/fixtures/pom.xml | 2 +-
regressiontests/pom.xml | 13 ++--
.../layouts/integtest/model/Counter.layout.xml | 72 ++++++++++++++++++++++
.../integtest/model/LayoutTestDomainModel.java | 24 ++++++++
.../layouts/integtest/model/SimpleObject.java | 8 ++-
.../integtest/model/SimpleObject.layout.xml | 67 ++++++++++++++++++++
.../layouts/integtest/model/types/Name.java | 40 ++++++++++++
.../layouts/integtest/model/types/Notes.java | 45 ++++++++++++++
8 files changed, 263 insertions(+), 8 deletions(-)
diff --git a/extensions/vw/pdfjs/fixtures/pom.xml
b/extensions/vw/pdfjs/fixtures/pom.xml
index b6b1072ddb..f0e2119021 100644
--- a/extensions/vw/pdfjs/fixtures/pom.xml
+++ b/extensions/vw/pdfjs/fixtures/pom.xml
@@ -23,7 +23,7 @@ under the License.
<parent>
<groupId>org.apache.causeway.extensions</groupId>
<artifactId>causeway-extensions-pdfjs</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.causewayaddons.wicket.pdfjs</groupId>
diff --git a/regressiontests/pom.xml b/regressiontests/pom.xml
index 8c4813e219..b5b5371bba 100644
--- a/regressiontests/pom.xml
+++ b/regressiontests/pom.xml
@@ -133,6 +133,11 @@
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.causeway.commons</groupId>
+ <artifactId>causeway-commons</artifactId>
+ </dependency>
+
<dependency>
<groupId>org.apache.causeway.testing</groupId>
<artifactId>causeway-testing-unittestsupport-applib</artifactId>
@@ -151,28 +156,28 @@
<dependency>
<groupId>org.apache.causeway.extensions</groupId>
<artifactId>causeway-extensions</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.apache.causeway.testing</groupId>
<artifactId>causeway-testing</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.apache.causeway.valuetypes</groupId>
<artifactId>causeway-valuetypes</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.apache.causeway.viewer</groupId>
<artifactId>causeway-viewer-wicket</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
<scope>import</scope>
<type>pom</type>
</dependency>
diff --git
a/regressiontests/stable-layouts/src/test/java/org/apache/causeway/regressiontests/layouts/integtest/model/Counter.layout.xml
b/regressiontests/stable-layouts/src/test/java/org/apache/causeway/regressiontests/layouts/integtest/model/Counter.layout.xml
new file mode 100644
index 0000000000..84acea1a12
--- /dev/null
+++
b/regressiontests/stable-layouts/src/test/java/org/apache/causeway/regressiontests/layouts/integtest/model/Counter.layout.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+ 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.
+-->
+<bs3:grid
xsi:schemaLocation="http://causeway.apache.org/applib/layout/component
http://causeway.apache.org/applib/layout/component/component.xsd
http://causeway.apache.org/applib/layout/grid/bootstrap3
http://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd";
xmlns:c="http://causeway.apache.org/applib/layout/component";
xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
+
+ <bs3:row>
+ <bs3:col span="12" unreferencedActions="true">
+ <c:domainObject bookmarking="AS_ROOT"/>
+ </bs3:col>
+ </bs3:row>
+ <bs3:row>
+ <bs3:col span="4">
+ <bs3:row>
+ <bs3:col span="12">
+ <bs3:tabGroup>
+ <bs3:tab name="Identity">
+ <bs3:row>
+ <bs3:col span="12">
+ <c:fieldSet name="Identity" id="identity"/>
+ </bs3:col>
+ </bs3:row>
+ </bs3:tab>
+ <bs3:tab name="Other">
+ <bs3:row>
+ <bs3:col span="12">
+ <c:fieldSet name="Other" id="other"
unreferencedProperties="true"/>
+ </bs3:col>
+ </bs3:row>
+ </bs3:tab>
+ <bs3:tab name="Metadata">
+ <bs3:row>
+ <bs3:col span="12">
+ <c:fieldSet name="Metadata" id="metadata"/>
+ </bs3:col>
+ </bs3:row>
+ </bs3:tab>
+ </bs3:tabGroup>
+ </bs3:col>
+ </bs3:row>
+ <bs3:row>
+ <bs3:col span="12">
+ <c:fieldSet name="Details" id="details"/>
+ </bs3:col>
+ </bs3:row>
+ <bs3:row>
+ <bs3:col span="12">
+ <c:fieldSet name="Empty FieldSet" id="empty"/>
+ </bs3:col>
+ </bs3:row>
+ </bs3:col>
+ <bs3:col span="8">
+ <bs3:tabGroup unreferencedCollections="true">
+ </bs3:tabGroup>
+ </bs3:col>
+ </bs3:row>
+</bs3:grid>
diff --git
a/regressiontests/stable-layouts/src/test/java/org/apache/causeway/regressiontests/layouts/integtest/model/LayoutTestDomainModel.java
b/regressiontests/stable-layouts/src/test/java/org/apache/causeway/regressiontests/layouts/integtest/model/LayoutTestDomainModel.java
new file mode 100644
index 0000000000..89acdc1448
--- /dev/null
+++
b/regressiontests/stable-layouts/src/test/java/org/apache/causeway/regressiontests/layouts/integtest/model/LayoutTestDomainModel.java
@@ -0,0 +1,24 @@
+/*
+ * 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.
+ *
+ */
+
+package org.apache.causeway.regressiontests.layouts.integtest.model;
+
+public class LayoutTestDomainModel {
+}
diff --git
a/regressiontests/stable-layouts/src/test/java/org/apache/causeway/regressiontests/layouts/integtest/model/SimpleObject.java
b/regressiontests/stable-layouts/src/test/java/org/apache/causeway/regressiontests/layouts/integtest/model/SimpleObject.java
index d5ce452a24..bd24dced8d 100644
---
a/regressiontests/stable-layouts/src/test/java/org/apache/causeway/regressiontests/layouts/integtest/model/SimpleObject.java
+++
b/regressiontests/stable-layouts/src/test/java/org/apache/causeway/regressiontests/layouts/integtest/model/SimpleObject.java
@@ -23,6 +23,7 @@ package
org.apache.causeway.regressiontests.layouts.integtest.model;
import java.util.Comparator;
import jakarta.inject.Inject;
+import jakarta.inject.Named;
import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.apache.causeway.applib.annotation.Action;
@@ -68,7 +69,8 @@ import lombok.val;
)
})
//@jakarta.persistence.EntityListeners(CausewayEntityListener.class)
-@DomainObject(logicalTypeName = "simple.SimpleObject", entityChangePublishing
= Publishing.ENABLED)
+@DomainObject(entityChangePublishing = Publishing.ENABLED)
+@Named("simple.SimpleObject")
@DomainObjectLayout()
@NoArgsConstructor(access = AccessLevel.PUBLIC)
@XmlJavaTypeAdapter(PersistentEntityAdapter.class)
@@ -88,7 +90,7 @@ public class SimpleObject implements Comparable<SimpleObject>
{
@Getter @Setter
private long version;
- public static SimpleObject withName(String name) {
+ public static SimpleObject withName(final String name) {
val simpleObject = new SimpleObject();
simpleObject.setName(name);
return simpleObject;
@@ -125,7 +127,7 @@ public class SimpleObject implements
Comparable<SimpleObject> {
public String default0UpdateName() {
return getName();
}
- public String validate0UpdateName(String newName) {
+ public String validate0UpdateName(final String newName) {
for (char prohibitedCharacter : "&%$!".toCharArray()) {
if( newName.contains(""+prohibitedCharacter)) {
return "Character '" + prohibitedCharacter + "' is not
allowed.";
diff --git
a/regressiontests/stable-layouts/src/test/java/org/apache/causeway/regressiontests/layouts/integtest/model/SimpleObject.layout.xml
b/regressiontests/stable-layouts/src/test/java/org/apache/causeway/regressiontests/layouts/integtest/model/SimpleObject.layout.xml
new file mode 100644
index 0000000000..cadf329f34
--- /dev/null
+++
b/regressiontests/stable-layouts/src/test/java/org/apache/causeway/regressiontests/layouts/integtest/model/SimpleObject.layout.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+ ~ 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.
+ ~
+ -->
+
+<bs3:grid
xsi:schemaLocation="http://causeway.apache.org/applib/layout/component
http://causeway.apache.org/applib/layout/component/component.xsd
http://causeway.apache.org/applib/layout/grid/bootstrap3
http://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd";
xmlns:c="http://causeway.apache.org/applib/layout/component";
xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
+
+ <bs3:row>
+ <bs3:col span="12" unreferencedActions="true">
+ <c:domainObject bookmarking="AS_ROOT"/>
+ </bs3:col>
+ </bs3:row>
+ <bs3:row>
+ <bs3:col span="6">
+ <bs3:row>
+ <bs3:col span="12">
+ <bs3:tabGroup>
+ <bs3:tab name="Identity">
+ <bs3:row>
+ <bs3:col span="12">
+ <c:fieldSet name="Identity" id="identity"/>
+ </bs3:col>
+ </bs3:row>
+ </bs3:tab>
+ <bs3:tab name="Other">
+ <bs3:row>
+ <bs3:col span="12">
+ <c:fieldSet name="Other" id="other"
unreferencedProperties="true"/>
+ </bs3:col>
+ </bs3:row>
+ </bs3:tab>
+ <bs3:tab name="Metadata">
+ <bs3:row>
+ <bs3:col span="12">
+ <c:fieldSet name="Metadata" id="metadata"/>
+ </bs3:col>
+ </bs3:row>
+ </bs3:tab>
+ </bs3:tabGroup>
+ </bs3:col>
+ <bs3:col span="12">
+ <c:fieldSet name="Details" id="details"/>
+ </bs3:col>
+ </bs3:row>
+ </bs3:col>
+ <bs3:col span="6">
+ <bs3:tabGroup unreferencedCollections="true">
+ </bs3:tabGroup>
+ </bs3:col>
+ </bs3:row>
+</bs3:grid>
diff --git
a/regressiontests/stable-layouts/src/test/java/org/apache/causeway/regressiontests/layouts/integtest/model/types/Name.java
b/regressiontests/stable-layouts/src/test/java/org/apache/causeway/regressiontests/layouts/integtest/model/types/Name.java
new file mode 100644
index 0000000000..932dd33ed9
--- /dev/null
+++
b/regressiontests/stable-layouts/src/test/java/org/apache/causeway/regressiontests/layouts/integtest/model/types/Name.java
@@ -0,0 +1,40 @@
+/*
+ * 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.
+ *
+ */
+
+package org.apache.causeway.regressiontests.layouts.integtest.model.types;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import org.apache.causeway.applib.annotation.Parameter;
+import org.apache.causeway.applib.annotation.ParameterLayout;
+import org.apache.causeway.applib.annotation.Property;
+
+@Property(maxLength = Name.MAX_LEN)
+@Parameter(maxLength = Name.MAX_LEN)
+@ParameterLayout(named = "Name")
+@Target({ ElementType.METHOD, ElementType.FIELD, ElementType.PARAMETER,
ElementType.ANNOTATION_TYPE })
+@Retention(RetentionPolicy.RUNTIME)
+public @interface Name {
+
+ int MAX_LEN = 40;
+}
diff --git
a/regressiontests/stable-layouts/src/test/java/org/apache/causeway/regressiontests/layouts/integtest/model/types/Notes.java
b/regressiontests/stable-layouts/src/test/java/org/apache/causeway/regressiontests/layouts/integtest/model/types/Notes.java
new file mode 100644
index 0000000000..9dedfd315b
--- /dev/null
+++
b/regressiontests/stable-layouts/src/test/java/org/apache/causeway/regressiontests/layouts/integtest/model/types/Notes.java
@@ -0,0 +1,45 @@
+/*
+ * 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.
+ *
+ */
+
+package org.apache.causeway.regressiontests.layouts.integtest.model.types;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import org.apache.causeway.applib.annotation.Editing;
+import org.apache.causeway.applib.annotation.Parameter;
+import org.apache.causeway.applib.annotation.ParameterLayout;
+import org.apache.causeway.applib.annotation.Property;
+import org.apache.causeway.applib.annotation.PropertyLayout;
+import org.apache.causeway.applib.annotation.Where;
+
+@Property(editing = Editing.ENABLED, maxLength = Notes.MAX_LEN)
+@PropertyLayout(named = "Notes", multiLine = 10, hidden = Where.ALL_TABLES)
+@Parameter(maxLength = Notes.MAX_LEN)
+@ParameterLayout(named = "Notes", multiLine = 10)
+@Target({ ElementType.METHOD, ElementType.FIELD, ElementType.PARAMETER,
ElementType.ANNOTATION_TYPE })
+@Retention(RetentionPolicy.RUNTIME)
+public @interface Notes {
+
+ int MAX_LEN = 4000;
+
+}
