Skip to content

Commit

Permalink
Merge pull request #73 from hpmtissera/master
Browse files Browse the repository at this point in the history 
Merge release-5.1.0 branch
  • Loading branch information
@hpmtissera
hpmtissera committed Apr 30, 2015
2 parents acb1b18 + 54212e5 commit f4ded47
Show file tree
Hide file tree
Showing 97 changed files with 8,744 additions and 7,874 deletions.
1,084 changes: 0 additions & 1,084 deletions modules/distribution/conf/claim-config.xml
View file

This file was deleted.

105 changes: 0 additions & 105 deletions modules/distribution/conf/registry.xml
View file

This file was deleted.

274 changes: 0 additions & 274 deletions modules/distribution/conf/saml1-assertion-config.xml
View file

This file was deleted.

31 changes: 0 additions & 31 deletions modules/distribution/conf/sso-idp-config.xml
View file

This file was deleted.

Binary file removed modules/distribution/conf/userRP.jks
View file
Binary file not shown.
Binary file removed modules/distribution/conf/wso2is-user-certs.jks
View file
Binary file not shown.
117 changes: 63 additions & 54 deletions modules/distribution/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">

<parent>
<groupId>org.wso2.is</groupId>
<artifactId>identity-server-parent</artifactId>
<version>5.1.0-SNAPSHOT</version>
<groupId>org.wso2.is</groupId>
<artifactId>identity-server-parent</artifactId>
<version>5.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand All @@ -33,19 +33,19 @@
<description>Identity Server: Distribution</description>

<dependencies>
<dependency>
<dependency>
<groupId>com.h2database.wso2</groupId>
<artifactId>h2-database-engine</artifactId>
</dependency>
<dependency>
<groupId>org.apache.rampart</groupId>
<artifactId>rampart</artifactId>
<type>mar</type>
<exclusions>
<exclusion>
<groupId>org.apache.neethi</groupId>
<artifactId>neethi</artifactId>
</exclusion>
<exclusions>
<exclusion>
<groupId>org.apache.neethi</groupId>
<artifactId>neethi</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.woden</groupId>
<artifactId>woden-api</artifactId>
Expand All @@ -54,7 +54,7 @@
<groupId>org.apache.woden</groupId>
<artifactId>woden-impl-dom</artifactId>
</exclusion>
</exclusions>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.shindig</groupId>
Expand Down Expand Up @@ -123,7 +123,8 @@
<configuration>
<tasks>
<property name="tempdir" value="target/docs-temp"/>
<property name="hideMenu" value="&lt;/Security&gt;${line.separator}&lt;HideMenuItemIds&gt;${line.separator}&lt;HideMenuItemId&gt;generic_sts_menu&lt;/HideMenuItemId&gt;${line.separator}&lt;HideMenuItemId&gt;manage_saml_sso&lt;/HideMenuItemId&gt;${line.separator}&lt;HideMenuItemId&gt;oauth_menu&lt;/HideMenuItemId&gt;${line.separator}&lt;HideMenuItemId&gt;scim_menu&lt;/HideMenuItemId&gt;${line.separator}&lt;/HideMenuItemIds&gt;"/>
<property name="registryPolicyHandler"
value="&lt;handler class=&quot;org.wso2.carbon.identity.entitlement.policy.finder.registry.RegistryPolicyHandler&quot;&gt;${line.separator} &lt;filter class=&quot;org.wso2.carbon.identity.entitlement.policy.finder.registry.RegistryPolicyMediaTypeMatcher&quot;&gt;${line.separator} &lt;property name=&quot;mediaType&quot;&gt;application/xacml-policy+xml&lt;/property&gt;${line.separator} &lt;/filter&gt;${line.separator} &lt;/handler&gt;${line.separator}${line.separator} &lt;!--&lt;handler class=&quot;org.wso2.carbon.registry.extensions.handlers.SynapseRepositoryHandler&quot;&gt;"/>

<mkdir dir="${tempdir}"/>
<unzip dest="${tempdir}">
Expand Down Expand Up @@ -169,12 +170,7 @@
token="&lt;/TokenStoreClassName--&gt;"
value="&lt;/TokenStoreClassName&gt;"/>

<replace
file="target/wso2carbon-core-${carbon.kernel.version}/repository/conf/carbon.xml"
token="&lt;/Security&gt;"
value="${hideMenu}"/>

<!-- Comment all active UserStoreManagers -->
<!-- Comment all active UserStoreManagers -->
<replace
file="target/wso2carbon-core-${carbon.kernel.version}/repository/conf/user-mgt.xml"
token="&lt;UserStoreManager"
Expand All @@ -189,18 +185,18 @@
file="target/wso2carbon-core-${carbon.kernel.version}/repository/conf/user-mgt.xml"
token="&lt;!--ISUserStoreManager"
value="&lt;UserStoreManager"/>

<replace
file="target/wso2carbon-core-${carbon.kernel.version}/repository/conf/user-mgt.xml"
token="&lt;/ISUserStoreManager--&gt;"
value="&lt;/UserStoreManager&gt;"/>

