Merge pull request #24921 from dmatej/fixed-package

Fixed package name of the Audit class
eclipse-ee4j · Apr 17, 2024 · a4629b0 · a4629b0
2 parents 4f09f4c + 602170b
commit a4629b0
Show file tree

Hide file tree

Showing 43 changed files with 76 additions and 76 deletions.
diff --git a/appserver/admin/admin-core/src/test/resources/UpgradeTest.xml b/appserver/admin/admin-core/src/test/resources/UpgradeTest.xml
@@ -151,7 +151,7 @@
           <property name="repository" value="${com.sun.aas.instanceRoot}/generated/policy"></property>
         </jacc-provider>
         <jacc-provider policy-provider="org.glassfish.exousia.modules.locked.SimplePolicyProvider" name="simple" policy-configuration-factory-provider="org.glassfish.exousia.modules.locked.SimplePolicyConfigurationFactory"></jacc-provider>
-        <audit-module name="default" classname="com.sun.enterprise.security.ee.Audit">
+        <audit-module name="default" classname="com.sun.enterprise.security.ee.audit.Audit">
           <property name="auditOn" value="false"></property>
         </audit-module>
         <message-security-config auth-layer="SOAP">

diff --git a/appserver/admin/template/src/main/resources/config/domain.xml b/appserver/admin/template/src/main/resources/config/domain.xml
@@ -109,7 +109,7 @@
           <property value="${com.sun.aas.instanceRoot}/generated/policy" name="repository" />
         </jacc-provider>
         <jacc-provider policy-configuration-factory-provider="org.glassfish.exousia.modules.def.DefaultPolicyConfigurationFactory" policy-provider="org.glassfish.exousia.modules.def.DefaultPolicy" name="simple" />
-        <audit-module classname="com.sun.enterprise.security.ee.Audit" name="default">
+        <audit-module classname="com.sun.enterprise.security.ee.audit.Audit" name="default">
           <property value="false" name="auditOn" />
         </audit-module>
         <message-security-config auth-layer="SOAP">
@@ -316,7 +316,7 @@
                  <property name="repository" value="${com.sun.aas.instanceRoot}/generated/policy" />
              </jacc-provider>
              <jacc-provider policy-provider="org.glassfish.exousia.modules.def.DefaultPolicy" name="simple" policy-configuration-factory-provider="org.glassfish.exousia.modules.def.DefaultPolicyConfigurationFactory" />
-             <audit-module classname="com.sun.enterprise.security.ee.Audit" name="default">
+             <audit-module classname="com.sun.enterprise.security.ee.audit.Audit" name="default">
                  <property value="false" name="auditOn" />
              </audit-module>
              <message-security-config auth-layer="SOAP">

diff --git a/appserver/connectors/admin/src/test/resources/DomainTest.xml b/appserver/connectors/admin/src/test/resources/DomainTest.xml
@@ -87,7 +87,7 @@
           <property name="repository" value="${com.sun.aas.instanceRoot}/generated/policy" />
         </jacc-provider>
         <jacc-provider policy-provider="org.glassfish.exousia.modules.locked.SimplePolicyProvider" name="simple" policy-configuration-factory-provider="org.glassfish.exousia.modules.locked.SimplePolicyConfigurationFactory" />
-        <audit-module name="default" classname="com.sun.enterprise.security.ee.Audit">
+        <audit-module name="default" classname="com.sun.enterprise.security.ee.audit.Audit">
           <property name="auditOn" value="false" />
         </audit-module>
         <message-security-config auth-layer="SOAP">

diff --git a/appserver/connectors/connectors-internal-api/src/test/resources/DomainTest.xml b/appserver/connectors/connectors-internal-api/src/test/resources/DomainTest.xml
@@ -81,7 +81,7 @@
           <property name="repository" value="${com.sun.aas.instanceRoot}/generated/policy" />
         </jacc-provider>
         <jacc-provider policy-provider="org.glassfish.exousia.modules.locked.SimplePolicyProvider" name="simple" policy-configuration-factory-provider="org.glassfish.exousia.modules.locked.SimplePolicyConfigurationFactory" />
-        <audit-module name="default" classname="com.sun.enterprise.security.ee.Audit">
+        <audit-module name="default" classname="com.sun.enterprise.security.ee.audit.Audit">
           <property name="auditOn" value="false" />
         </audit-module>
         <message-security-config auth-layer="SOAP">

diff --git a/appserver/connectors/connectors-internal-api/src/test/resources/PasswordAliasTest.xml b/appserver/connectors/connectors-internal-api/src/test/resources/PasswordAliasTest.xml
@@ -89,7 +89,7 @@
           <property name="repository" value="${com.sun.aas.instanceRoot}/generated/policy" />
         </jacc-provider>
         <jacc-provider policy-provider="org.glassfish.exousia.modules.locked.SimplePolicyProvider" name="simple" policy-configuration-factory-provider="org.glassfish.exousia.modules.locked.SimplePolicyConfigurationFactory" />
