Merge remote-tracking branch 'upstream/develop' into develop
This commit is contained in:
Zoltan Nebli
@@ -112,6 +112,4 @@
|
||||
</bean>
|
||||
|
||||
<import resource="spmContext.xml"/>
|
||||
|
||||
<import resource="swagger.xml"/>
|
||||
</beans>
|
||||
|
||||
@@ -34,6 +34,6 @@
|
||||
p:cacheManager-ref="ehcacheInstance" />
|
||||
|
||||
<bean id="ehcacheInstance"
|
||||
class="org.springframework.cache.jcache.JCacheManagerFactoryBean"/>
|
||||
class="org.springframework.cache.jcache.JCacheManagerFactoryBean" p:cacheManagerUri="classpath:/META-INF/spring/ehcache.xml"/>
|
||||
|
||||
</beans>
|
||||
|
||||
@@ -24,33 +24,30 @@
|
||||
<config xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xmlns='http://www.ehcache.org/v3'
|
||||
xsi:schemaLocation="http://www.ehcache.org/v3 http://www.ehcache.org/schema/ehcache-core-3.7.xsd">
|
||||
|
||||
<defaultCache eternal="true" maxEntriesLocalHeap="100"
|
||||
overflowToDisk="false" />
|
||||
<cache-template name="defaultTemplate">
|
||||
<expiry>
|
||||
<none/>
|
||||
</expiry>
|
||||
<heap unit="entries">
|
||||
10000
|
||||
</heap>
|
||||
</cache-template>
|
||||
|
||||
<cache name="users" maxEntriesLocalHeap="10000" eternal="true"
|
||||
overflowToDisk="false" />
|
||||
<cache name="usersByUsername" maxEntriesLocalHeap="10000"
|
||||
eternal="true" overflowToDisk="false" />
|
||||
<cache name="tenantsById" maxEntriesLocalHeap="10000" eternal="true"
|
||||
overflowToDisk="false" />
|
||||
<cache name="offices" maxEntriesLocalHeap="10000" eternal="true"
|
||||
overflowToDisk="false" />
|
||||
<cache name="officesForDropdown" maxEntriesLocalHeap="10000"
|
||||
eternal="true" overflowToDisk="false" />
|
||||
<cache name="officesById" maxEntriesLocalHeap="10000" eternal="true"
|
||||
overflowToDisk="false" />
|
||||
<cache name="charges" maxEntriesLocalHeap="10000" eternal="true"
|
||||
overflowToDisk="false" />
|
||||
<cache name="funds" maxEntriesLocalHeap="10000" eternal="true"
|
||||
overflowToDisk="false" />
|
||||
<cache name="code_values" maxEntriesLocalHeap="10000" eternal="true"
|
||||
overflowToDisk="false" />
|
||||
<cache name="codes" maxEntriesLocalHeap="10000" eternal="true"
|
||||
overflowToDisk="false" />
|
||||
<cache name="hooks" maxEntriesLocalHeap="10000" eternal="true"
|
||||
overflowToDisk="false" />
|
||||
<cache name="userTFAccessToken" maxEntriesLocalHeap="10000"
|
||||
overflowToDisk="false" timeToIdleSeconds="7200" />
|
||||
<cache name="tfConfig" maxEntriesLocalHeap="10000" eternal="true"
|
||||
overflowToDisk="false" />
|
||||
<cache alias="users" uses-template="defaultTemplate"/>
|
||||
<cache alias="usersByUsername" uses-template="defaultTemplate"/>
|
||||
<cache alias="tenantsById" uses-template="defaultTemplate"/>
|
||||
<cache alias="offices" uses-template="defaultTemplate"/>
|
||||
<cache alias="officesForDropdown" uses-template="defaultTemplate"/>
|
||||
<cache alias="officesById" uses-template="defaultTemplate"/>
|
||||
<cache alias="charges" uses-template="defaultTemplate"/>
|
||||
<cache alias="funds" uses-template="defaultTemplate"/>
|
||||
<cache alias="code_values" uses-template="defaultTemplate"/>
|
||||
<cache alias="codes" uses-template="defaultTemplate"/>
|
||||
<cache alias="hooks" uses-template="defaultTemplate"/>
|
||||
<cache alias="tfConfig" uses-template="defaultTemplate"/>
|
||||
<cache alias="userTFAccessToken" uses-template="defaultTemplate">
|
||||
<expiry>
|
||||
<tti unit="seconds">7200</tti>
|
||||
</expiry>
|
||||
</cache>
|
||||
</config>
|
||||
|
||||
@@ -1,74 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
|
||||
<!--
|
||||
|
||||
Licensed to the Apache Software Foundation (ASF) under one
|
||||
or more contributor license agreements. See the NOTICE file
|
||||
distributed with this work for additional information
|
||||
regarding copyright ownership. The ASF licenses this file
|
||||
to you under the Apache License, Version 2.0 (the
|
||||
"License"); you may not use this file except in compliance
|
||||
with the License. You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing,
|
||||
software distributed under the License is distributed on an
|
||||
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||
KIND, either express or implied. See the License for the
|
||||
specific language governing permissions and limitations
|
||||
under the License.
|
||||
|
||||
-->
|
||||
|
||||
<beans xmlns="http://www.springframework.org/schema/beans"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
|
||||
|
||||
|
||||
|
||||
<bean id="apiListingResource" class="io.swagger.jaxrs.listing.ApiListingResource"/>
|
||||
<bean id="swaggerSerializers" class="io.swagger.jaxrs.listing.SwaggerSerializers" scope="singleton"/>
|
||||
|
||||
<bean id="beanConfig" class="io.swagger.jaxrs.config.BeanConfig">
|
||||
<property name="title" value="Apache Fineract API Documentation"/>
|
||||
<property name="version" value="1.0.0" />
|
||||
<property name="description" value="Apache Fineract is a secure, multi-tenanted microfinance platform. <br />
|
||||
|
||||
The goal of the Apache Fineract API is to empower developers to build apps on top of the Apache Fineract Platform. The reference app [ https://demo.mifos.io ] (username: mifos, password: password) works on the same demo tenant as the interactive links in this documentation.
|
||||
|
||||
<br/>The API
|
||||
|
||||
is organized around REST [ https://en.wikipedia.org/wiki/Representational_state_transfer ]
|
||||
<br/> Find out more about Apache Fineract on [ https://demo.fineract.dev/fineract-provider/api-docs/apiLive.htm#top ]
|
||||
|
||||
<br/> You can Try The API From Your Browser itself at [ https://demo.fineract.dev/fineract-provider/api-docs/apiLive.htm#interact ]
|
||||
|
||||
<br/> The Generic Options are available at [ https://demo.fineract.dev/fineract-provider/api-docs/apiLive.htm#genopts ]
|
||||
|
||||
<br/> Find out more about Updating Dates and Numbers at [ https://demo.fineract.dev/fineract-provider/api-docs/apiLive.htm#dates_and_numbers ]
|
||||
|
||||
<br/> For the Authentication and the Basic of HTTP and HTTPS refer [ https://demo.fineract.dev/fineract-provider/api-docs/apiLive.htm#authentication_overview ]
|
||||
|
||||
<br/> Check about ERROR codes at [ https://demo.fineract.dev/fineract-provider/api-docs/apiLive.htm#errors ]
|
||||
|
||||
|
||||
<br/> <br/> Please refer to the old documentation for any documentation queries [ https://demo.fineract.dev/fineract-provider/api-docs/apiLive.htm ]
|
||||
|
||||
<br/>
|
||||
______________________________________________________________________________________________________________________________
|
||||
|
||||
"/>
|
||||
|
||||
<property name="license" value="Apache 2.0" />
|
||||
<property name="schemes" value="https" />
|
||||
<property name="host" value="https://demo.mifos.io" />
|
||||
<property name="basePath" value="fineract-provider/api/v1"/>
|
||||
<property name="termsOfServiceUrl" value="https://demo.fineract.dev/fineract-provider/api-docs/apiLive.htm"/>
|
||||
<property name="contact" value="https://gitter.im/openMF/mifos"/>
|
||||
<!--<property name="resourcePackage" value="io.swagger.resources"/>-->
|
||||
<property name="resourcePackage" value="org.apache.fineract"/>
|
||||
<property name="scan" value="true"/>
|
||||
</bean>
|
||||
|
||||
</beans>
|
||||
+20
@@ -0,0 +1,20 @@
|
||||
--
|
||||
-- Licensed to the Apache Software Foundation (ASF) under one
|
||||
-- or more contributor license agreements. See the NOTICE file
|
||||
-- distributed with this work for additional information
|
||||
-- regarding copyright ownership. The ASF licenses this file
|
||||
-- to you under the Apache License, Version 2.0 (the
|
||||
-- "License"); you may not use this file except in compliance
|
||||
-- with the License. You may obtain a copy of the License at
|
||||
--
|
||||
-- http://www.apache.org/licenses/LICENSE-2.0
|
||||
--
|
||||
-- Unless required by applicable law or agreed to in writing,
|
||||
-- software distributed under the License is distributed on an
|
||||
-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||
-- KIND, either express or implied. See the License for the
|
||||
-- specific language governing permissions and limitations
|
||||
-- under the License.
|
||||
--
|
||||
|
||||
DELETE FROM `m_field_configuration` WHERE field = 'street';
|
||||
@@ -39,9 +39,10 @@
|
||||
window.onload = function() {
|
||||
// Begin Swagger UI call region
|
||||
const ui = SwaggerUIBundle({
|
||||
url: "response.json",
|
||||
url: "fineract.yaml",
|
||||
dom_id: '#swagger-ui',
|
||||
deepLinking: true,
|
||||
filter: '',
|
||||
presets: [
|
||||
SwaggerUIBundle.presets.apis,
|
||||
SwaggerUIStandalonePreset
|
||||
@@ -49,11 +50,15 @@
|
||||
plugins: [
|
||||
SwaggerUIBundle.plugins.DownloadUrl
|
||||
],
|
||||
layout: "StandaloneLayout"
|
||||
layout: "BaseLayout",
|
||||
onComplete: function() {
|
||||
ui.preauthorizeBasic("basicAuth", "mifos", "password");
|
||||
ui.preauthorizeApiKey("tenantid", "default");
|
||||
}
|
||||
})
|
||||
// End Swagger UI call region
|
||||
|
||||
window.ui = ui
|
||||
|
||||
}
|
||||
</script>
|
||||
</body>
|
||||
|
||||
File diff suppressed because one or more lines are too long
Reference in New Issue
Block a user