This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new d07fd78eaa ISIS-3276: rename reateasy4 package and module class
d07fd78eaa is described below
commit d07fd78eaa54ed3f6defe140ddd3607ee96ccd28
Author: Andi Huber <[email protected]>
AuthorDate: Mon Nov 14 15:40:33 2022 +0100
ISIS-3276: rename reateasy4 package and module class
---
.../relnotes/modules/ROOT/pages/2022/2.0.0-RC1/mignotes.adoc | 4 +++-
.../demo/web/src/main/java/demoapp/web/DemoAppManifestCommon.java | 4 ++--
.../restclient/integtests/OutboxRestClient_IntegTest.java | 4 ++--
.../org/apache/causeway/testdomain/rest/JsonValueEncoderTest.java | 4 ++--
.../apache/causeway/testdomain/rest/RestServiceStressTest.java | 4 ++--
.../java/org/apache/causeway/testdomain/rest/RestServiceTest.java | 4 ++--
.../CausewayModuleViewerRestfulObjectsJaxrsResteasy.java} | 8 ++++----
.../conneg/RestfulObjectsJaxbWriterForXml.java | 2 +-
.../webmodule/WebModuleJaxrsResteasy4.java | 2 +-
9 files changed, 19 insertions(+), 17 deletions(-)
diff --git
a/antora/components/relnotes/modules/ROOT/pages/2022/2.0.0-RC1/mignotes.adoc
b/antora/components/relnotes/modules/ROOT/pages/2022/2.0.0-RC1/mignotes.adoc
index f6d6743a57..87f5de0a59 100644
--- a/antora/components/relnotes/modules/ROOT/pages/2022/2.0.0-RC1/mignotes.adoc
+++ b/antora/components/relnotes/modules/ROOT/pages/2022/2.0.0-RC1/mignotes.adoc
@@ -51,12 +51,14 @@ The following changed:
| new
|
+`o.a.c.v.restfulobjects.jaxrsresteasy4.CausewayModuleViewerRestfulObjectsJaxrsResteasy4`
from
[source,xml]
----
<groupId>org.apache.causeway.viewer</groupId>
<artifactId>causeway-viewer-restfulobjects-jaxrsresteasy4</artifactId>
----
-|
+|
+`o.a.c.v.restfulobjects.jaxrsresteasy.CausewayModuleViewerRestfulObjectsJaxrsResteasy`
from
[source,xml]
----
<groupId>org.apache.causeway.viewer</groupId>
diff --git
a/examples/demo/web/src/main/java/demoapp/web/DemoAppManifestCommon.java
b/examples/demo/web/src/main/java/demoapp/web/DemoAppManifestCommon.java
index c31fce1e77..f3e89aafbd 100644
--- a/examples/demo/web/src/main/java/demoapp/web/DemoAppManifestCommon.java
+++ b/examples/demo/web/src/main/java/demoapp/web/DemoAppManifestCommon.java
@@ -31,7 +31,7 @@ import
org.apache.causeway.extensions.secman.encryption.spring.CausewayModuleExt
import
org.apache.causeway.extensions.secman.integration.CausewayModuleExtSecmanIntegration;
import
org.apache.causeway.extensions.viewer.wicket.exceldownload.ui.CausewayModuleExtExcelDownloadWicketUi;
import
org.apache.causeway.testing.h2console.ui.CausewayModuleTestingH2ConsoleUi;
-import
org.apache.causeway.viewer.restfulobjects.jaxrsresteasy4.CausewayModuleViewerRestfulObjectsJaxrsResteasy4;
+import
org.apache.causeway.viewer.restfulobjects.jaxrsresteasy.CausewayModuleViewerRestfulObjectsJaxrsResteasy;
import
org.apache.causeway.viewer.restfulobjects.viewer.CausewayModuleViewerRestfulObjectsViewer;
import demoapp.dom._infra.fixtures.DemoFixtureScript;
@@ -50,7 +50,7 @@ import lombok.extern.log4j.Log4j2;
// REST
CausewayModuleViewerRestfulObjectsViewer.class,
- CausewayModuleViewerRestfulObjectsJaxrsResteasy4.class,
+ CausewayModuleViewerRestfulObjectsJaxrsResteasy.class,
// CORS
CausewayModuleExtCors.class,
diff --git
a/extensions/core/executionoutbox/restclient/src/test/java/org/apache/causeway/extensions/executionoutbox/restclient/integtests/OutboxRestClient_IntegTest.java
b/extensions/core/executionoutbox/restclient/src/test/java/org/apache/causeway/extensions/executionoutbox/restclient/integtests/OutboxRestClient_IntegTest.java
index f60c28c80e..e0fba855f0 100644
---
a/extensions/core/executionoutbox/restclient/src/test/java/org/apache/causeway/extensions/executionoutbox/restclient/integtests/OutboxRestClient_IntegTest.java
+++
b/extensions/core/executionoutbox/restclient/src/test/java/org/apache/causeway/extensions/executionoutbox/restclient/integtests/OutboxRestClient_IntegTest.java
@@ -59,7 +59,7 @@ import
org.apache.causeway.persistence.jpa.eclipselink.CausewayModulePersistence
import org.apache.causeway.schema.ixn.v2.InteractionDto;
import org.apache.causeway.security.bypass.CausewayModuleSecurityBypass;
import
org.apache.causeway.testing.fixtures.applib.CausewayModuleTestingFixturesApplib;
-import
org.apache.causeway.viewer.restfulobjects.jaxrsresteasy4.CausewayModuleViewerRestfulObjectsJaxrsResteasy4;
+import
org.apache.causeway.viewer.restfulobjects.jaxrsresteasy.CausewayModuleViewerRestfulObjectsJaxrsResteasy;
@SpringBootTest(
classes = OutboxRestClient_IntegTest.AppManifest.class,
@@ -76,7 +76,7 @@ public class OutboxRestClient_IntegTest {
CausewayModulePersistenceJpaEclipselink.class,
CausewayModuleTestingFixturesApplib.class,
CausewayModuleExtExecutionOutboxPersistenceJpa.class,
- CausewayModuleViewerRestfulObjectsJaxrsResteasy4.class,
+ CausewayModuleViewerRestfulObjectsJaxrsResteasy.class,
CausewayModuleCoreWebapp.class,
// mixins
diff --git
a/regressiontests/stable-rest/src/test/java/org/apache/causeway/testdomain/rest/JsonValueEncoderTest.java
b/regressiontests/stable-rest/src/test/java/org/apache/causeway/testdomain/rest/JsonValueEncoderTest.java
index 6a02966000..041da4c8d2 100644
---
a/regressiontests/stable-rest/src/test/java/org/apache/causeway/testdomain/rest/JsonValueEncoderTest.java
+++
b/regressiontests/stable-rest/src/test/java/org/apache/causeway/testdomain/rest/JsonValueEncoderTest.java
@@ -42,7 +42,7 @@ import
org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
import org.apache.causeway.testdomain.conf.Configuration_headless;
import org.apache.causeway.viewer.restfulobjects.applib.JsonRepresentation;
-import
org.apache.causeway.viewer.restfulobjects.jaxrsresteasy4.CausewayModuleViewerRestfulObjectsJaxrsResteasy4;
+import
org.apache.causeway.viewer.restfulobjects.jaxrsresteasy.CausewayModuleViewerRestfulObjectsJaxrsResteasy;
import
org.apache.causeway.viewer.restfulobjects.rendering.service.valuerender.JsonValueConverter.Context;
import
org.apache.causeway.viewer.restfulobjects.rendering.service.valuerender.JsonValueEncoderServiceDefault;
@@ -50,7 +50,7 @@ import lombok.val;
@SpringBootTest(classes={
Configuration_headless.class,
- CausewayModuleViewerRestfulObjectsJaxrsResteasy4.class
+ CausewayModuleViewerRestfulObjectsJaxrsResteasy.class
})
//@DisabledIfSystemProperty(named = "isRunningWithSurefire", matches = "true")
//TODO WIP
@TestPropertySource(CausewayPresets.UseLog4j2Test)
diff --git
a/regressiontests/stable-rest/src/test/java/org/apache/causeway/testdomain/rest/RestServiceStressTest.java
b/regressiontests/stable-rest/src/test/java/org/apache/causeway/testdomain/rest/RestServiceStressTest.java
index 8a73bbe0da..54f7312c7a 100644
---
a/regressiontests/stable-rest/src/test/java/org/apache/causeway/testdomain/rest/RestServiceStressTest.java
+++
b/regressiontests/stable-rest/src/test/java/org/apache/causeway/testdomain/rest/RestServiceStressTest.java
@@ -39,7 +39,7 @@ import
org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.testdomain.conf.Configuration_usingJdo;
import org.apache.causeway.testdomain.util.rest.RestEndpointService;
import org.apache.causeway.viewer.restfulobjects.client.RestfulClient;
-import
org.apache.causeway.viewer.restfulobjects.jaxrsresteasy4.CausewayModuleViewerRestfulObjectsJaxrsResteasy4;
+import
org.apache.causeway.viewer.restfulobjects.jaxrsresteasy.CausewayModuleViewerRestfulObjectsJaxrsResteasy;
import lombok.val;
import lombok.extern.log4j.Log4j2;
@@ -50,7 +50,7 @@ import lombok.extern.log4j.Log4j2;
@TestPropertySource(CausewayPresets.UseLog4j2Test)
@Import({
Configuration_usingJdo.class,
- CausewayModuleViewerRestfulObjectsJaxrsResteasy4.class
+ CausewayModuleViewerRestfulObjectsJaxrsResteasy.class
})
@DisabledIfSystemProperty(named = "isRunningWithSurefire", matches = "true")
@Log4j2
diff --git
a/regressiontests/stable-rest/src/test/java/org/apache/causeway/testdomain/rest/RestServiceTest.java
b/regressiontests/stable-rest/src/test/java/org/apache/causeway/testdomain/rest/RestServiceTest.java
index 2e07e02aaf..6687032edd 100644
---
a/regressiontests/stable-rest/src/test/java/org/apache/causeway/testdomain/rest/RestServiceTest.java
+++
b/regressiontests/stable-rest/src/test/java/org/apache/causeway/testdomain/rest/RestServiceTest.java
@@ -38,7 +38,7 @@ import org.apache.causeway.testdomain.jdo.JdoInventoryJaxbVm;
import org.apache.causeway.testdomain.jdo.JdoTestFixtures;
import org.apache.causeway.testdomain.jdo.entities.JdoBook;
import org.apache.causeway.testdomain.util.rest.RestEndpointService;
-import
org.apache.causeway.viewer.restfulobjects.jaxrsresteasy4.CausewayModuleViewerRestfulObjectsJaxrsResteasy4;
+import
org.apache.causeway.viewer.restfulobjects.jaxrsresteasy.CausewayModuleViewerRestfulObjectsJaxrsResteasy;
import lombok.val;
@@ -48,7 +48,7 @@ import lombok.val;
@TestPropertySource(CausewayPresets.UseLog4j2Test)
@Import({
Configuration_usingJdo.class,
- CausewayModuleViewerRestfulObjectsJaxrsResteasy4.class
+ CausewayModuleViewerRestfulObjectsJaxrsResteasy.class
})
class RestServiceTest {
diff --git
a/viewers/restfulobjects/jaxrs-resteasy/src/main/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy4/CausewayModuleViewerRestfulObjectsJaxrsResteasy4.java
b/viewers/restfulobjects/jaxrs-resteasy/src/main/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy/CausewayModuleViewerRestfulObjectsJaxrsResteasy.java
similarity index 79%
rename from
viewers/restfulobjects/jaxrs-resteasy/src/main/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy4/CausewayModuleViewerRestfulObjectsJaxrsResteasy4.java
rename to
viewers/restfulobjects/jaxrs-resteasy/src/main/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy/CausewayModuleViewerRestfulObjectsJaxrsResteasy.java
index 40284f19d8..6b3c325e49 100644
---
a/viewers/restfulobjects/jaxrs-resteasy/src/main/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy4/CausewayModuleViewerRestfulObjectsJaxrsResteasy4.java
+++
b/viewers/restfulobjects/jaxrs-resteasy/src/main/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy/CausewayModuleViewerRestfulObjectsJaxrsResteasy.java
@@ -16,13 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.causeway.viewer.restfulobjects.jaxrsresteasy4;
+package org.apache.causeway.viewer.restfulobjects.jaxrsresteasy;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
-import
org.apache.causeway.viewer.restfulobjects.jaxrsresteasy4.conneg.RestfulObjectsJaxbWriterForXml;
-import
org.apache.causeway.viewer.restfulobjects.jaxrsresteasy4.webmodule.WebModuleJaxrsResteasy4;
+import
org.apache.causeway.viewer.restfulobjects.jaxrsresteasy.conneg.RestfulObjectsJaxbWriterForXml;
+import
org.apache.causeway.viewer.restfulobjects.jaxrsresteasy.webmodule.WebModuleJaxrsResteasy4;
import
org.apache.causeway.viewer.restfulobjects.viewer.CausewayModuleViewerRestfulObjectsViewer;
/**
@@ -41,6 +41,6 @@ import
org.apache.causeway.viewer.restfulobjects.viewer.CausewayModuleViewerRest
})
-public class CausewayModuleViewerRestfulObjectsJaxrsResteasy4 {
+public class CausewayModuleViewerRestfulObjectsJaxrsResteasy {
}
diff --git
a/viewers/restfulobjects/jaxrs-resteasy/src/main/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy4/conneg/RestfulObjectsJaxbWriterForXml.java
b/viewers/restfulobjects/jaxrs-resteasy/src/main/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy/conneg/RestfulObjectsJaxbWriterForXml.java
similarity index 97%
rename from
viewers/restfulobjects/jaxrs-resteasy/src/main/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy4/conneg/RestfulObjectsJaxbWriterForXml.java
rename to
viewers/restfulobjects/jaxrs-resteasy/src/main/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy/conneg/RestfulObjectsJaxbWriterForXml.java
index d99ef10b13..07f9a355e8 100644
---
a/viewers/restfulobjects/jaxrs-resteasy/src/main/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy4/conneg/RestfulObjectsJaxbWriterForXml.java
+++
b/viewers/restfulobjects/jaxrs-resteasy/src/main/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy/conneg/RestfulObjectsJaxbWriterForXml.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.causeway.viewer.restfulobjects.jaxrsresteasy4.conneg;
+package org.apache.causeway.viewer.restfulobjects.jaxrsresteasy.conneg;
import java.lang.annotation.Annotation;
import java.lang.reflect.Type;
diff --git
a/viewers/restfulobjects/jaxrs-resteasy/src/main/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy4/webmodule/WebModuleJaxrsResteasy4.java
b/viewers/restfulobjects/jaxrs-resteasy/src/main/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy/webmodule/WebModuleJaxrsResteasy4.java
similarity index 98%
rename from
viewers/restfulobjects/jaxrs-resteasy/src/main/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy4/webmodule/WebModuleJaxrsResteasy4.java
rename to
viewers/restfulobjects/jaxrs-resteasy/src/main/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy/webmodule/WebModuleJaxrsResteasy4.java
index aabd618734..8b44642061 100644
---
a/viewers/restfulobjects/jaxrs-resteasy/src/main/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy4/webmodule/WebModuleJaxrsResteasy4.java
+++
b/viewers/restfulobjects/jaxrs-resteasy/src/main/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy/webmodule/WebModuleJaxrsResteasy4.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.causeway.viewer.restfulobjects.jaxrsresteasy4.webmodule;
+package org.apache.causeway.viewer.restfulobjects.jaxrsresteasy.webmodule;
import javax.inject.Inject;
import javax.inject.Named;
