diff --git a/mifosng-individual-lending-app/src/main/java/org/mifosng/configuration/InMemoryApplicationConfigurationService.java b/mifosng-individual-lending-app/src/main/java/org/mifosng/configuration/InMemoryApplicationConfigurationService.java index afa4ddfd6..4306e554e 100644 --- a/mifosng-individual-lending-app/src/main/java/org/mifosng/configuration/InMemoryApplicationConfigurationService.java +++ b/mifosng-individual-lending-app/src/main/java/org/mifosng/configuration/InMemoryApplicationConfigurationService.java @@ -9,7 +9,7 @@ import org.springframework.stereotype.Service; public class InMemoryApplicationConfigurationService implements ApplicationConfigurationService { - private String oauthProviderUrl = "http://localhost:8085/mifosng-provider/"; + private String oauthProviderUrl = "http://localhost:8080/mifosng-provider/"; private String requestTokenURL = "oauth/request_token"; private String userAuthorizationURL = "oauth/confirm_access"; private String accessTokenURL = "oauth/access_token"; diff --git a/mifosng-individual-lending-app/src/main/java/org/mifosng/ui/reporting/ReportingRestOperationsImpl.java b/mifosng-individual-lending-app/src/main/java/org/mifosng/ui/reporting/ReportingRestOperationsImpl.java index 1db0834b2..09d11915c 100644 --- a/mifosng-individual-lending-app/src/main/java/org/mifosng/ui/reporting/ReportingRestOperationsImpl.java +++ b/mifosng-individual-lending-app/src/main/java/org/mifosng/ui/reporting/ReportingRestOperationsImpl.java @@ -42,7 +42,7 @@ public class ReportingRestOperationsImpl implements ReportingRestOperations { public void hackToForceAuthentication() { try { URI restUri = URI - .create(getBaseServerUrl().concat("api/v1/flexiblereporting/forceauth")); + .create(getBaseServerUrl().concat("api/v1/reports/forceauth")); this.oauthRestServiceTemplate.exchange(restUri, HttpMethod.GET, emptyRequest(), null); } catch (HttpStatusCodeException e) { diff --git a/mifosng-individual-lending-app/src/main/webapp/WEB-INF/views/reports/flexireport.jsp b/mifosng-individual-lending-app/src/main/webapp/WEB-INF/views/reports/flexireport.jsp index 2d028a36e..66fcfd7e1 100644 --- a/mifosng-individual-lending-app/src/main/webapp/WEB-INF/views/reports/flexireport.jsp +++ b/mifosng-individual-lending-app/src/main/webapp/WEB-INF/views/reports/flexireport.jsp @@ -91,8 +91,7 @@ function selectNewThousandsSep(selectedVal) { var reportingParams = { rptDB: "mifosngprovider", - //old link RESTUrl: "${baseUrl}api/protected/reporting/flexireport", - RESTUrl: "${baseUrl}api/v1/flexiblereporting", + RESTUrl: "${baseUrl}api/v1/reports", pentahoUrl: "${baseUrl}pentahoreport", //old link exportUrl: "${rootContext}exportcsv", exportUrl: "${baseUrl}exportcsv", diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/api/FlexibleReportingApiResource.java b/mifosng-provider/src/main/java/org/mifosng/platform/api/ReportingApiResource.java similarity index 96% rename from mifosng-provider/src/main/java/org/mifosng/platform/api/FlexibleReportingApiResource.java rename to mifosng-provider/src/main/java/org/mifosng/platform/api/ReportingApiResource.java index 65fb9eb4d..609b88945 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/api/FlexibleReportingApiResource.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/api/ReportingApiResource.java @@ -37,12 +37,12 @@ import org.springframework.context.annotation.Scope; import org.springframework.security.access.AccessDeniedException; import org.springframework.stereotype.Component; -@Path("/v1/flexiblereporting") +@Path("/v1/reports") @Component @Scope("singleton") -public class FlexibleReportingApiResource { +public class ReportingApiResource { - private final static Logger logger = LoggerFactory.getLogger(FlexibleReportingApiResource.class); + private final static Logger logger = LoggerFactory.getLogger(ReportingApiResource.class); @Autowired private ReadExtraDataAndReportingService ReadExtraDataAndReportingService;