Changeset 372

Timestamp:

04/21/10 16:36:41 (14 years ago)

Author:

patdui

Message:

• some fixes

Location:

ComponentRegistry/trunk/ComponentRegistry/src/main

Files:

• bin/registryFiller.sh (modified) (1 diff)
• bin/registryMigration.sh (modified) (1 diff)
• java/clarin/cmdi/componentregistry/tools/RegistryFiller.java (modified) (10 diffs)
• java/clarin/cmdi/componentregistry/tools/RegistryMigration.java (modified) (2 diffs)
• java/clarin/cmdi/componentregistry/tools/RegistryToolHelper.java (modified) (1 diff)

ComponentRegistry/trunk/ComponentRegistry/src/main/bin/registryFiller.sh

@@ -2 +2 @@
 
 LIB=../share
-CLASSPATH=.:./log4j.properties:
+CLASSPATH=.:./log4j.properties:./registry.properties
 JAVA=java
 

ComponentRegistry/trunk/ComponentRegistry/src/main/bin/registryMigration.sh

@@ -2 +2 @@
 
 LIB=../share
-CLASSPATH=.:./log4j.properties:
+CLASSPATH=.:./log4j.properties::./registry.properties
 JAVA=java
 

ComponentRegistry/trunk/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/tools/RegistryFiller.java

@@ -4 +4 @@
 import java.io.ByteArrayOutputStream;
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
 import java.net.HttpURLConnection;
 import java.net.URI;
