Update of /var/cvs/src/org/mmbase/module/core
In directory james.mmbase.org:/tmp/cvs-serv8194/src/org/mmbase/module/core
Modified Files:
MMBase.java
Log Message:
MMB-1521 Decide what to do with org.mmbase.model
Removed model package
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/module/core
See also: http://www.mmbase.org/jira/browse/MMB-1521
Index: MMBase.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/module/core/MMBase.java,v
retrieving revision 1.238
retrieving revision 1.239
diff -u -b -r1.238 -r1.239
--- MMBase.java 21 Mar 2008 13:42:59 -0000 1.238
+++ MMBase.java 21 Mar 2008 14:36:27 -0000 1.239
@@ -22,7 +22,6 @@
import org.mmbase.security.MMBaseCop;
import org.mmbase.storage.*;
import org.mmbase.storage.search.RelationStep;
-import org.mmbase.model.*;
import org.mmbase.storage.search.SearchQueryHandler;
import org.mmbase.util.ResourceLoader;
import org.mmbase.util.logging.Logger;
@@ -44,7 +43,7 @@
* @author Pierre van Rooden
* @author Johannes Verelst
* @author Ernst Bunders
- * @version $Id: MMBase.java,v 1.238 2008/03/21 13:42:59 michiel Exp $
+ * @version $Id: MMBase.java,v 1.239 2008/03/21 14:36:27 nklasens Exp $
*/
public class MMBase extends ProcessorModule {
@@ -132,8 +131,6 @@
*/
private final Map<String, MMObjectBuilder> mmobjs = new
ConcurrentHashMap<String, MMObjectBuilder>();
- private CloudModel cloudModel;
-
/**
* Determines whether MMBase is in development mode.
* @see #inDevelopment()
@@ -389,8 +386,6 @@
log.debug("Loading builders:");
- cloudModel = ModelsManager.addModel("default","default.xml");
-
loadBuilders();
if(Thread.currentThread().isInterrupted()) {
@@ -469,7 +464,6 @@
insRel = null;
typeRel = null;
mmobjs.clear();
- cloudModel = null;
storageManagerFactory = null;
rootBuilder = null;
mmbaseCop = null;
@@ -827,9 +821,6 @@
String resourceName = ResourceLoader.getName(builderXml);
String resourceDirectory = ResourceLoader.getDirectory(builderXml)
+ "/";
loadBuilderFromXML(resourceName, resourceDirectory);
- if (cloudModel != null) {
- cloudModel.addBuilder(resourceName,"builders/" +
resourceDirectory + resourceName + ".xml");
- }
}
log.debug("Starting Cluster Builder");
@@ -991,9 +982,6 @@
}
String path = getBuilderPath(builderName, ipath);
if (path != null) {
- if (cloudModel != null) {
- cloudModel.addBuilder(builderName,path+builderName+".xml");
- }
return loadBuilderFromXML(builderName, path);
} else {
throw new BuilderConfigurationException("Cannot find specified
builder " + builderName + " (" + path + ")");
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
