You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by sm...@apache.org on 2023/04/23 23:25:09 UTC

[directory-fortress-enmasse] 01/01: successful unit test

This is an automated email from the ASF dual-hosted git repository.

smckinney pushed a commit to branch jakarta3
in repository https://gitbox.apache.org/repos/asf/directory-fortress-enmasse.git

commit 9b068f6df1d68f1d5ee5b09c93436653e62b7594
Author: Shawn McKinney <sm...@symas.com>
AuthorDate: Sun Apr 23 18:24:56 2023 -0500

    successful unit test
---
 pom.xml                                            | 86 ++++++++++++++++++++--
 .../fortress/rest/FortressInterceptor.java         |  5 +-
 .../directory/fortress/rest/FortressService.java   |  8 +-
 .../fortress/rest/FortressServiceImpl.java         | 10 +--
 .../apache/directory/fortress/rest/SecUtils.java   |  2 +-
 .../fortress/rest/SecurityOutFaultInterceptor.java |  3 +-
 src/main/resources/applicationContext.xml          |  4 +
 .../org/apache/directory/fortress/rest/EmTest.java |  2 +-
 8 files changed, 101 insertions(+), 19 deletions(-)

diff --git a/pom.xml b/pom.xml
index 88db1e4..c72aa3c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -103,8 +103,10 @@
     <title>${project.name} ${project.version}</title>
     <java.version>1.8</java.version>
     <!-- Dependencies version -->
-    <fortress.realm.version>2.0.8</fortress.realm.version>
-    <cxf.version>3.5.5</cxf.version>
+    <fortress.realm.version>2.0.9-SNAPSHOT</fortress.realm.version>
+<!--    <fortress.realm.version>2.0.8</fortress.realm.version>-->
+    <!--<cxf.version>3.5.5</cxf.version>-->
+    <cxf.version>4.0.0</cxf.version>
     <httpclient.version>3.1</httpclient.version>
     <java.version>1.8</java.version>
     <javadoc.version>2.9.1</javadoc.version>
@@ -133,32 +135,78 @@
       <groupId>org.apache.cxf</groupId>
       <artifactId>cxf-core</artifactId>
       <version>${cxf.version}</version>
+<!--
       <exclusions>
         <exclusion>
           <groupId>org.jboss.spec.javax.rmi</groupId>
           <artifactId>jboss-rmi-api_1.0_spec</artifactId>
         </exclusion>
       </exclusions>
+-->
     </dependency>
 
     <dependency>
       <groupId>org.apache.cxf</groupId>
       <artifactId>cxf-rt-frontend-jaxrs</artifactId>
       <version>${cxf.version}</version>
+<!--
       <exclusions>
         <exclusion>
           <groupId>org.jboss.spec.javax.rmi</groupId>
           <artifactId>jboss-rmi-api_1.0_spec</artifactId>
         </exclusion>
       </exclusions>
+-->
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.cxf</groupId>
+      <artifactId>cxf-rt-frontend-jaxws</artifactId>
+      <version>4.0.0</version>
+    </dependency>
+
+<!--
+    <dependency>
+      <groupId>javax</groupId>
+      <artifactId>javaee-api</artifactId>
+      <version>${version.javaee.api}</version>
+    </dependency>
+-->
+
+    <dependency>
+      <groupId>jakarta.servlet</groupId>
+      <artifactId>jakarta.servlet-api</artifactId>
+      <version>6.0.0</version>
+      <scope>provided</scope>
     </dependency>
 
+
+<!--
     <dependency>
       <groupId>com.fasterxml.jackson.jaxrs</groupId>
       <artifactId>jackson-jaxrs-json-provider</artifactId>
       <version>${jackson-jaxrs.version}</version>
     </dependency>
+-->
+    <dependency>
+      <groupId>com.fasterxml.jackson.jaxrs</groupId>
+      <artifactId>jackson-jaxrs-json-provider</artifactId>
+      <version>2.15.0-rc3</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-core</artifactId>
+      <version>6.0.8</version>
+    </dependency>
 
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-web</artifactId>
+      <version>6.0.3</version>
+    </dependency>
+
+<!--
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-core</artifactId>
@@ -170,6 +218,7 @@
       <artifactId>spring-security-web</artifactId>
       <version>5.7.2</version>
     </dependency>
+-->
 
     <!-- Logging Dependencies -->
     <dependency>
@@ -199,17 +248,44 @@
       <scope>test</scope>
     </dependency>
 
+    <dependency>
+      <groupId>jakarta.xml.bind</groupId>
+      <artifactId>jakarta.xml.bind-api</artifactId>
+      <version>4.0.0</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.glassfish.jaxb</groupId>
+      <artifactId>jaxb-runtime</artifactId>
+      <version>4.0.2</version>
+    </dependency>
+
+<!--
+
     <dependency>
       <groupId>com.sun.xml.bind</groupId>
       <artifactId>jaxb-impl</artifactId>
       <version>${version.jaxb.impl}</version>
     </dependency>
 
+-->
+
+<!--
     <dependency>
-      <groupId>org.glassfish.jaxb</groupId>
-      <artifactId>jaxb-core</artifactId>
-      <version>${version.jaxb.core}</version>
+      <groupId>jakarta.xml.bind</groupId>
+      <artifactId>jakarta.xml.bind-api</artifactId>
+      <version>3.0.0</version>
+    </dependency>
+-->
+
+<!--
+    <dependency>
+      <groupId>com.sun.xml.bind</groupId>
+      <artifactId>jaxb-impl</artifactId>
+      <version>3.0.0</version>
+      <scope>runtime</scope>
     </dependency>
+-->
 
   </dependencies>
 