+import java.net.URL;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -36 +36 @@
 
 /**
- * Disclaimer: This class is only usable to automate the initialisation of an ComponentRegistry. It fill the registry with
+ * Disclaimer: This class is only usable to automate the initialisation of an ComponentRegistry. It fills the registry with
  * components/profiles from the file system, it is not meant to be used as a quick help setting up a Clarin Registry. Use the registry web
  * interface for "proper" adding of profiles/components.
@@ -69 +69 @@
 
     public RegistryFiller(String urlPropName) throws IOException {
-        properties.load(new FileInputStream("/registry.properties"));
+        URL urlResource = ClassLoader.getSystemResource("registry.properties");
+        properties.load(urlResource.openStream());
         String url = properties.getProperty(urlPropName);
         URI uri = UriBuilder.fromUri(url).build();
@@ -82 +83 @@
      * Uses a heuristic to resolve components which are linked together through fileName. It will try to find the component with a name
      * equal to the filename (without extension) and set the registered id correct.
-     * @param args RegistryFiller "P.Duin" "Test files" imdi -c
-     *            /Users/patdui/Workspace/Clarin/metadata/toolkit/components/imdi/component*.xml
+     * @param args RegistryFiller "Test files" imdi /Users/patdui/Workspace/Clarin/metadata/toolkit/components/imdi/component*.xml
      * @throws IOException when properties cannot be loaded
      * 
@@ -89 +89 @@
     public static void main(String[] args) throws IOException {
         LOG.info("RegistryFiller started with arguments: " + Arrays.toString(args));
-        if (args.length == 0 || args.length < 5) {
+        if (args.length == 0 || args.length < 3) {
             printUsage();
         }
         RegistryFiller filler = new RegistryFiller(FILLER_URL_PROP);
-        String creatorName = args[0];
-        String description = args[1];
-        String group = args[2];
-        boolean registerProfiles = "-p".equals(args[3]); //Otherwise -c
+        String description = args[0];
+        String group = args[1];
         int nrOfFailed = 0;
-        for (int i = 4; i < args.length; i++) {
+        for (int i = 2; i < args.length; i++) {
             File file = new File(args[i]);
             LOG.info("Adding " + (i - 3) + "/" + (args.length - 4) + ": " + file.getName());
             try {
-                if (registerProfiles) {
-                    filler.addProfile(file, FilenameUtils.getBaseName(file.getName()), creatorName, description, group);
+                CMDComponentSpec spec = MDMarshaller.unmarshal(CMDComponentSpec.class, file);
+                if (spec.isIsProfile()) {
+                    filler.addProfile(file, FilenameUtils.getBaseName(file.getName()), description, group);
                 } else {
-                    filler.addComponent(file, FilenameUtils.getBaseName(file.getName()), creatorName, description, group);
+                    filler.addComponent(file, FilenameUtils.getBaseName(file.getName()), description, group);
                 }
             } catch (Exception e) {
@@ -121 +120 @@
 
     private static void printUsage() {
-        System.out.println("usage: <creatorName> <description> <groupType> <-c|-p (components or profiles)> <xml file(s)>");
+        System.out.println("usage:  <description> <groupType> <xml file(s)>");
         System.out.println("It also needs a filled in registry.properties");
         System.exit(0);
     }
 
-    public void addProfile(File file, String name, String creatorName, String description, String group) {
-        profiles.add(new RegObject(file, name, creatorName, description, group));
-    }
-
-    public void addComponent(File file, String name, String creatorName, String description, String group) {
-        components.add(new RegObject(file, name, creatorName, description, group));
+    public void addProfile(File file, String name, String description, String group) {
+        profiles.add(new RegObject(file, name, description, group));
+    }
+
+    public void addComponent(File file, String name, String description, String group) {
+        components.add(new RegObject(file, name, description, group));
     }
 
@@ -174 +173 @@
             MDMarshaller.marshal(comp, out);
             ByteArrayInputStream input = new ByteArrayInputStream(out.toByteArray());
-            helper.registerProfile(input, regObject.getCreatorName(), regObject.getDescription(), regObject.getName());
+            helper.registerProfile(input, regObject.getDescription(), regObject.getName());
         }
         if (!unresolvedComponents.isEmpty()) {
@@ -275 +274 @@
             MDMarshaller.marshal(comp, out);
             ByteArrayInputStream input = new ByteArrayInputStream(out.toByteArray());
-            helper.registerComponent(input, regObject.getCreatorName(), regObject.getDescription(), regObject.getGroup(), regObject
-                    .getName());
+            helper.registerComponent(input, regObject.getDescription(), regObject.getGroup(), regObject.getName());
         }
         resolvedComponents = new HashMap<RegObject, CMDComponentSpec>();
@@ -306 +304 @@
         private final File file;
         private final String name;
-        private final String creatorName;
         private final String description;
         private final String group;
 
-        public RegObject(File file, String name, String creatorName, String description, String group) {
+        public RegObject(File file, String name, String description, String group) {
             this.file = file;
             this.name = name;
-            this.creatorName = creatorName;
             this.description = description;
             this.group = group;
@@ -324 +320 @@
         public String getName() {
             return name;
-        }
-
-        public String getCreatorName() {
-            return creatorName;
         }
 

ComponentRegistry/trunk/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/tools/RegistryMigration.java

@@ -51 +51 @@
         for (ComponentDescription desc : descriptions) {
             File file = registry.getComponentFile(desc.getId());
-            filler.addComponent(file, desc.getName(), desc.getCreatorName(), desc.getDescription(), desc.getGroupName());
+            filler.addComponent(file, desc.getName(), desc.getDescription(), desc.getGroupName());
         }
     }
@@ -59 +59 @@
         for (ProfileDescription desc : descriptions) {
             File file = registry.getProfileFile(desc.getId());
-            filler.addProfile(file, desc.getName(), desc.getCreatorName(), desc.getDescription(), "");
+            filler.addProfile(file, desc.getName(), desc.getDescription(), "");
         }
     }

ComponentRegistry/trunk/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/tools/RegistryToolHelper.java

@@ -35 +35 @@
     }
 
-    public void registerComponent(InputStream input, String creatorName, String description, String group, String name) throws IOException {
-        FormDataMultiPart form = createForm(input, creatorName, description, name);
+    public void registerComponent(InputStream input, String description, String group, String name) throws IOException {
+        FormDataMultiPart form = createForm(input, description, name);
         form.field(ComponentRegistryRestService.GROUP_FORM_FIELD, group);
-        RegisterResponse response = getAuthenticatedResource("/components").type(MediaType.MULTIPART_FORM_DATA).post(RegisterResponse.class, form);
+        RegisterResponse response = getAuthenticatedResource("/components").type(MediaType.MULTIPART_FORM_DATA).post(
+                RegisterResponse.class, form);
         handleResult(response);
     }
 
-    public void registerProfile(InputStream input, String creatorName, String description, String name) throws IOException {
-        FormDataMultiPart form = createForm(input, creatorName, description, name);
-        RegisterResponse response = getAuthenticatedResource("/profiles").type(MediaType.MULTIPART_FORM_DATA).post(RegisterResponse.class, form);
+    public void registerProfile(InputStream input, String description, String name) throws IOException {
+        FormDataMultiPart form = createForm(input, description, name);
+        RegisterResponse response = getAuthenticatedResource("/profiles").type(MediaType.MULTIPART_FORM_DATA).post(RegisterResponse.class,
+                form);
         handleResult(response);
     }
-    
+
     private Builder getAuthenticatedResource(String path) {
-        return service.path(path).header(HttpHeaders.AUTHORIZATION, "Basic " + new String(Base64.encode(userName+":"+password)));
+        return service.path(path).header(HttpHeaders.AUTHORIZATION, "Basic " + new String(Base64.encode(userName + ":" + password)));
     }
 
-
-    private FormDataMultiPart createForm(InputStream input, String creatorName, String description, String name) throws IOException {
+    private FormDataMultiPart createForm(InputStream input, String description, String name) throws IOException {
         FormDataMultiPart form = new FormDataMultiPart();
         form.field(ComponentRegistryRestService.DATA_FORM_FIELD, input, MediaType.APPLICATION_OCTET_STREAM_TYPE);