Author: michiel
Date: 2010-05-18 16:47:13 +0200 (Tue, 18 May 2010)
New Revision: 42218
Added:
mmbase/branches/MMBase-1_9/core/src/main/java/org/mmbase/core/event/BuildersRead.java
Modified:
mmbase/branches/MMBase-1_9/core/src/main/java/org/mmbase/bridge/mock/MockCloudContext.java
mmbase/branches/MMBase-1_9/core/src/main/java/org/mmbase/core/event/SystemEvent.java
mmbase/branches/MMBase-1_9/core/src/main/java/org/mmbase/module/core/MMBase.java
Log:
Renamed SystemEvent.BuildersRead to BuildersRead
Modified:
mmbase/branches/MMBase-1_9/core/src/main/java/org/mmbase/bridge/mock/MockCloudContext.java
===================================================================
---
mmbase/branches/MMBase-1_9/core/src/main/java/org/mmbase/bridge/mock/MockCloudContext.java
2010-05-18 14:42:27 UTC (rev 42217)
+++
mmbase/branches/MMBase-1_9/core/src/main/java/org/mmbase/bridge/mock/MockCloudContext.java
2010-05-18 14:47:13 UTC (rev 42218)
@@ -109,7 +109,7 @@
LOG.service("Builder with name '" + buil + "' already exists");
}
}
- EventManager.getInstance().propagateEvent(new
SystemEvent.BuildersRead(this));
+ EventManager.getInstance().propagateEvent(new BuildersRead(this));
}
protected int getTypeDefNode(String name) {
@@ -125,7 +125,7 @@
}
nodeManagers.put(name, new NodeManagerDescription(name, m,
getTypeDefNode(name)));
- EventManager.getInstance().propagateEvent(new
SystemEvent.BuildersRead(this));
+ EventManager.getInstance().propagateEvent(new BuildersRead(this));
}
public void addNodeManager(InputSource source) {
@@ -133,7 +133,7 @@
MockBuilderReader reader = new MockBuilderReader(source, this);
addNodeManager(reader);
}
- EventManager.getInstance().propagateEvent(new
SystemEvent.BuildersRead(this));
+ EventManager.getInstance().propagateEvent(new BuildersRead(this));
}
protected void addNodeManager(MockBuilderReader reader) {
@@ -157,7 +157,7 @@
}
}
}
- EventManager.getInstance().propagateEvent(new
SystemEvent.BuildersRead(this));
+ EventManager.getInstance().propagateEvent(new BuildersRead(this));
}
public synchronized int addNode(String type, Map<String, Object> map) {
Added:
mmbase/branches/MMBase-1_9/core/src/main/java/org/mmbase/core/event/BuildersRead.java
===================================================================
---
mmbase/branches/MMBase-1_9/core/src/main/java/org/mmbase/core/event/BuildersRead.java
(rev 0)
+++
mmbase/branches/MMBase-1_9/core/src/main/java/org/mmbase/core/event/BuildersRead.java
2010-05-18 14:47:13 UTC (rev 42218)
@@ -0,0 +1,33 @@
+/*
+ * This software is OSI Certified Open Source Software.
+ * OSI Certified is a certification mark of the Open Source Initiative. The
+ * license (Mozilla version 1.0) can be read at the MMBase site. See
+ * http://www.MMBase.org/license
+ */
+package org.mmbase.core.event;
+
+
+/**
+ * An BuilderReader system event is and should be issued after one or more
builders are added to the system.
+ */
+public class BuildersRead extends SystemEvent.Collectable {
+ private final String uri;
+ private final String name;
+ public BuildersRead() {
+ this(org.mmbase.bridge.ContextProvider.getDefaultCloudContext());
+ }
+ public BuildersRead(org.mmbase.bridge.CloudContext cc){
+ this(cc.getUri(), cc.getCloudNames().get(0));
+ }
+ public BuildersRead(String u, String n) {
+ uri = u;
+ name = n;
+ }
+ public String getUri() {
+ return uri;
+ }
+ public String getName() {
+ return name;
+ }
+
+}
Property changes on:
mmbase/branches/MMBase-1_9/core/src/main/java/org/mmbase/core/event/BuildersRead.java
___________________________________________________________________
Name: svn:keywords
+ Id
Modified:
mmbase/branches/MMBase-1_9/core/src/main/java/org/mmbase/core/event/SystemEvent.java
===================================================================
---
mmbase/branches/MMBase-1_9/core/src/main/java/org/mmbase/core/event/SystemEvent.java
2010-05-18 14:42:27 UTC (rev 42217)
+++
mmbase/branches/MMBase-1_9/core/src/main/java/org/mmbase/core/event/SystemEvent.java
2010-05-18 14:47:13 UTC (rev 42218)
@@ -38,32 +38,7 @@
}
- /**
- * An BuilderReader system event is and should be issued after one or more
builders are added to the system.
- */
- public static class BuildersRead extends Collectable {
- private final String uri;
- private final String name;
- public BuildersRead() {
- this(org.mmbase.bridge.ContextProvider.getDefaultCloudContext());
- }
- public BuildersRead(org.mmbase.bridge.CloudContext cc){
- this(cc.getUri(), cc.getCloudNames().get(0));
- }
- public BuildersRead(String u, String n) {
- uri = u;
- name = n;
- }
- public String getUri() {
- return uri;
- }
- public String getName() {
- return name;
- }
- }
-
-
public static class ServletContext extends Collectable {
private final javax.servlet.ServletContext servletContext;
public ServletContext(javax.servlet.ServletContext sc) {
Modified:
mmbase/branches/MMBase-1_9/core/src/main/java/org/mmbase/module/core/MMBase.java
===================================================================
---
mmbase/branches/MMBase-1_9/core/src/main/java/org/mmbase/module/core/MMBase.java
2010-05-18 14:42:27 UTC (rev 42217)
+++
mmbase/branches/MMBase-1_9/core/src/main/java/org/mmbase/module/core/MMBase.java
2010-05-18 14:47:13 UTC (rev 42218)
@@ -840,7 +840,7 @@
String resourceDirectory = ResourceLoader.getDirectory(builderXml)
+ "/";
loadBuilderFromXML(resourceName, resourceDirectory);
}
- EventManager.getInstance().propagateEvent(new
SystemEvent.BuildersRead(org.mmbase.bridge.LocalContext.getCloudContext()));
+ EventManager.getInstance().propagateEvent(new
BuildersRead(org.mmbase.bridge.LocalContext.getCloudContext()));
log.debug("Starting Cluster Builder");
clusterBuilder = new ClusterBuilder(this);
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
