Skip to content

Instantly share code, notes, and snippets.

@fghibellini

fghibellini/am.diff

Created May 24, 2017 09:37
Show Gist options
  • Save fghibellini/e455795bf4774588c8069157304afbdd to your computer and use it in GitHub Desktop.
Save fghibellini/e455795bf4774588c8069157304afbdd to your computer and use it in GitHub Desktop.
Download ZIP
Raw
am.diff
diff -C 4 -r clean/wso2am-2.1.0/repository/conf/api-manager.xml wso2am-2.1.0/repository/conf/api-manager.xml
*** clean/wso2am-2.1.0/repository/conf/api-manager.xml 2017-02-02 14:49:16.000000000 +0100
--- wso2am-2.1.0/repository/conf/api-manager.xml 2017-05-24 10:02:46.865844400 +0200
***************
*** 1,9 ****
<APIManager>
<!-- JNDI name of the data source to be used by the API publisher, API store and API
key manager. This data source should be defined in the master-datasources.xml file
in conf/datasources directory. -->
! <DataSourceName>jdbc/WSO2AM_DB</DataSourceName>
<!-- This parameter is used when adding api management capability to other products like GReg, AS, DSS etc.-->
<GatewayType>Synapse</GatewayType>
--- 1,9 ----
<APIManager>
<!-- JNDI name of the data source to be used by the API publisher, API store and API
key manager. This data source should be defined in the master-datasources.xml file
in conf/datasources directory. -->
! <DataSourceName>jdbc/WSO2APIManagerDB</DataSourceName>
<!-- This parameter is used when adding api management capability to other products like GReg, AS, DSS etc.-->
<GatewayType>Synapse</GatewayType>
***************
*** 15,23 ****
a required configuration for both web applications as their user authentication
logic relies on this. -->
<AuthManager>
<!-- Server URL of the Authentication service -->
! <ServerURL>https://localhost:${mgt.transport.https.port}${carbon.context}services/</ServerURL>
<!-- Admin username for the Authentication manager. -->
<Username>${admin.username}</Username>
<!-- Admin password for the Authentication manager. -->
<Password>${admin.password}</Password>
--- 15,23 ----
a required configuration for both web applications as their user authentication
logic relies on this. -->
<AuthManager>
<!-- Server URL of the Authentication service -->
! <ServerURL>https://localhost:9445${carbon.context}services/</ServerURL>
<!-- Admin username for the Authentication manager. -->
<Username>${admin.username}</Username>
<!-- Admin password for the Authentication manager. -->
<Password>${admin.password}</Password>
***************
*** 201,209 ****
API gateway uses it to validate and authenticate users against the provided API keys.
-->
<APIKeyValidator>
<!-- Server URL of the API key manager -->
! <ServerURL>https://localhost:${mgt.transport.https.port}${carbon.context}services/</ServerURL>
<!-- Admin username for API key manager. -->
<Username>${admin.username}</Username>
<!-- Admin password for API key manager. -->
--- 201,209 ----
API gateway uses it to validate and authenticate users against the provided API keys.
-->
<APIKeyValidator>
<!-- Server URL of the API key manager -->
! <ServerURL>https://localhost:9445${carbon.context}services/</ServerURL>
<!-- Admin username for API key manager. -->
<Username>${admin.username}</Username>
<!-- Admin password for API key manager. -->
***************
*** 215,227 ****
-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.
-The Gateway uses this parameter to connect to the key validation thrift service. -->
! <KeyValidatorClientType>ThriftClient</KeyValidatorClientType>
<ThriftClientConnectionTimeOut>10000</ThriftClientConnectionTimeOut>
<!--ThriftClientPort>10397</ThriftClientPort-->
! <EnableThriftServer>true</EnableThriftServer>
<ThriftServerHost>localhost</ThriftServerHost>
<!--ThriftServerPort>10397</ThriftServerPort-->
<!--ConnectionPool>
--- 215,227 ----
-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.
-The Gateway uses this parameter to connect to the key validation thrift service. -->
! <KeyValidatorClientType>WSClient</KeyValidatorClientType>
<ThriftClientConnectionTimeOut>10000</ThriftClientConnectionTimeOut>
<!--ThriftClientPort>10397</ThriftClientPort-->
! <EnableThriftServer>false</EnableThriftServer>
<ThriftServerHost>localhost</ThriftServerHost>
<!--ThriftServerPort>10397</ThriftServerPort-->
<!--ConnectionPool>
diff -C 4 -r clean/wso2am-2.1.0/repository/conf/datasources/master-datasources.xml wso2am-2.1.0/repository/conf/datasources/master-datasources.xml
*** clean/wso2am-2.1.0/repository/conf/datasources/master-datasources.xml 2017-02-02 14:41:36.000000000 +0100
--- wso2am-2.1.0/repository/conf/datasources/master-datasources.xml 2017-05-19 15:26:58.156844400 +0200
***************
*** 6,24 ****
<datasources>
<datasource>
! <name>WSO2_CARBON_DB</name>
! <description>The datasource used for registry and user manager</description>
<jndiConfig>
! <name>jdbc/WSO2CarbonDB</name>
</jndiConfig>
<definition type="RDBMS">
<configuration>
! <url>jdbc:h2:repository/database/WSO2CARBON_DB;DB_CLOSE_ON_EXIT=FALSE</url>
! <username>wso2carbon</username>
! <password>wso2carbon</password>
! <driverClassName>org.h2.Driver</driverClassName>
<maxActive>50</maxActive>
<maxWait>60000</maxWait>
<testOnBorrow>true</testOnBorrow>
<validationQuery>SELECT 1</validationQuery>
--- 6,24 ----
<datasources>
<datasource>
! <name>WSO2_AM_REG_DB</name>
! <description>The datasource used for local registry</description>
<jndiConfig>
! <name>jdbc/WSO2APIManaggerRegistryDB</name>
</jndiConfig>
<definition type="RDBMS">
<configuration>
! <url>jdbc:mysql://127.0.0.1:3306/WSO2_AM_REG_DB?autoReconnect=true&amp;relaxAutoCommit=true&amp;</url>
! <username>wso2_amreg</username>
! <password>pass1</password>
! <driverClassName>com.mysql.jdbc.Driver</driverClassName>
<maxActive>50</maxActive>
<maxWait>60000</maxWait>
<testOnBorrow>true</testOnBorrow>
<validationQuery>SELECT 1</validationQuery>
***************
*** 27,46 ****
</definition>
</datasource>
<datasource>
! <name>WSO2AM_DB</name>
<description>The datasource used for API Manager database</description>
<jndiConfig>
! <name>jdbc/WSO2AM_DB</name>
</jndiConfig>
<definition type="RDBMS">
<configuration>
! <url>jdbc:h2:repository/database/WSO2AM_DB;DB_CLOSE_ON_EXIT=FALSE</url>
! <username>wso2carbon</username>
! <password>wso2carbon</password>
<defaultAutoCommit>false</defaultAutoCommit>
! <driverClassName>org.h2.Driver</driverClassName>
<maxActive>50</maxActive>
<maxWait>60000</maxWait>
<testOnBorrow>true</testOnBorrow>
<validationQuery>SELECT 1</validationQuery>
--- 27,111 ----
</definition>
</datasource>
<datasource>
! <name>WSO2_REG_DB</name>
! <description>The datasource used for shared registry</description>
! <jndiConfig>
! <name>jdbc/WSO2SharedRegistryDB</name>
! </jndiConfig>
! <definition type="RDBMS">
! <configuration>
! <url>jdbc:mysql://127.0.0.1:3306/WSO2_REG_DB?autoReconnect=true&amp;relaxAutoCommit=true&amp;</url>
! <username>wso2_reg</username>
! <password>pass1</password>
! <driverClassName>com.mysql.jdbc.Driver</driverClassName>
! <maxActive>50</maxActive>
! <maxWait>60000</maxWait>
! <testOnBorrow>true</testOnBorrow>
! <validationQuery>SELECT 1</validationQuery>
! <validationInterval>30000</validationInterval>
! </configuration>
! </definition>
! </datasource>
!
! <datasource>
! <name>WSO2_AM_DB</name>
<description>The datasource used for API Manager database</description>
<jndiConfig>
! <name>jdbc/WSO2APIManagerDB</name>
! </jndiConfig>
! <definition type="RDBMS">
! <configuration>
! <url>jdbc:mysql://127.0.0.1:3306/WSO2_AM_DB?autoReconnect=true&amp;relaxAutoCommit=true&amp;</url>
! <username>wso2_am</username>
! <password>pass1</password>
! <defaultAutoCommit>false</defaultAutoCommit>
! <driverClassName>com.mysql.jdbc.Driver</driverClassName>
! <maxActive>50</maxActive>
! <maxWait>60000</maxWait>
! <testOnBorrow>true</testOnBorrow>
! <validationQuery>SELECT 1</validationQuery>
! <validationInterval>30000</validationInterval>
! </configuration>
! </definition>
! </datasource>
!
! <datasource>
! <name>WSO2_UM_DB</name>
! <description>The datasource used for user management database</description>
! <jndiConfig>
! <name>jdbc/WSO2UserManagementDB</name>
! </jndiConfig>
! <definition type="RDBMS">
! <configuration>
! <url>jdbc:mysql://127.0.0.1:3306/WSO2_UM_DB?autoReconnect=true&amp;relaxAutoCommit=true&amp;</url>
! <username>wso2_um</username>
! <password>pass1</password>
! <defaultAutoCommit>false</defaultAutoCommit>
! <driverClassName>com.mysql.jdbc.Driver</driverClassName>
! <maxActive>50</maxActive>
! <maxWait>60000</maxWait>
! <testOnBorrow>true</testOnBorrow>
! <validationQuery>SELECT 1</validationQuery>
! <validationInterval>30000</validationInterval>
! </configuration>
! </definition>
! </datasource>
!
! <datasource>
! <name>WSO2_AM_ID_DB</name>
! <description>The datasource used for authentication database</description>
! <jndiConfig>
! <name>jdbc/WSO2APIManagerIdentityDB</name>
</jndiConfig>
<definition type="RDBMS">
<configuration>
! <url>jdbc:mysql://127.0.0.1:3306/WSO2_AM_ID_DB?autoReconnect=true&amp;relaxAutoCommit=true&amp;</url>
! <username>wso2_amid</username>
! <password>pass1</password>
<defaultAutoCommit>false</defaultAutoCommit>
! <driverClassName>com.mysql.jdbc.Driver</driverClassName>
<maxActive>50</maxActive>
<maxWait>60000</maxWait>
<testOnBorrow>true</testOnBorrow>
<validationQuery>SELECT 1</validationQuery>
diff -C 4 -r clean/wso2am-2.1.0/repository/conf/identity/identity.xml wso2am-2.1.0/repository/conf/identity/identity.xml
*** clean/wso2am-2.1.0/repository/conf/identity/identity.xml 2017-02-02 14:50:06.000000000 +0100
--- wso2am-2.1.0/repository/conf/identity/identity.xml 2017-05-19 09:56:30.544844400 +0200
***************
*** 18,26 ****
<JDBCPersistenceManager>
<DataSource>
<!-- Include a data source name (jndiConfigName) from the set of data
sources defined in master-datasources.xml -->
! <Name>jdbc/WSO2AM_DB</Name>
</DataSource>
<!-- If the identity database is created from another place and if it is
required to skip schema initialization during the server start up, set the
following property to "true". -->
--- 18,26 ----
<JDBCPersistenceManager>
<DataSource>
<!-- Include a data source name (jndiConfigName) from the set of data
sources defined in master-datasources.xml -->
! <Name>jdbc/WSO2APIManagerDB</Name>
</DataSource>
<!-- If the identity database is created from another place and if it is
required to skip schema initialization during the server start up, set the
following property to "true". -->
diff -C 4 -r clean/wso2am-2.1.0/repository/conf/identity/thrift-authentication.xml wso2am-2.1.0/repository/conf/identity/thrift-authentication.xml
*** clean/wso2am-2.1.0/repository/conf/identity/thrift-authentication.xml 2017-02-02 14:50:04.000000000 +0100
--- wso2am-2.1.0/repository/conf/identity/thrift-authentication.xml 2017-05-19 10:00:10.006844400 +0200
***************
*** 18,26 ****
<JDBCPersistenceManager>
<DataSource>
<!-- Include a data source name (jndiConfigName) from the set of data sources defined in master-datasources.xml -->
! <Name>jdbc/WSO2AM_DB</Name>
</DataSource>
<!-- If the identity database is created from another place and if it is required to skip schema initialization during the server start up, set the following
property to "true". -->
<!--<SkipDBSchemaCreation>true</SkipDBSchemaCreation>-->
--- 18,26 ----
<JDBCPersistenceManager>
<DataSource>
<!-- Include a data source name (jndiConfigName) from the set of data sources defined in master-datasources.xml -->
! <Name>jdbc/WSO2APIManagerDB</Name>
</DataSource>
<!-- If the identity database is created from another place and if it is required to skip schema initialization during the server start up, set the following
property to "true". -->
<!--<SkipDBSchemaCreation>true</SkipDBSchemaCreation>-->
***************
*** 36,40 ****
<!--30 min-->
<ThriftSessionTimeout>1800000</ThriftSessionTimeout>
! </Server>
\ No newline at end of file
--- 36,40 ----
<!--30 min-->
<ThriftSessionTimeout>1800000</ThriftSessionTimeout>
! </Server>
diff -C 4 -r clean/wso2am-2.1.0/repository/conf/registry.xml wso2am-2.1.0/repository/conf/registry.xml
*** clean/wso2am-2.1.0/repository/conf/registry.xml 2017-02-02 14:41:36.000000000 +0100
--- wso2am-2.1.0/repository/conf/registry.xml 2017-05-24 09:35:09.041844400 +0200
***************
*** 26,34 ****
<enableCache>true</enableCache>
<registryRoot>/</registryRoot>
<dbConfig name="wso2registry">
! <dataSource>jdbc/WSO2CarbonDB</dataSource>
</dbConfig>
<!-- This handler provides the feature to add a simlink to a given resource -->
--- 26,34 ----
<enableCache>true</enableCache>
<registryRoot>/</registryRoot>
<dbConfig name="wso2registry">
! <dataSource>jdbc/WSO2APIManaggerRegistryDB</dataSource>
</dbConfig>
<!-- This handler provides the feature to add a simlink to a given resource -->
***************
*** 351,355 ****
--- 351,379 ----
<property key="bar" value="BarVal" />
</task>
</tasks-->
+ <dbConfig name="govregistry">
+ <dataSource>jdbc/WSO2SharedRegistryDB</dataSource>
+ </dbConfig>
+
+ <remoteInstance url="https://localhost">
+ <id>gov</id>
+ <dbConfig>govregistry</dbConfig>
+ <cacheId>apiuser@jdbc:mysql://localhost:3306/registry</cacheId>
+ <readOnly>false</readOnly>
+ <enableCache>false</enableCache>
+ <registryRoot>/</registryRoot>
+ </remoteInstance>
+
+ <mount path="/_system/governance" overwrite="true">
+ <instanceId>gov</instanceId>
+ <targetPath>/_system/governance</targetPath>
+ </mount>
+
+ <mount path="/_system/config" overwrite="true">
+ <instanceId>gov</instanceId>
+ <targetPath>/_system/config</targetPath>
+ </mount>
+
+
</wso2registry>
Only in wso2am-2.1.0/repository/conf/: solr
diff -C 4 -r clean/wso2am-2.1.0/repository/conf/thrift-authentication.xml wso2am-2.1.0/repository/conf/thrift-authentication.xml
*** clean/wso2am-2.1.0/repository/conf/thrift-authentication.xml 2017-02-02 14:41:36.000000000 +0100
--- wso2am-2.1.0/repository/conf/thrift-authentication.xml 2017-05-19 09:56:28.842844400 +0200
***************
*** 22,30 ****
<JDBCPersistenceManager>
<DataSource>
<!-- Include a data source name (jndiConfigName) from the set of data sources defined in master-datasources.xml -->
! <Name>jdbc/WSO2AM_DB</Name>
</DataSource>
<!-- If the identity database is created from another place and if it is required to skip schema initialization during the server start up, set the following
property to "true". -->
<!--<SkipDBSchemaCreation>true</SkipDBSchemaCreation>-->
--- 22,30 ----
<JDBCPersistenceManager>
<DataSource>
<!-- Include a data source name (jndiConfigName) from the set of data sources defined in master-datasources.xml -->
! <Name>jdbc/WSO2APIManagerDB</Name>
</DataSource>
<!-- If the identity database is created from another place and if it is required to skip schema initialization during the server start up, set the following
property to "true". -->
<!--<SkipDBSchemaCreation>true</SkipDBSchemaCreation>-->
***************
*** 40,44 ****
<!--30 min-->
<ThriftSessionTimeout>1800000</ThriftSessionTimeout>
! </Server>
\ No newline at end of file
--- 40,44 ----
<!--30 min-->
<ThriftSessionTimeout>1800000</ThriftSessionTimeout>
! </Server>
diff -C 4 -r clean/wso2am-2.1.0/repository/conf/user-mgt.xml wso2am-2.1.0/repository/conf/user-mgt.xml
*** clean/wso2am-2.1.0/repository/conf/user-mgt.xml 2017-02-02 14:50:06.000000000 +0100
--- wso2am-2.1.0/repository/conf/user-mgt.xml 2017-05-24 09:32:36.235844400 +0200
***************
*** 26,34 ****
<EveryOneRoleName>everyone</EveryOneRoleName>
<!-- By default users in this role sees the registry root -->
<Property name="isCascadeDeleteEnabled">true</Property>
<Property name="initializeNewClaimManager">true</Property>
! <Property name="dataSource">jdbc/WSO2CarbonDB</Property>
</Configuration>
<!-- Following is the configuration for internal JDBC user store. This user store manager is based on JDBC.
In case if application needs to manage passwords externally set property
<Property name="PasswordsExternallyManaged">true</Property>.
--- 26,34 ----
<EveryOneRoleName>everyone</EveryOneRoleName>
<!-- By default users in this role sees the registry root -->
<Property name="isCascadeDeleteEnabled">true</Property>
<Property name="initializeNewClaimManager">true</Property>
! <Property name="dataSource">jdbc/WSO2UserManagementDB</Property>
</Configuration>
<!-- Following is the configuration for internal JDBC user store. This user store manager is based on JDBC.
In case if application needs to manage passwords externally set property
<Property name="PasswordsExternallyManaged">true</Property>.
***************
*** 37,45 ****
Furthermore properties, IsEmailUserName and DomainCalculation are readonly properties.
Note: Do not comment within UserStoreManager tags. Cause, specific tag names are used as tokens
when building configurations for products.
-->
! <UserStoreManager class="org.wso2.carbon.user.core.jdbc.JDBCUserStoreManager">
<Property name="TenantManager">org.wso2.carbon.user.core.tenant.JDBCTenantManager</Property>
<Property name="ReadOnly">false</Property>
<Property name="ReadGroups">true</Property>
<Property name="WriteGroups">true</Property>
--- 37,45 ----
Furthermore properties, IsEmailUserName and DomainCalculation are readonly properties.
Note: Do not comment within UserStoreManager tags. Cause, specific tag names are used as tokens
when building configurations for products.
-->
! <!--UserStoreManager class="org.wso2.carbon.user.core.jdbc.JDBCUserStoreManager">
<Property name="TenantManager">org.wso2.carbon.user.core.tenant.JDBCTenantManager</Property>
<Property name="ReadOnly">false</Property>
<Property name="ReadGroups">true</Property>
<Property name="WriteGroups">true</Property>
***************
*** 60,68 ****
<Property name="MaxUserNameListLength">100</Property>
<Property name="MaxRoleNameListLength">100</Property>
<Property name="UserRolesCacheEnabled">true</Property>
<Property name="UserNameUniqueAcrossTenants">false</Property>
! </UserStoreManager>
<!-- If product is using an external LDAP as the user store in READ ONLY mode, use following user manager.
In case if user core cache domain is needed to identify uniquely set property
<Property name="UserCoreCacheIdentifier">domain</Property>
-->
--- 60,68 ----
<Property name="MaxUserNameListLength">100</Property>
<Property name="MaxRoleNameListLength">100</Property>
<Property name="UserRolesCacheEnabled">true</Property>
<Property name="UserNameUniqueAcrossTenants">false</Property>
! </UserStoreManager-->
<!-- If product is using an external LDAP as the user store in READ ONLY mode, use following user manager.
In case if user core cache domain is needed to identify uniquely set property
<Property name="UserCoreCacheIdentifier">domain</Property>
-->
***************
*** 163,173 ****
Thus "ServicePasswordJavaRegEx", "ServiceNameJavaRegEx" properties control the service name format and
service password formats. In case if user core cache domain is needed to identify uniquely set property
<Property name="UserCoreCacheIdentifier">domain</Property>
-->
! <!--ISUserStoreManager class="org.wso2.carbon.user.core.ldap.ReadWriteLDAPUserStoreManager">
<Property name="TenantManager">org.wso2.carbon.user.core.tenant.CommonHybridLDAPTenantManager</Property>
! <Property name="ConnectionURL">ldap://localhost:${Ports.EmbeddedLDAP.LDAPServerPort}</Property>
<Property name="ConnectionName">uid=admin,ou=system</Property>
<Property name="ConnectionPassword">admin</Property>
<Property name="AnonymousBind">false</Property>
<Property name="UserSearchBase">ou=Users,dc=wso2,dc=org</Property>
--- 163,173 ----
Thus "ServicePasswordJavaRegEx", "ServiceNameJavaRegEx" properties control the service name format and
service password formats. In case if user core cache domain is needed to identify uniquely set property
<Property name="UserCoreCacheIdentifier">domain</Property>
-->
! <UserStoreManager class="org.wso2.carbon.user.core.ldap.ReadWriteLDAPUserStoreManager">
<Property name="TenantManager">org.wso2.carbon.user.core.tenant.CommonHybridLDAPTenantManager</Property>
! <Property name="ConnectionURL">ldap://localhost:10391</Property>
<Property name="ConnectionName">uid=admin,ou=system</Property>
<Property name="ConnectionPassword">admin</Property>
<Property name="AnonymousBind">false</Property>
<Property name="UserSearchBase">ou=Users,dc=wso2,dc=org</Property>
***************
*** 206,214 ****
<Property name="ConnectionPoolingEnabled">false</Property>
<Property name="LDAPConnectionTimeout">5000</Property>
<Property name="ReadTimeout"/>
<Property name="RetryAttempts"/>
! </ISUserStoreManager-->
<AuthorizationManager class="org.wso2.carbon.user.core.authorization.JDBCAuthorizationManager">
<Property name="AdminRoleManagementPermissions">/permission</Property>
<Property name="AuthorizationCacheEnabled">true</Property>
<Property name="GetAllRolesOfUserEnabled">false</Property>
--- 206,214 ----
<Property name="ConnectionPoolingEnabled">false</Property>
<Property name="LDAPConnectionTimeout">5000</Property>
<Property name="ReadTimeout"/>
<Property name="RetryAttempts"/>
! </UserStoreManager>
<AuthorizationManager class="org.wso2.carbon.user.core.authorization.JDBCAuthorizationManager">
<Property name="AdminRoleManagementPermissions">/permission</Property>
<Property name="AuthorizationCacheEnabled">true</Property>
<Property name="GetAllRolesOfUserEnabled">false</Property>
Raw
is.diff
Only in wso2is-5.3.0/repository/conf/: api-manager.xml
diff -C 4 -r clean/wso2is-5.3.0/repository/conf/carbon.xml wso2is-5.3.0/repository/conf/carbon.xml
*** clean/wso2is-5.3.0/repository/conf/carbon.xml 2017-01-06 13:35:08.000000000 +0100
--- wso2is-5.3.0/repository/conf/carbon.xml 2017-05-19 15:08:30.719844400 +0200
***************
*** 123,131 ****
<!-- Ports offset. This entry will set the value of the ports defined below to
the define value + Offset.
e.g. Offset=2 and HTTPS port=9443 will set the effective HTTPS port to 9445
-->
! <Offset>0</Offset>
<!-- The JMX Ports -->
<JMX>
<!--The port RMI registry is exposed-->
--- 123,131 ----
<!-- Ports offset. This entry will set the value of the ports defined below to
the define value + Offset.
e.g. Offset=2 and HTTPS port=9443 will set the effective HTTPS port to 9445
-->
! <Offset>2</Offset>
<!-- The JMX Ports -->
<JMX>
<!--The port RMI registry is exposed-->
diff -C 4 -r clean/wso2is-5.3.0/repository/conf/datasources/master-datasources.xml wso2is-5.3.0/repository/conf/datasources/master-datasources.xml
*** clean/wso2is-5.3.0/repository/conf/datasources/master-datasources.xml 2016-12-21 18:58:42.000000000 +0100
--- wso2is-5.3.0/repository/conf/datasources/master-datasources.xml 2017-05-19 15:26:43.048844400 +0200
***************
*** 1,21 ****
<datasources-configuration xmlns:svns="http://org.wso2.securevault/configuration">
!
<providers>
<provider>org.wso2.carbon.ndatasource.rdbms.RDBMSDataSourceReader</provider>
</providers>
!
<datasources>
!
<datasource>
! <name>WSO2_CARBON_DB</name>
! <description>The datasource used for registry and user manager</description>
<jndiConfig>
! <name>jdbc/WSO2CarbonDB</name>
</jndiConfig>
<definition type="RDBMS">
<configuration>
! <url>jdbc:h2:./repository/database/WSO2CARBON_DB;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000</url>
<username>wso2carbon</username>
<password>wso2carbon</password>
<driverClassName>org.h2.Driver</driverClassName>
<maxActive>50</maxActive>
--- 1,128 ----
<datasources-configuration xmlns:svns="http://org.wso2.securevault/configuration">
!
<providers>
<provider>org.wso2.carbon.ndatasource.rdbms.RDBMSDataSourceReader</provider>
</providers>
!
<datasources>
!
! <datasource>
! <name>WSO2_IS_REG_DB</name>
! <description>The datasource used for local registry</description>
! <jndiConfig>
! <name>jdbc/WSO2IdentityServerRegistryDB</name>
! </jndiConfig>
! <definition type="RDBMS">
! <configuration>
! <url>jdbc:mysql://127.0.0.1:3306/WSO2_IS_REG_DB?autoReconnect=true&amp;relaxAutoCommit=true&amp;</url>
! <username>wso2_isreg</username>
! <password>pass1</password>
! <driverClassName>com.mysql.jdbc.Driver</driverClassName>
! <maxActive>50</maxActive>
! <maxWait>60000</maxWait>
! <testOnBorrow>true</testOnBorrow>
! <validationQuery>SELECT 1</validationQuery>
! <validationInterval>30000</validationInterval>
! </configuration>
! </definition>
! </datasource>
!
! <datasource>
! <name>WSO2_REG_DB</name>
! <description>The datasource used for shared registry</description>
! <jndiConfig>
! <name>jdbc/WSO2SharedRegistryDB</name>
! </jndiConfig>
! <definition type="RDBMS">
! <configuration>
! <url>jdbc:mysql://127.0.0.1:3306/WSO2_REG_DB?autoReconnect=true&amp;relaxAutoCommit=true&amp;</url>
! <username>wso2_reg</username>
! <password>pass1</password>
! <driverClassName>com.mysql.jdbc.Driver</driverClassName>
! <maxActive>50</maxActive>
! <maxWait>60000</maxWait>
! <testOnBorrow>true</testOnBorrow>
! <validationQuery>SELECT 1</validationQuery>
! <validationInterval>30000</validationInterval>
! </configuration>
! </definition>
! </datasource>
!
! <datasource>
! <name>WSO2_AM_DB</name>
! <description>The datasource used for API Manager database</description>
! <jndiConfig>
! <name>jdbc/WSO2APIManagerDB</name>
! </jndiConfig>
! <definition type="RDBMS">
! <configuration>
! <url>jdbc:mysql://127.0.0.1:3306/WSO2_AM_DB?autoReconnect=true&amp;relaxAutoCommit=true&amp;</url>
! <username>wso2_am</username>
! <password>pass1</password>
! <defaultAutoCommit>false</defaultAutoCommit>
! <driverClassName>com.mysql.jdbc.Driver</driverClassName>
! <maxActive>50</maxActive>
! <maxWait>60000</maxWait>
! <testOnBorrow>true</testOnBorrow>
! <validationQuery>SELECT 1</validationQuery>
! <validationInterval>30000</validationInterval>
! </configuration>
! </definition>
! </datasource>
!
! <datasource>
! <name>WSO2_UM_DB</name>
! <description>The datasource used for user management database</description>
! <jndiConfig>
! <name>jdbc/WSO2UserManagementDB</name>
! </jndiConfig>
! <definition type="RDBMS">
! <configuration>
! <url>jdbc:mysql://127.0.0.1:3306/WSO2_UM_DB?autoReconnect=true&amp;relaxAutoCommit=true&amp;</url>
! <username>wso2_um</username>
! <password>pass1</password>
! <defaultAutoCommit>false</defaultAutoCommit>
! <driverClassName>com.mysql.jdbc.Driver</driverClassName>
! <maxActive>50</maxActive>
! <maxWait>60000</maxWait>
! <testOnBorrow>true</testOnBorrow>
! <validationQuery>SELECT 1</validationQuery>
! <validationInterval>30000</validationInterval>
! </configuration>
! </definition>
! </datasource>
!
! <datasource>
! <name>WSO2AM_STATS_DB</name>
! <description>The datasource used for getting statistics to API Manager</description>
! <jndiConfig>
! <name>jdbc/WSO2AM_STATS_DB</name>
! </jndiConfig>
! <definition type="RDBMS">
! <configuration>
! <url>jdbc:h2:<!-- Full path to JDBC database -->;AUTO_SERVER=TRUE</url>
! <username>wso2carbon</username>
! <password>wso2carbon</password>
! <driverClassName>org.h2.Driver</driverClassName>
! <maxActive>50</maxActive>
! <maxWait>60000</maxWait>
! <testOnBorrow>true</testOnBorrow>
! <validationQuery>SELECT 1</validationQuery>
! <validationInterval>30000</validationInterval>
! </configuration>
! </definition>
! </datasource>
!
<datasource>
! <name>WSO2_MB_STORE_DB</name>
! <description>The datasource used for message broker database</description>
<jndiConfig>
! <name>WSO2MBStoreDB</name>
</jndiConfig>
<definition type="RDBMS">
<configuration>
! <url>jdbc:h2:repository/database/WSO2MB_DB;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000</url>
<username>wso2carbon</username>
<password>wso2carbon</password>
<driverClassName>org.h2.Driver</driverClassName>
<maxActive>50</maxActive>
***************
*** 32,43 ****
<!--datasource>
<name>SAMPLE_DATA_SOURCE</name>
<jndiConfig>
<name></name>
! <environment>
<property name="java.naming.factory.initial"></property>
<property name="java.naming.provider.url"></property>
! </environment>
</jndiConfig>
<definition type="RDBMS">
<configuration>
--- 139,150 ----
<!--datasource>
<name>SAMPLE_DATA_SOURCE</name>
<jndiConfig>
<name></name>
! <properties>
<property name="java.naming.factory.initial"></property>
<property name="java.naming.provider.url"></property>
! </properties>
</jndiConfig>
<definition type="RDBMS">
<configuration>
diff -C 4 -r clean/wso2is-5.3.0/repository/conf/identity/identity.xml wso2is-5.3.0/repository/conf/identity/identity.xml
*** clean/wso2is-5.3.0/repository/conf/identity/identity.xml 2017-01-06 13:33:38.000000000 +0100
--- wso2is-5.3.0/repository/conf/identity/identity.xml 2017-05-19 15:50:48.615844400 +0200
***************
*** 20,28 ****
<JDBCPersistenceManager>
<DataSource>
<!-- Include a data source name (jndiConfigName) from the set of data
sources defined in master-datasources.xml -->
! <Name>jdbc/WSO2CarbonDB</Name>
</DataSource>
<!-- If the identity database is created from another place and if it is
required to skip schema initialization during the server start up, set the
following property to "true". -->
--- 20,28 ----
<JDBCPersistenceManager>
<DataSource>
<!-- Include a data source name (jndiConfigName) from the set of data
sources defined in master-datasources.xml -->
! <Name>jdbc/WSO2IdentityServerRegistryDB</Name>
</DataSource>
<!-- If the identity database is created from another place and if it is
required to skip schema initialization during the server start up, set the
following property to "true". -->
diff -C 4 -r clean/wso2is-5.3.0/repository/conf/identity/thrift-authentication.xml wso2is-5.3.0/repository/conf/identity/thrift-authentication.xml
*** clean/wso2is-5.3.0/repository/conf/identity/thrift-authentication.xml 2017-01-06 13:33:38.000000000 +0100
--- wso2is-5.3.0/repository/conf/identity/thrift-authentication.xml 2017-05-19 15:51:15.153844400 +0200
***************
*** 20,28 ****
<JDBCPersistenceManager>
<DataSource>
<!-- Include a data source name (jndiConfigName) from the set of data sources defined in master-datasources.xml -->
! <Name>jdbc/WSO2CarbonDB</Name>
</DataSource>
<!-- If the identity database is created from another place and if it is required to skip schema initialization during the server start up, set the following
property to "true". -->
<!--<SkipDBSchemaCreation>true</SkipDBSchemaCreation>-->
--- 20,28 ----
<JDBCPersistenceManager>
<DataSource>
<!-- Include a data source name (jndiConfigName) from the set of data sources defined in master-datasources.xml -->
! <Name>jdbc/WSO2IdentityServerRegistryDB</Name>
</DataSource>
<!-- If the identity database is created from another place and if it is required to skip schema initialization during the server start up, set the following
property to "true". -->
<!--<SkipDBSchemaCreation>true</SkipDBSchemaCreation>-->
diff -C 4 -r clean/wso2is-5.3.0/repository/conf/registry.xml wso2is-5.3.0/repository/conf/registry.xml
*** clean/wso2is-5.3.0/repository/conf/registry.xml 2017-01-06 13:35:00.000000000 +0100
--- wso2is-5.3.0/repository/conf/registry.xml 2017-05-19 15:38:38.663844400 +0200
***************
*** 27,35 ****
<enableCache>true</enableCache>
<registryRoot>/</registryRoot>
<dbConfig name="wso2registry">
! <dataSource>jdbc/WSO2CarbonDB</dataSource>
</dbConfig>
<handler class="org.wso2.carbon.identity.entitlement.policy.finder.registry.RegistryPolicyHandler">
<filter class="org.wso2.carbon.identity.entitlement.policy.finder.registry.RegistryPolicyMediaTypeMatcher">
--- 27,35 ----
<enableCache>true</enableCache>
<registryRoot>/</registryRoot>
<dbConfig name="wso2registry">
! <dataSource>jdbc/WSO2IdentityServerRegistryDB</dataSource>
</dbConfig>
<handler class="org.wso2.carbon.identity.entitlement.policy.finder.registry.RegistryPolicyHandler">
<filter class="org.wso2.carbon.identity.entitlement.policy.finder.registry.RegistryPolicyMediaTypeMatcher">
***************
*** 131,135 ****
--- 131,159 ----
<versioningComments>true</versioningComments>
<versioningTags>true</versioningTags>
<versioningRatings>true</versioningRatings>
</staticConfiguration>
+
+ <dbConfig name="govregistry">
+ <dataSource>jdbc/WSO2SharedRegistryDB</dataSource>
+ </dbConfig>
+
+ <remoteInstance url="https://localhost">
+ <id>gov</id>
+ <dbConfig>govregistry</dbConfig>
+ <cacheId>apiuser@jdbc:mysql://localhost:3306/registry</cacheId>
+ <readOnly>false</readOnly>
+ <enableCache>false</enableCache>
+ <registryRoot>/</registryRoot>
+ </remoteInstance>
+
+ <mount path="/_system/governance" overwrite="true">
+ <instanceId>gov</instanceId>
+ <targetPath>/_system/governance</targetPath>
+ </mount>
+
+ <mount path="/_system/config" overwrite="true">
+ <instanceId>gov</instanceId>
+ <targetPath>/_system/config</targetPath>
+ </mount>
+
</wso2registry>
Only in wso2is-5.3.0/repository/conf/: solr
diff -C 4 -r clean/wso2is-5.3.0/repository/conf/user-mgt.xml wso2is-5.3.0/repository/conf/user-mgt.xml
*** clean/wso2is-5.3.0/repository/conf/user-mgt.xml 2017-01-06 13:34:56.000000000 +0100
--- wso2is-5.3.0/repository/conf/user-mgt.xml 2017-05-19 15:41:06.137844400 +0200
***************
*** 25,33 ****
</AdminUser>
<EveryOneRoleName>everyone</EveryOneRoleName> <!-- By default users in this role sees the registry root -->
<Property name="isCascadeDeleteEnabled">true</Property>
<Property name="initializeNewClaimManager">true</Property>
! <Property name="dataSource">jdbc/WSO2CarbonDB</Property>
</Configuration>
<!-- Following is the configuration for internal JDBC user store. This user store manager is based on JDBC.
In case if application needs to manage passwords externally set property
--- 25,33 ----
</AdminUser>
<EveryOneRoleName>everyone</EveryOneRoleName> <!-- By default users in this role sees the registry root -->
<Property name="isCascadeDeleteEnabled">true</Property>
<Property name="initializeNewClaimManager">true</Property>
! <Property name="dataSource">jdbc/WSO2UserManagementDB</Property>
</Configuration>
<!-- Following is the configuration for internal JDBC user store. This user store manager is based on JDBC.
In case if application needs to manage passwords externally set property
Raw
mysq-init.sh
#!/bin/bash
# NOTES
# -----
# using 127.0.0.1 as the mysql client replaces localhost with the unix socket path
#####################
# DATABASE CREATION #
#####################
mysql -f -h 127.0.0.1 -u root -pheslo <<EOF
-- clean up databases & users
drop database if exists WSO2_AM_DB;
drop database if exists WSO2_IS_DB;
drop database if exists WSO2_AM_REG_DB;
drop database if exists WSO2_IS_REG_DB;
drop database if exists WSO2_REG_DB;
drop database if exists WSO2_UM_DB;
drop database if exists WSO2_AM_ID_DB;
drop user 'wso2_am';
drop user 'wso2_is';
drop user 'wso2_amreg';
drop user 'wso2_isreg';
drop user 'wso2_reg';
drop user 'wso2_um';
drop user 'wso2_amid';
-- create dbs
CREATE DATABASE WSO2_AM_DB;
CREATE DATABASE WSO2_IS_DB;
CREATE DATABASE WSO2_AM_REG_DB;
CREATE DATABASE WSO2_IS_REG_DB;
CREATE DATABASE WSO2_REG_DB;
CREATE DATABASE WSO2_UM_DB;
CREATE DATABASE WSO2_AM_ID_DB;
-- create users
CREATE USER 'wso2_am'@'%' IDENTIFIED BY 'pass1';
CREATE USER 'wso2_is'@'%' IDENTIFIED BY 'pass1';
CREATE USER 'wso2_amreg'@'%' IDENTIFIED BY 'pass1';
CREATE USER 'wso2_isreg'@'%' IDENTIFIED BY 'pass1';
CREATE USER 'wso2_reg'@'%' IDENTIFIED BY 'pass1';
CREATE USER 'wso2_um'@'%' IDENTIFIED BY 'pass1';
CREATE USER 'wso2_amid'@'%' IDENTIFIED BY 'pass1';
-- give access to dbs to respective users
GRANT ALL ON WSO2_AM_DB.* TO wso2_am;
GRANT ALL ON WSO2_IS_DB.* TO wso2_is;
GRANT ALL ON WSO2_AM_REG_DB.* TO wso2_amreg;
GRANT ALL ON WSO2_IS_REG_DB.* TO wso2_isreg;
GRANT ALL ON WSO2_REG_DB.* TO wso2_reg;
GRANT ALL ON WSO2_UM_DB.* TO wso2_um;
GRANT ALL ON WSO2_AM_ID_DB.* TO wso2_amid;
EOF
###########################
# DATABASE INITIALIZATION #
###########################
mysql -h 127.0.0.1 -u wso2_am -ppass1 -D WSO2_AM_DB < /opt/wso2/wso2am-2.1.0/dbscripts/apimgt/mysql.sql
mysql -h 127.0.0.1 -u wso2_is -ppass1 -D WSO2_IS_DB < /opt/wso2/wso2is-5.3.0/dbscripts/identity/mysql.sql
mysql -h 127.0.0.1 -u wso2_amreg -ppass1 -D WSO2_AM_REG_DB < /opt/wso2/wso2am-2.1.0/dbscripts/mysql.sql
mysql -h 127.0.0.1 -u wso2_isreg -ppass1 -D WSO2_IS_REG_DB < /opt/wso2/wso2am-2.1.0/dbscripts/mysql.sql
mysql -h 127.0.0.1 -u wso2_isreg -ppass1 -D WSO2_IS_REG_DB < /opt/wso2/wso2is-5.3.0/dbscripts/identity/mysql.sql
mysql -h 127.0.0.1 -u wso2_reg -ppass1 -D WSO2_REG_DB < /opt/wso2/wso2am-2.1.0/dbscripts/mysql.sql
mysql -h 127.0.0.1 -u wso2_um -ppass1 -D WSO2_UM_DB < /opt/wso2/wso2am-2.1.0/dbscripts/mysql.sql
mysql -h 127.0.0.1 -u wso2_amid -ppass1 -D WSO2_AM_ID_DB < /opt/wso2/wso2am-2.1.0/dbscripts/mysql.sql
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment