shuber 2005/08/19 17:54:32 CEST
Modified files:
core/src/webapp/jsp/jahia/administration site_delete.jsp
core/src/webapp/jsp/jahia/administration/user_management
user_search.jsp
core/src/webapp/jsp/jahia/engines/users selectgroups.jsp
selectusers.jsp
Log:
Major refactoring of Jahia services. They now have the following life-cycle :
Instantiation via Spring -> start -> stop -> destroyed by JVM
A lot of the changes have to do to the fact that we are reducing access to
the SpringContextSingleton and ServicesRegistry but rather using setter
injection of service dependencies.
The goal was to have Spring initialize all the services, but due to
incompatibilities with Slide, we had to keep the actual system, which means
Spring creates all the beans, and then the ServicesRegistry calls the start
method on all services.
JahiaUserManagerService and JahiaGroupManagerService, as well as the
Application services were modified to take their configuration from the Spring
file instead of the XML files. This allowed for removing lots of XML parsing
code. Warning : LDAP activation/deactivation must now be done in Spring
applicationcontext-services.xml file. The routing.xml files are still used for
server config and criterias.
Revision Changes Path
1.2 +2 -2
jahia/core/src/webapp/jsp/jahia/administration/site_delete.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/administration/site_delete.jsp.diff?r1=1.1&r2=1.2&f=h
1.2 +1 -1
jahia/core/src/webapp/jsp/jahia/administration/user_management/user_search.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/administration/user_management/user_search.jsp.diff?r1=1.1&r2=1.2&f=h
1.2 +2 -2
jahia/core/src/webapp/jsp/jahia/engines/users/selectgroups.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/engines/users/selectgroups.jsp.diff?r1=1.1&r2=1.2&f=h
1.2 +2 -2
jahia/core/src/webapp/jsp/jahia/engines/users/selectusers.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/engines/users/selectusers.jsp.diff?r1=1.1&r2=1.2&f=h
Index: site_delete.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/jsp/jahia/administration/site_delete.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- site_delete.jsp 30 Mar 2004 14:14:22 -0000 1.1
+++ site_delete.jsp 19 Aug 2005 15:54:31 -0000 1.2
@@ -113,11 +113,11 @@
%>
<jahia:adminResourceBundle
resourceName="org.jahia.admin.site.ManageSites.deleteSiteUsersAndGroups.label"/> :<br>
<%
- UserManagerProviderBean
usrProviderBean;
+ JahiaUserManagerProvider
usrProviderBean;
int size = usrProviders.size();
for ( int i=0 ; i<size ; i++ )
{
- usrProviderBean =
(UserManagerProviderBean)usrProviders.get(i);
+ usrProviderBean =
(JahiaUserManagerProvider)usrProviders.get(i);
%>
<input
name="usrProviders" type="checkbox" value="<%=usrProviderBean.getKey()%>"
checked> <%=usrProviderBean.getKey()%>
<%
Index: user_search.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/jsp/jahia/administration/user_management/user_search.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- user_search.jsp 30 Mar 2004 14:14:22 -0000 1.1
+++ user_search.jsp 19 Aug 2005 15:54:31 -0000 1.2
@@ -78,7 +78,7 @@
<%
Enumeration providerEnum = providerList.elements();
while (providerEnum.hasMoreElements()) {
- UserManagerProviderBean curProvider =
(UserManagerProviderBean) providerEnum.nextElement();
+ JahiaUserManagerProvider curProvider =
(JahiaUserManagerProvider) providerEnum.nextElement();
%>
<input type="checkbox" name="providers"
value="<%=curProvider.getKey()%>" disabled
Index: selectgroups.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/jsp/jahia/engines/users/selectgroups.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- selectgroups.jsp 30 Mar 2004 14:16:26 -0000 1.1
+++ selectgroups.jsp 19 Aug 2005 15:54:32 -0000 1.2
@@ -82,12 +82,12 @@
<%
Enumeration providerEnum = providerList.elements();
while (providerEnum.hasMoreElements()) {
- GroupManagerProviderBean curProvider =
(GroupManagerProviderBean) providerEnum.nextElement();
+ JahiaGroupManagerProvider curProvider =
(JahiaGroupManagerProvider) providerEnum.nextElement();
%>
<input type="checkbox" name="providers"
value="<%=curProvider.getKey()%>" disabled
<%if (providerList.size() <= 1) { %> checked
<% } %>>
- <%=curProvider.getTitle()%>
(<%=curProvider.getKey()%>)<br>
+ <jahia:engineResourceBundle
resourceName="org.jahia.engines.users.SelectUG_Engine.providers.<%=curProvider.getKey()%>.label"/>
(<%=curProvider.getKey()%>)<br>
<%
}
%>
Index: selectusers.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/jsp/jahia/engines/users/selectusers.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- selectusers.jsp 30 Mar 2004 14:16:26 -0000 1.1
+++ selectusers.jsp 19 Aug 2005 15:54:32 -0000 1.2
@@ -89,12 +89,12 @@
<%
Enumeration providerEnum = providerList.elements();
while (providerEnum.hasMoreElements()) {
- UserManagerProviderBean curProvider =
(UserManagerProviderBean) providerEnum.nextElement();
+ JahiaUserManagerProvider curProvider =
(JahiaUserManagerProvider) providerEnum.nextElement();
%>
<input type="checkbox" name="providers"
value="<%=curProvider.getKey()%>" disabled
<%if (providerList.size() <= 1) { %> checked
<% } %>>
- <%=curProvider.getTitle()%>
(<%=curProvider.getKey()%>)<br>
+ <jahia:engineResourceBundle
resourceName="org.jahia.engines.users.SelectUG_Engine.providers.<%=curProvider.getKey()%>.label"/>
(<%=curProvider.getKey()%>)<br>
<%
}
%>
