Merge pull request #3010 from wso2/5.5.x

Merge 5.5.x to 5.x.x
wso2 · Mar 27, 2018 · 53de694 · 53de694
2 parents e9bf941 + 242a449
commit 53de694
Show file tree

Hide file tree

Showing 403 changed files with 108,369 additions and 1,046 deletions.
diff --git a/LICENSE.txt b/LICENSE.txt
diff --git a/README.md b/README.md
@@ -11,7 +11,7 @@ Welcome to WSO2 Identity Server
 
 |  Branch | Build Status |
 | :------------ |:-------------
-| master      | [![Build Status](https://wso2.org/jenkins/job/products/job/product-is_5.x.x/badge/icon)](https://wso2.org/jenkins/job/products/job/product-is_5.x.x) |
+| master      | [![Build Status](https://wso2.org/jenkins/job/products/job/product-is_5.5.x/badge/icon)](https://wso2.org/jenkins/job/products/job/product-is_5.5.x) |
 
 
 
@@ -40,15 +40,15 @@ System Requirements
 5. To build WSO2 Identity Server from the Source distribution, it is also necessary that you have Maven 3 or later.
 
 For more details see
-   http://docs.wso2.com/display/IS541/Installation+Prerequisites
+   http://docs.wso2.com/display/IS550/Installation+Prerequisites
 
 
 Project Resources
 =================
 
 * Home page          : http://wso2.com/products/identity-server
 * Library            : http://wso2.org/library/identity
-* Wiki               : http://docs.wso2.org/wiki/display/IS541/WSO2+Identity+Server+Documentation
+* Wiki               : http://docs.wso2.org/wiki/display/IS550/WSO2+Identity+Server+Documentation
 * JIRA-Issue Tracker : https://wso2.org/jira/browse/IDENTITY      
 * Forums             : http://stackoverflow.com/questions/tagged/wso2is/
 * WSO2 Developer List: dev@wso2.org
@@ -57,7 +57,7 @@ Project Resources
 Building the distribution from source
 =========================================
 
-1. Install Java 8 or above
+1. Install Java 8
 2. Install Apache Maven 3.x.x(https://maven.apache.org/download.cgi#)
 3. Get a clone from https://github.com/wso2/product-is.git or download the source 
 4. Run the one of the below maven commands from product-is directory, 
@@ -216,4 +216,4 @@ For further details, see the WSO2 Carbon documentation at
 https://docs.wso2.com/display/Carbon4411/WSO2+Carbon+Documentation
 
 ---------------------------------------------------------------------------
-(c) Copyright 2017 WSO2 Inc.
+(c) Copyright 2018 WSO2 Inc.
diff --git a/README.txt b/README.txt
@@ -27,17 +27,17 @@ System Requirements
 5. To build WSO2 Identity Server from the Source distribution, it is also necessary that you have Maven 3 or later.
 
 For more details see
-   http://docs.wso2.org/wiki/display/IS540/Installation+Prerequisites
+   http://docs.wso2.org/wiki/display/IS550/Installation+Prerequisites
 
 
 Project Resources
 =================
 
 * Home page          : http://wso2.com/products/identity-server
 * Library            : http://wso2.org/library/identity
-* Wiki               : http://docs.wso2.org/wiki/display/IS540/WSO2+Identity+Server+Documentation
-* JIRA-Issue Tracker : https://wso2.org/jira/browse/IDENTITY      
-* Forums             : http://stackoverflow.com/questions/tagged/wso2/
+* Wiki               : http://docs.wso2.org/wiki/display/IS550/WSO2+Identity+Server+Documentation
+* Issue Tracker      : https://github.com/wso2/product-is/issues
+* Forums             : http://stackoverflow.com/questions/tagged/wso2is/
 * WSO2 Developer List: dev@wso2.org
 
 
@@ -49,6 +49,7 @@ Installation and Running
 3. Once the server starts, point your Web browser to https://localhost:9443/carbon/
 4. User dashboard is available at https://localhost:9443/dashboard
 5. For more information, see the Installation Guide
+    https://docs.wso2.com/display/IS550/Installation+Guide
 
 
 WSO2 Identity Server Distribution Directory Structure
@@ -171,7 +172,7 @@ By default mode, it would ask you to enter the master password
 > ciphertool -Dchange  (in UNIX)
 
 For more details see
-https://docs.wso2.com/display/Carbon443/WSO2+Carbon+Secure+Vault
+https://docs.wso2.com/display/ADMIN44x/Carbon+Secure+Vault+Implementation
 
 Support
 =======
@@ -219,7 +220,7 @@ For more information about WSO2 Identity Server please see http://wso2.org/proje
 WSO2 Oxygen Tank developer portal for addition resources.
 
 For further details, see the WSO2 Identity Server documentation at
-https://docs.wso2.com/display/IS540/WSO2+Identity+Server+Documentation
+https://docs.wso2.com/display/IS550/WSO2+Identity+Server+Documentation
 
 ---------------------------------------------------------------------------
-(c) Copyright 2017 WSO2 Inc.
+(c) Copyright 2018 WSO2 Inc.
diff --git a/modules/authenticators/pom.xml b/modules/authenticators/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>identity-server-parent</artifactId>
-        <version>5.4.1-update6-SNAPSHOT</version>
+        <version>5.6.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/modules/connectors/pom.xml b/modules/connectors/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>identity-server-parent</artifactId>
-        <version>5.4.1-update6-SNAPSHOT</version>
+        <version>5.6.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>identity-server-parent</artifactId>
-        <version>5.4.1-update6-SNAPSHOT</version>
+        <version>5.6.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -35,6 +35,14 @@
             <groupId>com.h2database.wso2</groupId>
             <artifactId>h2-database-engine</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.wso2.carbon.privacy</groupId>
+            <artifactId>org.wso2.carbon.privacy.forgetme.conf</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.wso2.carbon.privacy</groupId>
+            <artifactId>org.wso2.carbon.privacy.forgetme.tool</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.apache.rampart</groupId>
             <artifactId>rampart</artifactId>
@@ -88,6 +96,14 @@
                                     <overWrite>true</overWrite>
                                     <outputDirectory>target</outputDirectory>
                                 </artifactItem>
+                                <artifactItem>
+                                    <groupId>org.wso2.carbon.privacy</groupId>
+                                    <artifactId>org.wso2.carbon.privacy.forgetme.tool</artifactId>
+                                    <version>${forgetme.tool.version}</version>
+                                    <type>zip</type>
+                                    <overWrite>true</overWrite>
+                                    <outputDirectory>target/forget-me</outputDirectory>
+                                </artifactItem>
                             </artifactItems>
                         </configuration>
                     </execution>
@@ -165,6 +181,10 @@
 
                                 <replace file="target/wso2carbon-core-${carbon.kernel.version}/repository/conf/log4j.properties" token="log4j.appender.CARBON_MEMORY.layout.ConversionPattern=[%d] %5p {%c} - %x %m %n" value="log4j.appender.CARBON_MEMORY.layout.ConversionPattern=TID: [%T] [%S] [%d] %P%5p {%c} - %x %m {%c}%n${line.separator}log4j.appender.CARBON_MEMORY.layout.TenantPattern=%U%@%D [%T] [%S]${line.separator}log4j.appender.CARBON_MEMORY.columnList=%T,%S,%A,%d,%c,%p,%m,%H,%I,%Stacktrace" />
 
+                                <replace file="target/wso2carbon-core-${carbon.kernel.version}/repository/conf/log4j.properties" token="log4j.logger.AUDIT_LOG=INFO, AUDIT_LOGFILE" value="log4j.logger.AUDIT_LOG=INFO, AUDIT_LOGFILE${line.separator}log4j.logger.DELETE_EVENT_LOGGER=INFO, DELETE_EVENT_LOGFILE" />
+
+                                <replace file="target/wso2carbon-core-${carbon.kernel.version}/repository/conf/log4j.properties" token="log4j.additivity.AUDIT_LOG=false" value="log4j.additivity.AUDIT_LOG=false${line.separator}${line.separator}log4j.appender.DELETE_EVENT_LOGFILE=org.apache.log4j.FileAppender${line.separator}log4j.appender.DELETE_EVENT_LOGFILE.File=${carbon.home}/repository/logs/delete-event.log${line.separator}log4j.appender.DELETE_EVENT_LOGFILE.Append=true${line.separator}log4j.appender.DELETE_EVENT_LOGFILE.layout=org.apache.log4j.PatternLayout${line.separator}log4j.appender.DELETE_EVENT_LOGFILE.layout.ConversionPattern=%m %n${line.separator}log4j.appender.DELETE_EVENT_LOGFILE.threshold=INFO${line.separator}log4j.additivity.DELETE_EVENT_LOGFILE=false" />
+
                                 <!-- Update carbon webapps web.xml file for HttpHeaderSecurityFilter to skip /oidc/* path from antiClickJacking  -->
                                 <replaceregexp file="target/wso2carbon-core-${carbon.kernel.version}/repository/conf/tomcat/carbon/WEB-INF/web.xml" match="(?s)&lt;filter&gt;\s+&lt;filter-name&gt;HttpHeaderSecurityFilter&lt;/filter-name&gt;.*&lt;/filter&gt;" replace="${security-header-filter-is-token}" />
 
@@ -213,6 +233,9 @@
                                 <replace file="../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/security/cipher-text.properties" token="Server.Service.Connector.keystorePass=[wso2carbon]" value="Server.Service.Connector.keystorePass=[wso2carbon]${line.separator}ThirftBasedEntitlementConfig.KeyStore.Password=[wso2carbon]" />
                                 <replace file="../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/security/cipher-tool.properties" token="Server.Service.Connector.keystorePass=repository/conf/tomcat/catalina-server.xml//Server/Service/Connector[@keystorePass],true" value="Server.Service.Connector.keystorePass=repository/conf/tomcat/catalina-server.xml//Server/Service/Connector[@keystorePass],true${line.separator}ThirftBasedEntitlementConfig.KeyStore.Password=repository/conf/identity/identity.xml//Server/EntitlementSettings/ThirftBasedEntitlementConfig/KeyStore/Password,true" />
 
+                                <!-- Update the README.txt inside the bin folder about forgetme execution scripts. -->
+                                <replace file="target/wso2carbon-core-${carbon.kernel.version}/bin/README.txt" token="10. carbondump.sh &amp; carbondump.bat - Carbondump is a tool for collecting all the necessary data from a running Carbon instance at the time of an error. The carbondump generates a zip archive with the collected data, which can be used to analyze your system and determine the problem which caused the error." value="10. carbondump.sh &amp; carbondump.bat - Carbondump is a tool for collecting all the necessary data from a running Carbon instance at the time of an error. The carbondump generates a zip archive with the collected data, which can be used to analyze your system and determine the problem which caused the error.${line.separator}${line.separator}11. forgetme.sh &amp; forgetme.bat - Forgetme is a tool to anonymize deleted user information from metadata tables and log files. This tool will replace the given user name with a given or random pseudonym.${line.separator}" />
+
                                 <unzip dest="${tempdir}/shindig">
                                     <fileset dir="../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps">
                                         <include name="shindig.war" />
@@ -249,6 +272,11 @@
                                     </fileset>
                                 </copy>
 
+                                <copy todir="target/wso2carbon-core-${carbon.kernel.version}/dbscripts/consent" overwrite="false">
+                                    <fileset dir="${basedir}/../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/consent/">
+                                    </fileset>
+                                </copy>
+
                                 <path id="h2.classpath">
                                     <path refid="maven.compile.classpath" />
                                 </path>
@@ -260,6 +288,14 @@
                                     <fileset file="target/wso2carbon-core-${carbon.kernel.version}/dbscripts/identity/h2.sql" />
                                 </sql>
                                 <echo message="##################### END ########################" />
+                                <echo message="########### Create Consent Management Database ##############" />
+                                <sql driver="org.h2.Driver" url="jdbc:h2:${basedir}/target/wso2carbon-core-${carbon.kernel.version}/repository/database/WSO2CARBON_DB" userid="wso2carbon" password="wso2carbon" autocommit="true" onerror="continue">
+                                    <classpath>
+                                        <path refid="h2.classpath" />
+                                    </classpath>
+                                    <fileset file="target/wso2carbon-core-${carbon.kernel.version}/dbscripts/consent/h2.sql" />
+                                </sql>
+                                <echo message="##################### END ########################" />
 
                                 <delete file="target/wso2is-${project.version}.zip" />
                                 <delete dir="${tempdir}" />
@@ -336,6 +372,7 @@
                                 <delete dir="target/sources" />
                                 <delete dir="target/site" />
                                 <delete dir="src/site" />
+                                <delete dir="target/forget-me" />
                             </tasks>
                         </configuration>
                     </execution>

diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml
@@ -40,11 +40,18 @@
                 <exclude>**/LICENSE.txt</exclude>
                 <exclude>**/release-notes.html</exclude>
                 <exclude>**/claim-config.xml</exclude>
-		<exclude>**/tomcat/catalina-server.xml</exclude>
+                <exclude>**/tomcat/catalina-server.xml</exclude>
                 <exclude>**/registry.xml</exclude>
                 <exclude>**/email/email-admin-config.xml</exclude>
                 <exclude>**/dbscripts/**</exclude>
                 <exclude>**/security/authenticators.xml</exclude>
+                <exclude>**/java2wsdl.sh</exclude>
+                <exclude>**/java2wsdl.bat</exclude>
+                <exclude>**/wsdl2java.bat</exclude>
+                <exclude>**/wsdl2java.sh</exclude>
+                <exclude>**/tcpmon-1.0.jar</exclude>
+                <exclude>**/tcpmon.sh</exclude>
+                <exclude>**/tcpmon.bat</exclude>
             </excludes>
         </fileSet>
 
@@ -53,6 +60,9 @@
             <outputDirectory>wso2is-${pom.version}</outputDirectory>
             <excludes>
                 <exclude>**/wso2server.bat</exclude>
+                <exclude>**/wsdl2java.sh</exclude>
+                <exclude>**/java2wsdl.sh</exclude>
+                <exclude>**/tcpmon.sh</exclude>
             </excludes>
             <includes>
                 <include>**/*.sh</include>
@@ -240,6 +250,17 @@
             </includes>
         </fileSet>
 
+        <!--copy jaxrs web app for consent management 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>api#identity#consent-mgt#v1.0.war</include>
+            </includes>
+        </fileSet>
+
         <!--copy the oauth2 grant type extensions -->
         <fileSet>
             <directory>../oauth2-grant-types/target/oauth2GrantCopied/jar</directory>
@@ -313,7 +334,7 @@
             </directory>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/webapps</outputDirectory>
             <includes>
-                <include>api#identity#user#v0.9.war</include>
+                <include>api#identity#user#v1.0.war</include>
             </includes>
         </fileSet>
 
@@ -427,6 +448,45 @@
                 <include>**/**.json</include>
             </includes>
         </fileSet>
+        <fileSet>
+            <directory>
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/consent/
+            </directory>
+            <outputDirectory>wso2is-${pom.version}/dbscripts/consent</outputDirectory>
+            <includes>
+                <include>**/*.sql</include>
+            </includes>
+            <fileMode>644</fileMode>
+            <directoryMode>775</directoryMode>
+        </fileSet>
+
+        <fileSet>
+            <directory>target/forget-me/identity-anonymization-tool-${forgetme.tool.version}</directory>
+            <outputDirectory>wso2is-${pom.version}/repository/components/tools/forget-me</outputDirectory>
+            <excludes>
+                <exclude>**/forgetme.sh</exclude>
+                <exclude>**/forgetme.bat</exclude>
+                <exclude>**/config.json</exclude>
+                <exclude>conf/sql/**</exclude>
+                <exclude>conf/datasources/**</exclude>
+                <exclude>conf/product-config/**</exclude>
+                <exclude>conf/streams/**</exclude>
+            </excludes>
+            <fileMode>644</fileMode>
+        </fileSet>
+        <fileSet>
+            <directory>target/forget-me/identity-anonymization-tool-${forgetme.tool.version}/conf/sql/identity/</directory>
+            <outputDirectory>wso2is-${pom.version}/repository/components/tools/forget-me/conf/sql/identity</outputDirectory>
+            <fileMode>644</fileMode>
+        </fileSet>
+
+        <!--Copy scope validator to dropins dropins.-->
+        <fileSet>
+            <directory>
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/resources/components/dropins/</directory>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/components/dropins</outputDirectory>
+            <fileMode>644</fileMode>
+        </fileSet>
     </fileSets>
 
     <files>
@@ -863,5 +923,44 @@
             <outputDirectory>wso2is-${pom.version}/repository/deployment/server/webapps/mex/</outputDirectory>
             <fileMode>644</fileMode>
         </file>
+        <file>
+            <source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/consent-mgt-config.xml</source>
+            <outputDirectory>wso2is-${pom.version}/repository/conf/</outputDirectory>
+            <fileMode>644</fileMode>
+        </file>
+        <file>
+            <source>src/bin/forgetme/forgetme.sh</source>
+            <outputDirectory>wso2is-${pom.version}/bin/</outputDirectory>
+            <fileMode>744</fileMode>
+        </file>
+        <file>
+            <source>src/bin/forgetme/forgetme.bat</source>
+            <outputDirectory>wso2is-${pom.version}/bin/</outputDirectory>
+            <fileMode>744</fileMode>
+        </file>
+        <file>
+            <source>target/forget-me/identity-anonymization-tool-${forgetme.tool.version}/bin/forgetme.sh</source>
+            <outputDirectory>wso2is-${pom.version}/repository/components/tools/forget-me/bin/</outputDirectory>
+            <fileMode>744</fileMode>
+        </file>
+        <file>
+            <source>target/forget-me/identity-anonymization-tool-${forgetme.tool.version}/bin/forgetme.bat</source>
+            <outputDirectory>wso2is-${pom.version}/repository/components/tools/forget-me/bin/</outputDirectory>
+            <fileMode>744</fileMode>
+        </file>
+        <file>
+            <source>target/forget-me/identity-anonymization-tool-${forgetme.tool.version}/conf/product-config/config-identity.json</source>
+            <outputDirectory>wso2is-${pom.version}/repository/components/tools/forget-me/conf/</outputDirectory>
+            <destName>config.json</destName>
+            <fileMode>644</fileMode>
+        </file>
+        <file>
+            <source>
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/resources/identity/policies/xacml/default/scope_based_token_validation_policy_template.xml
+            </source>
+            <outputDirectory>wso2is-${pom.version}/repository/resources/identity/policies/xacml/default
+            </outputDirectory>
+            <fileMode>644</fileMode>
+        </file>
     </files>
 </assembly>