Branch: refs/heads/issue1030_replace_shiro Home: https://github.com/RestComm/Restcomm-Connect Commit: edb90b04694aa27d99286f948931ea21137ead4d https://github.com/RestComm/Restcomm-Connect/commit/edb90b04694aa27d99286f948931ea21137ead4d Author: Orestis Tsakiridis <orestis.tsakiri...@telestax.com> Date: 2016-05-03 (Tue, 03 May 2016)
Changed paths: M restcomm/restcomm.application/pom.xml M restcomm/restcomm.application/src/main/webapp/WEB-INF/web.xml A restcomm/restcomm.commons/src/main/java/org/mobicents/servlet/restcomm/endpoints/Outcome.java M restcomm/restcomm.http/pom.xml M restcomm/restcomm.http/src/main/java/org/mobicents/servlet/restcomm/http/AbstractEndpoint.java M restcomm/restcomm.http/src/main/java/org/mobicents/servlet/restcomm/http/AccountsEndpoint.java M restcomm/restcomm.http/src/main/java/org/mobicents/servlet/restcomm/http/AnnouncementsEndpoint.java M restcomm/restcomm.http/src/main/java/org/mobicents/servlet/restcomm/http/ApplicationsEndpoint.java M restcomm/restcomm.http/src/main/java/org/mobicents/servlet/restcomm/http/ApplicationsXmlEndpoint.java M restcomm/restcomm.http/src/main/java/org/mobicents/servlet/restcomm/http/AvailablePhoneNumbersEndpoint.java M restcomm/restcomm.http/src/main/java/org/mobicents/servlet/restcomm/http/CallsEndpoint.java M restcomm/restcomm.http/src/main/java/org/mobicents/servlet/restcomm/http/ClientsEndpoint.java M restcomm/restcomm.http/src/main/java/org/mobicents/servlet/restcomm/http/ClientsXmlEndpoint.java M restcomm/restcomm.http/src/main/java/org/mobicents/servlet/restcomm/http/ConferencesEndpoint.java M restcomm/restcomm.http/src/main/java/org/mobicents/servlet/restcomm/http/EmailMessagesEndpoint.java M restcomm/restcomm.http/src/main/java/org/mobicents/servlet/restcomm/http/GatewaysEndpoint.java A restcomm/restcomm.http/src/main/java/org/mobicents/servlet/restcomm/http/IdentityInstancesEndpoint.java A restcomm/restcomm.http/src/main/java/org/mobicents/servlet/restcomm/http/IdentityInstancesEndpointJson.java A restcomm/restcomm.http/src/main/java/org/mobicents/servlet/restcomm/http/IdentityServerEndpointJson.java M restcomm/restcomm.http/src/main/java/org/mobicents/servlet/restcomm/http/IncomingPhoneNumbersEndpoint.java A restcomm/restcomm.http/src/main/java/org/mobicents/servlet/restcomm/http/KeycloakResourcesEndpoint.java M restcomm/restcomm.http/src/main/java/org/mobicents/servlet/restcomm/http/LogoutEndpoint.java M restcomm/restcomm.http/src/main/java/org/mobicents/servlet/restcomm/http/NotificationsEndpoint.java M restcomm/restcomm.http/src/main/java/org/mobicents/servlet/restcomm/http/OutboundProxyEndpoint.java M restcomm/restcomm.http/src/main/java/org/mobicents/servlet/restcomm/http/OutgoingCallerIdsEndpoint.java M restcomm/restcomm.http/src/main/java/org/mobicents/servlet/restcomm/http/OutgoingCallerIdsXmlEndpoint.java A restcomm/restcomm.http/src/main/java/org/mobicents/servlet/restcomm/http/ProductRegisterEndPoint.java M restcomm/restcomm.http/src/main/java/org/mobicents/servlet/restcomm/http/RecordingsEndpoint.java A restcomm/restcomm.http/src/main/java/org/mobicents/servlet/restcomm/http/SecuredEndpoint.java M restcomm/restcomm.http/src/main/java/org/mobicents/servlet/restcomm/http/SmsMessagesEndpoint.java M restcomm/restcomm.http/src/main/java/org/mobicents/servlet/restcomm/http/SupervisorEndpoint.java M restcomm/restcomm.http/src/main/java/org/mobicents/servlet/restcomm/http/TranscriptionsEndpoint.java M restcomm/restcomm.http/src/main/java/org/mobicents/servlet/restcomm/http/TranscriptionsXmlEndpoint.java M restcomm/restcomm.http/src/main/java/org/mobicents/servlet/restcomm/http/UsageEndpoint.java M restcomm/restcomm.http/src/main/java/org/mobicents/servlet/restcomm/http/UssdPushEndpoint.java A restcomm/restcomm.http/src/main/java/org/mobicents/servlet/restcomm/http/applications/KeycloakResources.java M restcomm/restcomm.http/src/main/java/org/mobicents/servlet/restcomm/http/converter/AbstractConverter.java M restcomm/restcomm.http/src/main/java/org/mobicents/servlet/restcomm/http/converter/AccountConverter.java A restcomm/restcomm.http/src/main/java/org/mobicents/servlet/restcomm/http/responseentities/IdentityInstanceEntity.java A restcomm/restcomm.http/src/main/java/org/mobicents/servlet/restcomm/http/responseentities/IdentityServerEntity.java A restcomm/restcomm.identity/pom.xml A restcomm/restcomm.identity/src/main/java/org/mobicents/servlet/restcomm/identity/AccountKey.java A restcomm/restcomm.identity/src/main/java/org/mobicents/servlet/restcomm/identity/AuthOutcome.java A restcomm/restcomm.identity/src/main/java/org/mobicents/servlet/restcomm/identity/IdentityContext.java A restcomm/restcomm.identity/src/main/java/org/mobicents/servlet/restcomm/identity/UserIdentityContext.java A restcomm/restcomm.identity/src/main/java/org/mobicents/servlet/restcomm/identity/entities/ClientEntity.java A restcomm/restcomm.identity/src/main/java/org/mobicents/servlet/restcomm/identity/entities/ResetPasswordEntity.java A restcomm/restcomm.identity/src/main/java/org/mobicents/servlet/restcomm/identity/exceptions/AuthServerAuthorizationError.java A restcomm/restcomm.identity/src/main/java/org/mobicents/servlet/restcomm/identity/exceptions/IdentityAuthorizationException.java A restcomm/restcomm.identity/src/main/java/org/mobicents/servlet/restcomm/identity/exceptions/IdentityClientRegistrationError.java A restcomm/restcomm.identity/src/main/java/org/mobicents/servlet/restcomm/identity/shiro/RestcommRoles.java Log Message: ----------- Selective merge from 'sso' branch regarding manual auth. Refers #1030 Conflicts: restcomm/pom.xml restcomm/restcomm.application/src/main/webapp/WEB-INF/data/hsql/restcomm.script restcomm/restcomm.application/src/main/webapp/WEB-INF/scripts/mariadb/init.sql restcomm/restcomm.application/src/main/webapp/WEB-INF/scripts/sql/init.sql restcomm/restcomm.commons/src/main/java/org/mobicents/servlet/restcomm/configuration/sets/MainConfigurationSet.java restcomm/restcomm.commons/src/main/java/org/mobicents/servlet/restcomm/http/CustomHttpClientBuilder.java restcomm/restcomm.http/src/main/java/org/mobicents/servlet/restcomm/http/AccountsEndpoint.java restcomm/restcomm.http/src/main/java/org/mobicents/servlet/restcomm/http/ApplicationsEndpoint.java restcomm/restcomm.http/src/main/java/org/mobicents/servlet/restcomm/http/CallsEndpoint.java restcomm/restcomm.rvd/pom.xml restcomm/restcomm.rvd/src/main/java/org/mobicents/servlet/restcomm/rvd/ProjectApplicationsApi.java restcomm/restcomm.rvd/src/main/java/org/mobicents/servlet/restcomm/rvd/http/resources/LoginRestService.java restcomm/restcomm.rvd/src/main/java/org/mobicents/servlet/restcomm/rvd/http/resources/ProjectRestService.java restcomm/restcomm.rvd/src/main/java/org/mobicents/servlet/restcomm/rvd/http/resources/RasRestService.java restcomm/restcomm.rvd/src/main/java/org/mobicents/servlet/restcomm/rvd/restcomm/RestcommClient.java restcomm/restcomm.rvd/src/main/java/org/mobicents/servlet/restcomm/rvd/security/AuthenticationService.java restcomm/restcomm.rvd/src/main/java/org/mobicents/servlet/restcomm/rvd/security/AutheticationFilter.java restcomm/restcomm.rvd/src/main/java/org/mobicents/servlet/restcomm/rvd/security/SecurityUtils.java restcomm/restcomm.rvd/src/main/java/org/mobicents/servlet/restcomm/rvd/security/TicketRepository.java restcomm/restcomm.rvd/src/main/webapp/app.js restcomm/restcomm.rvd/src/main/webapp/js/app/controllers/controllers.js restcomm/restcomm.rvd/src/main/webapp/js/app/controllers/packaging.js restcomm/restcomm.rvd/src/main/webapp/js/app/controllers/projectManager.js restcomm/restcomm.rvd/src/main/webapp/js/app/services.js restcomm/restcomm.rvd/src/main/webapp/templates/designer.html restcomm/restcomm.rvd/src/main/webapp/templates/packaging/download.html restcomm/restcomm.testsuite/src/test/resources/restcomm.script_SmsTest restcomm/restcomm.testsuite/src/test/resources/restcomm.script_dialForkTest restcomm/restcomm.testsuite/src/test/resources/restcomm.script_dialTest restcomm/restcomm.testsuite/src/test/resources/restcomm.script_playTest restcomm/restcomm.testsuite/src/test/resources/restcomm_AvailablePhoneNumbers_Test.xml restcomm/restcomm.testsuite/src/test/resources/restcomm_SmsTest.xml restcomm/restcomm.testsuite/src/test/resources/restcomm_SmsTest2.xml restcomm/restcomm.testsuite/src/test/resources/restcomm_bandwidth_test.xml restcomm/restcomm.testsuite/src/test/resources/restcomm_for_SMSEndpointTest.xml restcomm/restcomm.testsuite/src/test/resources/restcomm_nexmo_test.xml restcomm/restcomm.testsuite/src/test/resources/restcomm_voxbone_test.xml restcomm/restcomm.testsuite/src/test/resources/restcomm_with_Data.script restcomm/restcomm.ui/pom.xml restcomm/restcomm.ui/src/main/webapp/resources/js/controllers/navbar.js restcomm/restcomm.ui/src/main/webapp/resources/js/directives.js restcomm/restcomm.ui/src/main/webapp/resources/js/restcommApps/appConfig.js restcomm/restcomm.ui/src/main/webapp/resources/js/restcommApps/services.js restcomm/restcomm.ui/src/main/webapp/templates/rc-endpoint-url.html -- --- You received this message because you are subscribed to the Google Groups "mobicents-commits" group. To unsubscribe from this group and stop receiving emails from it, send an email to mobicents-commits+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout.