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

    • -43
    • +0
    ./main/resources/conf/exo.portal.component.test.jcr-infinispan-config.xml
    • -56
    • +0
    ./main/resources/conf/exo.portal.component.test.jcr-infinispan-lock.xml
    • -0
    • +40
    ./main/resources/conf/exo.portal.component.test.jcr-jbosscache-config.xml
    • -0
    • +24
    ./main/resources/conf/exo.portal.component.test.jcr-jbosscache-lock-config.xml
    • -26
    • +19
    ./main/resources/conf/exo.portal.component.test.jcr-repository-configuration.xml
  1. … 38 more files in changeset.
GTNPORTAL-3517 Cannot start Gatein Portal with MySQL in UTF-8

    • -0
    • +2
    ./main/resources/conf/exo.portal.component.test.jcr-repository-configuration.xml
  1. … 4 more files in changeset.
GTNPORTAL-3390 Use a correct class key of TransactionManagerLookup for infinispan implementation

  1. … 4 more files in changeset.
GTNPORTAL-3390 : Migration to JCR 1.16.0-Alpha4

    • -0
    • +43
    ./main/resources/conf/exo.portal.component.test.jcr-infinispan-config.xml
    • -0
    • +56
    ./main/resources/conf/exo.portal.component.test.jcr-infinispan-lock.xml
    • -40
    • +0
    ./main/resources/conf/exo.portal.component.test.jcr-jbosscache-config.xml
    • -24
    • +0
    ./main/resources/conf/exo.portal.component.test.jcr-jbosscache-lock-config.xml
    • -19
    • +26
    ./main/resources/conf/exo.portal.component.test.jcr-repository-configuration.xml
  1. … 54 more files in changeset.
GTNPORTAL-3231 upgrade JCR 1.16.0-Alpha1 and Core 2.6.0-Alpha1

    • -0
    • +2
    ./main/resources/conf/exo.portal.component.test.jcr-repository-configuration.xml
  1. … 5 more files in changeset.
Rename KernelLifeCycle -> KernelRule

  1. … 8 more files in changeset.
GTNPORTAL-2730 New code style rules and build level formatting enforcement

    • -150
    • +150
    ./main/resources/conf/exo.portal.component.test.jcr-configuration.xml
    • -12
    • +15
    ./main/resources/conf/exo.portal.component.test.jcr-jbosscache-config.xml
    • -1
    • +2
    ./main/resources/conf/exo.portal.component.test.jcr-jbosscache-lock-config.xml
    • -15
    • +25
    ./main/resources/conf/exo.portal.component.test.jcr-repository-configuration.xml
  1. … 2294 more files in changeset.
GTNPORTAL-2705 Use JCR db-structure-type isolated mode by default

    • -2
    • +2
    ./main/resources/conf/exo.portal.component.test.jcr-repository-configuration.xml
  1. … 8 more files in changeset.
GTNPORTAL-2603 : Make kernel bootstrap available as a junit Rule

  1. … 15 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
    • +16
    ./main/resources/conf/exo.portal.component.test.jcr-configuration.xml
  1. … 11 more files in changeset.
GTNPORTAL-2202 Change the target xsd on xml file

  1. … 120 more files in changeset.
GTNPORTAL-2027 Upgrade eXo JCR to 1.14.0-CR4-CP01 (and dependencies)

  1. … 7 more files in changeset.
GTNPORTAL-1867: 1/ TestConcurrencyDataStorage unit test bug fix that was not waiting thread stops 2/ Forked CharSequenceReader from Commons IO 1.4.0 3/ for now commented _testDirtyWrite until rewritten properly 4/ commented jpetstore persistence test that don't pass with HSQLDB 2.0 5/ thirdparty upgrade: - GateIn MOP 1.1.0-Beta01 - GateIn WSRP 2.1.0-Beta02 - eXo Kernel 2.3.0-CR1 - eXo Core 2.4.0-CR1 - eXo WS 2.2.0-CR1 - eXo JCR 1.14.0-CR1 - Chromattic 1.1.0-beta2 - Reflext 1.1.0-beta12 - Groovy 1.7.6 - Jibx 1.2.2 - Commons Beanutils 1.8.3 - Commons Chain 1.2 - Commons Logging 1.1.1 - Commons Pool 1.5.5 - Commons DBCP 1.4 - Commons IO 1.3.2 - Commons Lang 2.6 - HSQLDB 2.0.0 - Javassists 3.14.0-GA - JGroups 2.11.1.Final - Javax Inject 1 - Javax Activation 1.1.1 - Javax Transaction 1.1 - Javax Mail 1.4.4 - Lucene 2.9.4 - Quartz 1.8.4 - Apache Tika 0.7 - sjsxp 1.0.1 - stax-api 1.0-2 - XPP3 1.1.4c - maven-jaxb2-plugin 0.7.4

    • -0
    • +10
    ./main/resources/conf/exo.portal.component.test.jcr-configuration.xml
  1. … 30 more files in changeset.
