Update of /var/cvs/src/org/mmbase/module/tools
In directory james.mmbase.org:/tmp/cvs-serv9683
Modified Files:
ApplicationInstaller.java MMAdmin.java
Log Message:
cleaning project. Resolve some of the @move tags
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/module/tools
Index: ApplicationInstaller.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/module/tools/ApplicationInstaller.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- ApplicationInstaller.java 29 Jul 2008 09:17:46 -0000 1.15
+++ ApplicationInstaller.java 3 Sep 2008 23:18:01 -0000 1.16
@@ -21,9 +21,9 @@
import org.mmbase.storage.search.*;
import org.mmbase.storage.search.implementation.*;
import org.mmbase.util.*;
+import org.mmbase.util.xml.applicationdata.*;
import org.mmbase.util.logging.Logger;
import org.mmbase.util.logging.Logging;
-import org.mmbase.util.xml.ApplicationReader;
import org.xml.sax.InputSource;
@@ -32,7 +32,7 @@
*
* @author Nico Klasens
* @since MMBase-1.8
- * @version $Id: ApplicationInstaller.java,v 1.15 2008/07/29 09:17:46 michiel
Exp $
+ * @version $Id: ApplicationInstaller.java,v 1.16 2008/09/03 23:18:01 michiel
Exp $
*/
class ApplicationInstaller {
@@ -204,7 +204,7 @@
List<MMObjectNode> nodeFieldNodes = new ArrayList<MMObjectNode>(); //
a temporary list with all nodes that have NODE fields, which should be synced,
later.
if (syncbul != null) {
for (Map<String, String> bh : dataSources) {
- XMLNodeReader nodeReader = getNodeReader(bh, appName);
+ NodeReader nodeReader = getNodeReader(bh, appName);
if (nodeReader == null) {
continue;
}
@@ -221,7 +221,7 @@
}
}
- private void installDatasource(MMObjectBuilder syncbul, XMLNodeReader
nodeReader, List<MMObjectNode> nodeFieldNodes, ApplicationResult result) {
+ private void installDatasource(MMObjectBuilder syncbul, NodeReader
nodeReader, List<MMObjectNode> nodeFieldNodes, ApplicationResult result) {
String exportsource = nodeReader.getExportSource();
int timestamp = nodeReader.getTimeStamp();
@@ -433,7 +433,7 @@
if (syncbul != null) {
List<MMObjectNode> nodeFieldNodes = new ArrayList<MMObjectNode>();
// a temporary list with all nodes that have NODE fields, which should be
synced, later.
for (Map<String, String> bh : ds) {
- XMLRelationNodeReader nodereader =
getRelationNodeReader(appname, bh);
+ RelationNodeReader nodereader = getRelationNodeReader(appname,
bh);
if (nodereader == null) {
continue;
}
@@ -448,7 +448,7 @@
return result.isSuccess();
}
- private void installRelationSource(MMObjectBuilder syncbul, InsRel insRel,
XMLRelationNodeReader nodereader, List<MMObjectNode> nodeFieldNodes,
ApplicationResult result) {
+ private void installRelationSource(MMObjectBuilder syncbul, InsRel insRel,
RelationNodeReader nodereader, List<MMObjectNode> nodeFieldNodes,
ApplicationResult result) {
String exportsource = nodereader.getExportSource();
int timestamp = nodereader.getTimeStamp();
@@ -572,8 +572,8 @@
}
}
- private XMLNodeReader getNodeReader(Map<String,String> bh, String appName)
{
- XMLNodeReader nodeReader = null;
+ private NodeReader getNodeReader(Map<String,String> bh, String appName) {
+ NodeReader nodeReader = null;
String path = bh.get("path");
ResourceLoader applicationLoader =
ResourceLoader.getConfigurationRoot().getChildResourceLoader("applications");
@@ -584,13 +584,13 @@
log.info("No datasource resource " + path);
}
if (is != null) {
- nodeReader = new XMLNodeReader(is,
applicationLoader.getChildResourceLoader(appName));
+ nodeReader = new NodeReader(is,
applicationLoader.getChildResourceLoader(appName));
}
return nodeReader;
}
- private XMLRelationNodeReader getRelationNodeReader(String appname,
Map<String,String> bh) {
- XMLRelationNodeReader nodereader = null;
+ private RelationNodeReader getRelationNodeReader(String appname,
Map<String,String> bh) {
+ RelationNodeReader nodereader = null;
String path = bh.get("path");
ResourceLoader applicationLoader =
ResourceLoader.getConfigurationRoot().getChildResourceLoader("applications");
@@ -601,7 +601,7 @@
log.info("No relationsource resource " + path);
}
if (is != null) {
- nodereader = new XMLRelationNodeReader(is,
applicationLoader.getChildResourceLoader(appname));
+ nodereader = new RelationNodeReader(is,
applicationLoader.getChildResourceLoader(appname));
}
return nodereader;
}
Index: MMAdmin.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/module/tools/MMAdmin.java,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -b -r1.164 -r1.165
--- MMAdmin.java 26 Aug 2008 22:58:30 -0000 1.164
+++ MMAdmin.java 3 Sep 2008 23:18:01 -0000 1.165
@@ -31,6 +31,7 @@
import org.mmbase.util.*;
import org.mmbase.util.functions.*;
import org.mmbase.util.logging.*;
+import org.mmbase.util.xml.applicationdata.*;
import org.mmbase.util.xml.*;
import org.xml.sax.InputSource;
@@ -40,7 +41,7 @@
* @application Admin, Application
* @author Daniel Ockeloen
* @author Pierre van Rooden
- * @version $Id: MMAdmin.java,v 1.164 2008/08/26 22:58:30 michiel Exp $
+ * @version $Id: MMAdmin.java,v 1.165 2008/09/03 23:18:01 michiel Exp $
*/
public class MMAdmin extends ProcessorModule {
private static final Logger log = Logging.getLoggerInstance(MMAdmin.class);
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
