shuber 2005/07/25 18:51:55 CEST
Modified files:
core/src/java/org/jahia/data/xml JahiaXmlDocument.java
core/src/java/org/jahia/hibernate/manager
SpringContextSingleton.java
core/src/java/org/jahia/registries ServicesRegistry.java
Log:
Changes in ServicesRegistry broke the configuration wizard. These updates
correct this.
Revision Changes Path
1.4 +2 -1
jahia/core/src/java/org/jahia/data/xml/JahiaXmlDocument.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/data/xml/JahiaXmlDocument.java.diff?r1=1.3&r2=1.4&f=h
1.6 +9 -0
jahia/core/src/java/org/jahia/hibernate/manager/SpringContextSingleton.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/hibernate/manager/SpringContextSingleton.java.diff?r1=1.5&r2=1.6&f=h
1.19 +12 -0
jahia/core/src/java/org/jahia/registries/ServicesRegistry.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/registries/ServicesRegistry.java.diff?r1=1.18&r2=1.19&f=h
Index: JahiaXmlDocument.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/data/xml/JahiaXmlDocument.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JahiaXmlDocument.java 21 Jun 2004 13:31:19 -0000 1.3
+++ JahiaXmlDocument.java 25 Jul 2005 16:51:54 -0000 1.4
@@ -37,6 +37,7 @@
import org.jahia.exceptions.JahiaException;
import org.jahia.registries.ServicesRegistry;
+import org.jahia.bin.Jahia;
import org.w3c.dom.Document;
import org.xml.sax.EntityResolver;
import org.xml.sax.SAXException;
@@ -142,7 +143,7 @@
EntityResolver et = null;
try {
- if
(ServicesRegistry.getInstance().getJahiaWebAppsDeployerService() != null) {
+ if (Jahia.getSettings() != null) {
et = ServicesRegistry.getInstance().
getJahiaWebAppsDeployerService().
getDtdEntityResolver();
Index: SpringContextSingleton.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/hibernate/manager/SpringContextSingleton.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SpringContextSingleton.java 21 Jul 2005 15:07:26 -0000 1.5
+++ SpringContextSingleton.java 25 Jul 2005 16:51:55 -0000 1.6
@@ -15,6 +15,7 @@
private String springRelativePath = "/WEB-INF/etc/spring";
private ApplicationContext context;
private Log log = LogFactory.getLog(getClass());
+ private boolean initialized = false;
public static SpringContextSingleton getInstance() {
if (ourInstance == null) {
@@ -24,6 +25,9 @@
}
private SpringContextSingleton() {
+ if (Jahia.getSettings() == null) {
+ return;
+ }
try {
final String springPath =
Jahia.getSettings().getPathResolver().resolvePath(springRelativePath);
String[] paths = {"file:" + springPath +
"/applicationContext-*.xml"};
@@ -33,6 +37,7 @@
String[] paths = {"spring/applicationContext*.xml"};
context = new ClassPathXmlApplicationContext(paths);
}
+ initialized = true;
}
public ApplicationContext getContext() {
@@ -42,4 +47,8 @@
public void shutdown() {
context = null;
}
+
+ public boolean isInitialized() {
+ return initialized;
+ }
}
Index: ServicesRegistry.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/registries/ServicesRegistry.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- ServicesRegistry.java 25 Jul 2005 12:08:39 -0000 1.18
+++ ServicesRegistry.java 25 Jul 2005 16:51:55 -0000 1.19
@@ -50,6 +50,7 @@
import org.jahia.exceptions.JahiaInitializationException;
import org.jahia.resourcebundle.ResourceBundleService;
import org.jahia.services.JahiaService;
+import org.jahia.services.cluster.ClusterService;
import org.jahia.services.sso.CasService;
import org.jahia.services.acl.JahiaACLManagerService;
import org.jahia.services.applications.DispatchingService;
@@ -130,6 +131,7 @@
/** Setting used to initialize services **/
private SettingsBean jSettings;
+ private boolean servicesInitialized = false;
// Jahia Files Services
private final String FILE_TRANSFER_SERVICE = "JahiaFileTransferService";
@@ -247,6 +249,8 @@
private final String CAS_SERVICE = "CasService";
// END [added by Pascal Aubry for CAS authentication]
+ private final String CLUSTER_SERVICE = "ClusterService";
+
// Jetspeed engine
private Engine jetspeed = null;
private static final String JETSPEED_CONFIG = "jetspeed.properties";
@@ -281,6 +285,7 @@
initService(curServiceName);
}
+ servicesInitialized = true;
// initialize Jetspeed
// initJetspeed(jSettings);
@@ -298,6 +303,9 @@
* Shutdowns all the services. In no specific order !
*/
public void shutdown () {
+ if (!servicesInitialized) {
+ return;
+ }
Iterator serviceIter = getServiceInstances().iterator();
while (serviceIter.hasNext()) {
JahiaService curJahiaService = (JahiaService) serviceIter.next();
@@ -577,6 +585,10 @@
}
// END [added by Pascal Aubry for CAS authentication]
+ public ClusterService getClusterService() {
+ return (ClusterService) getService(this.CLUSTER_SERVICE);
+ }
+
/** Default constructor, creates a new <code>ServiceRegistry</code>
instance.
*/
private ServicesRegistry () {
