few changes on apim features

merge-requests/1/head
ayyoob 9 years ago
parent 888bdb8873
commit f3c807d5e2

@ -0,0 +1,41 @@
<sequence xmlns="http://ws.apache.org/ns/synapse" name="json_fault">
<log level="custom">
<property name="STATUS" value="Executing custom 'fault' sequence"/>
<property name="ERROR_CODE" expression="get-property('ERROR_CODE')"/>
<property name="ERROR_MESSAGE" expression="get-property('ERROR_MESSAGE')"/>
</log>
<payloadFactory>
<format>
<am:fault xmlns:am="http://wso2.org/apimanager">
<am:code>$1</am:code>
<am:type>Status report</am:type>
<am:message>Runtime Error</am:message>
<am:description>$2</am:description>
</am:fault>
</format>
<args>
<arg expression="$ctx:ERROR_CODE"/>
<arg expression="$ctx:ERROR_MESSAGE"/>
</args>
</payloadFactory>
<filter xpath="$ctx:CUSTOM_HTTP_SC">
<then>
<property name="HTTP_SC" expression="$ctx:CUSTOM_HTTP_SC" scope="axis2"/>
</then>
<else>
<property name="HTTP_SC" value="500" scope="axis2"/>
</else>
</filter>
<class name="org.wso2.carbon.apimgt.usage.publisher.APIMgtFaultHandler"/>
<property name="RESPONSE" value="true"/>
<header name="To" action="remove"/>
<property name="NO_ENTITY_BODY" scope="axis2" action="remove"/>
<property name="ContentType" scope="axis2" action="remove"/>
<property name="Authorization" scope="transport" action="remove"/>
<property name="Host" scope="transport" action="remove"/>
<property name="Accept" scope="transport" action="remove"/>
<property name="X-JWT-Assertion" scope="transport" action="remove"/>
<property name="messageType" value="application/json" scope="axis2"/>
<send/>
<drop/>
</sequence>

@ -0,0 +1,3 @@
<sequence xmlns="http://ws.apache.org/ns/synapse" name="json_to_xml_in_message">
<property name="messageType" value="application/xml" scope="axis2"/>
</sequence>

@ -0,0 +1,5 @@
<sequence xmlns="http://ws.apache.org/ns/synapse" name="log_in_message">
<log level="full">
<property name="IN_MESSAGE" value="IN_MESSAGE"/>
</log>
</sequence>

@ -0,0 +1,4 @@
<sequence xmlns="http://ws.apache.org/ns/synapse" name="preserve_accept_header">
<property name="WSO2_AM_API_ACCEPT_MESSAGE_TYPE" expression="get-property('transport', 'Accept')" scope="default"/>
<property name="Accept" scope="transport" action="remove"/>
</sequence>

@ -0,0 +1,3 @@
<sequence xmlns="http://ws.apache.org/ns/synapse" name="xml_to_json_in_message">
<property name="messageType" value="application/json" scope="axis2"/>
</sequence>

@ -0,0 +1,5 @@
<sequence xmlns="http://ws.apache.org/ns/synapse" name="apply_accept_header">
<property name="messageType"
expression="get-property('default', 'WSO2_AM_API_ACCEPT_MESSAGE_TYPE')"
scope="axis2"/>
</sequence>

@ -0,0 +1,3 @@
<sequence xmlns="http://ws.apache.org/ns/synapse" name="json_to_xml_out_message">
<property name="messageType" value="application/xml" scope="axis2"/>
</sequence>

@ -0,0 +1,5 @@
<sequence xmlns="http://ws.apache.org/ns/synapse" name="log_out_message">
<log level="full">
<property name="OUT_MESSAGE" value="OUT_MESSAGE"/>
</log>
</sequence>

@ -0,0 +1,3 @@
<sequence xmlns="http://ws.apache.org/ns/synapse" name="xml_to_json_out_message">
<property name="messageType" value="application/json" scope="axis2"/>
</sequence>

@ -97,46 +97,46 @@
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<!--============ Added with ES Features ===============-->
<execution>
<id>2-identity-h2-table-gen</id>
<phase>package</phase>
<configuration>
<target>
<echo message="########### Create Identity Database ##############"/>
<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 message="########### Create Identity 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/identity/h2.sql"/>
</sql>
<!--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/identity/h2.sql" />
</sql-->
<echo message="##################### END ########################"/>
</target>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
<!--&lt;!&ndash;============ Added with ES Features ===============&ndash;&gt;-->
<!--<execution>-->
<!--<id>2-identity-h2-table-gen</id>-->
<!--<phase>package</phase>-->
<!--<configuration>-->
<!--<target>-->
<!--<echo message="########### Create Identity Database ##############"/>-->
<!--<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 message="########### Create Identity 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/identity/h2.sql"/>-->
<!--</sql>-->
<!--&lt;!&ndash;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/identity/h2.sql" />-->
<!--</sql&ndash;&gt;-->
<!--<echo message="##################### END ########################"/>-->
<!--</target>-->
<!--</configuration>-->
<!--<goals>-->
<!--<goal>run</goal>-->
<!--</goals>-->
<!--</execution>-->
<!--============ Added with ES Features ===============-->
@ -516,10 +516,6 @@
<fileset dir="src/statistics"/>
</copy>
<copy todir="target/wso2carbon-core-${carbon.kernel.version}/repository/components/patches">
<fileset dir="src/patches"/>
</copy>
<copy todir="target/wso2carbon-core-${carbon.kernel.version}/repository/components/lib">
<fileset dir="src/lib"/>
</copy>

