This is an automated email from the ASF dual-hosted git repository.
jamesbognar pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/juneau.git
The following commit(s) were added to refs/heads/master by this push:
new 807cbd37c Remove JAX-RS support.
807cbd37c is described below
commit 807cbd37c34bbfcadd0d20e1ec5777f75e788148
Author: JamesBognar <[email protected]>
AuthorDate: Sat Sep 17 10:48:17 2022 -0400
Remove JAX-RS support.
---
juneau-distrib/pom.xml | 69 --------
juneau-doc/pom.xml | 10 --
.../juneau-examples-core/build-overlay/pom.xml | 5 -
.../build-overlay/pom.xml | 2 +-
.../juneau-microservice-core/pom.xml | 2 +-
.../juneau-microservice-ftest/pom.xml | 7 +-
juneau-rest/juneau-rest-server-jaxrs/.gitignore | 6 -
juneau-rest/juneau-rest-server-jaxrs/pom.xml | 89 -----------
.../org/apache/juneau/rest/jaxrs/BaseProvider.java | 173 ---------------------
.../apache/juneau/rest/jaxrs/BasicProvider.java | 75 ---------
.../apache/juneau/rest/jaxrs/JuneauProvider.java | 75 ---------
.../org/apache/juneau/rest/jaxrs/package-info.java | 18 ---
juneau-rest/pom.xml | 1 -
juneau-utest-utils/pom.xml | 2 +-
14 files changed, 4 insertions(+), 530 deletions(-)
diff --git a/juneau-distrib/pom.xml b/juneau-distrib/pom.xml
index cd6692118..29b63dd03 100644
--- a/juneau-distrib/pom.xml
+++ b/juneau-distrib/pom.xml
@@ -82,29 +82,6 @@
<destFileName>org.apache.juneau.marshall_${project.version}.jar</destFileName>
</artifactItem>
- <!--
juneau-marshall-rdf -->
- <artifactItem>
-
<outputDirectory>${project.build.directory}/src/lib</outputDirectory>
-
<groupId>org.apache.juneau</groupId>
-
<artifactId>juneau-marshall-rdf</artifactId>
-
<version>${project.version}</version>
-
<type>jar</type>
-
<classifier>sources</classifier>
- </artifactItem>
- <artifactItem>
-
<outputDirectory>${project.build.directory}/bin/lib</outputDirectory>
-
<groupId>org.apache.juneau</groupId>
-
<artifactId>juneau-marshall-rdf</artifactId>
-
<version>${project.version}</version>
- </artifactItem>
- <artifactItem>
-
<outputDirectory>${project.build.directory}/bin/osgi</outputDirectory>
-
<groupId>org.apache.juneau</groupId>
-
<artifactId>juneau-marshall-rdf</artifactId>
-
<version>${project.version}</version>
-
<destFileName>org.apache.juneau.marshall.rdf_${project.version}.jar</destFileName>
- </artifactItem>
-
<!--
juneau-config -->
<artifactItem>
<outputDirectory>${project.build.directory}/src/lib</outputDirectory>
@@ -174,52 +151,6 @@
<destFileName>org.apache.juneau.rest.server_${project.version}.jar</destFileName>
</artifactItem>
- <!--
juneau-rest-server-jaxrs -->
- <artifactItem>
-
<outputDirectory>${project.build.directory}/src/lib</outputDirectory>
-
<groupId>org.apache.juneau</groupId>
-
<artifactId>juneau-rest-server-jaxrs</artifactId>
-
<version>${project.version}</version>
-
<type>jar</type>
-
<classifier>sources</classifier>
- </artifactItem>
- <artifactItem>
-
<outputDirectory>${project.build.directory}/bin/lib</outputDirectory>
-
<groupId>org.apache.juneau</groupId>
-
<artifactId>juneau-rest-server-jaxrs</artifactId>
-
<version>${project.version}</version>
- </artifactItem>
- <artifactItem>
-
<outputDirectory>${project.build.directory}/bin/osgi</outputDirectory>
-
<groupId>org.apache.juneau</groupId>
-
<artifactId>juneau-rest-server-jaxrs</artifactId>
-
<version>${project.version}</version>
-
<destFileName>org.apache.juneau.rest.server.jaxrs_${project.version}.jar</destFileName>
- </artifactItem>
-
- <!--
juneau-rest-server-rdf -->
- <artifactItem>
-
<outputDirectory>${project.build.directory}/src/lib</outputDirectory>
-
<groupId>org.apache.juneau</groupId>
-
<artifactId>juneau-rest-server-rdf</artifactId>
-
<version>${project.version}</version>
-
<type>jar</type>
-
<classifier>sources</classifier>
- </artifactItem>
- <artifactItem>
-
<outputDirectory>${project.build.directory}/bin/lib</outputDirectory>
-
<groupId>org.apache.juneau</groupId>
-
<artifactId>juneau-rest-server-rdf</artifactId>
-
<version>${project.version}</version>
- </artifactItem>
- <artifactItem>
-
<outputDirectory>${project.build.directory}/bin/osgi</outputDirectory>
-
<groupId>org.apache.juneau</groupId>
-
<artifactId>juneau-rest-server-rdf</artifactId>
-
<version>${project.version}</version>
-
<destFileName>org.apache.juneau.rest.server.rdf_${project.version}.jar</destFileName>
- </artifactItem>
-
<!--
juneau-rest-server-springboot -->
<artifactItem>
<outputDirectory>${project.build.directory}/src/lib</outputDirectory>
diff --git a/juneau-doc/pom.xml b/juneau-doc/pom.xml
index d0c3f0e4e..bda507e1a 100644
--- a/juneau-doc/pom.xml
+++ b/juneau-doc/pom.xml
@@ -45,11 +45,6 @@
<artifactId>juneau-marshall</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.juneau</groupId>
- <artifactId>juneau-marshall-rdf</artifactId>
- <version>${project.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.juneau</groupId>
<artifactId>juneau-config</artifactId>
@@ -65,11 +60,6 @@
<artifactId>juneau-rest-server</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.juneau</groupId>
- <artifactId>juneau-rest-server-jaxrs</artifactId>
- <version>${project.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.juneau</groupId>
<artifactId>juneau-rest-client</artifactId>
diff --git a/juneau-examples/juneau-examples-core/build-overlay/pom.xml
b/juneau-examples/juneau-examples-core/build-overlay/pom.xml
index d01a4fa93..33db03672 100644
--- a/juneau-examples/juneau-examples-core/build-overlay/pom.xml
+++ b/juneau-examples/juneau-examples-core/build-overlay/pom.xml
@@ -37,11 +37,6 @@
<artifactId>juneau-marshall</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.juneau</groupId>
- <artifactId>juneau-marshall-rdf</artifactId>
- <version>${project.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.juneau</groupId>
<artifactId>juneau-dto</artifactId>
diff --git
a/juneau-examples/juneau-examples-rest-springboot/build-overlay/pom.xml
b/juneau-examples/juneau-examples-rest-springboot/build-overlay/pom.xml
index e8110d87a..7ca60b7a2 100644
--- a/juneau-examples/juneau-examples-rest-springboot/build-overlay/pom.xml
+++ b/juneau-examples/juneau-examples-rest-springboot/build-overlay/pom.xml
@@ -63,7 +63,7 @@
</dependency>
<dependency>
<groupId>org.apache.juneau</groupId>
- <artifactId>juneau-marshall-rdf</artifactId>
+ <artifactId>juneau-marshall</artifactId>
<version>\${juneau.version}</version>
</dependency>
<dependency>
diff --git a/juneau-microservice/juneau-microservice-core/pom.xml
b/juneau-microservice/juneau-microservice-core/pom.xml
index a7b9425ff..b50eed8d8 100644
--- a/juneau-microservice/juneau-microservice-core/pom.xml
+++ b/juneau-microservice/juneau-microservice-core/pom.xml
@@ -39,7 +39,7 @@
<dependencies>
<dependency>
<groupId>org.apache.juneau</groupId>
- <artifactId>juneau-rest-server-rdf</artifactId>
+ <artifactId>juneau-rest-server</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
diff --git a/juneau-microservice/juneau-microservice-ftest/pom.xml
b/juneau-microservice/juneau-microservice-ftest/pom.xml
index df8e5e2e9..3d1dfa21a 100644
--- a/juneau-microservice/juneau-microservice-ftest/pom.xml
+++ b/juneau-microservice/juneau-microservice-ftest/pom.xml
@@ -43,7 +43,7 @@
</dependency>
<dependency>
<groupId>org.apache.juneau</groupId>
- <artifactId>juneau-rest-server-jaxrs</artifactId>
+ <artifactId>juneau-rest-server</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
@@ -51,11 +51,6 @@
<artifactId>juneau-rest-mock</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.juneau</groupId>
- <artifactId>juneau-marshall-rdf</artifactId>
- <version>${project.version}</version>
- </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
diff --git a/juneau-rest/juneau-rest-server-jaxrs/.gitignore
b/juneau-rest/juneau-rest-server-jaxrs/.gitignore
deleted file mode 100644
index 34acf885c..000000000
--- a/juneau-rest/juneau-rest-server-jaxrs/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-/target/
-**/.DS_Store
-.classpath
-.project
-/.settings/
-/bin/
diff --git a/juneau-rest/juneau-rest-server-jaxrs/pom.xml
b/juneau-rest/juneau-rest-server-jaxrs/pom.xml
deleted file mode 100644
index 281ac6820..000000000
--- a/juneau-rest/juneau-rest-server-jaxrs/pom.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
***************************************************************************************************************************
- * 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.
*
-
***************************************************************************************************************************
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.juneau</groupId>
- <artifactId>juneau-rest</artifactId>
- <version>9.0.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>juneau-rest-server-jaxrs</artifactId>
- <name>juneau/rest/rest-server-jaxrs</name>
- <description>Apache Juneau REST Servlet JAX-RS Support</description>
- <packaging>bundle</packaging>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.juneau</groupId>
- <artifactId>juneau-marshall-rdf</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.juneau</groupId>
- <artifactId>juneau-rest-server</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>javax.ws.rs</groupId>
- <artifactId>jsr311-api</artifactId>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- </dependency>
- </dependencies>
-
- <properties>
- <!-- Skip javadoc generation since we generate them in the
aggregate pom -->
- <maven.javadoc.skip>true</maven.javadoc.skip>
-
- <maven.compiler.source>1.8</maven.compiler.source>
- <maven.compiler.target>1.8</maven.compiler.target>
- </properties>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-sources</id>
- <phase>verify</phase>
- <goals>
- <goal>jar-no-fork</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>3.2.0</version>
- <extensions>true</extensions>
- <configuration>
- <instructions>
-
<Automatic-Module-Name>org.apache.juneau.rest.server.jaxrs</Automatic-Module-Name>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git
a/juneau-rest/juneau-rest-server-jaxrs/src/main/java/org/apache/juneau/rest/jaxrs/BaseProvider.java
b/juneau-rest/juneau-rest-server-jaxrs/src/main/java/org/apache/juneau/rest/jaxrs/BaseProvider.java
deleted file mode 100644
index f2bb2a32e..000000000
---
a/juneau-rest/juneau-rest-server-jaxrs/src/main/java/org/apache/juneau/rest/jaxrs/BaseProvider.java
+++ /dev/null
@@ -1,173 +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. *
-//
***************************************************************************************************************************
-package org.apache.juneau.rest.jaxrs;
-
-import static javax.servlet.http.HttpServletResponse.*;
-import static org.apache.juneau.internal.ThrowableUtils.*;
-import static org.apache.juneau.internal.IOUtils.*;
-
-import java.io.*;
-import java.lang.annotation.*;
-import java.lang.reflect.*;
-import java.util.*;
-
-import javax.ws.rs.*;
-import javax.ws.rs.core.*;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.ext.*;
-
-import org.apache.juneau.*;
-import org.apache.juneau.collections.*;
-import org.apache.juneau.parser.*;
-import org.apache.juneau.serializer.*;
-
-/**
- * Base class for defining JAX-RS providers based on Juneau serializers and
parsers.
- *
- * <ul class='seealso'>
- * <li class='link'>{@doc juneau-rest-server-jaxrs}
- * <li class='extlink'>{@source}
- * </ul>
- */
-public class BaseProvider implements MessageBodyReader<Object>,
MessageBodyWriter<Object> {
-
- private SerializerSet serializers;
- private ParserSet parsers;
-
- /**
- * Constructor.
- */
- protected BaseProvider() {
- try {
- JuneauProvider jp =
getClass().getAnnotation(JuneauProvider.class);
-
- serializers = SerializerSet.create()
- .add(jp.serializers())
- .forEach(x -> x.swaps(jp.swaps()))
- .build();
-
- parsers = ParserSet.create()
- .add(jp.parsers())
- .forEach(x -> x.swaps(jp.swaps()))
- .build();
-
- } catch (Exception e) {
- throw asRuntimeException(e);
- }
- }
-
- @Override /* MessageBodyWriter */
- public long getSize(Object o, Class<?> type, Type gType, Annotation[]
a, MediaType mediaType) {
- return -1;
- }
-
- @Override /* MessageBodyWriter */
- public boolean isWriteable(Class<?> type, Type gType, Annotation[] a,
MediaType mediaType) {
- return serializers.getSerializerMatch(mediaType.toString()) !=
null;
- }
-
- @Override /* MessageBodyWriter */
- public void writeTo(Object o, Class<?> type, Type gType, Annotation[]
a, MediaType mediaType,
- MultivaluedMap<String,Object> headers, OutputStream os)
throws IOException, WebApplicationException {
- try {
- SerializerMatch sm =
serializers.getSerializerMatch(mediaType.toString());
- if (sm == null)
- throw new
WebApplicationException(SC_NOT_ACCEPTABLE);
- Serializer s = sm.getSerializer();
- JsonMap m = JsonMap.create();
- m.append("mediaType", mediaType.toString());
- Locale locale = getLocale(headers);
- TimeZone timeZone = getTimeZone(headers);
-
- SerializerSession session = s.createSession()
- .properties(m)
- .locale(locale)
- .timeZone(timeZone)
- .mediaType(sm.getMediaType())
- .build();
-
- // Leave this open in case an error occurs.
- Closeable c = s.isWriterSerializer() ? new
OutputStreamWriter(os, UTF8) : os;
- session.serialize(o, c);
-
- } catch (SerializeException e) {
- throw new IOException(e);
- }
- }
-
- @Override /* MessageBodyReader */
- public boolean isReadable(Class<?> type, Type gType, Annotation[] a,
MediaType mediaType) {
- return parsers.getParserMatch(mediaType.toString()) != null;
- }
-
- @Override /* MessageBodyReader */
- public Object readFrom(Class<Object> type, Type gType, Annotation[] a,
MediaType mediaType,
- MultivaluedMap<String,String> headers, InputStream in)
throws IOException, WebApplicationException {
- try {
- ParserMatch pm =
parsers.getParserMatch(mediaType.toString());
- if (pm == null)
- throw new
WebApplicationException(SC_UNSUPPORTED_MEDIA_TYPE);
- Parser p = pm.getParser();
- JsonMap m = JsonMap.create();
- m.put("mediaType", mediaType.toString());
- Locale locale = getLocale(headers);
- TimeZone timeZone = getTimeZone(headers);
- ParserSession session = p.createSession()
- .properties(m)
- .locale(locale)
- .timeZone(timeZone)
- .mediaType(pm.getMediaType())
- .build();
- Object in2 = session.isReaderParser() ? new
InputStreamReader(in, UTF8) : in;
- return session.parse(in2,
p.getBeanContext().getClassMeta(gType));
- } catch (ParseException e) {
- throw new IOException(e);
- }
- }
-
- @SuppressWarnings("rawtypes")
- private static Locale getLocale(MultivaluedMap headers) {
- if (headers.containsKey("Accept-Language") &&
headers.get("Accept-Language") != null) {
- String h =
String.valueOf(headers.get("Accept-Language"));
- if (h != null) {
- StringRanges mr = StringRanges.of(h);
- if (! mr.toList().isEmpty())
- return
toLocale(mr.getRange(0).getName());
- }
- }
- return null;
- }
-
- /*
- * Converts an Accept-Language value entry to a Locale.
- */
- private static Locale toLocale(String lang) {
- String country = "";
- int i = lang.indexOf('-');
- if (i > -1) {
- country = lang.substring(i+1).trim();
- lang = lang.substring(0,i).trim();
- }
- return new Locale(lang, country);
- }
-
- @SuppressWarnings("rawtypes")
- private static TimeZone getTimeZone(MultivaluedMap headers) {
- if (headers.containsKey("Time-Zone") &&
headers.get("Time-Zone") != null) {
- String h = String.valueOf(headers.get("Time-Zone"));
- return TimeZone.getTimeZone(h);
- }
- return null;
- }
-
-}
diff --git
a/juneau-rest/juneau-rest-server-jaxrs/src/main/java/org/apache/juneau/rest/jaxrs/BasicProvider.java
b/juneau-rest/juneau-rest-server-jaxrs/src/main/java/org/apache/juneau/rest/jaxrs/BasicProvider.java
deleted file mode 100644
index 070ef6723..000000000
---
a/juneau-rest/juneau-rest-server-jaxrs/src/main/java/org/apache/juneau/rest/jaxrs/BasicProvider.java
+++ /dev/null
@@ -1,75 +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. *
-//
***************************************************************************************************************************
-package org.apache.juneau.rest.jaxrs;
-
-import javax.ws.rs.*;
-import javax.ws.rs.ext.*;
-
-import org.apache.juneau.html.*;
-import org.apache.juneau.json.*;
-import org.apache.juneau.rest.servlet.*;
-import org.apache.juneau.soap.*;
-import org.apache.juneau.uon.UonParser;
-import org.apache.juneau.uon.UonSerializer;
-import org.apache.juneau.urlencoding.*;
-import org.apache.juneau.xml.*;
-
-/**
- * JAX-RS provider for the same serialize/parse support provided by the {@link
BasicRestServlet} class.
- *
- * <ul class='seealso'>
- * <li class='link'>{@doc juneau-rest-server-jaxrs}
- * <li class='extlink'>{@source}
- * </ul>
- */
-@Provider
-@Produces({
- "application/json", "text/json", // JsonSerializer
- "application/json+simple", "text/json+simple", //
JsonSerializer.Simple
- "application/json+schema", // JsonSchemaSerializer
- "text/xml", // XmlDocSerializer.Ns
- "text/xml+simple", // XmlDocSerializer
- "text/xml+schema", //
XmlSchemaDocSerializer
- "text/html", // HtmlDocSerializer
- "application/x-www-form-urlencoded", //
UrlEncodingSerializer
- "text/xml+soap" // SoapXmlSerializer
-})
-@Consumes({
- "application/json", "text/json", // JsonParser
- "text/xml", // XmlParser
- "text/html", // HtmlParser
- "application/x-www-form-urlencoded" // UrlEncodingParser
-})
-@JuneauProvider(
- serializers={
- JsonSerializer.class,
- SimpleJsonSerializer.class,
- JsonSchemaSerializer.class,
- XmlDocSerializer.Ns.class,
- XmlDocSerializer.class,
- HtmlDocSerializer.class,
- UrlEncodingSerializer.class,
- SoapXmlSerializer.class,
- HtmlSerializer.class,
- UonSerializer.class
- },
- parsers={
- JsonParser.class,
- XmlParser.class,
- HtmlParser.class,
- UonParser.class,
- UrlEncodingParser.class,
- }
-)
-public final class BasicProvider extends BaseProvider {}
-
diff --git
a/juneau-rest/juneau-rest-server-jaxrs/src/main/java/org/apache/juneau/rest/jaxrs/JuneauProvider.java
b/juneau-rest/juneau-rest-server-jaxrs/src/main/java/org/apache/juneau/rest/jaxrs/JuneauProvider.java
deleted file mode 100644
index 6ce12aae6..000000000
---
a/juneau-rest/juneau-rest-server-jaxrs/src/main/java/org/apache/juneau/rest/jaxrs/JuneauProvider.java
+++ /dev/null
@@ -1,75 +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. *
-//
***************************************************************************************************************************
-package org.apache.juneau.rest.jaxrs;
-
-import static java.lang.annotation.ElementType.*;
-import static java.lang.annotation.RetentionPolicy.*;
-
-import java.lang.annotation.*;
-
-import org.apache.juneau.parser.*;
-import org.apache.juneau.serializer.*;
-import org.apache.juneau.swap.*;
-
-/**
- * Annotations applicable to subclasses of {@link BaseProvider}.
- *
- * <h5 class='topic'>Description</h5>
- *
- * Used to associate serializers, parsers, filters, and properties with
instances of {@link BaseProvider}.
- *
- * <ul class='seealso'>
- * <li class='link'>{@doc juneau-rest-server-jaxrs}
- * <li class='extlink'>{@source}
- * </ul>
- */
-@Documented
-@Target(TYPE)
-@Retention(RUNTIME)
-@Inherited
-public @interface JuneauProvider {
-
- /**
- * Provider-level POJO swaps.
- *
- * <p>
- * These POJO swaps are applied to all serializers and parsers being
used by the provider.
- *
- * <p>
- * If the specified class is an instance of {@link ObjectSwap}, then
that swap is added.
- * Any other classes are wrapped in a {@link SurrogateSwap}.
- *
- * @return The annotation value.
- */
- Class<?>[] swaps() default {};
-
- /**
- * Specifies a list of {@link Serializer} classes to add to the list of
serializers available for this provider.
- *
- * <p>
- * This annotation can only be used on {@link Serializer} classes that
have no-arg constructors.
- *
- * @return The annotation value.
- */
- Class<? extends Serializer>[] serializers() default {};
-
- /**
- * Specifies a list of {@link Parser} classes to add to the list of
parsers available for this provider.
- *
- * <p>
- * This annotation can only be used on {@link Parser} classes that have
no-arg constructors.
- *
- * @return The annotation value.
- */
- Class<? extends Parser>[] parsers() default {};
-}
diff --git
a/juneau-rest/juneau-rest-server-jaxrs/src/main/java/org/apache/juneau/rest/jaxrs/package-info.java
b/juneau-rest/juneau-rest-server-jaxrs/src/main/java/org/apache/juneau/rest/jaxrs/package-info.java
deleted file mode 100644
index e4c8b3b51..000000000
---
a/juneau-rest/juneau-rest-server-jaxrs/src/main/java/org/apache/juneau/rest/jaxrs/package-info.java
+++ /dev/null
@@ -1,18 +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.
- *
-
***************************************************************************************************************************/
-
-/**
- * JAX-RS Integration
- */
-package org.apache.juneau.rest.jaxrs;
\ No newline at end of file
diff --git a/juneau-rest/pom.xml b/juneau-rest/pom.xml
index 74e0b56e7..3a2da2cb0 100644
--- a/juneau-rest/pom.xml
+++ b/juneau-rest/pom.xml
@@ -31,7 +31,6 @@
<modules>
<module>juneau-rest-common</module>
<module>juneau-rest-server</module>
- <module>juneau-rest-server-jaxrs</module>
<module>juneau-rest-server-springboot</module>
<module>juneau-rest-client</module>
<module>juneau-rest-mock</module>
diff --git a/juneau-utest-utils/pom.xml b/juneau-utest-utils/pom.xml
index 591199d90..d237381de 100644
--- a/juneau-utest-utils/pom.xml
+++ b/juneau-utest-utils/pom.xml
@@ -36,7 +36,7 @@
</dependency>
<dependency>
<groupId>org.apache.juneau</groupId>
- <artifactId>juneau-marshall-rdf</artifactId>
+ <artifactId>juneau-marshall</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