diff --git a/src/main/java/org/apache/directory/fortress/rest/FortressInterceptor.java b/src/main/java/org/apache/directory/fortress/rest/FortressInterceptor.java
index f92527c..da72df9 100644
--- a/src/main/java/org/apache/directory/fortress/rest/FortressInterceptor.java
+++ b/src/main/java/org/apache/directory/fortress/rest/FortressInterceptor.java
@@ -45,8 +45,9 @@ public class FortressInterceptor extends SimpleAuthorizingInterceptor
     /** A logger for this class */
     private static final Logger LOG = LoggerFactory.getLogger( FortressInterceptor.class.getName() );
 
-    private static final String DEFAULT_ANNOTATION_CLASS_NAME = "javax.annotation.security.RolesAllowed";
-    
+    //private static final String DEFAULT_ANNOTATION_CLASS_NAME = "javax.annotation.security.RolesAllowed";
+    private static final String DEFAULT_ANNOTATION_CLASS_NAME = "jakarta.annotation.security.RolesAllowed";
+
     /** The list of methods we want to skip */
     private static final Set<String> SKIP_METHODS;
 
diff --git a/src/main/java/org/apache/directory/fortress/rest/FortressService.java b/src/main/java/org/apache/directory/fortress/rest/FortressService.java
index a36608a..8391e72 100644
--- a/src/main/java/org/apache/directory/fortress/rest/FortressService.java
+++ b/src/main/java/org/apache/directory/fortress/rest/FortressService.java
@@ -27,9 +27,9 @@ import org.apache.directory.fortress.core.model.FortResponse;
 import org.apache.directory.fortress.core.model.Group;
 import org.apache.directory.fortress.core.model.UserRole;
 
-import javax.annotation.security.RolesAllowed;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
+import jakarta.annotation.security.RolesAllowed;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
 
 /**
  * Interface for Fortress Rest Service methods.
@@ -7296,4 +7296,4 @@ public interface FortressService
      * @return reference to {@code FortResponse}
      */
     FortResponse invalid( FortRequest request );
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/apache/directory/fortress/rest/FortressServiceImpl.java b/src/main/java/org/apache/directory/fortress/rest/FortressServiceImpl.java
index f47e6b2..3b100ad 100644
--- a/src/main/java/org/apache/directory/fortress/rest/FortressServiceImpl.java
+++ b/src/main/java/org/apache/directory/fortress/rest/FortressServiceImpl.java
@@ -19,11 +19,11 @@
  */
 package org.apache.directory.fortress.rest;
 
-import javax.annotation.security.RolesAllowed;
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.core.Context;
+import jakarta.annotation.security.RolesAllowed;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.core.Context;
 
 import org.apache.directory.fortress.core.GlobalErrIds;
 import org.apache.directory.fortress.core.model.*;
diff --git a/src/main/java/org/apache/directory/fortress/rest/SecUtils.java b/src/main/java/org/apache/directory/fortress/rest/SecUtils.java
index ab7b8e4..ba6c732 100644
--- a/src/main/java/org/apache/directory/fortress/rest/SecUtils.java
+++ b/src/main/java/org/apache/directory/fortress/rest/SecUtils.java
@@ -19,7 +19,7 @@
  */
 package org.apache.directory.fortress.rest;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.apache.directory.fortress.core.GlobalErrIds;
 import org.apache.directory.fortress.core.GlobalIds;
diff --git a/src/main/java/org/apache/directory/fortress/rest/SecurityOutFaultInterceptor.java b/src/main/java/org/apache/directory/fortress/rest/SecurityOutFaultInterceptor.java
index 20d653b..c3d06d0 100644
--- a/src/main/java/org/apache/directory/fortress/rest/SecurityOutFaultInterceptor.java
+++ b/src/main/java/org/apache/directory/fortress/rest/SecurityOutFaultInterceptor.java
@@ -27,7 +27,8 @@ import org.apache.cxf.phase.Phase;
 import org.apache.cxf.transport.http.AbstractHTTPDestination;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import javax.servlet.http.HttpServletResponse;
+//import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 
 /**
diff --git a/src/main/resources/applicationContext.xml b/src/main/resources/applicationContext.xml
index 6e6d26e..d5a445a 100644
--- a/src/main/resources/applicationContext.xml
+++ b/src/main/resources/applicationContext.xml
@@ -41,9 +41,11 @@ under the License.
     <bean id="customMapper" class="org.apache.directory.fortress.rest.JacksonFieldOnlyMapper">
     </bean>
 
+<!--
     <bean id="customJsonProvider" class="com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider">
         <constructor-arg ref="customMapper"/>
     </bean>
+-->
 
     <bean id="fortressResponseInterceptor" class="org.apache.directory.fortress.rest.FortressResponseInterceptor"/>
 
@@ -64,9 +66,11 @@ under the License.
             <bean class="org.apache.directory.fortress.rest.SecurityOutFaultInterceptor"/>
         </jaxrs:outFaultInterceptors>
 
+<!--
         <jaxrs:providers>
            <ref bean="customJsonProvider"/>
         </jaxrs:providers>
+-->
     </jaxrs:server>
 
 </beans>
diff --git a/src/test/java/org/apache/directory/fortress/rest/EmTest.java b/src/test/java/org/apache/directory/fortress/rest/EmTest.java
index 71fd011..95b7d20 100644
--- a/src/test/java/org/apache/directory/fortress/rest/EmTest.java
+++ b/src/test/java/org/apache/directory/fortress/rest/EmTest.java
@@ -40,7 +40,7 @@ import org.slf4j.LoggerFactory;
 import org.junit.Assert;
 import org.junit.Test;
 
-import javax.ws.rs.WebApplicationException;
+import jakarta.ws.rs.WebApplicationException;
 
 
 /**