--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/services/MetaDataService.java	Wed Jul 20 07:08:10 2011 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/services/MetaDataService.java	Wed Jul 20 09:56:39 2011 +0000
@@ -1,10 +1,5 @@
 package de.intevation.flys.artifacts.services;
 
-import java.io.InputStream;
-import java.io.IOException;
-import java.io.File;
-import java.io.FileInputStream;
-
 import java.sql.Connection;
 import java.sql.SQLException;
 
@@ -16,16 +11,15 @@
 import java.util.HashMap;
 
 import de.intevation.artifacts.CallMeta;
-import de.intevation.artifacts.ServiceFactory;
 
 import de.intevation.artifactdatabase.DefaultService;
 
-import de.intevation.artifacts.common.utils.Config;
 import de.intevation.artifacts.common.utils.XMLUtils;
 
 import de.intevation.artifacts.common.ArtifactNamespaceContext;
 
 import de.intevation.flys.artifacts.services.meta.Builder;
+import de.intevation.flys.artifacts.services.meta.DataCage;
 
 import de.intevation.flys.backend.SessionHolder;
 
@@ -38,13 +32,8 @@
 {
     private static Logger log = Logger.getLogger(MetaDataService.class);
 
-    public static final String XPATH_META_DATA_TEMPLATE =
-        "/artifact-database/metadata/@template";
-
     public static final String XPATH_RIVER = "/art:river/text()";
 
-    protected Builder builder;
-
     public MetaDataService() {
     }
 
@@ -73,6 +62,8 @@
 
         final Document result = XMLUtils.newDocument();
 
+        final Builder builder = DataCage.getInstance().getBuilder();
+
         if (builder == null) {
             log.error("MetaDataService is not setup properly.");
             return result;
@@ -99,52 +90,5 @@
 
         return result;
     }
-
-    @Override
-    public void setup(ServiceFactory factory, Object globalContext) {
-        log.debug("MetaDataService.setup");
-
-        String path = Config.getStringXPath(XPATH_META_DATA_TEMPLATE);
-
-        if (path == null) {
-            log.error("no path to template file given");
-            return;
-        }
-
-        path = Config.replaceConfigDir(path);
-
-        File file = new File(path);
-
-        if (!file.isFile() || !file.canRead()) {
-            log.error("Cannot open template file '" + file + "'");
-            return;
-        }
-
-        InputStream in = null;
-
-        try {
-            in = new FileInputStream(file);
-            Document template = XMLUtils.parseDocument(in);
-            if (template == null) {
-                log.error("cannot parse meta data template");
-            }
-            else {
-                builder = new Builder(template);
-            }
-        }
-        catch (IOException ioe) {
-            log.error(ioe);
-        }
-        finally {
-            if (in != null) {
-                try {
-                    in.close();
-                }
-                catch (IOException ioe) {
-                    log.error(ioe);
-                }
-            }
-        }
-    }
 }
 // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 :