Update igw-dev branch with latest IGW release

README.md

@@ -1,5 +1,5 @@
 
-# APIGATE Accelerator Platform 
+# AXP Accelerator Platform 
 
 
 ---
@@ -10,7 +10,7 @@
 
 ---
 
-APIGATE Accelerator Platform (Apigate AXP) is an API management and monetization 
+AXP Accelerator Platform (AXP) is an API management and monetization 
 platform which supports all aspects of an API business, including creating, publishing, 
 consuming, discovery and monetization of APIs.
 
@@ -19,7 +19,11 @@ Key Features
 
 Internal Gateway Features
 -------------------------
-1. 
+1. Custom TOKEN API Implementation
+2. Custom Authentication Handler Implementation
+3. Custom JWT token implementation
+4. Admin Portal
+5. Traffic Manager
 
 System Requirements
 ==================================
@@ -31,7 +35,7 @@ System Requirements
    with MS IE 7. In addition to JavaScript, ActiveX should also be enabled
    with IE. This can be achieved by setting your security level to
    medium or lower.
-5. To build APIGATE AXP from the Source distribution, it is necessary that you have
+5. To build AXP from the Source distribution, it is necessary that you have
    JDK 1.8 version and Maven 3.3.9
 
 Installation & Running
@@ -48,7 +52,7 @@ Documentation
 ==============
 
 On-line product documentation is available at:
-       https://docs.apigate.com/display/MI/INT-GW-4.0.1
+       https://docs.apigate.com/display/MI/INT-GW-4.1.0
 
 Support
 ==================================
@@ -58,12 +62,12 @@ supported from evaluation to production. Our unique approach ensures that all su
 leverages our open development methodology and is provided by the very same engineers 
 who build the technology.
 
-For additional support information please refer to [Apigate Support](https://support.wso2telco.com)
+For additional support information please refer to [AXP Support](https://aifel.atlassian.net)
 
-Known issues of APIGATE AXP INTERNAL GATEWAY
+Known issues of AXP INTERNAL GATEWAY
 =====================================
 
-All the open issues pertaining to APIGATE AXP INTERNAL GATEWAY 4.0.1 :
+All the open issues pertaining to AXP INTERNAL GATEWAY 4.1.0 :
 
     https://jira.wso2telco.com/jira/browse/**
 
@@ -73,7 +77,7 @@ Issue Tracker
 Help us make our software better. Please submit any bug reports or feature
 requests through the WSO2Telco JIRA system:
 
-    https://jira.wso2telco.com/jira/projects/INTGW/issues
+    https://aifel.atlassian.net/projects/INTGW/issues
 
 ### Big Thanks
 
@@ -83,4 +87,4 @@ Cross-browser Testing Platform and Open Source ❤ Provided by
 
 
 --------------------------------------------------------------------------------
-(c) Copyright 2019 Apigate.
+(c) Copyright 2020 AXP.

modules/distribution/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>com.wso2telco.product.dep</groupId>
         <artifactId>dep-product-parent</artifactId>
-        <version>4.0.1</version>
+        <version>4.1.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

modules/distribution/product/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>com.wso2telco.product.dep</groupId>
         <artifactId>am-distribution-parent</artifactId>
-        <version>4.0.1</version>
+        <version>4.1.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -186,7 +186,7 @@
                         <configuration>
                             <tasks>
                                 <!-- download file -->
-                                <get src="https://sftp-release-binaries.s3.amazonaws.com/sftp/apim25/wso2am-2.5.0%2B1561479996720.full.zip" dest="${project.build.directory}/wso2am-2.5.0.zip" verbose="false" usetimestamp="true" />
+                                <get src="https://sftp-release-binaries.s3.amazonaws.com/sftp/apim25/wso2am-2.5.0%2B1588256020350-IGW.zip" dest="${project.build.directory}/wso2am-2.5.0.zip" verbose="false" usetimestamp="true" />
                                 <property name="tempdir" value="target/intgw" />
                                 <mkdir dir="${tempdir}" />
                                 <unzip dest="${tempdir}">

modules/distribution/product/src/main/assembly/bin.xml

@@ -437,6 +437,14 @@
             <fileMode>644</fileMode>
         </file>
 
+        <file>
+            <source>
+                ../../p2-profile/product/target/features/hub-core/config/super-token-conf.properties
+            </source>
+            <outputDirectory>wso2telcohub-${pom.version}/repository/conf</outputDirectory>
+            <fileMode>644</fileMode>
+        </file>
+
         <!-- default custom sequences -->
 
         <file>
@@ -471,7 +479,21 @@
             <fileMode>644</fileMode>
         </file>
 
+	<file>
+            <source>
+                ../../p2-profile/product/target/features/hub-core/config/ip-validation.properties
+            </source>
+            <outputDirectory>wso2telcohub-${pom.version}/repository/conf</outputDirectory>
+            <fileMode>644</fileMode>
+        </file>
 
+	<file>
+            <source>
+                ../../p2-profile/product/target/features/hub-core/config/noauth-validation.properties
+            </source>
+            <outputDirectory>wso2telcohub-${pom.version}/repository/conf</outputDirectory>
+            <fileMode>644</fileMode>
+        </file>
 
         <!--todo  extract the features and move to relevant locations  -->
         <!--

modules/distribution/product/src/main/conf/log4j.properties

@@ -50,6 +50,7 @@ log4j.logger.de.hunsicker.jalopy.io=FATAL
 log4j.logger.com.wso2telco.dep=INFO
 log4j.logger.com.wso2telco.hub=INFO
 log4j.logger.com.wso2telco.dep.apimlogging=INFO
+log4j.logger.com.wso2telco.workflow=INFO
 
 # uncomment the following logs to see HTTP headers and messages
 #log4j.logger.org.apache.synapse.transport.http.headers=DEBUG

modules/distribution/product/src/main/conf/synapse-configs/default/api/_CustomTokenType1_.xml

@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<api xmlns="http://ws.apache.org/ns/synapse"
+     name="_CustomTokenType1_"
+     context="/oauth">
+   <resource methods="POST" url-mapping="/*" faultSequence="_token_fault_">
+      <inSequence>
+         <property name="client_id"
+                   expression="json-eval($.client_id)"
+                   scope="default"
+                   type="STRING"
+                   description="Get API Key"/>
+         <property name="client_id"
+                   expression="fn:normalize-space($ctx:client_id)"
+                   scope="default"
+                   type="STRING"
+                   pattern="((^(?!null).*$)|(^(null).+$))"
+                   group="1"/>
+         <property name="client_secret"
+                   expression="json-eval($.client_secret)"
+                   scope="default"
+                   type="STRING"
+                   description="Get API Secret"/>
+         <property name="granttype"
+                   expression="json-eval($.grant_type)"
+                   scope="default"
+                   type="STRING"
+                   description="Grant Type"/>
+         <property name="client_secret"
+                   expression="fn:normalize-space($ctx:client_secret)"
+                   scope="default"
+                   type="STRING"
+                   pattern="((^(?!null).*$)|(^(null).+$))"
+                   group="1"/>
+         <property name="bearerTokenValue"
+                   expression="fn:concat(get-property('client_id'), ':', get-property('client_secret'))"
+                   scope="default"
+                   type="STRING"
+                   description="Concat client id and secret"/>
+         <property name="encodedBearerTokenValue"
+                   expression="base64Encode(get-property('bearerTokenValue'))"
+                   scope="default"
+                   type="STRING"
+                   description="Encode token value"/>
+         <property name="headerValue"
+                   expression="fn:concat('Basic ', get-property('encodedBearerTokenValue'))"
+                   scope="default"
+                   type="STRING"
+                   description="Calculate Header Value"/>
+         <header name="Authorization"
+                 scope="transport"
+                 expression="get-property('headerValue')"/>
+         <property name="uri.var.grant_type"
+                   expression="$url:grant_type"
+                   scope="default"
+                   type="STRING"/>
+         <filter source="boolean(get-property('uri.var.grant_type'))" regex="false">
+            <then>
+               <payloadFactory description="Payload" media-type="json">
+                        <format>
+                            {
+                                "grant_type" : "$1"
+                            }
+                </format>
+            <args>
+                            <arg evaluator="xml" expression="$ctx:granttype"/>
+                        </args>
+                    </payloadFactory>
+            </then>
+            <else/>
+         </filter>
+         <property name="messageType"
+                   value="application/x-www-form-urlencoded"
+                   scope="axis2"
+                   type="STRING"/>
+         <property name="uri.var.portnum"
+                   expression="get-property('keyManager.port')"
+                   scope="default"
+                   type="STRING"/>
+         <property name="uri.var.hostname"
+                   expression="get-property('keyManager.hostname')"
+                   scope="default"
+                   type="STRING"/>
+         <send>
+            <endpoint>
+               <http uri-template="https://{uri.var.hostname}:{uri.var.portnum}/oauth2/token">
+                  <timeout>
+                     <duration>60000</duration>
+                     <responseAction>fault</responseAction>
+                  </timeout>
+               </http>
+            </endpoint>
+         </send>
+      </inSequence>
+      <outSequence>
+
+         <send/>
+      </outSequence>
+   </resource>
+   <handlers>
+      <handler class="org.wso2.carbon.apimgt.gateway.handlers.ext.APIManagerCacheExtensionHandler"/>
+      <handler class="org.wso2.carbon.apimgt.gateway.handlers.common.SynapsePropertiesHandler"/>
+   </handlers>
+</api>

modules/distribution/resources/customsequences/out/response_filter.xml

@@ -0,0 +1,4 @@
+<sequence xmlns="http://ws.apache.org/ns/synapse" name="response_filter">
+	<property name="jsonPayload" expression="json-eval($.)"/>
+    <class name="com.wso2telco.dep.responsefilter.ResponseFilterMediator"/>
+</sequence>

modules/p2-profile/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>com.wso2telco.product.dep</groupId>
         <artifactId>dep-product-parent</artifactId>
-        <version>4.0.1</version>
+        <version>4.1.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

modules/p2-profile/product/pom.xml

@@ -61,7 +61,7 @@
     <parent>
         <groupId>com.wso2telco.product.dep</groupId>
         <artifactId>am-p2-profile-gen-parent</artifactId>
-        <version>4.0.1</version>
+        <version>4.1.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -180,6 +180,15 @@
                                 <featureArtifactDef>
                                     com.wso2telco.dep:com.wso2telco.dep.server.startup.observer.feature:${com.wso2telco.dep.version}
                                 </featureArtifactDef>
+				<featureArtifactDef>
+                                    com.wso2telco.dep:com.wso2telco.dep.ipvalidate.handler.feature:${com.wso2telco.dep.version}
+                                </featureArtifactDef>
+				<featureArtifactDef>
+                                    com.wso2telco.dep:com.wso2telco.dep.noauth.handler.feature:${com.wso2telco.dep.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    com.wso2telco.dep:com.wso2telco.dep.responsefilter.feature:${com.wso2telco.dep.version}
+                                </featureArtifactDef>
 
                             </featureArtifacts>
                         </configuration>

pom.xml

@@ -29,7 +29,7 @@
     <groupId>com.wso2telco.product.dep</groupId>
     <artifactId>dep-product-parent</artifactId>
     <packaging>pom</packaging>
-    <version>4.0.1</version>
+    <version>4.1.1-SNAPSHOT</version>
     <name>WSO2 Telco HUB - Aggregator Module</name>
     <url>http://wso2.com/products/api-manager</url>
     <description>WSO2Telco Digital Enablement Hub</description>
@@ -49,11 +49,11 @@
     <properties>
 
         <!-- WSO2 Telco versions -->
-        <com.wso2telco.dep.version>3.0.1-SNAPSHOT</com.wso2telco.dep.version>
-        <com.wso2telco.core.version>2.4.5</com.wso2telco.core.version>
-	    <com.wso2telco.manageapp.version>2.1.2-SNAPSHOT</com.wso2telco.manageapp.version>
-        <com.wso2telco.dep.feature.version>3.0.1.SNAPSHOT</com.wso2telco.dep.feature.version>
-        <com.wso2teloc.manageapp.feature>2.1.2.SNAPSHOT</com.wso2teloc.manageapp.feature>
+        <com.wso2telco.dep.version>3.0.4-SNAPSHOT</com.wso2telco.dep.version>
+        <com.wso2telco.core.version>2.4.8-SNAPSHOT</com.wso2telco.core.version>
+	    <com.wso2telco.manageapp.version>2.1.5-SNAPSHOT</com.wso2telco.manageapp.version>
+        <com.wso2telco.dep.feature.version>3.0.4.SNAPSHOT</com.wso2telco.dep.feature.version>
+        <com.wso2teloc.manageapp.feature>2.1.5.SNAPSHOT</com.wso2teloc.manageapp.feature>
         <!-- APIM Component Version -->
         <carbon.apimgt.version>6.0.4</carbon.apimgt.version>
         <carbon.apimgt.imp.pkg.version>[6.0.0, 7.0.0)</carbon.apimgt.imp.pkg.version>

release-notes.html

@@ -21,19 +21,19 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
     <meta content="text/html; charset=iso-8859-1" http-equiv="content-type"/>
-    <title>APIGATE AXP INTERNAL GATEWAY 4.0.1</title>
+    <title>AXP INTERNAL GATEWAY 4.1.0</title>
 </head>
 <body>
 <div id="main-content">
-    <h1> APIGATE AXP INTERNAL GATEWAY 4.0.1 Released!</h1>
+    <h1> AXP INTERNAL GATEWAY 4.1.0 Released!</h1>
 
     <p>
-        The Apigate team is pleased to announce the release of version 4.0.1 of
-        the Open Source APIGATE AXP Internal Gateway.
+        The AXP team is pleased to announce the release of version 4.1.0 of
+        the Open Source AXP Internal Gateway.
     </p>
 
     <p>
-        APIGATE AXP (Accelerator Platform) INTERNAL GATEWAY is an API management and monetization platform which supports all
+        AXP (Accelerator Platform) INTERNAL GATEWAY is an API management and monetization platform which supports all
         aspects of an API business, including creating, publishing, consuming, discovery
         and monetization of APIs.
     </p>
@@ -51,12 +51,26 @@ <h2>How to Run</h2>
     </ol>
 
 
-    <h2>Key Features of Apigate AXP Internal Gateway</h2>
+    <h2>Key Features of AXP Internal Gateway</h2>
     <ul>
+        <li>Custom TOKEN API Implementation</li>
+        <li>Custom Authentication Handler Implementation</li>
+        <li>Custom JWT token implementation</li>
+        <li>Admin Portal</li>
+        <li>Traffic Manager</li>
     </ul>
 
     <h2>Known Issues</h2>
     <ul>
+        <li><a href="https://aifel.atlassian.net/browse/INTGW-1178">https://aifel.atlassian.net/browse/INTGW-1178</a></li>
+        <li><a href="https://aifel.atlassian.net/browse/INTGW-1047">https://aifel.atlassian.net/browse/INTGW-1047</a></li>
+        <li><a href="https://aifel.atlassian.net/browse/INTGW-1048">https://aifel.atlassian.net/browse/INTGW-1048</a></li>
+        <li><a href="https://aifel.atlassian.net/browse/INTGW-1088">https://aifel.atlassian.net/browse/INTGW-1088</a></li>
+        <li><a href="https://aifel.atlassian.net/browse/INTGW-1156">https://aifel.atlassian.net/browse/INTGW-1156</a></li>
+        <li><a href="https://aifel.atlassian.net/browse/INTGW-1155">https://aifel.atlassian.net/browse/INTGW-1155</a></li>
+        <li><a href="https://aifel.atlassian.net/browse/INTGW-1227">https://aifel.atlassian.net/browse/INTGW-1227</a></li>
+        <li><a href="https://aifel.atlassian.net/browse/INTGW-1222">https://aifel.atlassian.net/browse/INTGW-1222</a></li>
+        <li><a href="https://aifel.atlassian.net/browse/INTGW-1223">https://aifel.atlassian.net/browse/INTGW-1223</a></li>
     </ul>
 
     <h2>How You Can Contribute</h2>
@@ -66,7 +80,7 @@ <h3>
     <p>
         We encourage you to report issues, documentation faults and feature requests
         regarding
-        APIGATE AXP Internal Gateway through the public <a href="https://jira.wso2telco.com/jira/projects/INTGW/issues"> Apigate AXP Internal Gateway Jira</a>.
+        AXP Internal Gateway through the public <a href="https://aifel.atlassian.net/projects/INTGW/issues">AXP Internal Gateway Jira</a>.
     </p>
 
     <h2>Support</h2>
@@ -78,11 +92,11 @@ <h2>Support</h2>
     </p>
     <p>
         For more details and to take advantage of this unique opportunity please
-        visit <a href="https://support.wso2telco.com">apigate support</a>.
+        visit <a href="https://aifel.atlassian.net/">AXP support</a>.
     </p>
 
     <p>
-        <i>-- The Apigate Team --</i>
+        <i>-- The AXP Team --</i>
     </p>
 </div>
 </body>