Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
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

    • -3
    • +3
    ./organization/TestOrganizationService-configuration.xml
  1. … 43 more files in changeset.
Revert "GTNPORTAL-3507: Update test case from PLIDM-46 to gatein-portal code base"

This reverts commit f3a823e4b43468b25d11475988e96551d8cd194d.

    • -294
    • +0
    ./organization/TestOrganization-picket-link-jta-configuration.xml
    • -1
    • +1
    ./organization/TestOrganizationService-configuration.xml
  1. … 4 more files in changeset.
Revert "GTNPORTAL-3507: Update test case from PLIDM-46 to gatein-portal code base"

This reverts commit 078b74b838bfa837056fa58d702019fb598625fa.

    • -294
    • +0
    ./organization/TestOrganization-picket-link-jta-configuration.xml
    • -1
    • +1
    ./organization/TestOrganizationService-configuration.xml
  1. … 4 more files in changeset.
GTNPORTAL-3507: Update test case from PLIDM-46 to gatein-portal code base

    • -0
    • +294
    ./organization/TestOrganization-picket-link-jta-configuration.xml
    • -1
    • +1
    ./organization/TestOrganizationService-configuration.xml
  1. … 4 more files in changeset.
GTNPORTAL-3507: Update test case from PLIDM-46 to gatein-portal code base

    • -0
    • +294
    ./organization/TestOrganization-picket-link-jta-configuration.xml
    • -1
    • +1
    ./organization/TestOrganizationService-configuration.xml
  1. … 4 more files in changeset.
GTNPORTAL-3507: Update test case from PLIDM-46 to gatein-portal code base

    • -0
    • +294
    ./organization/TestOrganization-picket-link-jta-configuration.xml
    • -1
    • +1
    ./organization/TestOrganizationService-configuration.xml
  1. … 4 more files in changeset.
GTNPORTAL-3390 Use a correct class key of TransactionManagerLookup for infinispan implementation

    • -1
    • +1
    ./organization/TestOrganizationService-configuration.xml
  1. … 4 more files in changeset.
GTNPORTAL-3390 : Migration to JCR 1.16.0-Alpha4

    • -2
    • +2
    ./organization/TestOrganizationService-configuration.xml
  1. … 59 more files in changeset.
GTNPORTAL-2899 Support * wildcard membership type

    • -2
    • +24
    ./organization/TestOrganizationService-configuration.xml
  1. … 14 more files in changeset.
Revert "GTNPORTAL-2899 Support * wildcard membership type"

This reverts commit b7ba8edcf82cb430bb4e9e3ab7897bfcf2310129.

    • -24
    • +2
    ./organization/TestOrganizationService-configuration.xml
  1. … 14 more files in changeset.
GTNPORTAL-2899 Support * wildcard membership type

    • -2
    • +24
    ./organization/TestOrganizationService-configuration.xml
  1. … 14 more files in changeset.
GTNPORTAL-2806 Fix LDAP integration. Introduce options 'ignoreMappedMembershipTypeGroupList' and 'skipPaginationInMembershipQuery'

GTNPORTAL-2806 Introduce option 'skipPaginationInMembershipQuery' to decide if we count paginated memberships or perform full query and filter memberships later

    • -5
    • +14
    ./organization/TestOrganizationService-jdbc-configuration.xml
    • -5
    • +14
    ./organization/TestOrganizationService-jta-configuration.xml
  1. … 11 more files in changeset.
GTNPORTAL-2806 Fix LDAP integration. Introduce options 'ignoreMappedMembershipTypeGroupList' and 'skipPaginationInMembershipQuery'

GTNPORTAL-2806 Introduce option 'skipPaginationInMembershipQuery' to decide if we count paginated memberships or perform full query and filter memberships later

    • -5
    • +14
    ./organization/TestOrganizationService-jdbc-configuration.xml
    • -5
    • +14
    ./organization/TestOrganizationService-jta-configuration.xml
  1. … 11 more files in changeset.
GTNPORTAL-2730 New code style rules and build level formatting enforcement

    • -117
    • +319
    ./organization/TestOrganization-configuration.xml
    • -80
    • +119
    ./organization/TestOrganizationService-configuration.xml
    • -78
    • +99
    ./organization/TestOrganizationService-jdbc-configuration.xml
    • -84
    • +107
    ./organization/TestOrganizationService-jta-configuration.xml
  1. … 2295 more files in changeset.
GTNPORTAL-2696 Upgrade to IDM 1.4.0.M03. Perf improvements for PLIDM+infinispan integration. Added InfinispanCacheFactory

Support for printCache from JMX. IntegrationCache using methods from superclass

Migration to new TreeAPI from plidm

Specific lifespan of leaf nodes

Added support for staleCacheNodesLinksCleanerDelay

Move cache related stuff from PLIDMServiceImpl to new InfinispanCacheFactory

Perf improvement - Using Fqn.fromElements instead of Fqn.fromString

    • -0
    • +4
    ./organization/TestOrganizationService-configuration.xml
  1. … 6 more files in changeset.
GTNPORTAL-2634 Using infinispan for Picketlink IDM cache

Infinispan integration - cluster is working

Packaging for plidm+infinispan integration. Programmatic configuration of TransactionManagerLookup

Introduce DelegatingClassLoader and use it for infinispan. Use infinispan apiCacheProvider into TestOrganizationService

Simplified configuration and using shared cacheManager for whole idm cluster

Use CustomHibernateServiceImpl as HibernateService implementation

Picketlink IDM dependency updated to 1.4.0.M02

    • -0
    • +4
    ./organization/TestOrganizationService-configuration.xml
  1. … 17 more files in changeset.
Remove unecessary class from tests

    • -1
    • +1
    ./organization/TestOrganizationService-jta-configuration.xml
  1. … 1 more file in changeset.
GTNPORTAL-2574 - Upgrade to eXo JCR 1.15 Beta 01 GTNPORTAL-2501 - AS7 support with Hibernate 4 Workaround for AS7-5329 JTA support improvements with more test cases

    • -83
    • +0
    ./organization/TestOrganizationService-configuration.xml
    • -0
    • +109
    ./organization/TestOrganizationService-jdbc-configuration.xml
    • -0
    • +115
    ./organization/TestOrganizationService-jta-configuration.xml
  1. … 62 more files in changeset.
1) Add new JTAUserTransactionLifeCycleService with methods for obtain, start and commit JTA transaction. 2) Sync in POMDataStorage before sending page query to commit current JTA transaction and start new if JTA is enabled and there are pending changes in MOP

    • -0
    • +21
    ./organization/TestOrganizationService-configuration.xml
  1. … 11 more files in changeset.
GTNPORTAL-2202 Change the target xsd on xml file

    • -2
    • +2
    ./organization/TestOrganization-configuration.xml
    • -2
    • +2
    ./organization/TestOrganizationService-configuration.xml
  1. … 119 more files in changeset.
GTNPORTAL-1962 The navigation import should be configurable some modes for particular requirement - Improve testcase initial data on each

    • -0
    • +316
    ./organization/TestOrganization-configuration.xml
    • -0
    • +309
    ./organization/TestOrganizationService-configuration.xml
  1. … 54 more files in changeset.