Author: michiel
Date: 2009-06-04 13:56:57 +0200 (Thu, 04 Jun 2009)
New Revision: 35718
Added:
mmbase/trunk/base-webapp/src/
mmbase/trunk/base-webapp/src/main/
mmbase/trunk/base-webapp/src/main/webapp/
Removed:
mmbase/trunk/core/src/main/webapp/
Modified:
mmbase/trunk/core/src/main/java/org/mmbase/datatypes/processors/BinaryCommitProcessor.java
mmbase/trunk/core/src/main/java/org/mmbase/module/Module.java
mmbase/trunk/core/src/main/java/org/mmbase/module/ProcessorModule.java
mmbase/trunk/core/src/main/java/org/mmbase/module/core/MMBase.java
mmbase/trunk/core/src/main/java/org/mmbase/security/MMBaseCopConfig.java
mmbase/trunk/core/src/main/java/org/mmbase/servlet/MMBaseServlet.java
Log:
Maved web-app stuff from core (which is a jar) to base-webapp, which is a war
Copied: mmbase/trunk/base-webapp/src/main/webapp (from rev 35714,
mmbase/trunk/core/src/main/webapp)
Property changes on: mmbase/trunk/base-webapp/src/main/webapp
___________________________________________________________________
Name: svn:mergeinfo
+
Modified:
mmbase/trunk/core/src/main/java/org/mmbase/datatypes/processors/BinaryCommitProcessor.java
===================================================================
---
mmbase/trunk/core/src/main/java/org/mmbase/datatypes/processors/BinaryCommitProcessor.java
2009-06-04 11:52:50 UTC (rev 35717)
+++
mmbase/trunk/core/src/main/java/org/mmbase/datatypes/processors/BinaryCommitProcessor.java
2009-06-04 11:56:57 UTC (rev 35718)
@@ -77,7 +77,7 @@
log.debug("Committing" + node);
}
if (node.isChanged(field.getName())) {
- Object value = node.getObjectValue(field.getName());
+
if (node.getNodeManager().hasField(filesizeField) &&
(! node.isChanged(filesizeField) ||
node.isNull(filesizeField))) {
long size = node.getSize(field.getName());
@@ -87,6 +87,8 @@
log.debug("Skipping filesize");
}
+ Object value = node.getObjectValue(field.getName());
+
if (node.getNodeManager().hasField(filenameField) &&
(! node.isChanged(filenameField) ||
node.isNull(filenameField))) {
String fn = getFileName(value);
Modified: mmbase/trunk/core/src/main/java/org/mmbase/module/Module.java
===================================================================
--- mmbase/trunk/core/src/main/java/org/mmbase/module/Module.java
2009-06-04 11:52:50 UTC (rev 35717)
+++ mmbase/trunk/core/src/main/java/org/mmbase/module/Module.java
2009-06-04 11:56:57 UTC (rev 35718)
@@ -10,7 +10,6 @@
package org.mmbase.module;
import org.mmbase.module.core.MMBaseContext;
-import org.mmbase.util.ThreadPools;
import java.util.concurrent.*;
import java.util.*;
import java.net.*;
@@ -58,6 +57,7 @@
* @since MMBase-1.8
*/
protected Function<Integer> getVersionFunction = new
AbstractFunction<Integer>("getVersion") {
+ private static final long serialVersionUID = 0L;
public Integer getFunctionValue(Parameters arguments) {
return getVersion();
}
@@ -70,6 +70,7 @@
* @since MMBase-1.8
*/
protected Function<String> getMaintainerFunction = new
AbstractFunction<String>("getMaintainer") {
+ private static final long serialVersionUID = 0L;
public String getFunctionValue(Parameters arguments) {
return getMaintainer();
}
@@ -509,12 +510,13 @@
* Loads all module-xml present in <mmbase-config-dir>/modules.
* @return A HashTable with <module-name> --> Module-instance
*/
+ @SuppressWarnings("deprecation")
private static synchronized Map<String, Module> loadModulesFromDisk() {
- Map<String, Module> results = new TreeMap<String, Module>();
+ Map<String, Module> results = Collections.synchronizedMap(new
TreeMap<String, Module>());
ResourceLoader moduleLoader = getModuleLoader();
- Collection<String> modules =
moduleLoader.getResourcePaths(ResourceLoader.XML_PATTERN, false/*
non-recursive*/);
- log.info("In " + moduleLoader + " the following module XML's were
found " + modules);
- for (String file : modules) {
+ Collection<String> mods =
moduleLoader.getResourcePaths(ResourceLoader.XML_PATTERN, false/*
non-recursive*/);
+ log.info("In " + moduleLoader + " the following module XML's were
found " + mods);
+ for (String file : mods) {
ModuleReader parser = null;
try {
InputSource is = moduleLoader.getInputSource(file);
Modified: mmbase/trunk/core/src/main/java/org/mmbase/module/ProcessorModule.java
===================================================================
--- mmbase/trunk/core/src/main/java/org/mmbase/module/ProcessorModule.java
2009-06-04 11:52:50 UTC (rev 35717)
+++ mmbase/trunk/core/src/main/java/org/mmbase/module/ProcessorModule.java
2009-06-04 11:56:57 UTC (rev 35718)
@@ -241,6 +241,7 @@
* {...@inheritdoc}
* @scope abstract
*/
+ @Override
public void init() {
}
@@ -248,6 +249,7 @@
* {...@inheritdoc}
* @scope abstract
*/
+ @Override
public void onload() {
}
Modified: mmbase/trunk/core/src/main/java/org/mmbase/module/core/MMBase.java
===================================================================
--- mmbase/trunk/core/src/main/java/org/mmbase/module/core/MMBase.java
2009-06-04 11:52:50 UTC (rev 35717)
+++ mmbase/trunk/core/src/main/java/org/mmbase/module/core/MMBase.java
2009-06-04 11:56:57 UTC (rev 35718)
@@ -884,6 +884,7 @@
public void initBuilder(MMObjectBuilder builder) {
if (!builder.isVirtual()) {
builder.init();
+ if (typeDef == null) throw new IllegalStateException("No typedef
builder defined");
typeDef.loadTypeDef(builder.getTableName());
Versions versions = (Versions)getBuilder("versions");
if (versions != null && versions.created()) {
Modified:
mmbase/trunk/core/src/main/java/org/mmbase/security/MMBaseCopConfig.java
===================================================================
--- mmbase/trunk/core/src/main/java/org/mmbase/security/MMBaseCopConfig.java
2009-06-04 11:52:50 UTC (rev 35717)
+++ mmbase/trunk/core/src/main/java/org/mmbase/security/MMBaseCopConfig.java
2009-06-04 11:56:57 UTC (rev 35718)
@@ -58,8 +58,9 @@
if(cop == null) throw new RuntimeException("MMBase cop was null");
// log.debug("Starting the file watcher");
this.cop = cop;
+ add("security.xml");
}
-
+ @Override
public void onChange(String s) {
try {
cop.reload();
@@ -97,7 +98,6 @@
log.info("using: '" + config + "' as configuration file for security");
watcher = new SecurityConfigWatcher(mmbaseCop);
- watcher.add("security.xml");
watcher.start();
cop = mmbaseCop;
@@ -125,7 +125,7 @@
}
// load the sharedSecret
- sharedSecret =
reader.getElementValue(reader.getElementByPath("security.sharedsecret"));
+ sharedSecret =
DocumentReader.getElementValue(reader.getElementByPath("security.sharedsecret"));
if(active) {
@@ -138,7 +138,7 @@
authentication = getAuthentication(authenticationClass);
// load the key
- String key =
reader.getElementValue(reader.getElementByPath("security.key"));
+ String key =
DocumentReader.getElementValue(reader.getElementByPath("security.key"));
if (key != null && ! key.equals("")) {
try {
long k = Long.parseLong(key);
Modified: mmbase/trunk/core/src/main/java/org/mmbase/servlet/MMBaseServlet.java
===================================================================
--- mmbase/trunk/core/src/main/java/org/mmbase/servlet/MMBaseServlet.java
2009-06-04 11:52:50 UTC (rev 35717)
+++ mmbase/trunk/core/src/main/java/org/mmbase/servlet/MMBaseServlet.java
2009-06-04 11:56:57 UTC (rev 35718)
@@ -587,8 +587,9 @@
}
}
+ @Override
public void destroy() {
- log.info("Servlet " + getServletName() + " is taken out of service");
+ log.info("Servlet " + getServletName() + " is taken out of service",
new Exception());
if (initThread != null) {
initThread.interrupt();
} else {
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
