Skip to content

Commit

Permalink
Merge pull request #741 from kasungayan/IDENTITY-4785
Browse files Browse the repository at this point in the history
Fixing IDENTITY-4785 : Enhance WS-Trust Support for Microsoft CRM Dynamics
  • Loading branch information
kasungayan authored Oct 7, 2016
2 parents eef5b4d + 3f8039f commit 8d4ce65
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 1 deletion.
17 changes: 17 additions & 0 deletions modules/distribution/src/assembly/bin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,18 @@
</includes>
</fileSet>


<!--copy jaxrs web app for Mex feature-->
<fileSet>
<directory>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps
</directory>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/webapps</outputDirectory>
<includes>
<include>mexut.war</include>
</includes>
</fileSet>

<!--copy web app for application authentication feature -->
<fileSet>
<directory>
Expand Down Expand Up @@ -775,5 +787,10 @@
<outputDirectory>wso2is-${pom.version}/repository/conf/identity</outputDirectory>
<fileMode>644</fileMode>
</file>
<file>
<source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps/mex/metadata.xml</source>
<outputDirectory>wso2is-${pom.version}/repository/deployment/server/webapps/mex/</outputDirectory>
<fileMode>644</fileMode>
</file>
</files>
</assembly>
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1212,7 +1212,7 @@
<identity.inbound.auth.oauth.version>5.2.1</identity.inbound.auth.oauth.version>
<identity.inbound.auth.openid.version>5.2.0</identity.inbound.auth.openid.version>
<identity.agent.sso.version>5.1.3</identity.agent.sso.version>
<identity.inbound.auth.sts.version>5.1.3</identity.inbound.auth.sts.version>
<identity.inbound.auth.sts.version>5.1.4</identity.inbound.auth.sts.version>
<identity.local.auth.fido.version>5.1.3</identity.local.auth.fido.version>
<identity.outbound.auth.requestpath.basicauth.version>5.1.3</identity.outbound.auth.requestpath.basicauth.version>
<identity.carbon.auth.mutual.ssl.version>5.1.2</identity.carbon.auth.mutual.ssl.version>
Expand Down

0 comments on commit 8d4ce65

Please sign in to comment.