Changeset 875

Timestamp:

11/10/10 13:57:18 (14 years ago)

Author:

patdui

Message:

• download expandable xml implemented

File:

• ComponentRegistry/trunk/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/ComponentRegistryImpl.java (modified) (6 diffs)

ComponentRegistry/trunk/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/ComponentRegistryImpl.java

@@ -2 +2 @@
 
 import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
+import java.io.UnsupportedEncodingException;
 import java.security.Principal;
 import java.text.ParseException;
@@ -24 +23 @@
 import org.apache.commons.collections.map.LRUMap;
 import org.apache.commons.io.FileUtils;
-import org.apache.commons.io.IOUtils;
 import org.apache.commons.io.filefilter.IOFileFilter;
 import org.apache.commons.io.filefilter.NameFileFilter;
@@ -201 +199 @@
 
     public void getMDProfileAsXml(String profileId, OutputStream output) {
-        File file = getProfileFile(profileId);
-        copyStream(file, output);
+        CMDComponentSpec expandedSpec = CMDComponentSpecExpander.expandProfile(profileId, this);
+        writeXml(expandedSpec, output);
     }
 
@@ -214 +212 @@
     }
 
-    public File getProfileFile(String profileId) {
+    private void writeXml(CMDComponentSpec spec, OutputStream outputStream) {
+        try {
+            MDMarshaller.marshal(spec, outputStream);
+        } catch (UnsupportedEncodingException e) {
+            LOG.error("Error in encoding: ", e);
+        } catch (JAXBException e) {
+            LOG.error("Cannot marshall spec: " + spec, e);
+        }
+    }
+
+    private File getProfileFile(String profileId) {
         String id = stripRegistryId(profileId);
         File file = new File(getProfileDir(), id + File.separator + id + ".xml");
@@ -230 +238 @@
 
     public void getMDComponentAsXml(String componentId, OutputStream output) {
-        File file = getComponentFile(componentId);
-        copyStream(file, output);
-    }
-
-    private void copyStream(File file, OutputStream output) {
-        try {
-            IOUtils.copy(new FileInputStream(file), output);
-        } catch (FileNotFoundException e) {
-            LOG.error("Cannot retrieve file: " + file, e);
-        } catch (IOException e) {
-            LOG.error("Cannot retrieve content from file: " + file, e);
-        }
+        CMDComponentSpec expandedSpec = CMDComponentSpecExpander.expandComponent(componentId, this);
+        writeXml(expandedSpec, output);
     }
 
@@ -249 +247 @@
     }
 
-    public File getComponentFile(String componentId) {
+    private File getComponentFile(String componentId) {
         String id = stripRegistryId(componentId);
         File file = new File(getComponentDir(), id + File.separator + id + ".xml");