-        <audit-module name="default" classname="com.sun.enterprise.security.ee.Audit">
+        <audit-module name="default" classname="com.sun.enterprise.security.ee.audit.Audit">
           <property name="auditOn" value="false" />
         </audit-module>
         <message-security-config auth-layer="SOAP">

diff --git a/appserver/jdbc/admin/src/test/resources/DomainTest.xml b/appserver/jdbc/admin/src/test/resources/DomainTest.xml
@@ -74,7 +74,7 @@
         <jacc-provider policy-provider="org.glassfish.exousia.modules.locked.SimplePolicyProvider" name="default" policy-configuration-factory-provider="org.glassfish.exousia.modules.locked.SimplePolicyConfigurationFactory">
           <property name="repository" value="${com.sun.aas.instanceRoot}/generated/policy"></property>
         </jacc-provider>
-        <audit-module classname="com.sun.enterprise.security.ee.Audit" name="default">
+        <audit-module classname="com.sun.enterprise.security.ee.audit.Audit" name="default">
           <property name="auditOn" value="false"></property>
         </audit-module>
         <message-security-config auth-layer="SOAP">

diff --git a/appserver/jdbc/jdbc-runtime/src/test/resources/DomainTest.xml b/appserver/jdbc/jdbc-runtime/src/test/resources/DomainTest.xml
@@ -95,7 +95,7 @@
           <property name="repository" value="${com.sun.aas.instanceRoot}/generated/policy" />
         </jacc-provider>
         <jacc-provider policy-provider="org.glassfish.exousia.modules.locked.SimplePolicyProvider" name="simple" policy-configuration-factory-provider="org.glassfish.exousia.modules.locked.SimplePolicyConfigurationFactory" />
-        <audit-module name="default" classname="com.sun.enterprise.security.ee.Audit">
+        <audit-module name="default" classname="com.sun.enterprise.security.ee.audit.Audit">
           <property name="auditOn" value="false" />
         </audit-module>
         <message-security-config auth-layer="SOAP">

diff --git a/appserver/orb/orb-connector/src/test/resources/DomainTest.xml b/appserver/orb/orb-connector/src/test/resources/DomainTest.xml
@@ -82,7 +82,7 @@
           <property name="repository" value="${com.sun.aas.instanceRoot}/generated/policy" />
         </jacc-provider>
         <jacc-provider policy-provider="org.glassfish.exousia.modules.locked.SimplePolicyProvider" name="simple" policy-configuration-factory-provider="org.glassfish.exousia.modules.locked.SimplePolicyConfigurationFactory" />
-        <audit-module name="default" classname="com.sun.enterprise.security.ee.Audit">
+        <audit-module name="default" classname="com.sun.enterprise.security.ee.audit.Audit">
           <property name="auditOn" value="false" />
         </audit-module>
         <message-security-config auth-layer="SOAP">

diff --git a/appserver/resources/mail/mail-connector/src/test/resources/DomainTest.xml b/appserver/resources/mail/mail-connector/src/test/resources/DomainTest.xml
@@ -87,7 +87,7 @@
           <property name="repository" value="${com.sun.aas.instanceRoot}/generated/policy" />
         </jacc-provider>
         <jacc-provider policy-provider="org.glassfish.exousia.modules.locked.SimplePolicyProvider" name="simple" policy-configuration-factory-provider="org.glassfish.exousia.modules.locked.SimplePolicyConfigurationFactory" />
-        <audit-module name="default" classname="com.sun.enterprise.security.ee.Audit">
+        <audit-module name="default" classname="com.sun.enterprise.security.ee.audit.Audit">
           <property name="auditOn" value="false" />
         </audit-module>
         <message-security-config auth-layer="SOAP">

diff --git a/appserver/resources/resources-connector/src/test/resources/DomainTest.xml b/appserver/resources/resources-connector/src/test/resources/DomainTest.xml
@@ -74,7 +74,7 @@
           <property name="repository" value="${com.sun.aas.instanceRoot}/generated/policy"></property>
         </jacc-provider>
         <jacc-provider policy-provider="org.glassfish.exousia.modules.locked.SimplePolicyProvider" name="simple" policy-configuration-factory-provider="org.glassfish.exousia.modules.locked.SimplePolicyConfigurationFactory"></jacc-provider>
-        <audit-module classname="com.sun.enterprise.security.ee.Audit" name="default">
+        <audit-module classname="com.sun.enterprise.security.ee.audit.Audit" name="default">
           <property name="auditOn" value="false"></property>
         </audit-module>
         <message-security-config auth-layer="SOAP">