@ -484,6 +484,16 @@
</includes>
</fileSet>
<!--============ Added with API Features ===============-->
<fileSet>
<directory>apim-resources/customsequences</directory>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/resources/customsequences</outputDirectory>
<includes>
<include>**/**.xml</include>
</includes>
</fileSet>
<!-- End of api Features -->
<!-- Copying API Manager Publisher and Store Jaggery apps -->
<!--fileSet>
<directory>
@ -993,5 +1003,7 @@
<!--========================================================================================================-->
<!-- End of Enterprise Store Features -->
</files>
</assembly>

@ -52,11 +52,11 @@
<!--
Admin username for the Authentication manager.
-->
<Username>admin</Username>
<Username>${admin.username}</Username>
<!--
Admin password for the Authentication manager.
-->
<Password>admin</Password>
<Password>${admin.password}</Password>
</AuthManager>
<!--
@ -71,7 +71,8 @@
<!--
Fully qualified name of the class that will retrieve additional user claims
to be appended to the JWT. If not specified no claims will be appended.
to be appended to the JWT. If not specified no claims will be appended.If user wants to add all user claims in the
jwt token, he needs to enable this parameter.
The DefaultClaimsRetriever class adds user claims from the default carbon user store.
-->
<!--ClaimsRetrieverImplClass>org.wso2.carbon.apimgt.impl.token.DefaultClaimsRetriever</ClaimsRetrieverImplClass-->
@ -94,6 +95,12 @@
-->
<!--EnableTokenGeneration>false</EnableTokenGeneration-->
<!--
This parameter specifies which implementation should be used for generating the Token. JWTGenerator is the
default implementation provided.
-->
<TokenGeneratorImpl>org.wso2.carbon.apimgt.impl.token.JWTGenerator</TokenGeneratorImpl>
<!--
Remove OAuth headers from outgoing message or keep with it.
-->
@ -124,8 +131,9 @@
An API deployed on a 'production' type gateway will only support production keys
An API deployed on a 'sandbox' type gateway will only support sandbox keys
An API deployed on a 'hybrid' type gateway will support both production and sandbox keys -->
<Environment type="hybrid">
<Environment type="hybrid" api-console="true">
<Name>Production and Sandbox</Name>
<Description> Description of environment</Description>
<!--
Server URL of the API gateway.
-->
@ -133,11 +141,11 @@
<!--
Admin username for the API gateway.
-->
<Username>admin</Username>
<Username>${admin.username}</Username>
<!--
Admin password for the API gateway.
-->
<Password>admin</Password>
<Password>${admin.password}</Password>
<!--
Endpoint URLs for the APIs hosted in this API gateway.
-->
@ -146,10 +154,15 @@
</Environments>
<!--
Enable/Disable caching at gateway node.
Enable/Disable token caching at gateway node.
-->
<EnableGatewayKeyCache>false</EnableGatewayKeyCache>
<!--
Enable/Disable API resource caching at gateway node.
-->
<EnableGatewayResourceCache>true</EnableGatewayResourceCache>
<!-- Header name can be configurable, as you preferred. When API invocation is restricted to access only for authorized domains,
client request should send his domain, as the value of this header.
-->
@ -169,9 +182,10 @@
<APIUsageTracking>
<!--
Enable/Disable the API usage tracker.
Below property is used to skip trying to connect to event receiver nodes when publishing events even if
the stats enabled flag is set to true.
-->
<Enabled>false</Enabled>
<SkipEventReceiverConnection>false</SkipEventReceiverConnection>
<!--
API Usage Data Publisher.
@ -179,65 +193,49 @@
<PublisherClass>org.wso2.carbon.apimgt.usage.publisher.APIMgtUsageDataBridgeDataPublisher</PublisherClass>
<!--
Thrift port of the remote BAM server.
-->
<ThriftPort>7612</ThriftPort>
<!--
Server URL of the remote BAM/CEP server used to collect statistics. Must
be specified in protocol://hostname:port/ format.
An event can also be published to multiple Receiver Groups each having 1 or more receivers. Receiver
Groups are delimited by curly braces whereas receivers are delimited by commas.
Ex - Multiple Receivers within a single group
tcp://localhost:7612/,tcp://localhost:7613/,tcp://localhost:7614/
Ex - Multiple Receiver Groups with two receivers each
{tcp://localhost:7612/,tcp://localhost:7613},{tcp://localhost:7712/,tcp://localhost:7713/}
-->
<BAMServerURL>tcp://localhost:7612/</BAMServerURL>
<!--
Administrator username to login to the remote BAM server.
-->
<BAMUsername>admin</BAMUsername>
<!--
Administrator password to login to the remote BAM server.
If below property set to true,then the response message size will be calculated and publish
with each successful API invocation event.
-->
<BAMPassword>admin</BAMPassword>
<PublishResponseMessageSize>false</PublishResponseMessageSize>
<!--
JNDI name of the data source to be used for getting BAM statistics.This data source should
be defined in the master-datasources.xml file in conf/datasources directory.
Data publishing stream names and versions of API requests, responses and faults. If the default values
are changed, the toolbox also needs to be changed accordingly.
-->
<!--DataSourceName>jdbc/WSO2AM_STATS_DB</DataSourceName-->
<!--
Google Analytics publisher configuration. Create Google Analytics account and obtain a
Tracking ID.
Reffer http://support.google.com/analytics/bin/answer.py?hl=en&answer=1009694
-->
<GoogleAnalyticsTracking>
<!--
Enable/Disable Google Analytics Tracking
-->
<Enabled>false</Enabled>
<!--
Google Analytics Tracking ID
-->
<TrackingID>UA-XXXXXXXX-X</TrackingID>
</GoogleAnalyticsTracking>
<Streams>
<Request>
<Name>org.wso2.apimgt.statistics.request</Name>
<Version>1.0.0</Version>
</Request>
<Response>
<Name>org.wso2.apimgt.statistics.response</Name>
<Version>1.0.0</Version>
</Response>
<Fault>
<Name>org.wso2.apimgt.statistics.fault</Name>
<Version>1.0.0</Version>
</Fault>
<Destination>
<Name>org_wso2_apimgt_statistics_destination</Name>
<Version>1.0.0</Version>
<BAMProfileName>bam-profile</BAMProfileName>
</Destination>
<Throttle>
<Name>org.wso2.apimgt.statistics.throttle</Name>
<Version>1.0.0</Version>
</Throttle>
<Workflow>
<Name>org.wso2.apimgt.statistics.workflow</Name>
<Version>1.0.0</Version>
</Workflow>
</Streams>
</APIUsageTracking>
<!--
API key manager configuration used by API key manager (IS), API store and API gateway.
This is used by API store to generate and manage API keys. API gateway uses it to
validate and authenticate users against the provided API keys.
API key validator configuration used by API key manager (IS), API store and API gateway.
API gateway uses it to validate and authenticate users against the provided API keys.
-->
<APIKeyManager>
<APIKeyValidator>
<!--
Server URL of the API key manager
-->
@ -246,12 +244,12 @@
<!--
Admin username for API key manager.
-->
<Username>admin</Username>
<Username>${admin.username}</Username>
<!--
Admin password for API key manager.
-->
<Password>admin</Password>
<Password>${admin.password}</Password>
<!--
Enable/Disable JWT caching.
-->
@ -270,6 +268,7 @@
-If you are at the Gateway node, you need to point "ThriftClientPort" value to the "ThriftServerPort" value given at KeyManager node.
-If you need to start two API Manager instances in the same machine, you need to give different ports to "ThriftServerPort" value in two nodes.
-ThriftServerHost - Allows to configure a hostname for the thrift server. It uses the carbon hostname by default.
-Gateway use this parameter to connect key validation thrift service.
-->
<KeyValidatorClientType>ThriftClient</KeyValidatorClientType>
@ -278,26 +277,63 @@
<ThriftServerPort>10397</ThriftServerPort>
<!--ThriftServerHost>localhost</ThriftServerHost-->
<EnableThriftServer>true</EnableThriftServer>
<!--
This parameter is used to specify Thrift server host name. In a distributed deployment we must set this parameter
if keymanager running on separate machine. Gateway use this parameter to connect key validation thrift service
Scope used for marking Application Tokens. If a token is generated with this scope, they will be treated as Application Access Tokens
-->
<!--ThriftServerHost>127.0.0.1</ThriftServerHost-->
<ApplicationTokenScope>am_application_scope</ApplicationTokenScope>
<!--
Specifies the implementation to be used for KeyValidationHandler. Steps for validating a token can be controlled by plugging in a custom KeyValidation Handler
-->
<KeyValidationHandlerClassName>org.wso2.carbon.apimgt.keymgt.handlers.DefaultKeyValidationHandler</KeyValidationHandlerClassName>
<!--
Remove UserName from JWT Token
-->
<!-- <RemoveUserNameToJWTForApplicationToken>true</RemoveUserNameToJWTForApplicationToken>-->
<!-- <RemoveUserNameFromJWTForApplicationToken>true</RemoveUserNameFromJWTForApplicationToken>-->
<!-- All scopes under the ScopeWhitelist element are not validating against roles that has assigned to it.
By default ^device_.* and openid scopes have been white listed internally.
-->
<!--ScopeWhitelist>
<Scope>^device_.*</Scope>
<Scope>openid</Scope>
</ScopeWhitelist-->
<!-- Name of the token API -->
<TokenEndPointName>oauth2/token</TokenEndPointName>
<TokenEndPointName>/oauth2/token</TokenEndPointName>
<!-- This the API URL for revoke API. When we revoke tokens revoke requests should go through this
API deployed in API gateway. Then it will do cache invalidations related to revoked tokens.
In distributed deployment we should configure this property in key manager node by pointing
gateway https( /http, we recommend users to use 'https' endpoints for security purpose) url.
Also please note that we should point gateway revoke service to key manager
-->
<RevokeAPIURL>https://${carbon.local.ip}:${https.nio.port}/revoke</RevokeAPIURL>
<!-- Whether to encrypt tokens when storing in the Database
Note: If changing this value to true, change the value of <TokenPersistenceProcessor> to
org.wso2.carbon.identity.oauth.tokenprocessor.EncryptionDecryptionProcessor in the identity.xml -->
org.wso2.carbon.identity.oauth.tokenprocessor.EncryptionDecryptionPersistenceProcessor in the identity.xml -->
<EncryptPersistedTokens>false</EncryptPersistedTokens>
</APIKeyManager>
</APIKeyValidator>
<!--
Uncomment this section only if you are going to have an instance other than KeyValidator as your KeyManager.
Unless a ThirdParty KeyManager is used, you don't need to configure this section.
-->
<!--APIKeyManager>
<KeyManagerClientImpl>org.wso2.carbon.apimgt.keymgt.AMDefaultKeyManagerImpl</KeyManagerClientImpl>
<Configuration>
<ServerURL>https://${carbon.local.ip}:${mgt.transport.https.port}${carbon.context}/services/</ServerURL>
<Username>${admin.username}</Username>
<Password>${admin.password}</Password>
<TokenURL>https://${carbon.local.ip}:${https.nio.port}/token</TokenURL>
<RevokeURL>https://${carbon.local.ip}:${https.nio.port}/revoke</RevokeURL>
</Configuration>
</APIKeyManager-->
<!--
Settings related to managing API access tiers.
@ -310,39 +346,17 @@
<EnableUnlimitedTier>true</EnableUnlimitedTier>
</TierManagement>
<!--
Use this configuration to control the self-sign-up capability in API store.
-->
<SelfSignUp>
<!--
Enable or disable the self-sign-up feature.
-->
<Enabled>true</Enabled>
<!--
Self signed up users should be associated with a suitable subscriber
role for them to be able to access the API store portal. This required
parameter specifies which role should be used for that purpose. The role
specified here must have the '/permission/admin/manage/api/subscribe'
permission.
-->
<SubscriberRoleName>subscriber</SubscriberRoleName>
<!--
This parameter specifies whether the subscriber role specified above
should be created in the local user store or not. This only makes sense
when the API subscribers are authenticated against the local user store.
That is the local Carbon server is acting as the AuthManager. If a remote
Carbon server is acting as the AuthManager, this parameter should be turned
off for the local server.
-->
<CreateSubscriberRole>true</CreateSubscriberRole>
</SelfSignUp>
<!--
Use this configuration to control the number of APIs shown in API store.
-->
<APIStore>
<!--This property is used to indicate how we do user name comparision for token generation https://wso2.org/jira/browse/APIMANAGER-2225-->
<!--GroupingExtractor>org.wso2.carbon.apimgt.impl.DefaultGroupIDExtractorImpl</GroupingExtractor-->
<CompareCaseInsensitively>true</CompareCaseInsensitively>
<DisplayURL>false</DisplayURL>
<URL>https://${carbon.local.ip}:${mgt.transport.https.port}/store</URL>
<!--
This parameter specifies whether to display multiple versions of same
API or only showing the latest version of an API.
@ -356,6 +370,10 @@
-->
<DisplayAllAPIs>false</DisplayAllAPIs>
<!--
Uncomment this to limit the number of APIs in api the API Store
-->
<!--APIsPerPage>5</APIsPerPage-->
<!--
This parameter specifies whether to display the comment editing facility or not.
@ -378,9 +396,26 @@
-->
<!--TagCacheDuration>120000</TagCacheDuration-->
<!--
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>
</APIStore>
<APIPublisher>
<DisplayURL>false</DisplayURL>
<URL>https://${carbon.local.ip}:${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-->
</APIPublisher>
<!--
Status observers can be registered against the API Publisher to listen for
API status update events. Each observer must implement the APIStatusObserver
@ -391,36 +426,6 @@
<Observer>org.wso2.carbon.apimgt.impl.observers.SimpleLoggingObserver</Observer>
</StatusObservers-->
<!--
There are set of plugguble extensions for some operations related to API MAnager
operations such as self sign in, subscriptions and etc. For those operatios we can
trigger external work flow of business process server. Here are the configurations
related to those operations
-->
<WorkFlowExtensions>
<ApplicationCreation executor="org.wso2.carbon.apimgt.impl.workflow.ApplicationCreationSimpleWorkflowExecutor"/>
<!--ApplicationCreation executor="org.wso2.carbon.apimgt.impl.workflow.ApplicationCreationWSWorkflowExecutor">
<Property name="serviceEndpoint">http://localhost:9765/services/ApplicationApprovalWorkFlowProcess/</Property>
<Property name="username">admin</Property>
<Property name="password">admin</Property>
<Property name="callbackURL">https://localhost:8243/services/WorkflowCallbackService</Property>
</ApplicationCreation-->
<SubscriptionCreation executor="org.wso2.carbon.apimgt.impl.workflow.SubscriptionCreationSimpleWorkflowExecutor"/>
<!--SubscriptionCreation executor="org.wso2.carbon.apimgt.impl.workflow.SubscriptionCreationWSWorkflowExecutor">
<Property name="serviceEndpoint">http://localhost:9765/services/SubscriptionApprovalWorkFlowProcess/</Property>
<Property name="username">admin</Property>
<Property name="password">admin</Property>
<Property name="callbackURL">https://localhost:8243/services/WorkflowCallbackService</Property>
</SubscriptionCreation-->
<UserSignUp executor="org.wso2.carbon.apimgt.impl.workflow.UserSignUpSimpleWorkflowExecutor"/>
<!--UserSignUp executor="org.wso2.carbon.apimgt.impl.workflow.UserSignUpWSWorkflowExecutor">
<Property name="serviceEndpoint">http://localhost:9765/services/UserSignupProcess/</Property>
<Property name="username">admin</Property>
<Property name="password">admin</Property>
<Property name="callbackURL">https://localhost:8243/services/WorkflowCallbackService</Property>
</UserSignUp-->
</WorkFlowExtensions>
<!--
Use this configuration Create APIs at the Server startup
-->
@ -439,6 +444,16 @@
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.
@ -461,37 +476,7 @@
</StartupAPIPublisher>
<!--
Below are set of external APIStores which can be configured to publish an API from current running
APIM server.-->
<!--<ExternalAPIStores>-->
<!--Configuration to set the store URL of the current running APIM deployment.
APIs published to external stores will be redirected to this URL-->
<!--<StoreURL>http://localhost:9763/store</StoreURL>
<ExternalAPIStore id="Store1" type="wso2">
<DisplayName>Store1</DisplayName>
<Endpoint>http://localhost:9764/store</Endpoint>
<Username>xxxx</Username>
<Password>xxxx</Password>
</ExternalAPIStore>
<ExternalAPIStore id="ProWeb" type="proWeb">
<Name>ProgrammableWeb</Name>
<Endpoint>xxxxx</Endpoint>
</ExternalAPIStore>
<ExternalAPIStore id="Store2" type="wso2">
<DisplayName>Store2</DisplayName>
<Endpoint>http://localhost:9764/store</Endpoint>
<Username>xxxx</Username>
<Password>xxxx</Password>
</ExternalAPIStore>
</ExternalAPIStores> -->
<!--
When an API is invoked, a list of handlers get engaged to its execution flow. This
@ -511,14 +496,17 @@
<!--The value of the Access-Control-Allow-Origin header. Default values are
API Store addresses, which is needed for swagger to function.-->
<Access-Control-Allow-Origin>https://localhost:9443,http://localhost:9763</Access-Control-Allow-Origin>
<Access-Control-Allow-Origin>*</Access-Control-Allow-Origin>
<!--Configure Access-Control-Allow-Methods-->
<Access-Control-Allow-Methods>GET,PUT,POST,DELETE,OPTIONS</Access-Control-Allow-Methods>
<!--Configure Access-Control-Allow-Headers-->
<Access-Control-Allow-Headers>authorization,Access-Control-Allow-Origin,Content-Type</Access-Control-Allow-Headers>
<!--Configure Access-Control-Allow-Methods-->
<Access-Control-Allow-Methods>GET,POST,PUT,DELETE,OPTIONS</Access-Control-Allow-Methods>
</CORSConfiguration>
<!-- This property is there to configure velocity log output into existing Log4j carbon Logger.
You can enable this and set preferable Logger name.
-->
<!--VelocityLogger>VELOCITY</VelocityLogger-->
</APIManager>

@ -225,13 +225,13 @@
<!-- Identity Features -->
<!-- TODO: Verify this feature is needed -->
<!--<featureArtifactDef>-->
<!--org.wso2.carbon.identity:org.wso2.carbon.identity.oauth.common.feature:${carbon.identity.version}-->
<!--</featureArtifactDef>-->
<featureArtifactDef>
org.wso2.carbon.identity:org.wso2.carbon.identity.oauth.common.feature:${carbon.identity.version}
</featureArtifactDef>
<!-- TODO: Verify this feature is needed -->
<!--<featureArtifactDef>-->
<!--org.wso2.carbon.identity:org.wso2.carbon.idp.mgt.feature:${carbon.identity.version}-->
<!--</featureArtifactDef>-->
<featureArtifactDef>
org.wso2.carbon.identity:org.wso2.carbon.idp.mgt.feature:${carbon.identity.version}
</featureArtifactDef>
<!-- SSO -->
<featureArtifactDef>
org.wso2.carbon.identity:org.wso2.carbon.security.mgt.feature:${carbon.identity.version}
@ -251,26 +251,26 @@
<feaureArtifactDef>
org.wso2.carbon.identity:org.wso2.carbon.identity.sso.saml.feature:${carbon.identity.version}
</feaureArtifactDef>
<!--feaureArtifactDef>
org.wso2.carbon:org.wso2.stratos.identity.saml2.sso.mgt.feature:${carbon.platform.version}
</feaureArtifactDef-->
<!--<feaureArtifactDef>-->
<!--org.wso2.carbon:org.wso2.stratos.identity.saml2.sso.mgt.feature:${carbon.identity.version}-->
<!--</feaureArtifactDef>-->
<featureArtifactDef>
org.wso2.carbon.identity:org.wso2.carbon.user.mgt.feature:${carbon.identity.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.identity:org.wso2.carbon.claim.mgt.feature:${carbon.identity.version}
</featureArtifactDef>
<!--<featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.identity.user.profile.server.feature:${carbon.platform.version}
</featureArtifactDef>-->
<!-- TODO: Verify this feature is needed -->
<!--<featureArtifactDef>-->
<!--org.wso2.carbon.identity:org.wso2.carbon.identity.authenticator.saml2.sso.feature:${carbon.identity.version}-->
<!--org.wso2.carbon:org.wso2.carbon.identity.user.profile.server.feature:${carbon.identity.version}-->
<!--</featureArtifactDef>-->
<!-- TODO: Verify this feature is needed -->
<!--<feaureArtifactDef>-->
<!--org.wso2.carbon.identity:org.wso2.carbon.identity.sso.saml.feature:${carbon.identity.version}-->
<!--</feaureArtifactDef>-->
<featureArtifactDef>
org.wso2.carbon.identity:org.wso2.carbon.identity.authenticator.saml2.sso.feature:${carbon.identity.version}
</featureArtifactDef>
<!-- TODO: Verify this feature is needed -->
<feaureArtifactDef>
org.wso2.carbon.identity:org.wso2.carbon.identity.sso.saml.feature:${carbon.identity.version}
</feaureArtifactDef>
<!-- SSO Fix-->
<featureArtifactDef>
org.wso2.carbon.identity:org.wso2.carbon.identity.user.profile.feature:${carbon.identity.version}
@ -285,13 +285,13 @@
org.wso2.carbon.identity:org.wso2.carbon.identity.mgt.feature:${carbon.identity.version}
</featureArtifactDef>
<!-- TODO: Verify this feature is needed -->
<!--<featureArtifactDef>-->
<!--org.wso2.carbon.identity:org.wso2.carbon.identity.application.mgt.feature:${carbon.identity.version}-->
<!--</featureArtifactDef>-->
<featureArtifactDef>
org.wso2.carbon.identity:org.wso2.carbon.identity.application.mgt.feature:${carbon.identity.version}
</featureArtifactDef>
<!-- TODO: Verify this feature is needed -->
<!--<featureArtifactDef>-->
<!--org.wso2.carbon.identity:org.wso2.carbon.claim.mgt.server.feature:${carbon.identity.version}-->
<!--</featureArtifactDef>-->
<featureArtifactDef>
org.wso2.carbon.identity:org.wso2.carbon.claim.mgt.server.feature:${carbon.identity.version}
</featureArtifactDef>
<!-- End of SSO Fixes -->
<feaureArtifactDef>
org.wso2.carbon.identity:org.wso2.carbon.identity.core.feature:${carbon.identity.version}
@ -574,7 +574,9 @@
<!-- End of Enterprise Store Features -->
<!--=====================================================================================================-->
<featureArtifactDef>
org.wso2.carbon.mediation:org.apache.synapse.wso2.feature:${carbon.mediation.version}
</featureArtifactDef>
</featureArtifacts>
</configuration>
</execution>
@ -777,36 +779,36 @@
<version>${carbon.platform.version}</version>
</feature-->
<!-- TODO: Verify this feature is needed -->
<!--<feature>-->
<!--<id>org.wso2.carbon.identity.application.authenticator.basicauth.server.feature.group</id>-->
<!--<version>${carbon.identity.version}</version>-->
<!--</feature>-->
<feature>
<id>org.wso2.carbon.identity.application.authenticator.basicauth.server.feature.group</id>
<version>${carbon.identity.version}</version>
</feature>
<!-- TODO: Verify this feature is needed -->
<!--<feature>-->
<!--<id>org.wso2.carbon.identity.application.authentication.framework.server.feature.group</id>-->
<!--<version>${carbon.identity.version}</version>-->
<!--</feature>-->
<feature>
<id>org.wso2.carbon.identity.application.authentication.framework.server.feature.group</id>
<version>${carbon.identity.version}</version>
</feature>
<!-- TODO: Verify this feature is needed -->
<!--<feature>-->
<!--<id>org.wso2.carbon.identity.oauth.server.feature.group</id>-->
<!--<version>${carbon.identity.version}</version>-->
<!--</feature>-->
<feature>
<id>org.wso2.carbon.identity.oauth.server.feature.group</id>
<version>${carbon.identity.version}</version>
</feature>
<!-- TODO: Verify this feature is needed -->
<!--<feature>-->
<!--<id>org.wso2.carbon.identity.oauth.common.feature.group</id>-->
<!--<version>${carbon.identity.version}</version>-->
<!--</feature>-->
<feature>
<id>org.wso2.carbon.identity.oauth.common.feature.group</id>
<version>${carbon.identity.version}</version>
</feature>
<!-- TODO: Verify this feature is needed -->
<!--<feature>-->
<!--<id>org.wso2.carbon.idp.mgt.feature.group</id>-->
<!--<version>${carbon.identity.version}</version>-->
<!--</feature>-->
<feature>
<id>org.wso2.carbon.idp.mgt.feature.group</id>
<version>${carbon.identity.version}</version>
</feature>
<!-- SSO Features -->
<!-- TODO: Verify this feature is needed -->
<!--<feature>-->
<!--<id>org.wso2.carbon.identity.authenticator.saml2.sso.feature.group</id>-->
<!--<version>${carbon.identity.version}</version>-->
<!--</feature>-->
<feature>
<id>org.wso2.carbon.identity.authenticator.saml2.sso.feature.group</id>
<version>${carbon.identity.version}</version>
</feature>
<!-- SSO Fix-->
<feature>
<id>org.wso2.carbon.identity.user.profile.feature.group</id>
@ -825,20 +827,20 @@
<version>${carbon.identity.version}</version>
</feature>
<!-- TODO: Verify this feature is needed -->
<!--<feature>-->
<!--<id>org.wso2.carbon.identity.application.mgt.feature.group</id>-->
<!--<version>${carbon.identity.version}</version>-->
<!--</feature>-->
<feature>
<id>org.wso2.carbon.identity.application.mgt.feature.group</id>
<version>${carbon.identity.version}</version>
</feature>
<!-- TODO: Verify this feature is needed -->
<!--<feature>-->
<!--<id>org.wso2.carbon.claim.mgt.server.feature.group</id>-->
<!--<version>${carbon.identity.version}</version>-->
<!--</feature>-->
<feature>
<id>org.wso2.carbon.claim.mgt.server.feature.group</id>
<version>${carbon.identity.version}</version>
</feature>
<!-- TODO: Verify this feature is needed -->
<!--<feature>-->
<!--<id>org.wso2.carbon.claim.mgt.feature.group</id>-->
<!--<version>${carbon.identity.version}</version>-->
<!--</feature>-->
<feature>
<id>org.wso2.carbon.claim.mgt.feature.group</id>
<version>${carbon.identity.version}</version>
</feature>
<!-- End of SSO Fix -->
<!--Commented to remove SAML SSO menu item-->
<!--<feature>
@ -1083,7 +1085,10 @@
<!--========================================================================================================-->
<!-- End of Enterprise Store Features -->
<feature>
<id>org.apache.synapse.wso2.feature.group</id>
<version>${carbon.mediation.version}</version>
</feature>
</features>
</configuration>
</execution>

@ -797,7 +797,8 @@
<!--Carbon kernel versions-->
<carbon.kernel.version>4.4.1</carbon.kernel.version>
<carbon.kernel.version.range>[4.4.0, 4.5.0)</carbon.kernel.version.range>
<carbon.kernel.version.range>[4.4.1, 4.5.0)</carbon.kernel.version.range>
<carbon.platform.version>4.4.1</carbon.platform.version>
<!--Carbon p2 version-->
<carbon.p2.plugin.version>1.5.4</carbon.p2.plugin.version>
@ -806,11 +807,11 @@
<maven-buildnumber-plugin.version>1.3</maven-buildnumber-plugin.version>
<!--Jaggery -->
<jaggery.version>0.10.2</jaggery.version>
<jaggery.extensions.version>1.3.2</jaggery.extensions.version>
<jaggery.extensions.sso.version>1.3.2</jaggery.extensions.sso.version>
<jaggery.extensions.carbon.version>1.3.2</jaggery.extensions.carbon.version>
<jaggery.extensions.test.version>1.3.2</jaggery.extensions.test.version>
<jaggery.version>0.10.3</jaggery.version>
<jaggery.extensions.version>1.3.3</jaggery.extensions.version>
<jaggery.extensions.sso.version>1.3.3</jaggery.extensions.sso.version>
<jaggery.extensions.carbon.version>1.3.3</jaggery.extensions.carbon.version>
<jaggery.extensions.test.version>1.3.3</jaggery.extensions.test.version>
<!--Additional Jaggery Stuff-->
<caramel.feature.version>1.0.1</caramel.feature.version>
@ -845,22 +846,23 @@
<javax.ws.rs.version>1.1.1</javax.ws.rs.version>
<!-- Carbon Commons -->
<carbon.commons.version>4.4.4</carbon.commons.version>
<carbon.commons.version>4.4.6</carbon.commons.version>
<!-- Carbon Deployment -->
<carbon.deployment.version>4.4.1</carbon.deployment.version>
<carbon.deployment.version>4.5.0</carbon.deployment.version>
<!-- Carbon Identity -->
<carbon.identity.version>4.5.4</carbon.identity.version>
<carbon.identity.version>4.5.5</carbon.identity.version>
<!-- Carbon Multi-tenancy -->
<carbon.multitenancy.version>4.4.1</carbon.multitenancy.version>
<!-- Carbon Registry -->
<carbon.registry.version>4.4.5</carbon.registry.version>
<carbon.registry.version>4.4.6</carbon.registry.version>
<carbon.registry.package.import.version.range>[4.4.1, 4.5.0)</carbon.registry.package.import.version.range>
<!-- Carbon Governance -->
<carbon.governance.version>4.5.2</carbon.governance.version>
<carbon.governance.version>4.5.3</carbon.governance.version>
<!-- Carbon Device Management -->
<carbon.device.mgt.version>0.9.2-SNAPSHOT</carbon.device.mgt.version>
@ -869,8 +871,12 @@
<!-- IOT Device Management -->
<carbon.iot.device.mgt.version>1.0.0-SNAPSHOT</carbon.iot.device.mgt.version>
<!-- carbon mediation -->
<carbon.mediation.version>4.4.5</carbon.mediation.version>
<!-- API Management -->
<carbon.api.mgt.version>1.3.0-SNAPSHOT</carbon.api.mgt.version>
<apimserver.version>1.10.0-SNAPSHOT</apimserver.version>
<!-- Tomcat -->
<orbit.tomcat.version>7.0.59.wso2v1</orbit.tomcat.version>
@ -884,6 +890,17 @@
<codehaus.plexus.version>3.0.21</codehaus.plexus.version>
<axis2-transports.wso2.version>1.1.0-wso2v13</axis2-transports.wso2.version>
<!--DAS-->
<carbon.analytics.version>1.0.3-SNAPSHOT</carbon.analytics.version>
<carbon.analytics.common.version>5.0.1-SNAPSHOT</carbon.analytics.common.version>
<das.release.version>3.0.0-SNAPSHOT</das.release.version>
<carbon.data.version>4.3.1-SNAPSHOT</carbon.data.version>
<cipher.tool.version>1.0.0-wso2v3</cipher.tool.version>
<shindig.version>1.0.0</shindig.version>
<carbon.dashboard.version>1.0.1-SNAPSHOT</carbon.dashboard.version>
<carbon.event-processing.version>2.0.4-SNAPSHOT</carbon.event-processing.version>
<orbit.version.commons-httpclient>3.1.0.wso2v2</orbit.version.commons-httpclient>
<wss4j.security.version>1.6.17</wss4j.security.version>
<wss4j.security.common.version>2.0.0</wss4j.security.common.version>

Loading…
Cancel
Save