You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by bd...@apache.org on 2022/07/27 20:25:28 UTC
[directory-scimple] 01/01: Rename scim-server-common to scim-server
This is an automated email from the ASF dual-hosted git repository.
bdemers pushed a commit to branch organize-server-bits
in repository https://gitbox.apache.org/repos/asf/directory-scimple.git
commit befcb9f95b5fd25e7cc029a8e4c00d7d05102bd5
Author: Brian Demers <bd...@apache.org>
AuthorDate: Wed Jul 27 16:25:21 2022 -0400
Rename scim-server-common to scim-server
This naming pattern is used by scim-client
Server examples are moved under scim-server-examples and have been added to the root pom
---
pom.xml | 4 +-
scim-coverage/pom.xml | 2 +-
.../scim-server-jersey/README.md | 0
.../scim-server-jersey/pom.xml | 7 +-
.../scim/example/jersey/JerseyApplication.java | 0
.../jersey/extensions/LuckyNumberExtension.java | 0
.../jersey/service/InMemoryGroupService.java | 0
.../jersey/service/InMemorySelfResolverImpl.java | 0
.../jersey/service/InMemoryUserService.java | 0
.../src/main/resources/beans.xml | 0
.../src/main/resources/logback.xml | 0
.../scim-server-memory/README.md | 0
.../scim-server-memory/pom.xml | 7 +-
.../memory/extensions/LuckyNumberExtension.java | 0
.../scim/example/memory/rest/RestApplication.java | 0
.../memory/service/InMemoryGroupService.java | 0
.../memory/service/InMemorySelfResolverImpl.java | 0
.../memory/service/InMemoryUserService.java | 0
.../src/main/webapp/WEB-INF/beans.xml | 0
.../src/main/webapp/WEB-INF/jboss-web.xml | 0
.../src/main/webapp/WEB-INF/web.xml | 0
scim-server/.gitignore | 1 -
scim-server/pom.xml | 83 +++++++++++++++-
scim-server/scim-server-common/pom.xml | 109 ---------------------
scim-server/scim-server-example/pom.xml | 35 -------
.../directory/scim/server/ScimConfiguration.java | 0
.../scim/server/ScimServerInitializer.java | 0
.../server/configuration/ServerConfiguration.java | 0
.../exception/AttributeDoesNotExistException.java | 0
.../exception/FilterParseExceptionMapper.java | 0
.../server/exception/InvalidProviderException.java | 0
.../scim/server/exception/ResourceException.java | 0
.../scim/server/exception/ScimServerException.java | 0
.../exception/UnableToCreateResourceException.java | 0
.../exception/UnableToDeleteResourceException.java | 0
.../UnableToResolveIdResourceException.java | 0
...nableToRetrieveExtensionsResourceException.java | 0
.../UnableToRetrieveResourceException.java | 0
.../exception/UnableToUpdateResourceException.java | 0
.../scim/server/filter/ApiOriginFilter.java | 0
.../server/provider/PrioritySortingComparitor.java | 0
.../directory/scim/server/provider/Provider.java | 0
.../scim/server/provider/ProviderRegistry.java | 0
.../scim/server/provider/SelfIdResolver.java | 0
.../scim/server/provider/UpdateRequest.java | 0
.../provider/annotations/ProcessingExtensions.java | 0
.../annotations/ScimProcessingExtension.java | 0
.../extensions/AttributeFilterExtension.java | 0
.../provider/extensions/ProcessingExtension.java | 0
.../provider/extensions/ScimRequestContext.java | 0
.../exceptions/ClientFilterException.java | 0
.../server/rest/BaseResourceTypeResourceImpl.java | 0
.../scim/server/rest/BulkResourceImpl.java | 0
.../scim/server/rest/GroupResourceImpl.java | 0
.../scim/server/rest/ObjectMapperFactory.java | 0
.../server/rest/ResourceTypesResourceImpl.java | 0
.../scim/server/rest/SchemaResourceImpl.java | 0
.../rest/ScimJacksonXmlBindJsonProvider.java | 0
.../scim/server/rest/ScimResourceDeserializer.java | 0
.../scim/server/rest/ScimResourceHelper.java | 0
.../scim/server/rest/SearchResourceImpl.java | 0
.../scim/server/rest/SelfResourceImpl.java | 0
.../rest/ServiceProviderConfigResourceImpl.java | 0
.../scim/server/rest/UserResourceImpl.java | 0
.../server/rest/WebApplicationExceptionMapper.java | 0
.../directory/scim/server/schema/Registry.java | 0
.../schema/ScimExtensionRegistryProducer.java | 0
.../scim/server/utility/AttributeUtil.java | 0
.../scim/server/utility/EndpointUtil.java | 0
.../scim/server/utility/EtagGenerator.java | 0
.../scim/server/utility/ReflectionUtils.java | 0
.../scim/server/utility/UriUtilities.java | 0
.../src/main/resources/META-INF/beans.xml | 0
.../jakarta.enterprise.inject.spi.Extension | 0
.../provider/PrioritySortingComparitorTest.java | 0
.../scim/server/provider/ProviderRegistryTest.java | 0
.../scim/server/provider/ProviderTest.java | 0
.../scim/server/provider/UpdateRequestTest.java | 0
.../rest/BaseResourceTypeResourceImplTest.java | 0
.../scim/server/rest/SelfResourceImplTest.java | 0
.../scim/server/utility/AttributeUtilTest.java | 0
.../server/utility/ExampleObjectExtension.java | 0
.../directory/scim/server/utility/Order.java | 0
.../directory/scim/server/utility/Subobject.java | 0
src/owasp/suppression.xml | 18 +---
85 files changed, 92 insertions(+), 174 deletions(-)
diff --git a/pom.xml b/pom.xml
index 99eaa50..341d9f5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -49,6 +49,8 @@
<modules>
<module>scim-client</module>
<module>scim-server</module>
+ <module>scim-server-examples/scim-server-memory</module>
+ <module>scim-server-examples/scim-server-jersey</module>
<module>scim-spec</module>
<module>scim-tools</module>
<module>scim-coverage</module>
@@ -123,7 +125,7 @@
</dependency>
<dependency>
<groupId>org.apache.directory.scim</groupId>
- <artifactId>scim-server-common</artifactId>
+ <artifactId>scim-server</artifactId>
<version>2.23-SNAPSHOT</version>
</dependency>
<dependency>
diff --git a/scim-coverage/pom.xml b/scim-coverage/pom.xml
index c2d418f..eb88fb2 100644
--- a/scim-coverage/pom.xml
+++ b/scim-coverage/pom.xml
@@ -42,7 +42,7 @@
</dependency>
<dependency>
<groupId>org.apache.directory.scim</groupId>
- <artifactId>scim-server-common</artifactId>
+ <artifactId>scim-server</artifactId>
</dependency>
<dependency>
<groupId>org.apache.directory.scim</groupId>
diff --git a/scim-server/scim-server-example/scim-server-jersey/README.md b/scim-server-examples/scim-server-jersey/README.md
similarity index 100%
rename from scim-server/scim-server-example/scim-server-jersey/README.md
rename to scim-server-examples/scim-server-jersey/README.md
diff --git a/scim-server/scim-server-example/scim-server-jersey/pom.xml b/scim-server-examples/scim-server-jersey/pom.xml
similarity index 95%
rename from scim-server/scim-server-example/scim-server-jersey/pom.xml
rename to scim-server-examples/scim-server-jersey/pom.xml
index 274ba36..f7ff32d 100644
--- a/scim-server/scim-server-example/scim-server-jersey/pom.xml
+++ b/scim-server-examples/scim-server-jersey/pom.xml
@@ -19,12 +19,13 @@
<parent>
<groupId>org.apache.directory.scim</groupId>
- <artifactId>scim-server-examples</artifactId>
+ <artifactId>scim-parent</artifactId>
<version>2.23-SNAPSHOT</version>
+ <relativePath>../..</relativePath>
</parent>
<artifactId>scim-server-jersey</artifactId>
- <name>SCIM - Server - Jersey</name>
+ <name>SCIM - Server - Examples - Jersey</name>
<properties>
<jersey.version>3.0.5</jersey.version>
@@ -84,7 +85,7 @@
</dependency>
<dependency>
<groupId>org.apache.directory.scim</groupId>
- <artifactId>scim-server-common</artifactId>
+ <artifactId>scim-server</artifactId>
</dependency>
<dependency>
diff --git a/scim-server/scim-server-example/scim-server-jersey/src/main/java/org/apache/directory/scim/example/jersey/JerseyApplication.java b/scim-server-examples/scim-server-jersey/src/main/java/org/apache/directory/scim/example/jersey/JerseyApplication.java
similarity index 100%
rename from scim-server/scim-server-example/scim-server-jersey/src/main/java/org/apache/directory/scim/example/jersey/JerseyApplication.java
rename to scim-server-examples/scim-server-jersey/src/main/java/org/apache/directory/scim/example/jersey/JerseyApplication.java
diff --git a/scim-server/scim-server-example/scim-server-jersey/src/main/java/org/apache/directory/scim/example/jersey/extensions/LuckyNumberExtension.java b/scim-server-examples/scim-server-jersey/src/main/java/org/apache/directory/scim/example/jersey/extensions/LuckyNumberExtension.java
similarity index 100%
rename from scim-server/scim-server-example/scim-server-jersey/src/main/java/org/apache/directory/scim/example/jersey/extensions/LuckyNumberExtension.java
rename to scim-server-examples/scim-server-jersey/src/main/java/org/apache/directory/scim/example/jersey/extensions/LuckyNumberExtension.java
diff --git a/scim-server/scim-server-example/scim-server-jersey/src/main/java/org/apache/directory/scim/example/jersey/service/InMemoryGroupService.java b/scim-server-examples/scim-server-jersey/src/main/java/org/apache/directory/scim/example/jersey/service/InMemoryGroupService.java
similarity index 100%
rename from scim-server/scim-server-example/scim-server-jersey/src/main/java/org/apache/directory/scim/example/jersey/service/InMemoryGroupService.java
rename to scim-server-examples/scim-server-jersey/src/main/java/org/apache/directory/scim/example/jersey/service/InMemoryGroupService.java
diff --git a/scim-server/scim-server-example/scim-server-jersey/src/main/java/org/apache/directory/scim/example/jersey/service/InMemorySelfResolverImpl.java b/scim-server-examples/scim-server-jersey/src/main/java/org/apache/directory/scim/example/jersey/service/InMemorySelfResolverImpl.java
similarity index 100%
rename from scim-server/scim-server-example/scim-server-jersey/src/main/java/org/apache/directory/scim/example/jersey/service/InMemorySelfResolverImpl.java
rename to scim-server-examples/scim-server-jersey/src/main/java/org/apache/directory/scim/example/jersey/service/InMemorySelfResolverImpl.java
diff --git a/scim-server/scim-server-example/scim-server-jersey/src/main/java/org/apache/directory/scim/example/jersey/service/InMemoryUserService.java b/scim-server-examples/scim-server-jersey/src/main/java/org/apache/directory/scim/example/jersey/service/InMemoryUserService.java
similarity index 100%
rename from scim-server/scim-server-example/scim-server-jersey/src/main/java/org/apache/directory/scim/example/jersey/service/InMemoryUserService.java
rename to scim-server-examples/scim-server-jersey/src/main/java/org/apache/directory/scim/example/jersey/service/InMemoryUserService.java
diff --git a/scim-server/scim-server-example/scim-server-jersey/src/main/resources/beans.xml b/scim-server-examples/scim-server-jersey/src/main/resources/beans.xml
similarity index 100%
rename from scim-server/scim-server-example/scim-server-jersey/src/main/resources/beans.xml
rename to scim-server-examples/scim-server-jersey/src/main/resources/beans.xml
diff --git a/scim-server/scim-server-example/scim-server-jersey/src/main/resources/logback.xml b/scim-server-examples/scim-server-jersey/src/main/resources/logback.xml
similarity index 100%
rename from scim-server/scim-server-example/scim-server-jersey/src/main/resources/logback.xml
rename to scim-server-examples/scim-server-jersey/src/main/resources/logback.xml
diff --git a/scim-server/scim-server-example/scim-server-memory/README.md b/scim-server-examples/scim-server-memory/README.md
similarity index 100%
rename from scim-server/scim-server-example/scim-server-memory/README.md
rename to scim-server-examples/scim-server-memory/README.md
diff --git a/scim-server/scim-server-example/scim-server-memory/pom.xml b/scim-server-examples/scim-server-memory/pom.xml
similarity index 95%
rename from scim-server/scim-server-example/scim-server-memory/pom.xml
rename to scim-server-examples/scim-server-memory/pom.xml
index efb2d8b..0a89d63 100644
--- a/scim-server/scim-server-example/scim-server-memory/pom.xml
+++ b/scim-server-examples/scim-server-memory/pom.xml
@@ -19,12 +19,13 @@
<parent>
<groupId>org.apache.directory.scim</groupId>
- <artifactId>scim-server-examples</artifactId>
+ <artifactId>scim-parent</artifactId>
<version>2.23-SNAPSHOT</version>
+ <relativePath>../..</relativePath>
</parent>
<artifactId>scim-server-memory</artifactId>
- <name>SCIM - Server - Memory</name>
+ <name>SCIM - Server - Examples - Memory</name>
<packaging>war</packaging>
<dependencies>
@@ -34,7 +35,7 @@
</dependency>
<dependency>
<groupId>org.apache.directory.scim</groupId>
- <artifactId>scim-server-common</artifactId>
+ <artifactId>scim-server</artifactId>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
diff --git a/scim-server/scim-server-example/scim-server-memory/src/main/java/org/apache/directory/scim/example/memory/extensions/LuckyNumberExtension.java b/scim-server-examples/scim-server-memory/src/main/java/org/apache/directory/scim/example/memory/extensions/LuckyNumberExtension.java
similarity index 100%
rename from scim-server/scim-server-example/scim-server-memory/src/main/java/org/apache/directory/scim/example/memory/extensions/LuckyNumberExtension.java
rename to scim-server-examples/scim-server-memory/src/main/java/org/apache/directory/scim/example/memory/extensions/LuckyNumberExtension.java
diff --git a/scim-server/scim-server-example/scim-server-memory/src/main/java/org/apache/directory/scim/example/memory/rest/RestApplication.java b/scim-server-examples/scim-server-memory/src/main/java/org/apache/directory/scim/example/memory/rest/RestApplication.java
similarity index 100%
rename from scim-server/scim-server-example/scim-server-memory/src/main/java/org/apache/directory/scim/example/memory/rest/RestApplication.java
rename to scim-server-examples/scim-server-memory/src/main/java/org/apache/directory/scim/example/memory/rest/RestApplication.java
diff --git a/scim-server/scim-server-example/scim-server-memory/src/main/java/org/apache/directory/scim/example/memory/service/InMemoryGroupService.java b/scim-server-examples/scim-server-memory/src/main/java/org/apache/directory/scim/example/memory/service/InMemoryGroupService.java
similarity index 100%
rename from scim-server/scim-server-example/scim-server-memory/src/main/java/org/apache/directory/scim/example/memory/service/InMemoryGroupService.java
rename to scim-server-examples/scim-server-memory/src/main/java/org/apache/directory/scim/example/memory/service/InMemoryGroupService.java
diff --git a/scim-server/scim-server-example/scim-server-memory/src/main/java/org/apache/directory/scim/example/memory/service/InMemorySelfResolverImpl.java b/scim-server-examples/scim-server-memory/src/main/java/org/apache/directory/scim/example/memory/service/InMemorySelfResolverImpl.java
similarity index 100%
rename from scim-server/scim-server-example/scim-server-memory/src/main/java/org/apache/directory/scim/example/memory/service/InMemorySelfResolverImpl.java
rename to scim-server-examples/scim-server-memory/src/main/java/org/apache/directory/scim/example/memory/service/InMemorySelfResolverImpl.java
diff --git a/scim-server/scim-server-example/scim-server-memory/src/main/java/org/apache/directory/scim/example/memory/service/InMemoryUserService.java b/scim-server-examples/scim-server-memory/src/main/java/org/apache/directory/scim/example/memory/service/InMemoryUserService.java
similarity index 100%
rename from scim-server/scim-server-example/scim-server-memory/src/main/java/org/apache/directory/scim/example/memory/service/InMemoryUserService.java
rename to scim-server-examples/scim-server-memory/src/main/java/org/apache/directory/scim/example/memory/service/InMemoryUserService.java
diff --git a/scim-server/scim-server-example/scim-server-memory/src/main/webapp/WEB-INF/beans.xml b/scim-server-examples/scim-server-memory/src/main/webapp/WEB-INF/beans.xml
similarity index 100%
rename from scim-server/scim-server-example/scim-server-memory/src/main/webapp/WEB-INF/beans.xml
rename to scim-server-examples/scim-server-memory/src/main/webapp/WEB-INF/beans.xml
diff --git a/scim-server/scim-server-example/scim-server-memory/src/main/webapp/WEB-INF/jboss-web.xml b/scim-server-examples/scim-server-memory/src/main/webapp/WEB-INF/jboss-web.xml
similarity index 100%
rename from scim-server/scim-server-example/scim-server-memory/src/main/webapp/WEB-INF/jboss-web.xml
rename to scim-server-examples/scim-server-memory/src/main/webapp/WEB-INF/jboss-web.xml
diff --git a/scim-server/scim-server-example/scim-server-memory/src/main/webapp/WEB-INF/web.xml b/scim-server-examples/scim-server-memory/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from scim-server/scim-server-example/scim-server-memory/src/main/webapp/WEB-INF/web.xml
rename to scim-server-examples/scim-server-memory/src/main/webapp/WEB-INF/web.xml
diff --git a/scim-server/.gitignore b/scim-server/.gitignore
deleted file mode 100644
index ae3c172..0000000
--- a/scim-server/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/bin/
diff --git a/scim-server/pom.xml b/scim-server/pom.xml
index f301823..fa99682 100644
--- a/scim-server/pom.xml
+++ b/scim-server/pom.xml
@@ -26,11 +26,84 @@
<artifactId>scim-server</artifactId>
<name>SCIM - Server</name>
- <packaging>pom</packaging>
+ <packaging>jar</packaging>
- <modules>
- <module>scim-server-common</module>
- <module>scim-server-example</module>
- </modules>
+ <dependencies>
+ <dependency>
+ <groupId>jakarta.inject</groupId>
+ <artifactId>jakarta.inject-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.enterprise</groupId>
+ <artifactId>jakarta.enterprise.cdi-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.directory.scim</groupId>
+ <artifactId>scim-spec-schema</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.directory.scim</groupId>
+ <artifactId>scim-spec-protocol</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.resteasy</groupId>
+ <artifactId>resteasy-client</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.resteasy</groupId>
+ <artifactId>resteasy-jackson2-provider</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-junit-jupiter</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.assertj</groupId>
+ <artifactId>assertj-core</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>eu.codearte.catch-exception</groupId>
+ <artifactId>catch-exception</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.flipkart.zjsonpatch</groupId>
+ <artifactId>zjsonpatch</artifactId>
+ <version>0.4.12</version>
+ </dependency>
+ </dependencies>
</project>
diff --git a/scim-server/scim-server-common/pom.xml b/scim-server/scim-server-common/pom.xml
deleted file mode 100644
index d78078c..0000000
--- a/scim-server/scim-server-common/pom.xml
+++ /dev/null
@@ -1,109 +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. -->
-
-<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.directory.scim</groupId>
- <artifactId>scim-server</artifactId>
- <version>2.23-SNAPSHOT</version>
- </parent>
-
- <artifactId>scim-server-common</artifactId>
- <name>SCIM - Server - Common</name>
- <packaging>jar</packaging>
-
- <dependencies>
- <dependency>
- <groupId>jakarta.inject</groupId>
- <artifactId>jakarta.inject-api</artifactId>
- </dependency>
- <dependency>
- <groupId>jakarta.enterprise</groupId>
- <artifactId>jakarta.enterprise.cdi-api</artifactId>
- </dependency>
- <dependency>
- <groupId>jakarta.annotation</groupId>
- <artifactId>jakarta.annotation-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.directory.scim</groupId>
- <artifactId>scim-spec-schema</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.directory.scim</groupId>
- <artifactId>scim-spec-protocol</artifactId>
- </dependency>
- <dependency>
- <groupId>org.projectlombok</groupId>
- <artifactId>lombok</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.resteasy</groupId>
- <artifactId>resteasy-client</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.resteasy</groupId>
- <artifactId>resteasy-jackson2-provider</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-junit-jupiter</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.assertj</groupId>
- <artifactId>assertj-core</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>eu.codearte.catch-exception</groupId>
- <artifactId>catch-exception</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>com.flipkart.zjsonpatch</groupId>
- <artifactId>zjsonpatch</artifactId>
- <version>0.4.12</version>
- </dependency>
- </dependencies>
-
-</project>
diff --git a/scim-server/scim-server-example/pom.xml b/scim-server/scim-server-example/pom.xml
deleted file mode 100644
index 03d5836..0000000
--- a/scim-server/scim-server-example/pom.xml
+++ /dev/null
@@ -1,35 +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. -->
-<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.directory.scim</groupId>
- <artifactId>scim-server</artifactId>
- <version>2.23-SNAPSHOT</version>
- </parent>
-
- <artifactId>scim-server-examples</artifactId>
- <name>SCIM - Server - Examples</name>
- <packaging>pom</packaging>
-
- <modules>
- <module>scim-server-memory</module>
- <module>scim-server-jersey</module>
- </modules>
-
-</project>
diff --git a/scim-server/scim-server-common/src/main/java/org/apache/directory/scim/server/ScimConfiguration.java b/scim-server/src/main/java/org/apache/directory/scim/server/ScimConfiguration.java
similarity index 100%
rename from scim-server/scim-server-common/src/main/java/org/apache/directory/scim/server/ScimConfiguration.java
rename to scim-server/src/main/java/org/apache/directory/scim/server/ScimConfiguration.java
diff --git a/scim-server/scim-server-common/src/main/java/org/apache/directory/scim/server/ScimServerInitializer.java b/scim-server/src/main/java/org/apache/directory/scim/server/ScimServerInitializer.java
similarity index 100%
rename from scim-server/scim-server-common/src/main/java/org/apache/directory/scim/server/ScimServerInitializer.java
rename to scim-server/src/main/java/org/apache/directory/scim/server/ScimServerInitializer.java
diff --git a/scim-server/scim-server-common/src/main/java/org/apache/directory/scim/server/configuration/ServerConfiguration.java b/scim-server/src/main/java/org/apache/directory/scim/server/configuration/ServerConfiguration.java
similarity index 100%
rename from scim-server/scim-server-common/src/main/java/org/apache/directory/scim/server/configuration/ServerConfiguration.java
rename to scim-server/src/main/java/org/apache/directory/scim/server/configuration/ServerConfiguration.java
diff --git a/scim-server/scim-server-common/src/main/java/org/apache/directory/scim/server/exception/AttributeDoesNotExistException.java b/scim-server/src/main/java/org/apache/directory/scim/server/exception/AttributeDoesNotExistException.java
similarity index 100%
rename from scim-server/scim-server-common/src/main/java/org/apache/directory/scim/server/exception/AttributeDoesNotExistException.java
rename to scim-server/src/main/java/org/apache/directory/scim/server/exception/AttributeDoesNotExistException.java
diff --git a/scim-server/scim-server-common/src/main/java/org/apache/directory/scim/server/exception/FilterParseExceptionMapper.java b/scim-server/src/main/java/org/apache/directory/scim/server/exception/FilterParseExceptionMapper.java
similarity index 100%
rename from scim-server/scim-server-common/src/main/java/org/apache/directory/scim/server/exception/FilterParseExceptionMapper.java
rename to scim-server/src/main/java/org/apache/directory/scim/server/exception/FilterParseExceptionMapper.java
diff --git a/scim-server/scim-server-common/src/main/java/org/apache/directory/scim/server/exception/InvalidProviderException.java b/scim-server/src/main/java/org/apache/directory/scim/server/exception/InvalidProviderException.java
similarity index 100%
rename from scim-server/scim-server-common/src/main/java/org/apache/directory/scim/server/exception/InvalidProviderException.java
rename to scim-server/src/main/java/org/apache/directory/scim/server/exception/InvalidProviderException.java
diff --git a/scim-server/scim-server-common/src/main/java/org/apache/directory/scim/server/exception/ResourceException.java b/scim-server/src/main/java/org/apache/directory/scim/server/exception/ResourceException.java
similarity index 100%
rename from scim-server/scim-server-common/src/main/java/org/apache/directory/scim/server/exception/ResourceException.java
rename to scim-server/src/main/java/org/apache/directory/scim/server/exception/ResourceException.java
diff --git a/scim-server/scim-server-common/src/main/java/org/apache/directory/scim/server/exception/ScimServerException.java b/scim-server/src/main/java/org/apache/directory/scim/server/exception/ScimServerException.java
similarity index 100%
rename from scim-server/scim-server-common/src/main/java/org/apache/directory/scim/server/exception/ScimServerException.java
rename to scim-server/src/main/java/org/apache/directory/scim/server/exception/ScimServerException.java
diff --git a/scim-server/scim-server-common/src/main/java/org/apache/directory/scim/server/exception/UnableToCreateResourceException.java b/scim-server/src/main/java/org/apache/directory/scim/server/exception/UnableToCreateResourceException.java
similarity index 100%
rename from scim-server/scim-server-common/src/main/java/org/apache/directory/scim/server/exception/UnableToCreateResourceException.java
rename to scim-server/src/main/java/org/apache/directory/scim/server/exception/UnableToCreateResourceException.java
diff --git a/scim-server/scim-server-common/src/main/java/org/apache/directory/scim/server/exception/UnableToDeleteResourceException.java b/scim-server/src/main/java/org/apache/directory/scim/server/exception/UnableToDeleteResourceException.java
similarity index 100%
rename from scim-server/scim-server-common/src/main/java/org/apache/directory/scim/server/exception/UnableToDeleteResourceException.java
rename to scim-server/src/main/java/org/apache/directory/scim/server/exception/UnableToDeleteResourceException.java
diff --git a/scim-server/scim-server-common/src/main/java/org/apache/directory/scim/server/exception/UnableToResolveIdResourceException.java b/scim-server/src/main/java/org/apache/directory/scim/server/exception/UnableToResolveIdResourceException.java
similarity index 100%
rename from scim-server/scim-server-common/src/main/java/org/apache/directory/scim/server/exception/UnableToResolveIdResourceException.java
rename to scim-server/src/main/java/org/apache/directory/scim/server/exception/UnableToResolveIdResourceException.java
diff --git a/scim-server/scim-server-common/src/main/java/org/apache/directory/scim/server/exception/UnableToRetrieveExtensionsResourceException.java b/scim-server/src/main/java/org/apache/directory/scim/server/exception/UnableToRetrieveExtensionsResourceException.java
similarity index 100%
rename from scim-server/scim-server-common/src/main/java/org/apache/directory/scim/server/exception/UnableToRetrieveExtensionsResourceException.java
rename to scim-server/src/main/java/org/apache/directory/scim/server/exception/UnableToRetrieveExtensionsResourceException.java
diff --git a/scim-server/scim-server-common/src/main/java/org/apache/directory/scim/server/exception/UnableToRetrieveResourceException.java b/scim-server/src/main/java/org/apache/directory/scim/server/exception/UnableToRetrieveResourceException.java
similarity index 100%
rename from scim-server/scim-server-common/src/main/java/org/apache/directory/scim/server/exception/UnableToRetrieveResourceException.java
rename to scim-server/src/main/java/org/apache/directory/scim/server/exception/UnableToRetrieveResourceException.java
diff --git a/scim-server/scim-server-common/src/main/java/org/apache/directory/scim/server/exception/UnableToUpdateResourceException.java b/scim-server/src/main/java/org/apache/directory/scim/server/exception/UnableToUpdateResourceException.java
similarity index 100%
rename from scim-server/scim-server-common/src/main/java/org/apache/directory/scim/server/exception/UnableToUpdateResourceException.java
rename to scim-server/src/main/java/org/apache/directory/scim/server/exception/UnableToUpdateResourceException.java
diff --git a/scim-server/scim-server-common/src/main/java/org/apache/directory/scim/server/filter/ApiOriginFilter.java b/scim-server/src/main/java/org/apache/directory/scim/server/filter/ApiOriginFilter.java
similarity index 100%
rename from scim-server/scim-server-common/src/main/java/org/apache/directory/scim/server/filter/ApiOriginFilter.java
rename to scim-server/src/main/java/org/apache/directory/scim/server/filter/ApiOriginFilter.java
diff --git a/scim-server/scim-server-common/src/main/java/org/apache/directory/scim/server/provider/PrioritySortingComparitor.java b/scim-server/src/main/java/org/apache/directory/scim/server/provider/PrioritySortingComparitor.java
similarity index 100%
rename from scim-server/scim-server-common/src/main/java/org/apache/directory/scim/server/provider/PrioritySortingComparitor.java
rename to scim-server/src/main/java/org/apache/directory/scim/server/provider/PrioritySortingComparitor.java
diff --git a/scim-server/scim-server-common/src/main/java/org/apache/directory/scim/server/provider/Provider.java b/scim-server/src/main/java/org/apache/directory/scim/server/provider/Provider.java
similarity index 100%
rename from scim-server/scim-server-common/src/main/java/org/apache/directory/scim/server/provider/Provider.java
rename to scim-server/src/main/java/org/apache/directory/scim/server/provider/Provider.java
diff --git a/scim-server/scim-server-common/src/main/java/org/apache/directory/scim/server/provider/ProviderRegistry.java b/scim-server/src/main/java/org/apache/directory/scim/server/provider/ProviderRegistry.java
similarity index 100%
rename from scim-server/scim-server-common/src/main/java/org/apache/directory/scim/server/provider/ProviderRegistry.java
rename to scim-server/src/main/java/org/apache/directory/scim/server/provider/ProviderRegistry.java
diff --git a/scim-server/scim-server-common/src/main/java/org/apache/directory/scim/server/provider/SelfIdResolver.java b/scim-server/src/main/java/org/apache/directory/scim/server/provider/SelfIdResolver.java
similarity index 100%
rename from scim-server/scim-server-common/src/main/java/org/apache/directory/scim/server/provider/SelfIdResolver.java
rename to scim-server/src/main/java/org/apache/directory/scim/server/provider/SelfIdResolver.java
diff --git a/scim-server/scim-server-common/src/main/java/org/apache/directory/scim/server/provider/UpdateRequest.java b/scim-server/src/main/java/org/apache/directory/scim/server/provider/UpdateRequest.java
similarity index 100%
rename from scim-server/scim-server-common/src/main/java/org/apache/directory/scim/server/provider/UpdateRequest.java
rename to scim-server/src/main/java/org/apache/directory/scim/server/provider/UpdateRequest.java
diff --git a/scim-server/scim-server-common/src/main/java/org/apache/directory/scim/server/provider/annotations/ProcessingExtensions.java b/scim-server/src/main/java/org/apache/directory/scim/server/provider/annotations/ProcessingExtensions.java
similarity index 100%
rename from scim-server/scim-server-common/src/main/java/org/apache/directory/scim/server/provider/annotations/ProcessingExtensions.java
rename to scim-server/src/main/java/org/apache/directory/scim/server/provider/annotations/ProcessingExtensions.java
diff --git a/scim-server/scim-server-common/src/main/java/org/apache/directory/scim/server/provider/annotations/ScimProcessingExtension.java b/scim-server/src/main/java/org/apache/directory/scim/server/provider/annotations/ScimProcessingExtension.java
similarity index 100%
rename from scim-server/scim-server-common/src/main/java/org/apache/directory/scim/server/provider/annotations/ScimProcessingExtension.java
rename to scim-server/src/main/java/org/apache/directory/scim/server/provider/annotations/ScimProcessingExtension.java
diff --git a/scim-server/scim-server-common/src/main/java/org/apache/directory/scim/server/provider/extensions/AttributeFilterExtension.java b/scim-server/src/main/java/org/apache/directory/scim/server/provider/extensions/AttributeFilterExtension.java
similarity index 100%
rename from scim-server/scim-server-common/src/main/java/org/apache/directory/scim/server/provider/extensions/AttributeFilterExtension.java
rename to scim-server/src/main/java/org/apache/directory/scim/server/provider/extensions/AttributeFilterExtension.java
diff --git a/scim-server/scim-server-common/src/main/java/org/apache/directory/scim/server/provider/extensions/ProcessingExtension.java b/scim-server/src/main/java/org/apache/directory/scim/server/provider/extensions/ProcessingExtension.java
similarity index 100%
rename from scim-server/scim-server-common/src/main/java/org/apache/directory/scim/server/provider/extensions/ProcessingExtension.java
rename to scim-server/src/main/java/org/apache/directory/scim/server/provider/extensions/ProcessingExtension.java
diff --git a/scim-server/scim-server-common/src/main/java/org/apache/directory/scim/server/provider/extensions/ScimRequestContext.java b/scim-server/src/main/java/org/apache/directory/scim/server/provider/extensions/ScimRequestContext.java
similarity index 100%
rename from scim-server/scim-server-common/src/main/java/org/apache/directory/scim/server/provider/extensions/ScimRequestContext.java
rename to scim-server/src/main/java/org/apache/directory/scim/server/provider/extensions/ScimRequestContext.java
diff --git a/scim-server/scim-server-common/src/main/java/org/apache/directory/scim/server/provider/extensions/exceptions/ClientFilterException.java b/scim-server/src/main/java/org/apache/directory/scim/server/provider/extensions/exceptions/ClientFilterException.java
similarity index 100%
rename from scim-server/scim-server-common/src/main/java/org/apache/directory/scim/server/provider/extensions/exceptions/ClientFilterException.java
rename to scim-server/src/main/java/org/apache/directory/scim/server/provider/extensions/exceptions/ClientFilterException.java
diff --git a/scim-server/scim-server-common/src/main/java/org/apache/directory/scim/server/rest/BaseResourceTypeResourceImpl.java b/scim-server/src/main/java/org/apache/directory/scim/server/rest/BaseResourceTypeResourceImpl.java
similarity index 100%
rename from scim-server/scim-server-common/src/main/java/org/apache/directory/scim/server/rest/BaseResourceTypeResourceImpl.java
rename to scim-server/src/main/java/org/apache/directory/scim/server/rest/BaseResourceTypeResourceImpl.java
diff --git a/scim-server/scim-server-common/src/main/java/org/apache/directory/scim/server/rest/BulkResourceImpl.java b/scim-server/src/main/java/org/apache/directory/scim/server/rest/BulkResourceImpl.java
similarity index 100%
rename from scim-server/scim-server-common/src/main/java/org/apache/directory/scim/server/rest/BulkResourceImpl.java
rename to scim-server/src/main/java/org/apache/directory/scim/server/rest/BulkResourceImpl.java
diff --git a/scim-server/scim-server-common/src/main/java/org/apache/directory/scim/server/rest/GroupResourceImpl.java b/scim-server/src/main/java/org/apache/directory/scim/server/rest/GroupResourceImpl.java
similarity index 100%
rename from scim-server/scim-server-common/src/main/java/org/apache/directory/scim/server/rest/GroupResourceImpl.java
rename to scim-server/src/main/java/org/apache/directory/scim/server/rest/GroupResourceImpl.java
diff --git a/scim-server/scim-server-common/src/main/java/org/apache/directory/scim/server/rest/ObjectMapperFactory.java b/scim-server/src/main/java/org/apache/directory/scim/server/rest/ObjectMapperFactory.java
similarity index 100%
rename from scim-server/scim-server-common/src/main/java/org/apache/directory/scim/server/rest/ObjectMapperFactory.java
rename to scim-server/src/main/java/org/apache/directory/scim/server/rest/ObjectMapperFactory.java
diff --git a/scim-server/scim-server-common/src/main/java/org/apache/directory/scim/server/rest/ResourceTypesResourceImpl.java b/scim-server/src/main/java/org/apache/directory/scim/server/rest/ResourceTypesResourceImpl.java
similarity index 100%
rename from scim-server/scim-server-common/src/main/java/org/apache/directory/scim/server/rest/ResourceTypesResourceImpl.java
rename to scim-server/src/main/java/org/apache/directory/scim/server/rest/ResourceTypesResourceImpl.java
diff --git a/scim-server/scim-server-common/src/main/java/org/apache/directory/scim/server/rest/SchemaResourceImpl.java b/scim-server/src/main/java/org/apache/directory/scim/server/rest/SchemaResourceImpl.java
similarity index 100%
rename from scim-server/scim-server-common/src/main/java/org/apache/directory/scim/server/rest/SchemaResourceImpl.java
rename to scim-server/src/main/java/org/apache/directory/scim/server/rest/SchemaResourceImpl.java
diff --git a/scim-server/scim-server-common/src/main/java/org/apache/directory/scim/server/rest/ScimJacksonXmlBindJsonProvider.java b/scim-server/src/main/java/org/apache/directory/scim/server/rest/ScimJacksonXmlBindJsonProvider.java
similarity index 100%
rename from scim-server/scim-server-common/src/main/java/org/apache/directory/scim/server/rest/ScimJacksonXmlBindJsonProvider.java
rename to scim-server/src/main/java/org/apache/directory/scim/server/rest/ScimJacksonXmlBindJsonProvider.java
diff --git a/scim-server/scim-server-common/src/main/java/org/apache/directory/scim/server/rest/ScimResourceDeserializer.java b/scim-server/src/main/java/org/apache/directory/scim/server/rest/ScimResourceDeserializer.java
similarity index 100%
rename from scim-server/scim-server-common/src/main/java/org/apache/directory/scim/server/rest/ScimResourceDeserializer.java
rename to scim-server/src/main/java/org/apache/directory/scim/server/rest/ScimResourceDeserializer.java
diff --git a/scim-server/scim-server-common/src/main/java/org/apache/directory/scim/server/rest/ScimResourceHelper.java b/scim-server/src/main/java/org/apache/directory/scim/server/rest/ScimResourceHelper.java
similarity index 100%
rename from scim-server/scim-server-common/src/main/java/org/apache/directory/scim/server/rest/ScimResourceHelper.java
rename to scim-server/src/main/java/org/apache/directory/scim/server/rest/ScimResourceHelper.java
diff --git a/scim-server/scim-server-common/src/main/java/org/apache/directory/scim/server/rest/SearchResourceImpl.java b/scim-server/src/main/java/org/apache/directory/scim/server/rest/SearchResourceImpl.java
similarity index 100%
rename from scim-server/scim-server-common/src/main/java/org/apache/directory/scim/server/rest/SearchResourceImpl.java
rename to scim-server/src/main/java/org/apache/directory/scim/server/rest/SearchResourceImpl.java
diff --git a/scim-server/scim-server-common/src/main/java/org/apache/directory/scim/server/rest/SelfResourceImpl.java b/scim-server/src/main/java/org/apache/directory/scim/server/rest/SelfResourceImpl.java
similarity index 100%
rename from scim-server/scim-server-common/src/main/java/org/apache/directory/scim/server/rest/SelfResourceImpl.java
rename to scim-server/src/main/java/org/apache/directory/scim/server/rest/SelfResourceImpl.java
diff --git a/scim-server/scim-server-common/src/main/java/org/apache/directory/scim/server/rest/ServiceProviderConfigResourceImpl.java b/scim-server/src/main/java/org/apache/directory/scim/server/rest/ServiceProviderConfigResourceImpl.java
similarity index 100%
rename from scim-server/scim-server-common/src/main/java/org/apache/directory/scim/server/rest/ServiceProviderConfigResourceImpl.java
rename to scim-server/src/main/java/org/apache/directory/scim/server/rest/ServiceProviderConfigResourceImpl.java
diff --git a/scim-server/scim-server-common/src/main/java/org/apache/directory/scim/server/rest/UserResourceImpl.java b/scim-server/src/main/java/org/apache/directory/scim/server/rest/UserResourceImpl.java
similarity index 100%
rename from scim-server/scim-server-common/src/main/java/org/apache/directory/scim/server/rest/UserResourceImpl.java
rename to scim-server/src/main/java/org/apache/directory/scim/server/rest/UserResourceImpl.java
diff --git a/scim-server/scim-server-common/src/main/java/org/apache/directory/scim/server/rest/WebApplicationExceptionMapper.java b/scim-server/src/main/java/org/apache/directory/scim/server/rest/WebApplicationExceptionMapper.java
similarity index 100%
rename from scim-server/scim-server-common/src/main/java/org/apache/directory/scim/server/rest/WebApplicationExceptionMapper.java
rename to scim-server/src/main/java/org/apache/directory/scim/server/rest/WebApplicationExceptionMapper.java
diff --git a/scim-server/scim-server-common/src/main/java/org/apache/directory/scim/server/schema/Registry.java b/scim-server/src/main/java/org/apache/directory/scim/server/schema/Registry.java
similarity index 100%
rename from scim-server/scim-server-common/src/main/java/org/apache/directory/scim/server/schema/Registry.java
rename to scim-server/src/main/java/org/apache/directory/scim/server/schema/Registry.java
diff --git a/scim-server/scim-server-common/src/main/java/org/apache/directory/scim/server/schema/ScimExtensionRegistryProducer.java b/scim-server/src/main/java/org/apache/directory/scim/server/schema/ScimExtensionRegistryProducer.java
similarity index 100%
rename from scim-server/scim-server-common/src/main/java/org/apache/directory/scim/server/schema/ScimExtensionRegistryProducer.java
rename to scim-server/src/main/java/org/apache/directory/scim/server/schema/ScimExtensionRegistryProducer.java
diff --git a/scim-server/scim-server-common/src/main/java/org/apache/directory/scim/server/utility/AttributeUtil.java b/scim-server/src/main/java/org/apache/directory/scim/server/utility/AttributeUtil.java
similarity index 100%
rename from scim-server/scim-server-common/src/main/java/org/apache/directory/scim/server/utility/AttributeUtil.java
rename to scim-server/src/main/java/org/apache/directory/scim/server/utility/AttributeUtil.java
diff --git a/scim-server/scim-server-common/src/main/java/org/apache/directory/scim/server/utility/EndpointUtil.java b/scim-server/src/main/java/org/apache/directory/scim/server/utility/EndpointUtil.java
similarity index 100%
rename from scim-server/scim-server-common/src/main/java/org/apache/directory/scim/server/utility/EndpointUtil.java
rename to scim-server/src/main/java/org/apache/directory/scim/server/utility/EndpointUtil.java
diff --git a/scim-server/scim-server-common/src/main/java/org/apache/directory/scim/server/utility/EtagGenerator.java b/scim-server/src/main/java/org/apache/directory/scim/server/utility/EtagGenerator.java
similarity index 100%
rename from scim-server/scim-server-common/src/main/java/org/apache/directory/scim/server/utility/EtagGenerator.java
rename to scim-server/src/main/java/org/apache/directory/scim/server/utility/EtagGenerator.java
diff --git a/scim-server/scim-server-common/src/main/java/org/apache/directory/scim/server/utility/ReflectionUtils.java b/scim-server/src/main/java/org/apache/directory/scim/server/utility/ReflectionUtils.java
similarity index 100%
rename from scim-server/scim-server-common/src/main/java/org/apache/directory/scim/server/utility/ReflectionUtils.java
rename to scim-server/src/main/java/org/apache/directory/scim/server/utility/ReflectionUtils.java
diff --git a/scim-server/scim-server-common/src/main/java/org/apache/directory/scim/server/utility/UriUtilities.java b/scim-server/src/main/java/org/apache/directory/scim/server/utility/UriUtilities.java
similarity index 100%
rename from scim-server/scim-server-common/src/main/java/org/apache/directory/scim/server/utility/UriUtilities.java
rename to scim-server/src/main/java/org/apache/directory/scim/server/utility/UriUtilities.java
diff --git a/scim-server/scim-server-common/src/main/resources/META-INF/beans.xml b/scim-server/src/main/resources/META-INF/beans.xml
similarity index 100%
rename from scim-server/scim-server-common/src/main/resources/META-INF/beans.xml
rename to scim-server/src/main/resources/META-INF/beans.xml
diff --git a/scim-server/scim-server-common/src/main/resources/META-INF/services/jakarta.enterprise.inject.spi.Extension b/scim-server/src/main/resources/META-INF/services/jakarta.enterprise.inject.spi.Extension
similarity index 100%
rename from scim-server/scim-server-common/src/main/resources/META-INF/services/jakarta.enterprise.inject.spi.Extension
rename to scim-server/src/main/resources/META-INF/services/jakarta.enterprise.inject.spi.Extension
diff --git a/scim-server/scim-server-common/src/test/java/org/apache/directory/scim/server/provider/PrioritySortingComparitorTest.java b/scim-server/src/test/java/org/apache/directory/scim/server/provider/PrioritySortingComparitorTest.java
similarity index 100%
rename from scim-server/scim-server-common/src/test/java/org/apache/directory/scim/server/provider/PrioritySortingComparitorTest.java
rename to scim-server/src/test/java/org/apache/directory/scim/server/provider/PrioritySortingComparitorTest.java
diff --git a/scim-server/scim-server-common/src/test/java/org/apache/directory/scim/server/provider/ProviderRegistryTest.java b/scim-server/src/test/java/org/apache/directory/scim/server/provider/ProviderRegistryTest.java
similarity index 100%
rename from scim-server/scim-server-common/src/test/java/org/apache/directory/scim/server/provider/ProviderRegistryTest.java
rename to scim-server/src/test/java/org/apache/directory/scim/server/provider/ProviderRegistryTest.java
diff --git a/scim-server/scim-server-common/src/test/java/org/apache/directory/scim/server/provider/ProviderTest.java b/scim-server/src/test/java/org/apache/directory/scim/server/provider/ProviderTest.java
similarity index 100%
rename from scim-server/scim-server-common/src/test/java/org/apache/directory/scim/server/provider/ProviderTest.java
rename to scim-server/src/test/java/org/apache/directory/scim/server/provider/ProviderTest.java
diff --git a/scim-server/scim-server-common/src/test/java/org/apache/directory/scim/server/provider/UpdateRequestTest.java b/scim-server/src/test/java/org/apache/directory/scim/server/provider/UpdateRequestTest.java
similarity index 100%
rename from scim-server/scim-server-common/src/test/java/org/apache/directory/scim/server/provider/UpdateRequestTest.java
rename to scim-server/src/test/java/org/apache/directory/scim/server/provider/UpdateRequestTest.java
diff --git a/scim-server/scim-server-common/src/test/java/org/apache/directory/scim/server/rest/BaseResourceTypeResourceImplTest.java b/scim-server/src/test/java/org/apache/directory/scim/server/rest/BaseResourceTypeResourceImplTest.java
similarity index 100%
rename from scim-server/scim-server-common/src/test/java/org/apache/directory/scim/server/rest/BaseResourceTypeResourceImplTest.java
rename to scim-server/src/test/java/org/apache/directory/scim/server/rest/BaseResourceTypeResourceImplTest.java
diff --git a/scim-server/scim-server-common/src/test/java/org/apache/directory/scim/server/rest/SelfResourceImplTest.java b/scim-server/src/test/java/org/apache/directory/scim/server/rest/SelfResourceImplTest.java
similarity index 100%
rename from scim-server/scim-server-common/src/test/java/org/apache/directory/scim/server/rest/SelfResourceImplTest.java
rename to scim-server/src/test/java/org/apache/directory/scim/server/rest/SelfResourceImplTest.java
diff --git a/scim-server/scim-server-common/src/test/java/org/apache/directory/scim/server/utility/AttributeUtilTest.java b/scim-server/src/test/java/org/apache/directory/scim/server/utility/AttributeUtilTest.java
similarity index 100%
rename from scim-server/scim-server-common/src/test/java/org/apache/directory/scim/server/utility/AttributeUtilTest.java
rename to scim-server/src/test/java/org/apache/directory/scim/server/utility/AttributeUtilTest.java
diff --git a/scim-server/scim-server-common/src/test/java/org/apache/directory/scim/server/utility/ExampleObjectExtension.java b/scim-server/src/test/java/org/apache/directory/scim/server/utility/ExampleObjectExtension.java
similarity index 100%
rename from scim-server/scim-server-common/src/test/java/org/apache/directory/scim/server/utility/ExampleObjectExtension.java
rename to scim-server/src/test/java/org/apache/directory/scim/server/utility/ExampleObjectExtension.java
diff --git a/scim-server/scim-server-common/src/test/java/org/apache/directory/scim/server/utility/Order.java b/scim-server/src/test/java/org/apache/directory/scim/server/utility/Order.java
similarity index 100%
rename from scim-server/scim-server-common/src/test/java/org/apache/directory/scim/server/utility/Order.java
rename to scim-server/src/test/java/org/apache/directory/scim/server/utility/Order.java
diff --git a/scim-server/scim-server-common/src/test/java/org/apache/directory/scim/server/utility/Subobject.java b/scim-server/src/test/java/org/apache/directory/scim/server/utility/Subobject.java
similarity index 100%
rename from scim-server/scim-server-common/src/test/java/org/apache/directory/scim/server/utility/Subobject.java
rename to scim-server/src/test/java/org/apache/directory/scim/server/utility/Subobject.java
diff --git a/src/owasp/suppression.xml b/src/owasp/suppression.xml
index 8d5cbdc..6dbb60f 100644
--- a/src/owasp/suppression.xml
+++ b/src/owasp/suppression.xml
@@ -19,29 +19,15 @@
<!-- Wrong GAV detection -->
<suppress>
- <notes><![CDATA[file name: scim-server-common-*.jar]]></notes>
+ <notes><![CDATA[file name: scim-server-*.jar]]></notes>
<gav regex="true">^org\.apache\.directory\.scim:.*$</gav>
<cpe>cpe:/a:apache:apache_http_server</cpe>
</suppress>
<suppress>
- <notes><![CDATA[file name: scim-server-common-*.jar]]></notes>
+ <notes><![CDATA[file name: scim-server-*.jar]]></notes>
<gav regex="true">^org\.apache\.directory\.scim:.*$</gav>
<cpe>cpe:/a:apache:http_server</cpe>
</suppress>
- <!-- Used by compliance test code. Jetty is a transitive dependency of Restfuse, which has not been updated. -->
- <suppress>
- <notes><![CDATA[file name: jetty-http-9.4.8.v20180619.jar]]>
- <![CDATA[file name: jetty-server-9.4.8.v20180619.jar]]></notes>
- <vulnerabilityName>CVE-2017-7656</vulnerabilityName>
- <vulnerabilityName>CVE-2017-7657</vulnerabilityName>
- <vulnerabilityName>CVE-2017-7658</vulnerabilityName>
- <vulnerabilityName>CVE-2018-12536</vulnerabilityName>
- <vulnerabilityName>CVE-2018-12538</vulnerabilityName>
- <vulnerabilityName>CVE-2018-12545</vulnerabilityName>
- <vulnerabilityName>CVE-2019-10241</vulnerabilityName>
- <vulnerabilityName>CVE-2019-10247</vulnerabilityName>
- </suppress>
-
<suppress>
<notes><![CDATA[
Weld contains META-INF/client/probe.js which includes old versions of bootstrap and JQuery