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

  1. … 43 more files in changeset.
Set versions to 3.9.0.Alpha01-SNAPSHOT

  1. … 112 more files in changeset.
GTNPORTAL-3396 Support all possible js module dependency names in define()

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

  1. … 59 more files in changeset.
Remove gwt-gadget

  1. … 40 more files in changeset.
GTNPORTAL-3251: Upgrade PicketLink IDM to 1.4.3.Final for 3.5.x branch

  1. … 8 more files in changeset.
GTNPORTAL-3227 Disabled User feature

    • -0
    • +3
    ./src/main/resources/jetty/etc/login.conf
  1. … 36 more files in changeset.
Remove what we redo

    • -39
    • +0
    ./src/main/resources/jetty/bin/gatein-dev.bat
    • -51
    • +0
    ./src/main/resources/jetty/bin/gatein-dev.sh
    • -34
    • +0
    ./src/main/resources/jetty/bin/gatein.bat
    • -49
    • +0
    ./src/main/resources/jetty/bin/gatein.sh
    • -20
    • +0
    ./src/main/resources/jetty/contexts/portal.xml
    • -20
    • +0
    ./src/main/resources/jetty/contexts/rest.xml
    • -246
    • +0
    ./src/main/resources/jetty/etc/jetty.xml
    • -11
    • +0
    ./src/main/resources/jetty/etc/login.conf
    • -532
    • +0
    ./src/main/resources/jetty/etc/webdefault.xml
  1. … 2891 more files in changeset.
GTNPORTAL-3037 Update to Picketlink IDM 1.4.2.CR02. Get rid of org.infinispan.tree module

  1. … 7 more files in changeset.
GTNPORTAL-2976 Change the declaration of xsd schema in web.xml for webapps

  1. … 29 more files in changeset.
GTNPORTAL-2976 Change the declaration of xsd schema in web.xml for webapps

  1. … 39 more files in changeset.
GTNPORTAL-2854 Fix packaging for Redirect Admin UI

  1. … 5 more files in changeset.
GTNPORTAL-2849 GateIn Redirect Admin UI

  1. … 65 more files in changeset.
Add back in the redirect dependencies to jetty and tomcat as these are still needed (its more generic and shouldn't be included as part of the mobile site)

  1. … 1 more file in changeset.
Merge branch 'master' into mobile

  1. … 4 more files in changeset.
Merge branch 'master' into mobile

  1. … 4 more files in changeset.
GTNPORTAL-1956 Public API - Navigation API - Initial support for Pages and Sites

  1. … 86 more files in changeset.
Merge branch 'master' into mobile

Conflicts:

component/portal/src/main/java/org/exoplatform/portal/config/model/PortalConfig.java

mobile-integration/extension-configuration/src/main/webapp/WEB-INF/conf/portal/portal/mobile/pages.xml

mobile-integration/extension-configuration/src/main/webapp/WEB-INF/conf/portal/portal/template/portal/mobile/portal.xml

packaging/jboss-as7/pkg/package.xml

packaging/jboss-as7/pkg/pom.xml

packaging/jboss-as7/pkg/src/main/resources/jboss/main/gatein/gatein.ear/META-INF/application.xml

packaging/jetty/pkg/pom.xml

packaging/tomcat/pkg/pom.xml

pom.xml

portlet/exoadmin/src/main/java/org/exoplatform/account/webui/component/UIRegisterForm.java

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

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

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

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

web/redirect/src/main/java/org/gatein/web/redirect/implementation/SiteRedirectServiceImpl.java

  1. … 16 more files in changeset.
GTNPORTAL-2780: moved over the mobile configuration to a separate portal extension.

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

    • -1
    • +2
    ./src/main/resources/jetty/contexts/portal.xml
    • -1
    • +2
    ./src/main/resources/jetty/contexts/rest.xml
    • -212
    • +223
    ./src/main/resources/jetty/etc/jetty.xml
    • -54
    • +174
    ./src/main/resources/jetty/etc/webdefault.xml
  1. … 2288 more files in changeset.
GTNPORTAL-2709 Upgrade SSO and WCI dependencies

    • -9
    • +9
    ./src/main/resources/jetty/etc/login.conf
  1. … 1 more file in changeset.
GTNPORTAL-2676 SSO packaging available in GateIn

Parameter for skipJSPRedirection in SSOHelper

First version of SSO packaging with CAS working through configuration.properties

OpenAM works with new packaging

SPNEGO packaging

SAML2 works with new packaging

JOSSO packaging and SSO update to 1.3.0.Beta01

Filter order change for SSODelegateFilter

SSO packaging for Tomcat, Jetty and JBoss 7.1.1

    • -0
    • +1
    ./src/main/resources/jetty/etc/login.conf
  1. … 22 more files in changeset.
GTNPORTAL-2613: Make configuration change so that Datasource don't change if there is an additional portal container - Fixes for tomcat - Fixed Kernel version (aligned with other files, should probably upgrade all to 1.3 though)

  1. … 4 more files in changeset.
GTNPORTAL-2613: Make configuration change so that Datasource don't change if there is an additional portal container

  1. … 2 more files in changeset.
GTNPORTAL-2601: Rename groupId "org.exoplatform.portal" to "org.gatein.portal"

  1. … 84 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

  1. … 17 more files in changeset.
GTNPORTAL-2594 - Dependency Cleanup (Part II) - removing asm, 5 "commons" libs, guava, jdom, joda-time, hibernate and slf4j from as7 packaging

  1. … 9 more files in changeset.
GTNPORTAL-2594 - Dependency Cleanup - Part I

  1. … 20 more files 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

  1. … 64 more files in changeset.
GTNPORTAL-2583: Full servlet 3.0 support GTNPORTAL-2567: Credentials saved in temporary authRegistry duing authentication. Adding ConversationStateUpdateFilter for update credentials in ConversationState

    • -2
    • +0
    ./src/main/resources/jetty/etc/login.conf
  1. … 35 more files in changeset.