shuber 2005/08/23 12:17:18 CEST
Modified files:
core/src/java/org/jahia/services/content JCRStoreService.java
core/src/java/org/jahia/services/fileextraction
JahiaFileExtractionServiceImpl.java
core/src/java/org/jahia/services/htmleditors
HtmlEditorsBaseService.java
core/src/java/org/jahia/services/htmlparser
HtmlParserBaseService.java
core/src/java/org/jahia/services/metadata
MetadataBaseService.java
core/src/java/org/jahia/services/templates_deployer
JahiaTemplatesDeployerBaseService.java
core/src/java/org/jahia/services/timebasedpublishing
TimeBasedPublishingImplService.java
core/src/java/org/jahia/services/usermanager
JahiaGroupManagerLDAPProvider.java
core/src/test/src/java/org/jahia/services/cluster
AbstractClusterServiceTest.java
core/src/webapp/WEB-INF/etc/spring
applicationcontext-services.xml
Log:
- Bugfix in Group LDAP provider implementation
- Corrected typo in Spring config file
- Made cluster service configurable (can turn it off now)
- Removed some logging messages in INFO level.
Revision Changes Path
1.6 +0 -1
jahia/core/src/java/org/jahia/services/content/JCRStoreService.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/services/content/JCRStoreService.java.diff?r1=1.5&r2=1.6&f=h
1.4 +0 -1
jahia/core/src/java/org/jahia/services/fileextraction/JahiaFileExtractionServiceImpl.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/services/fileextraction/JahiaFileExtractionServiceImpl.java.diff?r1=1.3&r2=1.4&f=h
1.3 +0 -1
jahia/core/src/java/org/jahia/services/htmleditors/HtmlEditorsBaseService.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/services/htmleditors/HtmlEditorsBaseService.java.diff?r1=1.2&r2=1.3&f=h
1.9 +0 -1
jahia/core/src/java/org/jahia/services/htmlparser/HtmlParserBaseService.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/services/htmlparser/HtmlParserBaseService.java.diff?r1=1.8&r2=1.9&f=h
1.9 +0 -1
jahia/core/src/java/org/jahia/services/metadata/MetadataBaseService.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/services/metadata/MetadataBaseService.java.diff?r1=1.8&r2=1.9&f=h
1.3 +0 -1
jahia/core/src/java/org/jahia/services/templates_deployer/JahiaTemplatesDeployerBaseService.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/services/templates_deployer/JahiaTemplatesDeployerBaseService.java.diff?r1=1.2&r2=1.3&f=h
1.5 +0 -1
jahia/core/src/java/org/jahia/services/timebasedpublishing/TimeBasedPublishingImplService.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/services/timebasedpublishing/TimeBasedPublishingImplService.java.diff?r1=1.4&r2=1.5&f=h
1.14 +5 -4
jahia/core/src/java/org/jahia/services/usermanager/JahiaGroupManagerLDAPProvider.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/services/usermanager/JahiaGroupManagerLDAPProvider.java.diff?r1=1.13&r2=1.14&f=h
1.5 +7 -0
jahia/core/src/test/src/java/org/jahia/services/cluster/AbstractClusterServiceTest.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/test/src/java/org/jahia/services/cluster/AbstractClusterServiceTest.java.diff?r1=1.4&r2=1.5&f=h
1.6 +4 -1
jahia/core/src/webapp/WEB-INF/etc/spring/applicationcontext-services.xml
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/WEB-INF/etc/spring/applicationcontext-services.xml.diff?r1=1.5&r2=1.6&f=h
Index: JCRStoreService.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/services/content/JCRStoreService.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- JCRStoreService.java 19 Aug 2005 15:53:43 -0000 1.5
+++ JCRStoreService.java 23 Aug 2005 10:17:15 -0000 1.6
@@ -45,7 +45,6 @@
protected JCRStoreService() {
- logger.info("***** Starting the JCRStoreService *****" );
}
public static JCRStoreService getInstance() {
Index: JahiaFileExtractionServiceImpl.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/services/fileextraction/JahiaFileExtractionServiceImpl.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JahiaFileExtractionServiceImpl.java 19 Aug 2005 15:53:45 -0000
1.3
+++ JahiaFileExtractionServiceImpl.java 23 Aug 2005 10:17:16 -0000
1.4
@@ -42,7 +42,6 @@
static private JahiaFileExtractionServiceImpl instance = null;
protected JahiaFileExtractionServiceImpl() {
- logger.info("***** Starting the JahiaFileExtractionServiceImpl
*****" );
}
private Properties fileExtractors = null;
Index: HtmlEditorsBaseService.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/services/htmleditors/HtmlEditorsBaseService.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- HtmlEditorsBaseService.java 19 Aug 2005 15:53:47 -0000 1.2
+++ HtmlEditorsBaseService.java 23 Aug 2005 10:17:16 -0000 1.3
@@ -40,7 +40,6 @@
private String htmlEditorsConfigFile = "";
protected HtmlEditorsBaseService() {
- logger.info("***** Starting the HtmlEditorsBaseService *****" );
}
public static HtmlEditorsBaseService getInstance() {
Index: HtmlParserBaseService.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/services/htmlparser/HtmlParserBaseService.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- HtmlParserBaseService.java 19 Aug 2005 15:53:47 -0000 1.8
+++ HtmlParserBaseService.java 23 Aug 2005 10:17:16 -0000 1.9
@@ -55,7 +55,6 @@
private JahiaConfig jahiaConfig;
protected HtmlParserBaseService() {
- logger.info("***** Starting the HtmlParserBaseService *****" );
}
public JahiaConfig getJahiaConfig() {
Index: MetadataBaseService.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/services/metadata/MetadataBaseService.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- MetadataBaseService.java 19 Aug 2005 15:53:48 -0000 1.8
+++ MetadataBaseService.java 23 Aug 2005 10:17:16 -0000 1.9
@@ -65,7 +65,6 @@
private JahiaEventListenerInterface metadataEventListener;
protected MetadataBaseService() {
- logger.info("***** Starting the MetadataBaseService *****" );
}
public static MetadataBaseService getInstance() {
Index: JahiaTemplatesDeployerBaseService.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/services/templates_deployer/JahiaTemplatesDeployerBaseService.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JahiaTemplatesDeployerBaseService.java 19 Aug 2005 15:53:52 -0000
1.2
+++ JahiaTemplatesDeployerBaseService.java 23 Aug 2005 10:17:17 -0000
1.3
@@ -88,7 +88,6 @@
* Constructor
*/
protected JahiaTemplatesDeployerBaseService(){
- logger.info("***** Starting the Jahia Templates Deployer Base
Service *****" );
}
Index: TimeBasedPublishingImplService.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/services/timebasedpublishing/TimeBasedPublishingImplService.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TimeBasedPublishingImplService.java 22 Aug 2005 08:40:37 -0000
1.4
+++ TimeBasedPublishingImplService.java 23 Aug 2005 10:17:17 -0000
1.5
@@ -30,7 +30,6 @@
private List defaultRulesDef = null;
protected TimeBasedPublishingImplService() {
- logger.info("***** Starting the TimeBasedPublishingImplService
*****" );
}
public static TimeBasedPublishingImplService getInstance() {
Index: JahiaGroupManagerLDAPProvider.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/services/usermanager/JahiaGroupManagerLDAPProvider.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- JahiaGroupManagerLDAPProvider.java 19 Aug 2005 15:53:53 -0000
1.13
+++ JahiaGroupManagerLDAPProvider.java 23 Aug 2005 10:17:17 -0000
1.14
@@ -164,10 +164,6 @@
protected JahiaGroupManagerLDAPProvider ()
throws JahiaException {
- // instanciates the cache
- mGroupCache = cacheService.createCacheInstance(LDAP_GROUP_CACHE);
- mProvidersGroupCache =
cacheService.createCacheInstance(PROVIDERS_GROUP_CACHE);
-
nonExistentGroups = new Vector ();
nonExistentGroups.add ("administrators");
nonExistentGroups.add ("guest");
@@ -1227,6 +1223,11 @@
public void start()
throws JahiaInitializationException {
+
+ // instanciates the cache
+ mGroupCache = cacheService.createCacheInstance(LDAP_GROUP_CACHE);
+ mProvidersGroupCache =
cacheService.createCacheInstance(PROVIDERS_GROUP_CACHE);
+
String configPath = settingsBean.getJahiaLdapDiskPath ();
String configFileName;
Index: AbstractClusterServiceTest.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/test/src/java/org/jahia/services/cluster/AbstractClusterServiceTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AbstractClusterServiceTest.java 19 Aug 2005 15:53:58 -0000 1.4
+++ AbstractClusterServiceTest.java 23 Aug 2005 10:17:17 -0000 1.5
@@ -9,6 +9,7 @@
import org.springframework.context.support.FileSystemXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import org.apache.log4j.xml.DOMConfigurator;
+import org.jgroups.Address;
import java.io.File;
import java.io.Serializable;
@@ -104,6 +105,12 @@
value = message.getObject();
}
+ public void memberJoined(Address address) {
+ }
+
+ public void memberLeft(Address address) {
+ }
+
public void sendMessage(String message) {
ClusterMessage clusterMessage = new ClusterMessage(message);
clusterService.sendMessage(clusterMessage);
Index: applicationcontext-services.xml
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/WEB-INF/etc/spring/applicationcontext-services.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- applicationcontext-services.xml 19 Aug 2005 15:53:59 -0000 1.5
+++ applicationcontext-services.xml 23 Aug 2005 10:17:18 -0000 1.6
@@ -18,6 +18,9 @@
<bean id="ClusterService" parent="txProxyTemplate">
<property name="target">
<bean class="org.jahia.services.cluster.JGroupsClusterService"
parent="jahiaServiceTemplate">
+ <property name="activated">
+ <value>false</value>
+ </property>
<property name="channelGroupName">
<value>JahiaCluster</value>
</property>
@@ -293,7 +296,7 @@
<ref bean="JahiaACLManagerService"/>
</property>
<property name="incrementorService">
- <ref bean="JahiaIncrementorDBService"/>
+ <ref bean="JahiaIncrementorsDBService"/>
</property>
<property name="cacheService">
<ref bean="JahiaCacheService"/>
