Temp fix for mysterious import of "com.sun.enterprise.security.web"

It's not clear where it comes from, but excluding it helps. Should find root cause before merging. Signed-off-by: Arjan Tijms <arjan.tijms@omnifish.ee>
eclipse-ee4j · Oct 21, 2023 · 8a1049b · 8a1049b
1 parent bb0c961
commit 8a1049b
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 2 deletions.
diff --git a/appserver/web/web-ha/pom.xml b/appserver/web/web-ha/pom.xml
@@ -92,5 +92,19 @@
                 <directory>src/main/resources</directory>
             </resource>
         </resources>
+
+            <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Import-Package>
+                        !com.sun.enterprise.security.web,*
+                        </Import-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
     </build>
 </project>
diff --git a/.../common-util/src/main/java/com/sun/enterprise/security/integration/SecurityConstants.java b/.../common-util/src/main/java/com/sun/enterprise/security/integration/SecurityConstants.java
@@ -22,7 +22,7 @@
  */
 public interface SecurityConstants {
     //TODO: Not a very good idea, revisit.
-    String WEB_PRINCIPAL_CLASS = "com.sun.enterprise.security.web.integration.WebPrincipal";
+    String WEB_PRINCIPAL_CLASS = "com.sun.enterprise.security.ee.web.integration.WebPrincipal";
 
     //TODO V3: Temporary till we have AppContainer integration design sorted out
     int APPCONTAINER_CERTIFICATE = 2;

diff --git a/nucleus/core/kernel/pom.xml b/nucleus/core/kernel/pom.xml
@@ -233,7 +233,7 @@
                     <instructions>
                         <!-- GlassfishRoleMapper is sometimes located via kernel's classloader' -->
                         <DynamicImport-Package>
-                            com.sun.enterprise.security.web.integration,
+                            com.sun.enterprise.security.ee.web.integration,
                             org.glassfish.flashlight.provider,
                             org.objectweb.asm,
                             org.objectweb.asm.commons