<replace
<replace
file="../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/security/sso-idp-config.xml"
token="&lt;!--ServiceProvider&gt;"
value="&lt;ServiceProvider&gt;"/>

<replace
<replace
file="../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/security/sso-idp-config.xml"
token="&lt;Issuer&gt;&lt;/Issuer&gt;"
value="&lt;Issuer&gt;wso2.my.dashboard&lt;/Issuer&gt;"/>
Expand All @@ -210,40 +206,53 @@
token="&lt;AssertionConsumerService&gt;&lt;/AssertionConsumerService&gt;"
value="&lt;AssertionConsumerService&gt;https://localhost:9443/dashboard/acs&lt;/AssertionConsumerService&gt;"/>

<replace
<replace
file="../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/security/sso-idp-config.xml"
token="&lt;SignAssertion&gt;false&lt;/SignAssertion&gt;"
value="&lt;SignAssertion&gt;true&lt;/SignAssertion&gt;"/>

<replace
<replace
file="../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/security/sso-idp-config.xml"
token="&lt;SignResponse&gt;false&lt;/SignResponse&gt;"
value="&lt;SignResponse&gt;true&lt;/SignResponse&gt;"/>

<replace
<replace
file="../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/security/sso-idp-config.xml"
token="&lt;EnableAudienceRestriction&gt;false&lt;/EnableAudienceRestriction&gt;"
value="&lt;EnableAudienceRestriction&gt;true&lt;/EnableAudienceRestriction&gt;"/>

<replace
<replace
file="../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/security/sso-idp-config.xml"
token="&lt;Audience&gt;&lt;/Audience&gt;"
value="&lt;Audience&gt;carbonServer&lt;/Audience&gt;"/>

<replace
<replace
file="../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/security/sso-idp-config.xml"
token="&lt;/ServiceProvider--&gt;"
value="&lt;/ServiceProvider&gt;"/>


<!-- Enable KDC for IS -->
<!-- Add org.wso2.carbon.identity.entitlement.policy.finder.registry.RegistryPolicyHandler to IS -->

<replace
file="../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/registry.xml"
token="&lt;!--&lt;handler class=&quot;org.wso2.carbon.registry.extensions.handlers.SynapseRepositoryHandler&quot;&gt;"
value="${registryPolicyHandler}"/>

<!-- set versionResourcesOnChange to true -->
<replace
file="../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/registry.xml"
token="&lt;versionResourcesOnChange&gt;false&lt;/versionResourcesOnChange&gt;"
value="&lt;versionResourcesOnChange&gt;true&lt;/versionResourcesOnChange&gt;"/>

<!-- Enable KDC for IS -->

<copy
todir="target/wso2carbon-core-${carbon.kernel.version}/repository/components/"
overwrite="false">
<fileset
dir="${tempdir}/wso2is-${project.version}/repository/components/">
</fileset>
</fileset>
</copy>
<copy
todir="target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/client/modules"
Expand All @@ -259,15 +268,15 @@
<concat destfile="target/wso2carbon-core-${carbon.kernel.version}/repository/log4j.properties">
log4j.logger.net.sf.ehcache=ERROR
</concat>
<copy
todir="target/wso2carbon-core-${carbon.kernel.version}/dbscripts/identity"
overwrite="false">
<fileset
dir="${basedir}/../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/identity/">
</fileset>
</copy>

<path id="h2.classpath">
<copy
todir="target/wso2carbon-core-${carbon.kernel.version}/dbscripts/identity"
overwrite="false">
<fileset
dir="${basedir}/../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/identity/">
</fileset>
</copy>

<path id="h2.classpath">
<path refid="maven.compile.classpath"/>
</path>
<echo
Expand Down Expand Up @@ -314,7 +323,7 @@
<exclude name="**/WEB-INF/**"/>
<include name="**/*.html"/>
<exclude name="**/editarea/**"/>
<exclude name="**/codepress/**"/>
<exclude name="**/codepress/**"/>
</fileset>
<mapper type="glob" from="*.html" to="*.xml"/>
</move>
Expand Down Expand Up @@ -344,7 +353,7 @@
<exclude name="**/user-mgt-actdir.xml"/>
<exclude name="**/user-mgt-jdbc.xml"/>
<exclude name="**/user-mgt-ldap.xml"/>
<exclude name="**/user-mgt-ldap-read-write.xml"/>
<exclude name="**/user-mgt-ldap-read-write.xml"/>
</fileset>
<filterset>
<filter token="buildNumber" value="${buildNumber}"/>
Expand Down Expand Up @@ -385,22 +394,22 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>3.0</version>
<configuration>
<reportPlugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>2.4</version>
<reportSets>
<reportSet>
<reports>
<report>index</report>
</reports>
</reportSet>
</reportSets>
</plugin>
</reportPlugins>
</configuration>
<configuration>
<reportPlugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>2.4</version>
<reportSets>
<reportSet>
<reports>
<report>index</report>
</reports>
</reportSet>
</reportSets>
</plugin>
</reportPlugins>
</configuration>
<executions>
<execution>
<phase>package</phase>
Expand Down
Loading

0 comments on commit f4ded47

Please sign in to comment.