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
commit a52488c57f64a6552ff0036a5e3be57b7a850e7b Merge: 4a74042650 c1b4364049 Author: Andi Huber <[email protected]> AuthorDate: Tue Nov 15 08:41:33 2022 +0100 ISIS-3275: convert RO artifacts to Java Modules (except jaxrsresteasay) core/metamodel/src/main/java/module-info.java | 10 +++- .../context/MetaModelContext_usingSpring.java | 7 ++- .../applib/src/main/java/module-info.java | 43 +++++++++++++++++ .../client/src/main/java/module-info.java | 34 +++++++------ viewers/restfulobjects/jaxrs-resteasy/pom.xml | 4 ++ .../webmodule/WebModuleJaxrsResteasy.java | 3 +- .../rendering/src/main/java/module-info.java | 54 +++++++++++++++++++++ .../domainobjects/DomainObjectReprRenderer.java | 3 +- .../domainobjects/DomainServiceLinkTo.java | 3 +- .../service/swagger/SwaggerServiceMenu.java | 2 +- .../service/swagger/internal/Generation.java | 25 ++++------ .../viewer/src/main/java/module-info.java | 55 ++++++++++++++++++++++ 12 files changed, 199 insertions(+), 44 deletions(-) diff --cc viewers/restfulobjects/applib/src/main/java/module-info.java index 0000000000,d9ec7aca94..723f71950d mode 000000,100644..100644 --- a/viewers/restfulobjects/applib/src/main/java/module-info.java +++ b/viewers/restfulobjects/applib/src/main/java/module-info.java @@@ -1,0 -1,43 +1,43 @@@ + /* + * 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. + */ + module org.apache.causeway.viewer.restfulobjects.applib { + exports org.apache.causeway.viewer.restfulobjects.applib.homepage; + exports org.apache.causeway.viewer.restfulobjects.applib.errors; + exports org.apache.causeway.viewer.restfulobjects.applib.util; + exports org.apache.causeway.viewer.restfulobjects.applib.domaintypes; + exports org.apache.causeway.viewer.restfulobjects.applib.domainobjects; + exports org.apache.causeway.viewer.restfulobjects.applib.version; + exports org.apache.causeway.viewer.restfulobjects.applib.boot; + exports org.apache.causeway.viewer.restfulobjects.applib; + exports org.apache.causeway.viewer.restfulobjects.applib.health; + exports org.apache.causeway.viewer.restfulobjects.applib.menubars; + exports org.apache.causeway.viewer.restfulobjects.applib.user; + exports org.apache.causeway.viewer.restfulobjects.applib.dtos; + + requires com.fasterxml.jackson.annotation; + requires com.fasterxml.jackson.core; + requires com.fasterxml.jackson.databind; - requires java.ws.rs; ++ requires jakarta.ws.rs; + requires lombok; + requires org.apache.causeway.applib; + requires org.apache.causeway.commons; + requires org.joda.time; + requires spring.context; + requires spring.core; + } diff --cc viewers/restfulobjects/client/src/main/java/module-info.java index 0cc44cb82c,d0d437acbb..bc1bf17cd8 --- a/viewers/restfulobjects/client/src/main/java/module-info.java +++ b/viewers/restfulobjects/client/src/main/java/module-info.java @@@ -16,22 -16,20 +16,20 @@@ * specific language governing permissions and limitations * under the License. */ - package org.apache.causeway.core.metamodel.services; + module org.apache.causeway.viewer.restfulobjects.client { + exports org.apache.causeway.viewer.restfulobjects.client.log; + exports org.apache.causeway.viewer.restfulobjects.client; + exports org.apache.causeway.viewer.restfulobjects.client.auth; - import org.apache.causeway.core.metamodel.object.ManagedObject; - import org.apache.causeway.core.metamodel.spec.ObjectSpecification; - - public final class ServiceUtil { - - private ServiceUtil() { - } - - public static String idOfSpec(final ObjectSpecification serviceSpec) { - return serviceSpec.getLogicalTypeName(); - } - - public static String idOfAdapter(final ManagedObject serviceAdapter) { - return idOfSpec(serviceAdapter.getSpecification()); - } - - } + requires com.fasterxml.jackson.core; + requires com.fasterxml.jackson.databind; - requires java.annotation; - requires java.ws.rs; - requires java.xml.bind; ++ requires jakarta.annotation; ++ requires jakarta.ws.rs; ++ requires jakarta.xml.bind; + requires lombok; + requires org.apache.causeway.applib; + requires org.apache.causeway.commons; + requires org.apache.causeway.viewer.restfulobjects.applib; + requires org.apache.logging.log4j; + requires spring.core; + } diff --cc viewers/restfulobjects/jaxrs-resteasy/src/main/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy/webmodule/WebModuleJaxrsResteasy.java index 45a1a5e8e8,dbf85139a9..399070de33 --- a/viewers/restfulobjects/jaxrs-resteasy/src/main/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy/webmodule/WebModuleJaxrsResteasy.java +++ b/viewers/restfulobjects/jaxrs-resteasy/src/main/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy/webmodule/WebModuleJaxrsResteasy.java @@@ -55,8 -56,9 +55,9 @@@ import lombok.val * */ @Service - @Named(CausewayModuleViewerRestfulObjectsApplib.NAMESPACE + ".WebModuleJaxrsRestEasy4") // CAUTION: SwaggerServiceMenu refers to this name + //CAUTION: SwaggerServiceMenu refers to this name + @Named(CausewayModuleViewerRestfulObjectsApplib.NAMESPACE + ".WebModuleJaxrsRestEasy") [email protected](PriorityPrecedence.MIDPOINT - 80) [email protected](PriorityPrecedence.MIDPOINT - 80) @Qualifier("JaxrsRestEasy4") public final class WebModuleJaxrsResteasy extends WebModuleAbstract { diff --cc viewers/restfulobjects/rendering/src/main/java/module-info.java index 0000000000,e6a4afd8d3..f6f8349596 mode 000000,100644..100644 --- a/viewers/restfulobjects/rendering/src/main/java/module-info.java +++ b/viewers/restfulobjects/rendering/src/main/java/module-info.java @@@ -1,0 -1,54 +1,54 @@@ + /* + * 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. + */ + module org.apache.causeway.viewer.restfulobjects.rendering { + exports org.apache.causeway.viewer.restfulobjects.rendering.service.conneg; + exports org.apache.causeway.viewer.restfulobjects.rendering.service.swagger; + exports org.apache.causeway.viewer.restfulobjects.rendering.service.valuerender; + exports org.apache.causeway.viewer.restfulobjects.rendering.util; + exports org.apache.causeway.viewer.restfulobjects.rendering.domainobjects; + exports org.apache.causeway.viewer.restfulobjects.rendering; + exports org.apache.causeway.viewer.restfulobjects.rendering.service.swagger.internal; + exports org.apache.causeway.viewer.restfulobjects.rendering.domaintypes; + exports org.apache.causeway.viewer.restfulobjects.rendering.service.acceptheader; + exports org.apache.causeway.viewer.restfulobjects.rendering.service; + + requires org.apache.causeway.viewer.restfulobjects.applib; + requires com.fasterxml.jackson.core; + requires com.fasterxml.jackson.databind; + requires jakarta.activation; - requires java.annotation; - requires java.inject; ++ requires jakarta.annotation; ++ requires jakarta.inject; + requires java.sql; - requires java.ws.rs; - requires java.xml.bind; ++ requires jakarta.ws.rs; ++ requires jakarta.xml.bind; + requires lombok; + requires org.apache.causeway.applib; + requires org.apache.causeway.commons; + requires org.apache.causeway.core.config; + requires org.apache.causeway.core.metamodel; + requires org.apache.causeway.core.runtime; + requires org.apache.causeway.schema; + requires org.apache.logging.log4j; + requires org.joda.time; + requires spring.beans; + requires spring.context; + requires spring.core; + requires swagger.core; + requires swagger.models; + } diff --cc viewers/restfulobjects/viewer/src/main/java/module-info.java index 0000000000,a3a78111f8..c6583775dc mode 000000,100644..100644 --- a/viewers/restfulobjects/viewer/src/main/java/module-info.java +++ b/viewers/restfulobjects/viewer/src/main/java/module-info.java @@@ -1,0 -1,55 +1,55 @@@ + /* + * 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. + */ + module org.apache.causeway.viewer.restfulobjects.viewer { + exports org.apache.causeway.viewer.restfulobjects.viewer.jaxrsapp; + exports org.apache.causeway.viewer.restfulobjects.viewer.webmodule; + exports org.apache.causeway.viewer.restfulobjects.viewer.context; + exports org.apache.causeway.viewer.restfulobjects.viewer; + exports org.apache.causeway.viewer.restfulobjects.viewer.webmodule.auth; + exports org.apache.causeway.viewer.restfulobjects.viewer.resources; + exports org.apache.causeway.viewer.restfulobjects.viewer.util; + exports org.apache.causeway.viewer.restfulobjects.viewer.mappers.entity; + exports org.apache.causeway.viewer.restfulobjects.viewer.mappers; + exports org.apache.causeway.viewer.restfulobjects.viewer.resources.serialization; + + requires com.fasterxml.jackson.core; + requires com.fasterxml.jackson.databind; - requires java.annotation; - requires java.inject; - requires java.transaction; - requires java.ws.rs; - requires java.xml.bind; - requires javax.servlet.api; ++ requires jakarta.annotation; ++ requires jakarta.inject; ++ requires jakarta.transaction; ++ requires jakarta.ws.rs; ++ requires jakarta.xml.bind; ++ requires jakarta.servlet; + requires lombok; + requires org.apache.causeway.applib; + requires org.apache.causeway.commons; + requires org.apache.causeway.core.config; + requires org.apache.causeway.core.metamodel; + requires org.apache.causeway.core.webapp; + requires org.apache.causeway.security.api; + requires org.apache.causeway.viewer.commons.applib; + requires org.apache.causeway.viewer.commons.services; + requires org.apache.causeway.viewer.restfulobjects.applib; + requires org.apache.causeway.viewer.restfulobjects.rendering; + requires org.apache.logging.log4j; + requires spring.beans; + requires spring.context; + requires spring.core; + requires spring.web; + }
