Changeset 286 for tools

Timestamp:

03/26/09 13:58:46 (18 months ago)

Author:

anton

Message:

Resource processing added

Location:

tools/routingservice/branches/wrs-2.0

Files:

• data/config/configuration.xml (modified) (1 diff)
• data/resources.xml (added)
• lib/commons-collections-3.2.1.jar (added)
• src/WRS.java (modified) (9 diffs)
• src/model/Profile.java (modified) (4 diffs)
• src/model/Resource.java (modified) (1 diff)
• src/util/resource/ObjectFactory.java (modified) (3 diffs)
• src/util/resource/Resources.java (modified) (3 diffs)

tools/routingservice/branches/wrs-2.0/data/config/configuration.xml

@@ -7 +7 @@
         <log level="5" url="./logs/wrs-log.log"/>
         <includes>
+                <include name="services" url="./data/services.xml"/>    
                 <include name="templates" url="./data/templates.xml"/>
-                <include name="services" url="./data/services.xml"/>
+                <include name="resources" url="./data/resources.xml"/>          
                 <include name="profiles" url="./data/profiles.xml"/>
-                <include name="resources" url="./data/resources.xml"/>
         </includes>
 </configuration>

tools/routingservice/branches/wrs-2.0/src/WRS.java

@@ -1 +1 @@
 import java.io.IOException;
+import java.util.Enumeration;
 import java.util.Hashtable;
 import java.util.ListIterator;
@@ -13 +14 @@
 import org.xml.sax.SAXException;
 
-
 import util.IOHelper;
 import util.Log;
+import util.Parameter;
 import util.conf.Configuration;
 import util.conf.Configuration.Includes.Include;
 import util.profile.Profiles;
 import util.profile.Profiles.Profile.Resources.Rref;
-
+import util.resource.Resources;
 
 public class WRS
@@ -38 +39 @@
 
         public WRS(String[] args)
