perfsonar development work

Author: dante.delvaux
Date: 2013-03-04 15:01:48 +0000 (Mon, 04 Mar 2013)
New Revision: 6181

Removed:
   
trunk/perfsonar-java-rrd-ma-base3/src/main/java/net/geant/perfsonar/ma/ServiceController.java
Modified:
   
trunk/perfsonar-java-rrd-ma-base3/src/main/java/net/geant/perfsonar/ma/RrdMAService.java
   
trunk/perfsonar-java-rrd-ma-base3/src/test/java/net/geant/perfsonar/ma/rrd/RrdMAWebServiceTest.java
Log:
RRD MA with base3: first draft of Service Controller.

Modified: 
trunk/perfsonar-java-rrd-ma-base3/src/main/java/net/geant/perfsonar/ma/RrdMAService.java
===================================================================
--- 
trunk/perfsonar-java-rrd-ma-base3/src/main/java/net/geant/perfsonar/ma/RrdMAService.java
    2013-03-04 14:59:22 UTC (rev 6180)
+++ 
trunk/perfsonar-java-rrd-ma-base3/src/main/java/net/geant/perfsonar/ma/RrdMAService.java
    2013-03-04 15:01:48 UTC (rev 6181)
@@ -14,7 +14,7 @@
  */
 
 @WebServiceProvider
-public class RrdMAService extends PerfSONAR {
+public class RRDMAService extends PerfSONAR {
 
     @Override
     public ServiceType getServiceType() {

Deleted: 
trunk/perfsonar-java-rrd-ma-base3/src/main/java/net/geant/perfsonar/ma/ServiceController.java
===================================================================
--- 
trunk/perfsonar-java-rrd-ma-base3/src/main/java/net/geant/perfsonar/ma/ServiceController.java
       2013-03-04 14:59:22 UTC (rev 6180)
+++ 
trunk/perfsonar-java-rrd-ma-base3/src/main/java/net/geant/perfsonar/ma/ServiceController.java
       2013-03-04 15:01:48 UTC (rev 6181)
@@ -1,10 +0,0 @@
-package net.geant.perfsonar.ma;
-
-/**
- * @author Antoine Delvaux - 

- *
- */
-public class ServiceController {
-    public ServiceController() { }
-
-}

Modified: 
trunk/perfsonar-java-rrd-ma-base3/src/test/java/net/geant/perfsonar/ma/rrd/RrdMAWebServiceTest.java
===================================================================
--- 
trunk/perfsonar-java-rrd-ma-base3/src/test/java/net/geant/perfsonar/ma/rrd/RrdMAWebServiceTest.java
 2013-03-04 14:59:22 UTC (rev 6180)
+++ 
trunk/perfsonar-java-rrd-ma-base3/src/test/java/net/geant/perfsonar/ma/rrd/RrdMAWebServiceTest.java
 2013-03-04 15:01:48 UTC (rev 6181)
@@ -11,12 +11,11 @@
 
 import net.geant.perfsonar.helpers.PerfSONARServiceClient;
 import net.geant.perfsonar.helpers.Response;
-import net.geant.perfsonar.ma.RrdMAService;
+import net.geant.perfsonar.ma.RRDMAService;
 import net.geant.perfsonar.templates.NMWG;
 
 import org.junit.After;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.xml.sax.SAXException;
 
@@ -25,11 +24,11 @@
  * 
  * @author <a 
href="mailto:">Blazej
 Pietrzak</a>
  */
-public class RrdMAWebServiceTest {
+public class RRDMAWebServiceTest {
        private static final String REQUEST_ID = "request1";
        private static final String SERVICE_URL = 
"http://localhost:9000/perfsonar-java-rrd-ma";;
        private final PerfSONARServiceClient client = new 
PerfSONARServiceClient(SERVICE_URL);
-       private RrdMAService service = new RrdMAService();
+       private RRDMAService service = new RRDMAService();
        private Endpoint endpoint;
        
        @Before
@@ -50,8 +49,7 @@
                assertEquals(new Response(NMWG.toEchoResponse(REQUEST_ID)), 
client.echo(REQUEST_ID));
        }
 
-       @Test(expected=SOAPFaultException.class)
-    @Ignore
+    @Test(expected=SOAPFaultException.class)
        public void shouldFail() throws FileNotFoundException, SAXException {
                client.invoke(new 
FileReader("samples/requests/MetadataKeyRequest-Discards-1.xml"));
        }