Changeset 4509 for vlo/branches/vlo-3.0/vlo-commons/src/main/java/eu/clarin/cmdi/vlo/config/VloConfig.java

Timestamp:

02/13/14 14:42:31 (10 years ago)

Author:

twagoo

Message:

Written marshaller/unmarshaller for VloConfig?

File:

• vlo/branches/vlo-3.0/vlo-commons/src/main/java/eu/clarin/cmdi/vlo/config/VloConfig.java (modified) (16 diffs)

vlo/branches/vlo-3.0/vlo-commons/src/main/java/eu/clarin/cmdi/vlo/config/VloConfig.java

@@ -4 +4 @@
 import java.net.URLEncoder;
 import java.util.List;
-import org.simpleframework.xml.Root;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlElementWrapper;
+import javax.xml.bind.annotation.XmlRootElement;
 
 /**
@@ -11 +13 @@
  * @author keeloo, twagoo
  */
-@Root
+@XmlRootElement(name = "VloConfig")
 public class VloConfig {
 
@@ -41 +43 @@
     private int solrTimeOut = 0;
 
-    private List<DataRoot> dataRoots;
+    @XmlElementWrapper(name="dataRoots")
+    @XmlElement(name="DataRoot")
+    private List<DataRoot> dataRoot;
 
     private int maxFileSize = 0;
@@ -67 +71 @@
 
     // services
-    private String FederatedContentSearchUrl = "";
+    private String federatedContentSearchUrl = "";
 
     private boolean useHandleResolver = false;
 
+    @XmlElement
     private String profileSchemaUrl = "";
 
@@ -77 +82 @@
     private String handleServerUrl = "";
 
+    @XmlElement
     private String imdiBrowserUrl = "";
 
@@ -93 +99 @@
      * An array of facetFields<br><br>
      *
-     * In case of an array of elements, the number of elements in the array
-     * needs to be communicated to the Simple framework. The following would be
-     * a correct description of an array of three facet fields<br><br>
-     *
-     * {@literal <facetFields length="3">}<br> {@literal    <facetField>}<br>
-     * {@literal       fieldOne}<br> {@literal    </facetField>}<br>
-     * {@literal    <facetField>}<br> {@literal       fieldTwo}<br>
-     * {@literal    </facetField>}<br> {@literal    <facetField>}<br>
-     * {@literal       fieldThree}<br> {@literal    </facetField>}<br>
-     * {@literal </facetFields>}<br><br>
-     *
-     * To let Simple now it has to interpret the facetFields element as an
-     * array, use the ElementArray directive. Use the directive to let Simple
-     * know that the elements inside 'facetFields' are named 'facetField'.
-     */
-    //Array(entry = "facetField")
-    private String[] facetFields = {"", "", ""};
+     * To let JAXB know it has to interpret the facetFields element as an array,
+     * use the XmlElementWrapper directive. Use the directive to let JAXB know
+     * that the elements inside 'facetFields' are named 'facetField'.
+     */
+    @XmlElementWrapper(name = "facetFields")
+    private String[] facetField = {"", "", ""};
 
     // test related parameters
@@ -182 +177 @@
      * @return the value
      */
-    public boolean deleteAllFirst() {
+    public boolean getDeleteAllFirst() {
         return deleteAllFirst;
     }
@@ -351 +346 @@
      */
     public List<DataRoot> getDataRoots() {
-        return dataRoots;
+        return dataRoot;
     }
 
@@ -363 +358 @@
      */
     public void setDataRoots(List<DataRoot> param) {
-        dataRoots = param;
+        dataRoot = param;
     }
 
@@ -506 +501 @@
      * @param param the value
      */
-    public void setProfileSchemaUrl(String param) {
+    public void setComponentRegistryProfileSchema(String param) {
         profileSchemaUrl = param;
     }
@@ -567 +562 @@
      * @return the value
      */
-    public String getIMDIBrowserUrl(String handle) {
+    public String getImdiBrowserUrl(String handle) {
         String result;
         try {
@@ -585 +580 @@
      * @param param the value
      */
-    public void setIMDIBrowserUrl(String param) {
+    public void setImdiBrowserUrl(String param) {
         imdiBrowserUrl = param;
     }
@@ -645 +640 @@
      * @return the value
      */
+    @XmlElement(name = "FederatedContentSearchUrl")
     public String getFederatedContentSearchUrl() {
-        return FederatedContentSearchUrl;
+        return federatedContentSearchUrl;
     }
 
@@ -658 +654 @@
      */
     public void setFederatedContentSearchUrl(String param) {
-        FederatedContentSearchUrl = param;
+        federatedContentSearchUrl = param;
     }
 
@@ -694 +690 @@
      */
     public String[] getFacetFields() {
-        return facetFields;
+        return facetField;
     }
 
@@ -706 +702 @@
      */
     public void setFacetFields(String[] param) {
-        facetFields = param;
+        facetField = param;
     }