GTNPORTAL-730 : Secure webdav access

    • -1
    • +1
    ./main/resources/conf/exo.portal.component.test.jcr-repository-configuration.xml
  1. … 4 more files in changeset.
- added an intermediate AbstractKernelTest in addition of AbstractGateInTest - now all the unit test to extend directly or indirectly AbstractGateInTest

  1. … 60 more files in changeset.
externalize unit test jdbc configuration with a profile for mysql (that will not work for the whole build as no cleanup is done in the database)

    • -6
    • +6
    ./main/resources/conf/exo.portal.component.test.jcr-repository-configuration.xml
  1. … 6 more files in changeset.
GTNPORTAL-649 : Update to MOP 1.0.0-CR1

    • -6
    • +6
    ./main/resources/conf/exo.portal.component.test.jcr-repository-configuration.xml
  1. … 7 more files in changeset.
- GTNPORTAL-604 : Thirdparty and component integration - rework the skin deployer to be less error prone

    • -43
    • +0
    ./main/resources/conf/exo.portal.component.test.jcr-jbosscache-lock-config-portal-test.xml
    • -42
    • +0
    ./main/resources/conf/exo.portal.component.test.jcr-jbosscache-lock-config-system.xml
    • -0
    • +23
    ./main/resources/conf/exo.portal.component.test.jcr-jbosscache-lock-config.xml
    • -2
    • +2
    ./main/resources/conf/exo.portal.component.test.jcr-repository-configuration.xml
  1. … 57 more files in changeset.
simplifying configuration

    • -0
    • +0
    ./main/resources/conf/exo.portal.component.test.jcr-jbosscache-lock-config-portal-test.xml
    • -43
    • +0
    ./main/resources/conf/exo.portal.component.test.jcr-jbosscache-lockconfig-portal-test.xml
    • -0
    • +0
    ./main/resources/conf/exo.portal.component.test.jcr-jbosscache-lock-config-system.xml
    • -42
    • +0
    ./main/resources/conf/exo.portal.component.test.jcr-jbosscache-lockconfig-system.xml
    • -2
    • +2
    ./main/resources/conf/exo.portal.component.test.jcr-repository-configuration.xml
  1. … 16 more files in changeset.
forgot to add those files

    • -0
    • +37
    ./main/resources/conf/exo.portal.component.test.jcr-jbosscache-config.xml
    • -0
    • +43
    ./main/resources/conf/exo.portal.component.test.jcr-jbosscache-lockconfig-portal-test.xml
    • -0
    • +42
    ./main/resources/conf/exo.portal.component.test.jcr-jbosscache-lockconfig-system.xml
GTNPORTAL-550 : JCR 1.12.0-Beta06 integration

    • -21
    • +15
    ./main/resources/conf/exo.portal.component.test.jcr-repository-configuration.xml
  1. … 11 more files in changeset.
use configuration files identified by the artifact id of the module they are to avoid any naming issue when loading configuration

    • -183
    • +0
    ./main/resources/conf/jcr/jcr-configuration.xml
    • -0
    • +0
    ./main/resources/conf/exo.portal.component.test.jcr-repository-configuration.xml
  1. … 41 more files in changeset.
- update GateInTest to create a tmp dir per runtime execution (allow to avoid mvn clean install) - change ../temp to ${basedir}/target in test idm configuration as it's putting data at wrong place

  1. … 13 more files in changeset.
- update unit test for organization based components - add a dependency of PicketLinkIDMServiceImpl on InitialContextInitializer to be able to use JNDI setup from this service

  1. … 3 more files in changeset.
- unit test the component test to validate they work - added logging

  1. … 7 more files in changeset.
split the test configuration into units to have a finer granularity

    • -0
    • +0
    ./main/resources/conf/jcr/jcr-configuration.xml
  1. … 25 more files in changeset.