diff --git a/...erver/tests/embedded/web/web-api/src/main/resources/org/glassfish/tests/webapi/domain.xml b/...erver/tests/embedded/web/web-api/src/main/resources/org/glassfish/tests/webapi/domain.xml
@@ -91,7 +91,7 @@
           <property value="${com.sun.aas.instanceRoot}/generated/policy" name="repository" />
         </jacc-provider>
         <jacc-provider policy-configuration-factory-provider="com.sun.enterprise.security.jacc.provider.SimplePolicyConfigurationFactory" policy-provider="com.sun.enterprise.security.jacc.provider.SimplePolicyProvider" name="simple" />
-        <audit-module classname="com.sun.enterprise.security.ee.Audit" name="default">
+        <audit-module classname="com.sun.enterprise.security.ee.audit.Audit" name="default">
           <property value="false" name="auditOn" />
         </audit-module>
         <message-security-config auth-layer="SOAP">

diff --git a/...eus/admin/config-api/src/main/java/org/glassfish/config/support/DefaultConfigUpgrade.java b/...eus/admin/config-api/src/main/java/org/glassfish/config/support/DefaultConfigUpgrade.java
@@ -739,7 +739,7 @@ private void createJaccProviderProperty(JaccProvider jp) throws PropertyVetoExce
     /* Cursor should be already be at audit-module START_ELEMENT in the template.
      * Create AuditModle config object.
      * from template:
-     * <audit-module classname="com.sun.enterprise.security.ee.Audit" name="default">
+     * <audit-module classname="com.sun.enterprise.security.ee.audit.Audit" name="default">
      *      <property name="auditOn" value="false"/>
      * </audit-module>
      */

diff --git a/nucleus/admin/config-api/src/test/resources/ClusterDomain.xml b/nucleus/admin/config-api/src/test/resources/ClusterDomain.xml
@@ -54,7 +54,7 @@
           <property name="repository" value="${com.sun.aas.instanceRoot}/generated/policy" />
         </jacc-provider>
         <jacc-provider policy-provider="org.glassfish.exousia.modules.locked.SimplePolicyProvider" name="simple" policy-configuration-factory-provider="org.glassfish.exousia.modules.locked.SimplePolicyConfigurationFactory" />
-        <audit-module name="default" classname="com.sun.enterprise.security.ee.Audit">
+        <audit-module name="default" classname="com.sun.enterprise.security.ee.audit.Audit">
           <property name="auditOn" value="false" />
         </audit-module>
         <message-security-config auth-layer="SOAP">
@@ -181,7 +181,7 @@
           <property name="repository" value="${com.sun.aas.instanceRoot}/generated/policy" />
         </jacc-provider>
         <jacc-provider policy-provider="org.glassfish.exousia.modules.locked.SimplePolicyProvider" name="simple" policy-configuration-factory-provider="org.glassfish.exousia.modules.locked.SimplePolicyConfigurationFactory" />
-        <audit-module classname="com.sun.enterprise.security.ee.Audit" name="default">
+        <audit-module classname="com.sun.enterprise.security.ee.audit.Audit" name="default">
           <property name="auditOn" value="false" />
         </audit-module>
         <message-security-config auth-layer="SOAP">
@@ -308,7 +308,7 @@
           <property name="repository" value="${com.sun.aas.instanceRoot}/generated/policy" />
         </jacc-provider>
         <jacc-provider policy-provider="org.glassfish.exousia.modules.locked.SimplePolicyProvider" name="simple" policy-configuration-factory-provider="org.glassfish.exousia.modules.locked.SimplePolicyConfigurationFactory" />
-        <audit-module classname="com.sun.enterprise.security.ee.Audit" name="default">
+        <audit-module classname="com.sun.enterprise.security.ee.audit.Audit" name="default">
           <property name="auditOn" value="false" />
         </audit-module>
         <message-security-config auth-layer="SOAP">

diff --git a/nucleus/admin/config-api/src/test/resources/DomainTest.xml b/nucleus/admin/config-api/src/test/resources/DomainTest.xml
@@ -80,7 +80,7 @@
           <property name="repository" value="${com.sun.aas.instanceRoot}/generated/policy" />
         </jacc-provider>
         <jacc-provider policy-provider="org.glassfish.exousia.modules.locked.SimplePolicyProvider" name="simple" policy-configuration-factory-provider="org.glassfish.exousia.modules.locked.SimplePolicyConfigurationFactory" />
-        <audit-module name="default" classname="com.sun.enterprise.security.ee.Audit">
+        <audit-module name="default" classname="com.sun.enterprise.security.ee.audit.Audit">
           <property name="auditOn" value="false" />
         </audit-module>
         <message-security-config auth-layer="SOAP">

