Changeset 5470

Timestamp:

07/09/14 15:38:07 (10 years ago)

Author:

Twan Goosen

Message:

VCR submit endpoint read from VLO configuration

Location:

vlo/branches/vlo-3.1-vcr

Files:

• vlo-commons/src/main/java/eu/clarin/cmdi/vlo/config/VloConfig.java (modified) (3 diffs)
• vlo-commons/src/main/resources/VloConfig.xml (modified) (1 diff)
• vlo-commons/src/test/java/eu/clarin/cmdi/vlo/config/DefaultVloConfigFactoryTest.java (modified) (1 diff)
• vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/pages/VirtualCollectionSubmissionPage.java (modified) (3 diffs)

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

@@ -85 +85 @@
     private String handleServerUrl = "";
 
-    @XmlElement
-    private String imdiBrowserUrl = "";
-
     private String languageLinkPrefix = "";
 
@@ -98 +95 @@
 
     private String feedbackFromUrl = "";
+
+    private String vcrSubmitEndpoint;
     /**
      * A set of fields to be excluded from display<br><br>
@@ -629 +628 @@
     public void setFeedbackFromUrl(String param) {
         feedbackFromUrl = param;
+    }
+
+    public String getVcrSubmitEndpoint() {
+        return vcrSubmitEndpoint;
+    }
+
+    public void setVcrSubmitEndpoint(String vcrSubmitEndpoint) {
+        this.vcrSubmitEndpoint = vcrSubmitEndpoint;
     }
 

vlo/branches/vlo-3.1-vcr/vlo-commons/src/main/resources/VloConfig.xml

@@ -149 +149 @@
     
     <cqlEndpointAlternative>http://cqlservlet.mpi.nl/</cqlEndpointAlternative>
+    
+    <vcrSubmitEndpoint>http://catalog-clarin.esc.rzg.mpg.de/vcr/service/submit</vcrSubmitEndpoint>
 </VloConfig>

vlo/branches/vlo-3.1-vcr/vlo-commons/src/test/java/eu/clarin/cmdi/vlo/config/DefaultVloConfigFactoryTest.java

@@ -939 +939 @@
         assertEquals(5, result.size());
     }
+    
+    @Test
+    public void testGetVcrSubmitEndpoint(){
+        assertEquals("http://catalog-clarin.esc.rzg.mpg.de/vcr/service/submit", config.getVcrSubmitEndpoint());
+    }
 }

vlo/branches/vlo-3.1-vcr/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/pages/VirtualCollectionSubmissionPage.java

@@ -18 +18 @@
 
 import eu.clarin.cmdi.vlo.FacetConstants;
+import eu.clarin.cmdi.vlo.config.VloConfig;
 import eu.clarin.cmdi.vlo.pojo.FacetSelection;
 import eu.clarin.cmdi.vlo.pojo.QueryFacetsSelection;
@@ -39 +40 @@
 import org.apache.wicket.model.PropertyModel;
 import org.apache.wicket.model.util.ListModel;
+import org.apache.wicket.spring.injection.annot.SpringBean;
 
 /**
@@ -46 +48 @@
 public class VirtualCollectionSubmissionPage extends VloBasePage<QueryFacetsSelection> {
 
-    private final String vcrSubmitEndpoint = "http://localhost:8080/VirtualCollectionRegistry/service/submit";
+    @SpringBean
+    private VloConfig vloConfig;
 
     public VirtualCollectionSubmissionPage(IModel<QueryFacetsSelection> model) {
         super(model);
+
         final WebMarkupContainer form = new WebMarkupContainer("vcrForm");
-        form.add(new AttributeModifier("action", Model.of(vcrSubmitEndpoint)));
+        form.add(new AttributeModifier("action", Model.of(vloConfig.getVcrSubmitEndpoint())));
         add(form);