-        {               
+        {
                 if (!checkParams(args))
                 {
@@ -44 +45 @@
                         System.out.println("Usage: java WRS configuration.xml");
                         System.exit(0);
-                }               
-                
+                }
+
+                this.resources = new Hashtable();
+
                 this.conf = readConfig(args[0]);
 
@@ -78 +81 @@
                         {
                                 Include inc = li.next();
-                                
+
                                 switch (Includes.valueOf(inc.getName().toUpperCase()))
                                 {
@@ -119 +122 @@
         private void readResources(String url)
         {
-                System.out.println("Read resources from "+url+" file.");
+                System.out.println("Read resources from " + url + " file.");
+                Resources resources;
+                try
+                {
+                        resources = IOHelper.readConfig(Resources.class, url);
+                        ListIterator<util.resource.Resources.Resource> li = resources
+                                        .getResource().listIterator();
+                        while (li.hasNext())
+                        {
+                                util.resource.Resources.Resource res = li.next();
+                                Resource resource = new Resource(res.getName(), res.getType());
+
+                                ListIterator<Parameter> pi = res.getParameters().getParameter()
+                                                .listIterator();
+                                while (pi.hasNext())
+                                {
+                                        Parameter p = pi.next();
+                                        if (p.getSource() == null)
+                                                p.setSource("resource");
+                                        resource.getParameters().put(p.getName(), p);
+                                }
+
+                                this.resources.put(resource.getName(), resource);
+                        }
+
+                }
+                catch (SAXException e)
+                {
+                        System.out.println("Wrong resources configuration file.");
+                }
+                catch (IOException e)
+                {
+                        System.out.println("Can't open resources configuration file.");
+                }
+                catch (ParserConfigurationException e)
+                {
+                        System.out.println("Wrong resources configuration file.");
+                }
+                catch (JAXBException e)
+                {
+                        System.out.println("Wrong resources configuration file.");
+                }
 
         }
@@ -125 +169 @@
         private void readProfiles(String url)
         {
-                System.out.println("Read profiles from "+url+" file.");
+                System.out.println("Read profiles from " + url + " file.");
                 try
                 {
                         Profiles profiles = IOHelper.readConfig(Profiles.class, url);
-                        ListIterator<util.profile.Profiles.Profile> li = profiles.getProfile().listIterator();
-                        while(li.hasNext())
+                        ListIterator<util.profile.Profiles.Profile> li = profiles
+                                        .getProfile().listIterator();
+                        while (li.hasNext())
                         {
                                 util.profile.Profiles.Profile prof = li.next();
                                 Profile profile = new Profile(prof.getName());
                                 profile.setDescription(prof.getDescription());
-                                ListIterator<Rref> ri = prof.getResources().getRref().listIterator();
-                                while(ri.hasNext())
+                                ListIterator<Rref> ri = prof.getResources().getRref()
+                                                .listIterator();
+                                while (ri.hasNext())
                                 {
                                         Rref rref = ri.next();
-                                        
+
                                         try
                                         {
                                                 Resource res = this.resources.get(rref.getRef());
-                                                if(res != null)
+                                                if (res != null)
                                                 {
-                                                        //TODO copy parameters from the resource
-                                                        profile.getResources().add(res);
+                                                        Enumeration<String> pi = res.getParameters().keys();
+                                                        while (pi.hasMoreElements())
+                                                        {
+                                                                String pk = pi.nextElement();
+                                                                profile.getParameters().put(pk,
+                                                                                res.getParameters().get(pk));
+                                                        }
+
+                                                        profile.getResources().put(res.getName(), res);
+                                                }
+                                                else
+                                                {
+                                                        System.out.println("No such resource: "
+                                                                        + rref.getRef());
                                                 }
                                         }
                                         catch (NullPointerException e)
                                         {
-                                                System.out.println("No such resource: "+rref.getRef());
+                                                System.out.println("Resource " + rref.getRef()
+                                                                + " is not properly configured");
                                         }
+
+                                }
+
+                                ListIterator<Parameter> pi = prof.getParameters()
+                                                .getParameter().listIterator();
+                                while (pi.hasNext())
+                                {
+                                        Parameter p = pi.next();
+                                        if (p.getSource() == null)
+                                                p.setSource("profile");
+                                        profile.getParameters().put(p.getName(), p);
                                 }
                         }
@@ -177 +247 @@
         private void readTemplates(String url)
         {
-                System.out.println("Read templates from "+url+" file.");
+                System.out.println("Read templates from " + url + " file.");
 
         }
@@ -183 +253 @@
         private void readServices(String url)
         {
-                System.out.println("Read services from "+url+" file.");
+                System.out.println("Read services from " + url + " file.");
         }
 

tools/routingservice/branches/wrs-2.0/src/model/Profile.java

@@ -1 +1 @@
 package model;
 
-import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.Hashtable;
+
+import org.apache.commons.collections.map.MultiValueMap;
 
 import util.Parameter;
@@ -10 +12 @@
         private String name;
         private String description;
-        private Hashtable<String, Parameter> parameters;
-        private ArrayList<Resource> resources;
+        private MultiValueMap parameters;
+        private Hashtable<String, Resource> resources;
+        private Hashtable<String, Service> services;    
 
         public Profile(String name)
@@ -17 +20 @@
                 super();
                 this.name = name;
+                
+                HashMap<String, Parameter> hm = new HashMap<String, Parameter>();
+                parameters = MultiValueMap.decorate(hm);
+                
+                //parameters = new MultiValueMap();
+                resources = new Hashtable<String, Resource>();
+                services = new Hashtable<String, Service>();
+
         }
 
@@ -39 +50 @@
         }
 
-        public Hashtable<String, Parameter> getParameters()
+        public MultiValueMap getParameters()
         {
                 return parameters;
         }
 
-        public void setParameters(Hashtable<String, Parameter> parameters)
-        {
-                this.parameters = parameters;
-        }
 
-        public ArrayList<Resource> getResources()
+        public Hashtable<String, Resource> getResources()
         {
                 return resources;
         }
 
-        public void setResources(ArrayList<Resource> resources)
+        public void setResources(Hashtable<String, Resource> resources)
         {
                 this.resources = resources;
         }
 
-        public void addResource(Resource resource)
-        {
-                this.resources.add(resource);
-        }
-
 }

tools/routingservice/branches/wrs-2.0/src/model/Resource.java

@@ -25 +25 @@
                 this.name = name;
                 this.type = type;
+                
+                parameters = new Hashtable<String, Parameter>();
+                services = new Hashtable<String, Service>();
         }
+        
+        public String getName()
+        {
+                return name;
+        }       
 
         public String getDescription()

tools/routingservice/branches/wrs-2.0/src/util/resource/ObjectFactory.java

@@ -3 +3 @@
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2009.03.25 at 04:41:37 PM JST 
+// Generated on: 2009.03.26 at 01:00:53 PM JST 
 //
 
@@ -48 +48 @@
 
     /**
-     * Create an instance of {@link Resources.Resource.Parameters }
-     * 
-     */
-    public Resources.Resource.Parameters createResourcesResourceParameters() {
-        return new Resources.Resource.Parameters();
-    }
-
-    /**
-     * Create an instance of {@link Resources }
-     * 
-     */
-    public Resources createResources() {
-        return new Resources();
-    }
-
-    /**
      * Create an instance of {@link Resources.Resource.Services.Sref }
      * 
@@ -87 +71 @@
     }
 
+    /**
+     * Create an instance of {@link Resources }
+     * 
+     */
+    public Resources createResources() {
+        return new Resources();
+    }
+
+    /**
+     * Create an instance of {@link Resources.Resource.Parameters }
+     * 
+     */
+    public Resources.Resource.Parameters createResourcesResourceParameters() {
+        return new Resources.Resource.Parameters();
+    }
+
 }

tools/routingservice/branches/wrs-2.0/src/util/resource/Resources.java

@@ -3 +3 @@
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2009.03.25 at 04:41:37 PM JST 
+// Generated on: 2009.03.26 at 01:00:53 PM JST 
 //
 
@@ -31 +31 @@
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       &lt;sequence>
- *         &lt;element name="resource">
+ *         &lt;element name="resource" maxOccurs="unbounded">
  *           &lt;complexType>
  *             &lt;complexContent>
@@ -104 +104 @@
 
     @XmlElement(required = true)
-    protected Resources.Resource resource;
+    protected List<Resources.Resource> resource;
 
     /**
      * Gets the value of the resource property.
      * 
-     * @return
-     *     possible object is
-     *     {@link Resources.Resource }
-     *     
+     * <p>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the resource property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getResource().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link Resources.Resource }
+     * 
+     * 
      */
-    public Resources.Resource getResource() {
-        return resource;
-    }
-
-    /**
-     * Sets the value of the resource property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Resources.Resource }
-     *     
-     */
-    public void setResource(Resources.Resource value) {
-        this.resource = value;
+    public List<Resources.Resource> getResource() {
+        if (resource == null) {
+            resource = new ArrayList<Resources.Resource>();
+        }
+        return this.resource;
     }