diff --git a/nucleus/admin/config-api/src/test/resources/parser/c1i1.xml b/nucleus/admin/config-api/src/test/resources/parser/c1i1.xml
@@ -100,7 +100,7 @@
           <property name="repository" value="${com.sun.aas.instanceRoot}/generated/policy" />
         </jacc-provider>
         <jacc-provider policy-provider="org.glassfish.exousia.modules.locked.SimplePolicyProvider" name="simple" policy-configuration-factory-provider="org.glassfish.exousia.modules.locked.SimplePolicyConfigurationFactory" />
-        <audit-module classname="com.sun.enterprise.security.ee.Audit" name="default">
+        <audit-module classname="com.sun.enterprise.security.ee.audit.Audit" name="default">
           <property name="auditOn" value="false" />
         </audit-module>
         <message-security-config auth-layer="SOAP">
@@ -225,7 +225,7 @@
           <property name="repository" value="${com.sun.aas.instanceRoot}/generated/policy" />
         </jacc-provider>
         <jacc-provider policy-provider="org.glassfish.exousia.modules.locked.SimplePolicyProvider" name="simple" policy-configuration-factory-provider="org.glassfish.exousia.modules.locked.SimplePolicyConfigurationFactory" />
-        <audit-module classname="com.sun.enterprise.security.ee.Audit" name="default">
+        <audit-module classname="com.sun.enterprise.security.ee.audit.Audit" name="default">
           <property name="auditOn" value="false" />
         </audit-module>
         <message-security-config auth-layer="SOAP">
@@ -356,7 +356,7 @@
           <property name="repository" value="${com.sun.aas.instanceRoot}/generated/policy" />
         </jacc-provider>
         <jacc-provider policy-provider="org.glassfish.exousia.modules.locked.SimplePolicyProvider" name="simple" policy-configuration-factory-provider="org.glassfish.exousia.modules.locked.SimplePolicyConfigurationFactory" />
-        <audit-module name="default" classname="com.sun.enterprise.security.ee.Audit">
+        <audit-module name="default" classname="com.sun.enterprise.security.ee.audit.Audit">
           <property name="auditOn" value="false" />
         </audit-module>
         <message-security-config auth-layer="SOAP">
@@ -487,7 +487,7 @@
           <property name="repository" value="${com.sun.aas.instanceRoot}/generated/policy" />
         </jacc-provider>
         <jacc-provider policy-provider="org.glassfish.exousia.modules.locked.SimplePolicyProvider" name="simple" policy-configuration-factory-provider="org.glassfish.exousia.modules.locked.SimplePolicyConfigurationFactory" />
-        <audit-module name="default" classname="com.sun.enterprise.security.ee.Audit">
+        <audit-module name="default" classname="com.sun.enterprise.security.ee.audit.Audit">
           <property name="auditOn" value="false" />
         </audit-module>
         <message-security-config auth-layer="SOAP">
@@ -618,7 +618,7 @@
           <property name="repository" value="${com.sun.aas.instanceRoot}/generated/policy" />
         </jacc-provider>
         <jacc-provider policy-provider="org.glassfish.exousia.modules.locked.SimplePolicyProvider" name="simple" policy-configuration-factory-provider="org.glassfish.exousia.modules.locked.SimplePolicyConfigurationFactory" />
-        <audit-module name="default" classname="com.sun.enterprise.security.ee.Audit">
+        <audit-module name="default" classname="com.sun.enterprise.security.ee.audit.Audit">
           <property name="auditOn" value="false" />
         </audit-module>
         <message-security-config auth-layer="SOAP">
@@ -749,7 +749,7 @@
           <property name="repository" value="${com.sun.aas.instanceRoot}/generated/policy" />
         </jacc-provider>
         <jacc-provider policy-provider="org.glassfish.exousia.modules.locked.SimplePolicyProvider" name="simple" policy-configuration-factory-provider="org.glassfish.exousia.modules.locked.SimplePolicyConfigurationFactory" />
-        <audit-module name="default" classname="com.sun.enterprise.security.ee.Audit">
+        <audit-module name="default" classname="com.sun.enterprise.security.ee.audit.Audit">
           <property name="auditOn" value="false" />
         </audit-module>
         <message-security-config auth-layer="SOAP">
@@ -880,7 +880,7 @@
           <property name="repository" value="${com.sun.aas.instanceRoot}/generated/policy" />
         </jacc-provider>
         <jacc-provider policy-provider="org.glassfish.exousia.modules.locked.SimplePolicyProvider" name="simple" policy-configuration-factory-provider="org.glassfish.exousia.modules.locked.SimplePolicyConfigurationFactory" />
-        <audit-module name="default" classname="com.sun.enterprise.security.ee.Audit">
+        <audit-module name="default" classname="com.sun.enterprise.security.ee.audit.Audit">
           <property name="auditOn" value="false" />
         </audit-module>
         <message-security-config auth-layer="SOAP">