Clone
Peter Palaga
committed
on 06 Nov 14
Revert "GTNPORTAL-3390 : Migration to JCR 1.16.0-Alpha4"
This reverts commit 722675f80757caa688d6394e50797b55b2815155.

Conflicts:
componen… Show more
Revert "GTNPORTAL-3390 : Migration to JCR 1.16.0-Alpha4"

This reverts commit 722675f80757caa688d6394e50797b55b2815155.

Conflicts:

        component/common/src/main/java/conf/configuration-jboss.properties

        component/common/src/main/java/conf/configuration-jetty.properties

        component/common/src/main/java/conf/configuration-tomcat.properties

        component/identity/src/main/java/org/exoplatform/services/organization/idm/IDMUserListAccess.java

        component/identity/src/main/java/org/exoplatform/services/organization/idm/IntegrationCache.java

        component/identity/src/main/java/org/exoplatform/services/organization/idm/UserDAOImpl.java

        component/identity/src/test/resources/conf/exo.portal.component.identity-configuration.xml

        component/identity/src/test/resources/conf/standalone/test-configuration.xml

        component/identity/src/test/resources/org/exoplatform/services/organization/TestOrganizationService-configuration.xml

        component/portal/src/main/java/org/gatein/portal/installer/SetupOrganizationDatabaseInitializer.java

        component/test/jcr/src/main/resources/conf/exo.portal.component.test.jcr-configuration.xml

        component/test/web/src/main/java/org/exoplatform/component/test/web/WebAppImpl.java

        component/web/api/src/main/java/org/gatein/portal/installer/PortalSetupFilter.java

        component/web/oauth-common/src/main/java/org/gatein/security/oauth/data/SocialNetworkServiceImpl.java

        component/web/security/src/main/java/org/exoplatform/web/CacheUserProfileFilter.java

        component/web/security/src/main/java/org/exoplatform/web/login/FilterDisabledLoginModule.java

        pom.xml

        portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/FindUsersPageList.java

        portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIAccountEditInputSet.java

        portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIGroupEditMembershipForm.java

        portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIGroupMembershipForm.java

        portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIListUsers.java

        portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIUserInfo.java

        web/portal/src/main/webapp/WEB-INF/conf/common/common-configuration.xml

        web/portal/src/main/webapp/WEB-INF/conf/infinispan/cluster/config.xml

        web/portal/src/main/webapp/WEB-INF/conf/jcr/infinispan/cluster/config.xml

        web/portal/src/main/webapp/WEB-INF/conf/jcr/infinispan/cluster/config_portal-system.xml

        web/portal/src/main/webapp/WEB-INF/conf/jcr/infinispan/cluster/indexer-config.xml

        web/portal/src/main/webapp/WEB-INF/conf/jcr/infinispan/cluster/lock-config.xml

        web/portal/src/main/webapp/WEB-INF/conf/jcr/infinispan/local/lock-config.xml

        web/portal/src/main/webapp/WEB-INF/conf/portal/portal-configuration.xml

        webui/eXo/src/main/java/org/exoplatform/webui/organization/UIAccountForm.java

        webui/eXo/src/main/java/org/exoplatform/webui/organization/UIAccountInputSet.java

        webui/eXo/src/main/java/org/exoplatform/webui/organization/account/UIUserSelector.java

        webui/portal/src/main/java/org/exoplatform/portal/application/PortalLogoutLifecycle.java

        webui/portal/src/main/java/org/exoplatform/portal/webui/login/UIForgetPassword.java

        webui/portal/src/main/java/org/exoplatform/portal/webui/login/UIResetPassword.java

        webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComponentActionListener.java

        webui/portal/src/main/java/org/exoplatform/portal/webui/register/UIRegisterForm.java

        webui/portal/src/main/java/org/exoplatform/portal/webui/register/UIRegisterInputSet.java

Show less