Skip to content

Commit

Permalink
Merge pull request #121 from chirangaalwis/release-1
Browse files Browse the repository at this point in the history 
Push WSO2 API Manager 2.2.x Docker resources to master
  • Loading branch information
@msmshariq
msmshariq authored Apr 5, 2018
2 parents c3f8f07 + 6935acb commit 721ef7d
Show file tree
Hide file tree
Showing 29 changed files with 1,346 additions and 1,107 deletions.
4 changes: 2 additions & 2 deletions docker-compose/APIM-ISasKM-with-Analytics/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
in order to run the steps provided in following Quick start guide. <br><br>
* In order to run this Docker Compose setup, you will need an active [Free Trial Subscription](https://wso2.com/free-trial-subscription)
from WSO2 since the referring Docker images hosted at docker.wso2.com contains the latest updates and fixes for WSO2 API Manager <br>and
API Manager Analytics 2.1.0 and WSO2 Identity Server as KM 5.3.0. You can sign up for a Free Trial Subscription [here](https://wso2.com/free-trial-subscription). <br><br>
API Manager Analytics 2.2.0 and WSO2 Identity Server as KM 5.3.0. You can sign up for a Free Trial Subscription [here](https://wso2.com/free-trial-subscription). <br><br>
* If you wish to run the Docker Compose setup using Docker images built locally, build Docker images using <br> [WSO2 API Manager Dockerfile](../../dockerfiles/apim/README.md), [API Manager Analytics Dockerfile](../../dockerfiles/apim-analytics/README.md) and
[WSO2 Identity Server as KM Dockerfile](../../dockerfiles/is-as-km/README.md) and remove the `docker.wso2.com/` prefix
from the `image` name In the `docker-compose.yml`. For example, change the line <br> `image: docker.wso2.com/wso2am:2.1.0` to `image: wso2am:2.1.0` . <br><br>
from the `image` name In the `docker-compose.yml`. For example, change the line <br> `image: docker.wso2.com/wso2am:2.2.0` to `image: wso2am:2.2.0` . <br><br>
## Quick Start Guide

1. Clone WSO2 API Manager Docker git repository.
Expand Down
10 changes: 6 additions & 4 deletions ...SasKM-with-Analytics/apim-analytics/repository/conf/datasources/analytics-datasources.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,11 @@
<driverClassName>com.mysql.jdbc.Driver</driverClassName>
<maxActive>50</maxActive>
<maxWait>60000</maxWait>
<testOnBorrow>true</testOnBorrow>
<validationQuery>SELECT 1</validationQuery>
<validationInterval>30000</validationInterval>
<defaultAutoCommit>false</defaultAutoCommit>
<initialSize>0</initialSize>
<testWhileIdle>true</testWhileIdle>
<minEvictableIdleTimeMillis>4000</minEvictableIdleTimeMillis>
<defaultTransactionIsolation>READ_COMMITTED</defaultTransactionIsolation>
</configuration>
</definition>
Expand All @@ -39,10 +40,11 @@
<driverClassName>com.mysql.jdbc.Driver</driverClassName>
<maxActive>50</maxActive>
<maxWait>60000</maxWait>
<testOnBorrow>true</testOnBorrow>
<validationQuery>SELECT 1</validationQuery>
<validationInterval>30000</validationInterval>
<defaultAutoCommit>false</defaultAutoCommit>
<initialSize>0</initialSize>
<testWhileIdle>true</testWhileIdle>
<minEvictableIdleTimeMillis>4000</minEvictableIdleTimeMillis>
<defaultTransactionIsolation>READ_COMMITTED</defaultTransactionIsolation>
</configuration>
</definition>
Expand Down
96 changes: 28 additions & 68 deletions docker-compose/APIM-ISasKM-with-Analytics/apim/repository/conf/api-manager.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,6 @@
Token generation the implementation is provided in URLSafeJWTGenerator -->
<!--<JWTGeneratorImpl>org.wso2.carbon.apimgt.keymgt.token.URLSafeJWTGenerator</JWTGeneratorImpl>-->

<!-- Remove UserName from JWT Token -->
<!-- <RemoveUserNameFromJWTForApplicationToken>true</RemoveUserNameFromJWTForApplicationToken>-->
</JWTConfiguration>

<!-- Primary/secondary login configuration for APIstore. If user likes to keep two login attributes in a distributed setup, to login the APIstore,
Expand Down Expand Up @@ -108,6 +106,15 @@
<!-- This parameter specifies whether Recently Added APIs will be loaded from the cache or not.
If there are multiple API modification during a short time period, better to disable cache. -->
<EnableRecentlyAddedAPICache>false</EnableRecentlyAddedAPICache>
<!-- This parameter specifies whether scopes are taken from cache or not. If you are modifying application
subscriptions frequently, modifying the user roles frequently or updating the subscribed APIs frequently, it
is better to turn-off this cache-->
<EnableScopeCache>true</EnableScopeCache>
<!-- This indicates whether the role cache need to enabled in the publisher. If this is disabled, there will
be a call to key manager to all the calls to API publisher APIs. It is highly recommended to enable this
cache. However, if the system is in a state, where the role addition and deletion happens seamlessly, the
cache will be in in-valid state.-->
<EnablePublisherRoleCache>true</EnablePublisherRoleCache>
<!-- JWT claims Cache expiry in seconds -->
<!--JWTClaimCacheExpiry>900</JWTClaimCacheExpiry-->
<!-- Expiry time for the apim key mgt validation info cache -->
Expand Down Expand Up @@ -190,7 +197,7 @@
</ExecutionTime>
<AlertTypes>
<Name>org.wso2.analytics.apim.alertStakeholderInfo</Name>
<Version>1.0.0</Version>
<Version>1.0.1</Version>
</AlertTypes>
</Streams>

Expand Down Expand Up @@ -249,6 +256,8 @@
<OAuthConfigurations>
<!-- Remove OAuth headers from outgoing message. -->
<!--RemoveOAuthHeadersFromOutMessage>true</RemoveOAuthHeadersFromOutMessage-->
<!--Authorization header-->
<!--AuthorizationHeader>Authorization</AuthorizationHeader-->
<!-- Scope used for marking Application Tokens. If a token is generated with this scope, they will be treated as Application Access Tokens -->
<ApplicationTokenScope>am_application_scope</ApplicationTokenScope>
<!-- All scopes under the ScopeWhitelist element are not validating against roles that has assigned to it.
Expand Down Expand Up @@ -280,6 +289,7 @@

<!-- API Store Related Configurations -->
<APIStore>
<EnableMultipleGroupId>false</EnableMultipleGroupId>
<!--GroupingExtractor>org.wso2.carbon.apimgt.impl.DefaultGroupIDExtractorImpl</GroupingExtractor-->
<!--This property is used to indicate how we do user name comparision for token generation https://wso2.org/jira/browse/APIMANAGER-2225-->
<CompareCaseInsensitively>true</CompareCaseInsensitively>
Expand Down Expand Up @@ -317,14 +327,16 @@

<APIPublisher>
<DisplayURL>false</DisplayURL>
<URL>https://localhost/publisher</URL>
<URL>https://localhost:${mgt.transport.https.port}/publisher</URL>
<!-- This parameter specifies enabling the capability of setting API documentation level granular visibility levels.
By default any document associate with an API will have the same permissions set as the API.With enabling below
property,it will show two additional permission levels as visible only to all registered users in a particular
domain or only visible to API doc creator -->
<!--EnableAPIDocVisibilityLevels>true</EnableAPIDocVisibilityLevels-->
<!-- Uncomment this to limit the number of APIs in api the API Publisher -->
<!--APIsPerPage>30</APIsPerPage-->
<!-- This property need to be enabled to enable the publisher access control support -->
<EnableAccessControl>true</EnableAccessControl>
</APIPublisher>

<!-- Status observers can be registered against the API Publisher to listen for
Expand All @@ -336,46 +348,6 @@
<Observer>org.wso2.carbon.apimgt.impl.observers.SimpleLoggingObserver</Observer>
</StatusObservers-->

<!-- Use this configuration Create APIs at the Server startup -->
<StartupAPIPublisher>
<!-- Enable/Disable the API Startup Publisher -->
<Enabled>false</Enabled>

<!-- Configuration to create APIs for local endpoints.
Endpoint will be computed as http://${carbon.local.ip}:${mgt.transport.http.port}/Context.
Define many LocalAPI elements as below to create many APIs
for local Endpoints.
IconPath should be relative to CARBON_HOME. -->
<LocalAPIs>
<LocalAPI>
<Context>/resource</Context>
<Provider>admin</Provider>
<Version>1.0.0</Version>
<IconPath>none</IconPath>
<DocumentURL>none</DocumentURL>
<AuthType>Any</AuthType>
</LocalAPI>
</LocalAPIs>

<!-- Configuration to create APIs for remote endpoints.
When Endpoint need to be defined use this configuration.
Define many API elements as below to create many APIs
for external Endpoints.
If you do not need to add Icon or Documentation set
'none' as the value for IconPath & DocumentURL. -->
<!--APIs>
<API>
<Context>/resource</Context>
<Endpoint>http://localhost:9764/resource</Endpoint>
<Provider>admin</Provider>
<Version>1.0.0</Version>
<IconPath>none</IconPath>
<DocumentURL>none</DocumentURL>
<AuthType>Any</AuthType>
</API>
</APIs-->
</StartupAPIPublisher>

<!-- Configuration to enable/disable sending CORS headers in the Gateway response
and define the Access-Control-Allow-Origin header value.-->
<CORSConfiguration>
Expand Down Expand Up @@ -571,13 +543,15 @@
</RESTAPI>
<ThrottlingConfigurations>
<EnableAdvanceThrottling>true</EnableAdvanceThrottling>
<DataPublisher>
<Enabled>true</Enabled>
<TrafficManager>
<Type>Binary</Type>
<ReceiverUrlGroup>tcp://${carbon.local.ip}:${receiver.url.port}</ReceiverUrlGroup>
<AuthUrlGroup>ssl://${carbon.local.ip}:${auth.url.port}</AuthUrlGroup>
<Username>${admin.username}</Username>
<Password>${admin.password}</Password>
</TrafficManager>
<DataPublisher>
<Enabled>true</Enabled>
<DataPublisherPool>
<MaxIdle>1000</MaxIdle>
<InitIdleCapacity>200</InitIdleCapacity>
Expand All @@ -589,6 +563,7 @@
</DataPublisherThreadPool>
</DataPublisher>
<PolicyDeployer>
<Enabled>true</Enabled>
<ServiceURL>https://localhost:${mgt.transport.https.port}${carbon.context}services/</ServiceURL>
<Username>${admin.username}</Username>
<Password>${admin.password}</Password>
Expand All @@ -600,32 +575,16 @@
</BlockCondition>
<JMSConnectionDetails>
<Enabled>true</Enabled>
<ServiceURL>tcp://${carbon.local.ip}:${jms.port}</ServiceURL>
<Username>${admin.username}</Username>
<Password>${admin.password}</Password>
<Destination>throttleData</Destination>
<!--InitDelay>300000</InitDelay-->
<JMSConnectionParameters>
<transport.jms.ConnectionFactoryJNDIName>TopicConnectionFactory</transport.jms.ConnectionFactoryJNDIName>
<transport.jms.DestinationType>topic</transport.jms.DestinationType>
<java.naming.factory.initial>org.wso2.andes.jndi.PropertiesFileInitialContextFactory</java.naming.factory.initial>
<connectionfactory.TopicConnectionFactory>amqp://${jms.username}:${jms.password}@clientid/carbon?brokerlist='${jms.url}'</connectionfactory.TopicConnectionFactory>
<connectionfactory.TopicConnectionFactory>amqp://${admin.username}:${admin.password}@clientid/carbon?brokerlist='tcp://${carbon.local.ip}:${jms.port}'</connectionfactory.TopicConnectionFactory>
</JMSConnectionParameters>
<JMSTaskManager>
<MinThreadPoolSize>20</MinThreadPoolSize>
<MaxThreadPoolSize>100</MaxThreadPoolSize>
<KeepAliveTimeInMillis>1000</KeepAliveTimeInMillis>
<JobQueueSize>10</JobQueueSize>
</JMSTaskManager>
</JMSConnectionDetails>
<JMSEventPublisherParameters>
<java.naming.factory.initial>org.wso2.andes.jndi.PropertiesFileInitialContextFactory</java.naming.factory.initial>
<java.naming.provider.url>repository/conf/jndi.properties</java.naming.provider.url>
<transport.jms.DestinationType>topic</transport.jms.DestinationType>
<transport.jms.Destination>throttleData</transport.jms.Destination>
<transport.jms.ConcurrentPublishers>allow</transport.jms.ConcurrentPublishers>
<transport.jms.ConnectionFactoryJNDIName>TopicConnectionFactory</transport.jms.ConnectionFactoryJNDIName>
</JMSEventPublisherParameters>

<!--DefaultLimits>
<SubscriptionTierLimits>
<Gold>5000</Gold>
Expand All @@ -649,14 +608,15 @@
<EnableJWTClaimConditions>false</EnableJWTClaimConditions>
<EnableQueryParamConditions>false</EnableQueryParamConditions>
</ThrottlingConfigurations>

<WorkflowConfigurations>
<Enabled>false</Enabled>
<ServerUrl>https://localhost:9445/bpmn</ServerUrl>
<ServerUser>${admin.username}</ServerUser>
<ServerPassword>${admin.password}</ServerPassword>
<WorkflowCallbackAPI>https://localhost:${mgt.transport.https.port}/api/am/publisher/v0.11/workflows/update-workflow-status</WorkflowCallbackAPI>
<WorkflowCallbackAPI>https://localhost:${mgt.transport.https.port}/api/am/publisher/v0.12/workflows/update-workflow-status</WorkflowCallbackAPI>
<TokenEndPoint>https://localhost:${https.nio.port}/token</TokenEndPoint>
<DCREndPoint>https://localhost:${mgt.transport.https.port}/client-registration/v0.11/register</DCREndPoint>
<DCREndPoint>https://localhost:${mgt.transport.https.port}/client-registration/v0.12/register</DCREndPoint>
<DCREndPointUser>${admin.username}</DCREndPointUser>
<DCREndPointPassword>${admin.password}</DCREndPointPassword>
</WorkflowConfigurations>
Expand All @@ -668,8 +628,8 @@
<ModelPackage>org.wso2.client.model.</ModelPackage>
<ApiPackage>org.wso2.client.api.</ApiPackage>
<!-- Configure supported languages/Frameworks as comma separated values,
Supported Languages/Frameworks : android, java, scala, csharp, cpp, dart, flash, go, groovy, javascript, jmeter,
nodejs, perl, php, python, ruby, swift, clojure, aspNet5, asyncScala, spring, csharpDotNet2, haskell-->
Supported Languages/Frameworks : android, java, scala, csharp, dart, flash, groovy, javascript, jmeter,
nodejs, perl, php, python, ruby, swift, clojure, asyncScala, csharpDotNet2-->
<SupportedLanguages>java,android</SupportedLanguages>
</ClientGeneration>
</SwaggerCodegen>
Expand Down
40 changes: 31 additions & 9 deletions docker-compose/APIM-ISasKM-with-Analytics/apim/repository/conf/axis2/axis2.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@
<parameter name="ModulesDirectory">axis2modules</parameter>

<!-- User agent and the server details to be used in the http communication -->
<parameter name="userAgent" locked="true">WSO2 AM 2.1.0</parameter>
<parameter name="server" locked="true">WSO2 AM 2.1.0</parameter>
<parameter name="userAgent" locked="true">WSO2 AM 2.2.0</parameter>
<parameter name="server" locked="true">WSO2 AM 2.2.0</parameter>

<!-- During a fault, stacktrace can be sent with the fault message. The following flag -->
<!-- will control that behaviour -->
Expand Down Expand Up @@ -168,14 +168,16 @@
class="org.apache.axis2.format.PlainTextFormatter"/>

<!--JSON Message Formatters-->
<messageFormatter contentType="application/json"
class="org.apache.synapse.commons.json.JsonFormatter"/>
<messageFormatter contentType="application/json"
class="org.apache.synapse.commons.json.JsonStreamFormatter"/>
<!--messageFormatter contentType="application/json"
class="org.apache.synapse.commons.json.JsonStreamFormatter"/-->
class="org.apache.synapse.commons.json.JsonFormatter"/-->
<messageFormatter contentType="application/json/badgerfish"
class="org.apache.axis2.json.JSONBadgerfishMessageFormatter"/>
<messageFormatter contentType="text/javascript"
class="org.apache.axis2.json.JSONMessageFormatter"/>
<messageFormatter contentType="application/octet-streaml"
class="org.wso2.carbon.relay.ExpandingMessageFormatter"/>

<!-- See https://wso2.org/jira/browse/ESBJAVA-1725 before enabling bellow line -->
<!--messageFormatter contentType=".*"
Expand Down Expand Up @@ -232,14 +234,17 @@
class="org.apache.axis2.format.PlainTextBuilder"/>

<!--JSON Message Builders-->
<messageBuilder contentType="application/json"
class="org.apache.synapse.commons.json.JsonBuilder"/>
<messageBuilder contentType="application/json"
class="org.apache.synapse.commons.json.JsonStreamBuilder"/>
<!--messageBuilder contentType="application/json"
class="org.apache.synapse.commons.json.JsonStreamBuilder"/-->
class="org.apache.synapse.commons.json.JsonBuilder"/-->
<messageBuilder contentType="application/json/badgerfish"
class="org.apache.axis2.json.JSONBadgerfishOMBuilder"/>
<messageBuilder contentType="text/javascript"
class="org.apache.axis2.json.JSONBuilder"/>
<messageBuilder contentType="application/octet-stream"
class="org.wso2.carbon.relay.BinaryRelayBuilder"/>

<!--messageBuilder contentType="text/javascript"
class="org.apache.axis2.json.JSONStreamBuilder"/-->

Expand Down Expand Up @@ -543,7 +548,15 @@
<Password>wso2carbon</Password>
</TrustStore>
</parameter>
<parameter name="HostnameVerifier">AllowAll</parameter>>
<!-- ============================================== -->
<!-- Configuration for Dynamic SSL Profile loading. -->
<!-- Configured for 10 mins. -->
<!-- ============================================== -->
<parameter name="dynamicSSLProfilesConfig">
<filePath>repository/resources/security/sslprofiles.xml</filePath>
<fileReadInterval>600000</fileReadInterval>
</parameter>
<parameter name="HostnameVerifier">AllowAll</parameter>
<!--supports Strict|AllowAll|DefaultAndLocalhost or the default if none specified -->
</transportSender>

Expand Down Expand Up @@ -601,6 +614,15 @@
<parameter name="ws.outflow.dispatch.fault.sequence" locked="false">outflowFaultSeq</parameter>
</transportSender>

<transportSender name="wss" class="org.wso2.carbon.websocket.transport.WebsocketTransportSender">
<parameter name="ws.outflow.dispatch.sequence" locked="false">outflowDispatchSeq</parameter>
<parameter name="ws.outflow.dispatch.fault.sequence" locked="false">outflowFaultSeq</parameter>
<parameter name="ws.trust.store" locked="false">
<ws.trust.store.location>repository/resources/security/client-truststore.jks</ws.trust.store.location>
<ws.trust.store.Password>wso2carbon</ws.trust.store.Password>
</parameter>
</transportSender>

<!--<transportSender name="https"-->
<!--class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">-->
<!--<parameter name="PROTOCOL">HTTP/1.1</parameter>-->
Expand Down
Loading

0 comments on commit 721ef7d

Please sign in to comment.