Author: sshyrkov
Date: Mon Jan 21 18:41:21 2008
New Revision: 19558
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D19558&repname=
=3Djahia
Log:
[trunk 19536-19557]: 1) CONE-60: implement lazy loading of DB group members
2) CONE-60: some modifications to allow managing group memberships despite =
lazy loading
3) Added more site information to the virtual site list. Extended last "Act=
ions" coulmn with "delete" and "export" actions
Added:
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/jsp/jahia/engines/ima=
ges/icons/admin/site_delete.png
- copied unchanged from r19557, trunk/core/src/webapp/jsp/jahia/engin=
es/images/icons/admin/site_delete.png
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/jsp/jahia/engines/ima=
ges/icons/admin/site_edit.png
- copied unchanged from r19557, trunk/core/src/webapp/jsp/jahia/engin=
es/images/icons/admin/site_edit.png
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/jsp/jahia/engines/ima=
ges/icons/admin/site_export.png
- copied unchanged from r19557, trunk/core/src/webapp/jsp/jahia/engin=
es/images/icons/admin/site_export.png
Modified:
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/conf/java/JahiaAdministratio=
nResources.properties
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/conf/java/JahiaAdministratio=
nResources_de.properties
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/conf/java/JahiaAdministratio=
nResources_en.properties
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/conf/java/JahiaAdministratio=
nResources_es.properties
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/conf/java/JahiaAdministratio=
nResources_fr.properties
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/conf/java/JahiaAdministratio=
nResources_it.properties
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/conf/java/JahiaAdministratio=
nResources_pt.properties
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/admin/users/M=
anageGroups.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/hibernate/man=
ager/JahiaGroupManager.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/user=
manager/GuestGroup.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/user=
manager/JahiaDBGroup.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/user=
manager/JahiaGroup.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/user=
manager/JahiaGroupManagerDBProvider.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/user=
manager/JahiaLDAPGroup.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/user=
manager/UsersGroup.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/settings/Sett=
ingsBean.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/WEB-INF/etc/config/ja=
hia.skeleton
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/jsp/jahia/administrat=
ion/sites_management.jsp
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/conf/java/JahiaAdminis=
trationResources.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/conf/java/JahiaAdministrationResources.properties&rev=
=3D19558&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/conf/java/JahiaAdministratio=
nResources.properties (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/conf/java/JahiaAdministratio=
nResources.properties Mon Jan 21 18:41:21 2008
@@ -442,6 +442,7 @@
org.jahia.admin.site.label =3D site
org.jahia.admin.site.ManageSites.addSite.label =3D Add a new site
org.jahia.admin.site.ManageSites.first.label =3D You can now enter the inf=
ormation needed to create your site. You can also directly import one or mo=
re sites with a jahia import file, using the second form.
+org.jahia.admin.site.ManageSites.actions.label=3DActions
org.jahia.admin.site.ManageSites.administratorAccount.label =3D 2. Admini=
strator account
org.jahia.admin.site.ManageSites.anyVirtualSite.label =3D You don't have =
any virtual site... so you can't get sites administrators :o)
org.jahia.admin.site.ManageSites.availableLanguages.label =3D Available la=
nguages
@@ -485,6 +486,7 @@
org.jahia.admin.site.ManageSites.siteProperties.label =3D New virtual sit=
e properties
org.jahia.admin.site.ManageSites.siteServerName.label =3D Site serve=
r name
org.jahia.admin.site.ManageSites.siteTitle.label =3D Site title
+org.jahia.admin.site.ManageSites.templateSet.label =3D Template set
org.jahia.admin.site.ManageSites.virtualSitesListe.label =3D Virtual Site=
s List
org.jahia.admin.site.ManageSites.virtualSiteWhereAdministrator.label =3D V=
irtual site where is the administrator
org.jahia.admin.site.ManageSites.warnToRestartForNewTemplateSet.label=3DWa=
rning : if using a template set for the first time in a Jahia installation,=
you will have to restart your server before accessing the site.
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/conf/java/JahiaAdminis=
trationResources_de.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/conf/java/JahiaAdministrationResources_de.properties&=
rev=3D19558&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/conf/java/JahiaAdministratio=
nResources_de.properties (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/conf/java/JahiaAdministratio=
nResources_de.properties Mon Jan 21 18:41:21 2008
@@ -442,6 +442,7 @@
org.jahia.admin.site.label =3D Site
org.jahia.admin.site.ManageSites.addSite.label =3D Neue Site hinzuf=C3=BC=
gen
org.jahia.admin.site.ManageSites.first.label =3D Sie k=C3=B6nnen jetzt die=
Informationen zur Erstellung Ihre Website eingeben. Mit dem zweiten Formul=
ar k=C3=B6nnen Sie auch eine oder mehrere Sites mithilfe einer Jahia-Import=
datei direkt importieren.
+org.jahia.admin.site.ManageSites.actions.label =3D Aktionen
org.jahia.admin.site.ManageSites.administratorAccount.label =3D 2. Admini=
stratorkonto
org.jahia.admin.site.ManageSites.anyVirtualSite.label =3D Sie haben gar k=
eine virtuelle Site... Deshalb k=C3=B6nnen Sie auch keine Site-Administrato=
ren aufrufen.
org.jahia.admin.site.ManageSites.availableLanguages.label =3D Verf=C3=BCgb=
are Sprachen
@@ -485,6 +486,7 @@
org.jahia.admin.site.ManageSites.siteProperties.label =3D Site-Eigenschaf=
ten
org.jahia.admin.site.ManageSites.siteServerName.label =3D Site-Name
org.jahia.admin.site.ManageSites.siteTitle.label =3D Site-Titel
+org.jahia.admin.site.ManageSites.templateSet.label =3D Vorlagensatz
org.jahia.admin.site.ManageSites.virtualSitesListe.label =3D Liste der vi=
rtuellen Sites
org.jahia.admin.site.ManageSites.virtualSiteWhereAdministrator.label =3D V=
irtuelle Site, auf der sich der Administrator befindet
org.jahia.admin.site.ManageSites.noImport.label =3D Leere Site
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/conf/java/JahiaAdminis=
trationResources_en.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/conf/java/JahiaAdministrationResources_en.properties&=
rev=3D19558&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/conf/java/JahiaAdministratio=
nResources_en.properties (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/conf/java/JahiaAdministratio=
nResources_en.properties Mon Jan 21 18:41:21 2008
@@ -442,6 +442,7 @@
org.jahia.admin.site.label =3D site
org.jahia.admin.site.ManageSites.addSite.label =3D Add a new site
org.jahia.admin.site.ManageSites.first.label =3D You can now enter the inf=
ormation needed to create your site. You can also directly import one or mo=
re sites with a jahia import file, using the second form.
+org.jahia.admin.site.ManageSites.actions.label =3D Actions
org.jahia.admin.site.ManageSites.administratorAccount.label =3D 2. Admini=
strator account
org.jahia.admin.site.ManageSites.anyVirtualSite.label =3D You don't have =
any virtual site... so you can't get sites administrators :o)
org.jahia.admin.site.ManageSites.availableLanguages.label =3D Available la=
nguages
@@ -485,6 +486,7 @@
org.jahia.admin.site.ManageSites.siteProperties.label =3D New virtual sit=
e properties
org.jahia.admin.site.ManageSites.siteServerName.label =3D Site serve=
r name
org.jahia.admin.site.ManageSites.siteTitle.label =3D Site title
+org.jahia.admin.site.ManageSites.templateSet.label =3D Template set
org.jahia.admin.site.ManageSites.virtualSitesListe.label =3D Virtual Site=
s List
org.jahia.admin.site.ManageSites.virtualSiteWhereAdministrator.label =3D V=
irtual site where is the administrator
org.jahia.admin.site.ManageSites.warnToRestartForNewTemplateSet.label=3DWa=
rning : if using a template set for the first time in a Jahia installation,=
you will have to restart your server before accessing the site.
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/conf/java/JahiaAdminis=
trationResources_es.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/conf/java/JahiaAdministrationResources_es.properties&=
rev=3D19558&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/conf/java/JahiaAdministratio=
nResources_es.properties (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/conf/java/JahiaAdministratio=
nResources_es.properties Mon Jan 21 18:41:21 2008
@@ -439,6 +439,7 @@
org.jahia.admin.site.label =3D sitio
org.jahia.admin.site.ManageSites.addSite.label =3D Agregar un nuevo sitio
org.jahia.admin.site.ManageSites.first.label =3D Ahora puede introducir la=
informaci=C3=B3n necesaria para crear su sitio. Adem=C3=A1s, puede importa=
r directamente uno o m=C3=A1s sitios con un archivo de importaci=C3=B3n de =
Jahia utilizando el segundo formulario.
+org.jahia.admin.site.ManageSites.actions.label=3DAcciones
org.jahia.admin.site.ManageSites.administratorAccount.label =3D 2. Cuenta=
del administrador
org.jahia.admin.site.ManageSites.anyVirtualSite.label =3D Dado que no tie=
ne ning=C3=BAn sitio virtual, no puede tener administradores de sitios :o)
org.jahia.admin.site.ManageSites.availableLanguages.label =3D Idiomas disp=
onibles
@@ -482,6 +483,7 @@
org.jahia.admin.site.ManageSites.siteProperties.label =3D Propiedades de =
nuevo sitio virtual
org.jahia.admin.site.ManageSites.siteServerName.label =3D Nombre del=
servidor del sitio
org.jahia.admin.site.ManageSites.siteTitle.label =3D T=C3=ADtulo del=
sitio
+org.jahia.admin.site.ManageSites.templateSet.label =3D Conjunto de plantil=
las
org.jahia.admin.site.ManageSites.virtualSitesListe.label =3D Lista de sit=
ios virtuales
org.jahia.admin.site.ManageSites.virtualSiteWhereAdministrator.label =3D S=
itio virtual donde se encuentra el administrador
org.jahia.admin.site.ManageSites.noImport.label =3D Sitio vac=C3=ADo
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/conf/java/JahiaAdminis=
trationResources_fr.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/conf/java/JahiaAdministrationResources_fr.properties&=
rev=3D19558&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/conf/java/JahiaAdministratio=
nResources_fr.properties (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/conf/java/JahiaAdministratio=
nResources_fr.properties Mon Jan 21 18:41:21 2008
@@ -604,6 +604,7 @@
org.jahia.admin.serverpermissions.title.label=3DG=C3=A9rer les permissions=
sur le serveur
org.jahia.admin.showDetails.label =3D afficher les d=C3=A9tails
org.jahia.admin.site.ManageSites.NoTemplatePreview.label =3D Aucun aper=C3=
=A7u du mod=C3=A8le
+org.jahia.admin.site.ManageSites.actions.label =3D Actions
org.jahia.admin.site.ManageSites.addSite.label =3D Ajouter un site
org.jahia.admin.site.ManageSites.administratorAccount.label =3D 2. Compte=
de l'administrateur
org.jahia.admin.site.ManageSites.anyVirtualSite.label =3D Il n'y a aucun =
site virtuel, vous ne pouvez donc pas r=C3=A9cup=C3=A9rer d'administrateurs=
de site !
@@ -665,6 +666,7 @@
org.jahia.admin.site.ManageSites.siteProperties.label =3D Propri=C3=A9t=
=C3=A9s du nouveau site virtuel
org.jahia.admin.site.ManageSites.siteServerName.label =3D Nom du&nbs=
p;serveur du site
org.jahia.admin.site.ManageSites.siteTitle.label =3D Titre du si=
te
+org.jahia.admin.site.ManageSites.templateSet.label =3D Jeu de mod=C3=A8les
org.jahia.admin.site.ManageSites.virtualSiteWhereAdministrator.label =3D S=
ite virtuel o=C3=B9 se trouve l'administrateur
org.jahia.admin.site.ManageSites.virtualSitesListe.label =3D Liste des sit=
es virtuels
org.jahia.admin.site.ManageSites.warnToRestartForNewTemplateSet.label=3DAt=
tention : si vous utilisez un template set pour la premi=C3=A8re fois, il f=
aut red=C3=A9marrer le serveur avant d'acc=C3=A9der au site.
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/conf/java/JahiaAdminis=
trationResources_it.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/conf/java/JahiaAdministrationResources_it.properties&=
rev=3D19558&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/conf/java/JahiaAdministratio=
nResources_it.properties (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/conf/java/JahiaAdministratio=
nResources_it.properties Mon Jan 21 18:41:21 2008
@@ -440,6 +440,7 @@
org.jahia.admin.site.label =3D sito
org.jahia.admin.site.ManageSites.addSite.label =3D Aggiungi nuovo sito
org.jahia.admin.site.ManageSites.first.label =3D Ora =C3=A8 possibile inse=
rire le informazioni necessarie per creare il sito. =C3=88 inoltre possibil=
e importare direttamente uno o pi=C3=B9 siti con un file jahia da importare=
, tramite il secondo modulo.
+org.jahia.admin.site.ManageSites.actions.label=3DAzioni
org.jahia.admin.site.ManageSites.administratorAccount.label =3D 2. Accoun=
t amministratore
org.jahia.admin.site.ManageSites.anyVirtualSite.label =3D Non esiste alcu=
n sito virtuale... quindi non =C3=A8 possibile esserne l'amministratore!
org.jahia.admin.site.ManageSites.availableLanguages.label =3D Lingue dispo=
nibili
@@ -483,6 +484,7 @@
org.jahia.admin.site.ManageSites.siteProperties.label =3D Propriet=C3=A0 =
nuovo sito virtuale
org.jahia.admin.site.ManageSites.siteServerName.label =3D Nome server sito
org.jahia.admin.site.ManageSites.siteTitle.label =3D Titolo sito
+org.jahia.admin.site.ManageSites.templateSet.label =3D Serie di modelli
org.jahia.admin.site.ManageSites.virtualSitesListe.label =3D Elenco siti =
virtuali
org.jahia.admin.site.ManageSites.virtualSiteWhereAdministrator.label =3D S=
ito virtuale in cui si trova l'amministratore
org.jahia.admin.site.ManageSites.noImport.label =3D Sito vuoto
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/conf/java/JahiaAdminis=
trationResources_pt.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/conf/java/JahiaAdministrationResources_pt.properties&=
rev=3D19558&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/conf/java/JahiaAdministratio=
nResources_pt.properties (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/conf/java/JahiaAdministratio=
nResources_pt.properties Mon Jan 21 18:41:21 2008
@@ -439,6 +439,7 @@
org.jahia.admin.site.label =3D site
org.jahia.admin.site.ManageSites.addSite.label =3D Adicionar um novo site
org.jahia.admin.site.ManageSites.first.label =3D Voc=C3=AA j=C3=A1 pode in=
serir as informa=C3=A7=C3=B5es necess=C3=A1rias =C3=A0 cria=C3=A7=C3=A3o do=
seu site. Voc=C3=AA tamb=C3=A9m pode importar diretamente um ou mais sites=
com um arquivo de importa=C3=A7=C3=A3o jahia, usando o segundo formul=C3=
=A1rio.
+org.jahia.admin.site.ManageSites.actions.label=3DA=C3=A7=C3=B5es
org.jahia.admin.site.ManageSites.administratorAccount.label =3D 2. Conta =
do gerenciador
org.jahia.admin.site.ManageSites.anyVirtualSite.label =3D N=C3=A3o h=C3=
=A1 nenhum site virtual... portanto n=C3=A3o =C3=A9 poss=C3=ADvel obter ger=
enciadores de sites :o)
org.jahia.admin.site.ManageSites.availableLanguages.label =3D Idiomas disp=
on=C3=ADveis
@@ -482,6 +483,7 @@
org.jahia.admin.site.ManageSites.siteProperties.label =3D Propriedades do=
novo site virtual
org.jahia.admin.site.ManageSites.siteServerName.label =3D Nome do servido=
r do site
org.jahia.admin.site.ManageSites.siteTitle.label =3D T=C3=ADtulo do site
+org.jahia.admin.site.ManageSites.templateSet.label =3D Conjunto de modelos
org.jahia.admin.site.ManageSites.virtualSitesListe.label =3D Lista de Sit=
es Virtuais
org.jahia.admin.site.ManageSites.virtualSiteWhereAdministrator.label =3D S=
ite virtual onde se encontra o gerenciador
org.jahia.admin.site.ManageSites.noImport.label =3D Site vazio
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/admin/u=
sers/ManageGroups.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/java/org/jahia/admin/users/ManageGroups.java&rev=3D19=
558&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/admin/users/M=
anageGroups.java (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/admin/users/M=
anageGroups.java Mon Jan 21 18:41:21 2008
@@ -42,6 +42,8 @@
import org.jahia.data.events.JahiaEvent;
import org.jahia.data.viewhelper.principal.PrincipalViewHelper;
import org.jahia.exceptions.JahiaException;
+import org.jahia.hibernate.manager.JahiaGroupManager;
+import org.jahia.hibernate.manager.SpringContextSingleton;
import org.jahia.params.ProcessingContext;
import org.jahia.registries.ServicesRegistry;
import org.jahia.resourcebundle.JahiaResourceBundle;
@@ -899,7 +901,14 @@
JahiaGroup theGroup =3D (JahiaGroup)gMgr.lookupGroup(jahiaSite, gr=
oupName);
Set groupMembers =3D new HashSet();
if (theGroup !=3D null) {
- Enumeration groupMembersEnum =3D theGroup.members();
+ Enumeration groupMembersEnum =3D theGroup.isPreloadedGroups()=
? theGroup
+ .members()
+ : (new Vector(((JahiaGroupManager) SpringContextSingle=
ton
+ .getInstance().getContext().getBean(
+ JahiaGroupManager.class.getName()))
+ .getGroupMembers(theGroup.getGroupKey()).value=
s()))
+ .elements();
+ =
while (groupMembersEnum.hasMoreElements()) {
Object member =3D (Object)groupMembersEnum.nextElement();
// keep only members from this jahiaSite...
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/hiberna=
te/manager/JahiaGroupManager.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/java/org/jahia/hibernate/manager/JahiaGroupManager.ja=
va&rev=3D19558&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/hibernate/man=
ager/JahiaGroupManager.java (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/hibernate/man=
ager/JahiaGroupManager.java Mon Jan 21 18:41:21 2008
@@ -21,6 +21,7 @@
=
import org.apache.commons.collections.FastHashMap;
import org.apache.log4j.Logger;
+import org.jahia.bin.Jahia;
import org.jahia.exceptions.JahiaInitializationException;
import org.jahia.hibernate.dao.JahiaGroupAccessDAO;
import org.jahia.hibernate.dao.JahiaGroupDAO;
@@ -194,14 +195,20 @@
}
=
if (jahiaGrp !=3D null) {
+ // Find Members =
+ Map members =3D null;
+ if (Jahia.getSettings().isPreloadDBGroupMembersActivated()=
) {
+ members =3D getGroupMembers(jahiaGrp);
+ } else {
+ members =3D new FastHashMap();
+ }
=
- // Find Members
- Map members =3D getGroupMembers(jahiaGrp);
// Load Properties
Properties properties =3D dao.loadProperties(jahiaGrp.getI=
d(), jahiaGrp.getKey(),
JahiaGroupManag=
erDBProvider.PROVIDER_NAME);
=
- group =3D getJahiaGroup(jahiaGrp, siteID, members, propert=
ies);
+ group =3D getJahiaGroup(jahiaGrp, siteID, members, propert=
ies, Jahia.getSettings()
+ .isPreloadDBGroupMembersActivated());
if (cache !=3D null) {
cache.put(CacheAdvice.toGroupCacheKey(new Object[]{CAC=
HE_KEY_GROUPPREFIX + name + ":" + siteID,
CAC=
HE_KEY_SITEPREFIX + siteID}), group);
@@ -233,8 +240,13 @@
if (group =3D=3D null) {
JahiaGrp jahiaGrp =3D dao.loadJahiaGroupByGroupKey(groupKey);
if (jahiaGrp !=3D null) {
- // Find Members
- Map members =3D getGroupMembers(jahiaGrp);
+ // Find Members =
+ Map members =3D null;
+ if (Jahia.getSettings().isPreloadDBGroupMembersActivated()=
) {
+ members =3D getGroupMembers(jahiaGrp);
+ } else {
+ members =3D new FastHashMap();
+ }
// Load Properties
Properties properties =3D dao.loadProperties(jahiaGrp.getI=
d(), jahiaGrp.getKey(),
JahiaGroupManag=
erDBProvider.PROVIDER_NAME);
@@ -242,7 +254,8 @@
if (jahiaGrp.getSite() !=3D null) {
siteID =3D jahiaGrp.getSite().getId().intValue();
}
- group =3D getJahiaGroup(jahiaGrp, siteID, members, propert=
ies);
+ group =3D getJahiaGroup(jahiaGrp, siteID, members, propert=
ies, Jahia.getSettings()
+ .isPreloadDBGroupMembersActivated());
if (cache !=3D null) {
cache.put(entryKey, group);
}
@@ -251,7 +264,7 @@
return group;
}
=
- private JahiaGroup getJahiaGroup(JahiaGrp jahiaGrp, int siteID, Map me=
mbers, Properties properties) {
+ private JahiaGroup getJahiaGroup(JahiaGrp jahiaGrp, int siteID, Map me=
mbers, Properties properties, boolean preloadedGroups) {
JahiaGroup group;
if (JahiaGroupManagerDBProvider.GUEST_GROUPNAME.equals(jahiaGrp.ge=
tName())) {
group =3D new GuestGroup(jahiaGrp.getId().intValue(), siteID, =
properties);
@@ -259,7 +272,7 @@
group =3D new UsersGroup(jahiaGrp.getId().intValue(), siteID, =
properties);
} else {
group =3D new JahiaDBGroup(jahiaGrp.getId().intValue(), jahiaG=
rp.getName(), jahiaGrp.getKey(),
- siteID, members, properties);
+ siteID, members, properties, preloade=
dGroups);
}
return group;
}
@@ -401,8 +414,8 @@
}
}
=
- private Map getGroupMembers(JahiaGrp jahiaGrp) {
- List memberIds =3D accessDAO.findMemberIdsFromGroupName(jahiaGrp.g=
etKey());
+ public Map getGroupMembers(String groupKey) {
+ List memberIds =3D accessDAO.findMemberIdsFromGroupName(groupKey);
Map members =3D new FastHashMap(memberIds.size());
for (int i =3D 0; i < memberIds.size(); i++) {
Object[] objects =3D (Object[]) memberIds.get(i);
@@ -421,6 +434,10 @@
}
}
return members;
+ } =
+ =
+ private Map getGroupMembers(JahiaGrp jahiaGrp) {
+ return getGroupMembers(jahiaGrp.getKey());
}
=
public Map getGroupsInSite(int siteID) {
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/service=
s/usermanager/GuestGroup.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/java/org/jahia/services/usermanager/GuestGroup.java&r=
ev=3D19558&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/user=
manager/GuestGroup.java (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/user=
manager/GuestGroup.java Mon Jan 21 18:41:21 2008
@@ -35,7 +35,7 @@
=
public GuestGroup(int id, int siteId, Properties properties) {
super(id, JahiaGroupManagerDBProvider.GUEST_GROUPNAME,
- JahiaGroupManagerDBProvider.GUEST_GROUPNAME+":"+siteId, si=
teId, new HashMap(), properties);
+ JahiaGroupManagerDBProvider.GUEST_GROUPNAME+":"+siteId, si=
teId, new HashMap(), properties, false);
}
=
=
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/service=
s/usermanager/JahiaDBGroup.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/java/org/jahia/services/usermanager/JahiaDBGroup.java=
&rev=3D19558&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/user=
manager/JahiaDBGroup.java (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/user=
manager/JahiaDBGroup.java Mon Jan 21 18:41:21 2008
@@ -34,9 +34,11 @@
import java.security.Principal;
import java.security.acl.Group;
import java.util.Enumeration;
+import java.util.HashSet;
import java.util.Iterator;
import java.util.Map;
import java.util.Properties;
+import java.util.Set;
=
/**
* This class represents the Jahia native database based user group.
@@ -60,6 +62,12 @@
/** Group additional parameters. */
private Properties mProperties =3D new Properties ();
=
+ public JahiaDBGroup (int id, String groupname, String groupKey, int si=
teID,
+ Map members, Properties properties) {
+ this(id, groupname, groupKey, siteID, members, properties,
+ members !=3D null && !members.isEmpty() ? true : false);
+ } =
+ =
//--------------------------------------------------------------------=
-----
/**
* Instanciate a new JahiaDBGroup object.
@@ -74,7 +82,7 @@
* @param siteID The site id
*/
public JahiaDBGroup (int id, String groupname, String groupKey, int si=
teID,
- Map members, Properties properties) {
+ Map members, Properties properties, boolean pr=
eloadedGroups) {
=
mID =3D id;
mGroupname =3D groupname;
@@ -88,7 +96,7 @@
if (properties !=3D null) {
mProperties =3D properties;
}
-
+ this.preloadedGroups =3D preloadedGroups;
}
=
=
@@ -317,4 +325,22 @@
return JahiaGroupManagerDBProvider.PROVIDER_NAME;
}
=
+ public boolean isMember(Principal principal) {
+ if (super.isMember(principal)) {
+ return true;
+ }
+ if (!preloadedGroups && principal instanceof JahiaUser) {
+ if (notMembers.contains(principal.getName())) {
+ return false;
+ }
+ if (JahiaGroupManagerDBProvider.getInstance().getUserMembershi=
p((JahiaUser)principal).contains(getGroupKey())) {
+ mMembers.put(principal.getName(), principal);
+ return true;
+ } else {
+ notMembers.add(principal.getName());
+ }
+ }
+ return false;
+ } =
+ =
}
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/service=
s/usermanager/JahiaGroup.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/java/org/jahia/services/usermanager/JahiaGroup.java&r=
ev=3D19558&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/user=
manager/JahiaGroup.java (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/user=
manager/JahiaGroup.java Mon Jan 21 18:41:21 2008
@@ -88,7 +88,10 @@
/** Hashtable holding all the group members. Is assumed to be never nu=
ll. */
protected Map mMembers =3D new Hashtable ();
=
+ protected boolean preloadedGroups;
=
+ protected Set notMembers =3D new HashSet(); =
+ =
/**
* Get grp's properties list.
*
@@ -426,4 +429,9 @@
*/
public abstract String getProviderName ();
=
+
+ public boolean isPreloadedGroups() {
+ return preloadedGroups;
+ }
+
}
\ No newline at end of file
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/service=
s/usermanager/JahiaGroupManagerDBProvider.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/java/org/jahia/services/usermanager/JahiaGroupManager=
DBProvider.java&rev=3D19558&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/user=
manager/JahiaGroupManagerDBProvider.java (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/user=
manager/JahiaGroupManagerDBProvider.java Mon Jan 21 18:41:21 2008
@@ -136,7 +136,7 @@
// Create the group
JahiaDBGroup group =3D null;
String groupKey =3D name + ":" + String.valueOf(siteID);
- group =3D new JahiaDBGroup(0, name, groupKey, siteID, null, proper=
ties);
+ group =3D new JahiaDBGroup(0, name, groupKey, siteID, null, proper=
ties, false);
=
groupManager.createGroup(group);
group =3D (JahiaDBGroup) groupManager.findGroupBySiteAndName(siteI=
D, name);
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/service=
s/usermanager/JahiaLDAPGroup.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/java/org/jahia/services/usermanager/JahiaLDAPGroup.ja=
va&rev=3D19558&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/user=
manager/JahiaLDAPGroup.java (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/user=
manager/JahiaLDAPGroup.java Mon Jan 21 18:41:21 2008
@@ -57,12 +57,8 @@
// LDAP dynamic group (groupOfURLs)
private boolean dynamic;
=
- private boolean preloadedGroups;
-
private JahiaGroupManagerLDAPProvider myProvider;
=
- private Set notMembers =3D new HashSet();
-
/**
* Instanciate a new JahiaDBGroup object.
*
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/service=
s/usermanager/UsersGroup.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/java/org/jahia/services/usermanager/UsersGroup.java&r=
ev=3D19558&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/user=
manager/UsersGroup.java (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/user=
manager/UsersGroup.java Mon Jan 21 18:41:21 2008
@@ -35,7 +35,7 @@
=
public UsersGroup(int id, int siteId, Properties properties) {
super(id, JahiaGroupManagerDBProvider.USERS_GROUPNAME,
- JahiaGroupManagerDBProvider.USERS_GROUPNAME+":"+siteId, si=
teId, new HashMap(), properties);
+ JahiaGroupManagerDBProvider.USERS_GROUPNAME+":"+siteId, si=
teId, new HashMap(), properties, false);
}
=
=
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/setting=
s/SettingsBean.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/java/org/jahia/settings/SettingsBean.java&rev=3D19558=
&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/settings/Sett=
ingsBean.java (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/settings/Sett=
ingsBean.java Mon Jan 21 18:41:21 2008
@@ -368,6 +368,10 @@
private int suggestedRetryTimeAfterTimeout =3D 60; // in seconds
private int suggestedRetryTimeAfterTimeoutOnStartup =3D 15; // in seco=
nds
=
+ // Preload group members when loading user groups from DB =
+ final public static String PRELOAD_DBGROUP_MEMBERS_ACTIVATED =3D "prel=
oadDBGroupMembersActivated";
+ private boolean preloadDBGroupMembersActivated =3D true;
+ =
private int editModeSessionTimeout =3D 2*60*60; // 2 hours
=
// The db max elements for SQL IN clause
@@ -812,9 +816,10 @@
=
editModeSessionTimeout =3D getInt("editModeSessionTimeout", 2*=
60*60);
=
-
dBMaxElementsForInClause =3D getInt("db_max_elements_for_in_cl=
ause", dBMaxElementsForInClause);
=
+ preloadDBGroupMembersActivated =3D getBoolean(PRELOAD_DBGROUP_=
MEMBERS_ACTIVATED, true);
+ =
try {
DatabaseScripts scriptsManager =3D new DatabaseScripts();
Vector scriptsInfos =3D scriptsManager.getDatabaseScriptsI=
nfos (
@@ -2176,4 +2181,8 @@
public int getDBMaxElementsForInClause() {
return dBMaxElementsForInClause;
}
+ =
+ public boolean isPreloadDBGroupMembersActivated() {
+ return preloadDBGroupMembersActivated;
+ }
}
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/WEB-INF/etc/con=
fig/jahia.skeleton
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/webapp/WEB-INF/etc/config/jahia.skeleton&rev=3D19558&=
repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/WEB-INF/etc/config/ja=
hia.skeleton (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/WEB-INF/etc/config/ja=
hia.skeleton Mon Jan 21 18:41:21 2008
@@ -423,6 +423,10 @@
# Specifies whether we should preload ACLs from database on startup.
org.jahia.acl.preload_active =3D true
=
+# This variable controls whether all the members of a user group (in Jahia=
DB
+# not LDAP) are preloaded, when the group is loaded.
+preloadDBGroupMembersActivated =3D true
+
######################################################################
### Page properties ##################################################
######################################################################
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/jsp/jahia/admin=
istration/sites_management.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/webapp/jsp/jahia/administration/sites_management.jsp&=
rev=3D19558&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/jsp/jahia/administrat=
ion/sites_management.jsp (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/jsp/jahia/administrat=
ion/sites_management.jsp Mon Jan 21 18:41:21 2008
@@ -53,12 +53,21 @@
<% if ( sitesList !=3D null && sitesList.hasMoreElements()){ %>
=
<script type=3D"text/javascript">
- function sendExportForm() {
+ function selectSite(selectedSite) {
+ if (selectedSite) {
+ for (var i =3D 0; i < document.main.sitebox.length; i++) {
+ document.main.sitebox[i].checked =3D (document.main.sitebo=
x[i].value =3D=3D selectedSite);
+ }
+ }
+ }
+ function sendExportForm(selectedSite) {
+ selectSite(selectedSite);
document.main.action=3D'<%=3DjParams.composeSiteUrl() + "/engineNa=
me/export/export_" + new SimpleDateFormat("yyyy-MM-dd").format(new Date()) =
+ ".zip"%>';
document.main.submit();
}
=
- function sendDeleteForm() {
+ function sendDeleteForm(selectedSite) {
+ selectSite(selectedSite);
document.main.action=3D'<%=3Drequest.getContextPath()+JahiaAdminis=
tration.getServletPath()%>';
document.main.submit();
}
@@ -70,9 +79,10 @@
<thead>
<tr>
<th width=3D"5%"> </th>
- <th width=3D"80%"><jahia:adminResourceBundle resourceN=
ame=3D"org.jahia.admin.name.label"/></th>
- <th width=3D"15%"><jahia:adminResourceBundle
resourceN=
ame=3D"org.jahia.admin.edit.label"/></th>
- <!--<th width=3D"15%"><jahia:adminResourceBundle resou=
rceName=3D"org.jahia.admin.site.ManageSites.export.label"/></th>-->
+ <th width=3D"20%"><jahia:adminResourceBundle resourceN=
ame=3D"org.jahia.admin.name.label"/></th>
+ <th width=3D"10%" style=3D"white-space: nowrap"><jahia=
:adminResourceBundle resourceName=3D"org.jahia.admin.site.ManageSites.siteK=
ey.label"/></th>
+ <th width=3D"53%"><jahia:adminResourceBundle resourceN=
ame=3D"org.jahia.admin.site.ManageSites.siteDesc.label"/></th>
+ <th width=3D"12%"><jahia:adminResourceBundle
resourceN=
ame=3D"org.jahia.admin.site.ManageSites.actions.label"/></th>
</tr>
</thead>
<form name=3D"main">
@@ -94,15 +104,17 @@
<tr class=3D"<%=3DlineClass%>">
<td><input type=3D"checkbox" name=3D"siteb=
ox" value=3D"<%=3Dsite.getSiteKey()%>"></td>
<td><%=3Dsite.getTitle()%></td>
+ <td><%=3Dsite.getSiteKey()%></td>
+ <td><%=3Dsite.getDescr()%></td>
<td>
- <a href=3D'<%=3DJahiaAdministration.co=
mposeActionURL(request,response,"sites","&sub=3Dedit&siteid=3D" + site.getI=
D())%>' alt=3D"<jahia:adminResourceBundle resourceName=3D"org.jahia.admin.e=
ditProperties.label"/>"><jahia:adminResourceBundle resourceName=3D"org.jahi=
a.admin.edit.label"/></a>
+ <a href=3D'<%=3DJahiaAdministration.co=
mposeActionURL(request,response,"sites","&sub=3Dedit&siteid=3D" + site.getI=
D())%>' title=3D"<jahia:adminResourceBundle resourceName=3D'org.jahia.admin=
.edit.label'/>"><img src=3D"<%=3DURL%>images/icons/admin/site_edit.png" alt=
=3D"<jahia:adminResourceBundle resourceName=3D'org.jahia.admin.edit.label'/=
>" title=3D"<jahia:adminResourceBundle resourceName=3D'org.jahia.admin.edit=
.label'/>" width=3D"16" height=3D"16" border=3D"0"/></a>
+
+ <a href=3D"#delete" onclick=3D"sendDel=
eteForm('<%=3Dsite.getSiteKey()%>'); return false;" title=3D"<jahia:adminRe=
sourceBundle resourceName=3D'org.jahia.admin.delete.label'/>"><img src=3D"<=
%=3DURL%>images/icons/admin/site_delete.png" alt=3D"<jahia:adminResourceBun=
dle resourceName=3D'org.jahia.admin.delete.label'/>" title=3D"<jahia:adminR=
esourceBundle resourceName=3D'org.jahia.admin.delete.label'/>" width=3D"16"=
height=3D"16" border=3D"0"/></a>
+ <% if (homeContentPage !=3D null) { %>
+
+ <a href=3D"#export" onclick=3D"sendExp=
ortForm('<%=3Dsite.getSiteKey()%>'); return false;" title=3D"<jahia:adminRe=
sourceBundle resourceName=3D'org.jahia.admin.site.ManageSites.export.label'=
/>"><img src=3D"<%=3DURL%>images/icons/admin/site_export.png" alt=3D"<jahia=
:adminResourceBundle resourceName=3D'org.jahia.admin.site.ManageSites.expor=
t.label'/>" title=3D"<jahia:adminResourceBundle resourceName=3D'org.jahia.a=
dmin.site.ManageSites.export.label'/>" width=3D"16" height=3D"16" border=3D=
"0"/></a>
+ <% } %>
</td>
- <%--<td>--%>
- <%--<% if (homeContentPage !=3D null) =
{ %>--%>
- <%--<a href=3D'<%=3DjParams.composeSit=
eUrl(site) + "/engineName/export/" + site.getSiteKey() + ".zip" +--%>
- <%--"?site=3D" + site.getSiteKey() + =
"&exportformat=3Dsite" %>' alt=3D"<jahia:adminResourceBundle resourceName=
=3D"org.jahia.admin.site.ManageSites.export.label"/>"><jahia:adminResourceB=
undle resourceName=3D"org.jahia.admin.site.ManageSites.export.label"/></a>-=
-%>
- <%--<% } %>--%>
- <%--</td>--%>
</tr>
<%
} %>
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
