Skip to content

Commit

Permalink
Merge pull request #19953 from DilshanSenarath/issue-19760
Browse files Browse the repository at this point in the history
[Re] Pack x509 certificate authentication portal web.xml.j2 file into the product
  • Loading branch information
Thisara-Welmilla authored Mar 7, 2024
2 parents 1f4a77e + 797cfd9 commit a5e5ca6
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 0 deletions.
8 changes: 8 additions & 0 deletions modules/distribution/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -483,6 +483,14 @@
</unzip>
<delete file="../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps/accountrecoveryendpoint.war" />

<!-- Explode the x509certificateauthenticationendpoint.war -->
<unzip dest="../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps/x509certificateauthenticationendpoint">
<fileset dir="../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps">
<include name="x509certificateauthenticationendpoint.war" />
</fileset>
</unzip>
<delete file="../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps/x509certificateauthenticationendpoint.war" />

<!-- Explode the myaccount.war -->
<unzip dest="../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps/myaccount">
<fileset dir="../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps">
Expand Down
12 changes: 12 additions & 0 deletions modules/p2-profile-gen/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -464,6 +464,11 @@
org.wso2.identity.apps:org.wso2.identity.apps.recovery.portal.server.feature:${identity.apps.core.version}
</featureArtifactDef>

<!-- X509 certificate authentication portal feature -->
<featureArtifactDef>
org.wso2.identity.apps:org.wso2.identity.apps.x509certificate.portal.server.feature:${identity.apps.core.version}
</featureArtifactDef>

<!-- FIDO2/WebAuthn feature -->
<featureArtifactDef>
org.wso2.carbon.identity.local.auth.fido:org.wso2.carbon.identity.application.authenticator.fido2.server.feature:${identity.local.auth.fido.version}
Expand Down Expand Up @@ -899,6 +904,13 @@
<version>${identity.apps.core.version}</version>
</feature>

<feature>
<id>
org.wso2.identity.apps.x509certificate.portal.server.feature.group
</id>
<version>${identity.apps.core.version}</version>
</feature>

<feature>
<id>
org.wso2.carbon.identity.application.authz.xacml.server.feature.group
Expand Down
5 changes: 5 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1822,6 +1822,11 @@
<artifactId>org.wso2.identity.apps.recovery.portal.server.feature</artifactId>
<version>${identity.apps.core.version}</version>
</dependency>
<dependency>
<groupId>org.wso2.identity.apps</groupId>
<artifactId>org.wso2.identity.apps.x509certificate.portal.server.feature</artifactId>
<version>${identity.apps.core.version}</version>
</dependency>

<dependency>
<groupId>org.wso2.carbon.identity.application.authz.xacml</groupId>
Expand Down

0 comments on commit a5e5ca6

Please sign in to comment.