perfsonar development work

Author: dante.delvaux
Date: 2013-03-06 21:26:05 +0000 (Wed, 06 Mar 2013)
New Revision: 6183

Removed:
   
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
Modified:
   trunk/perfsonar-java-rrd-ma-base3/
Log:
RRD MA with base3: actually deleteing 2 renamed files.



Property changes on: trunk/perfsonar-java-rrd-ma-base3
___________________________________________________________________
Modified: svn:ignore
   - target

.settings

.classpath

.project

   + logs
velocity.log*
target
.apt_generated
.settings

.classpath

.project


Deleted: 
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-06 21:07:18 UTC (rev 6182)
+++ 
trunk/perfsonar-java-rrd-ma-base3/src/main/java/net/geant/perfsonar/ma/RrdMAService.java
    2013-03-06 21:26:05 UTC (rev 6183)
@@ -1,29 +0,0 @@
-package net.geant.perfsonar.ma;
-
-import javax.xml.ws.WebServiceProvider;
-
-import net.geant.perfsonar.PerfSONAR;
-import net.geant.perfsonar.ServiceType;
-
-/**
- * RRD MA perfSONAR service implementation
- * Based on psBase3 streaming framework
- * 
- * @author Antoine Delvaux 
<>
- *
- */
-
-@WebServiceProvider
-public class RRDMAService extends PerfSONAR {
-
-    @Override
-    public ServiceType getServiceType() {
-        return ServiceType.MA;
-    }
-
-    @Override
-    public String getServiceName() {
-        return "RRD MA";
-    }
-
-}

Deleted: 
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-06 21:07:18 UTC (rev 6182)
+++ 
trunk/perfsonar-java-rrd-ma-base3/src/test/java/net/geant/perfsonar/ma/rrd/RrdMAWebServiceTest.java
 2013-03-06 21:26:05 UTC (rev 6183)
@@ -1,56 +0,0 @@
-package net.geant.perfsonar.ma.rrd;
-
-import static org.junit.Assert.*;
-
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.IOException;
-
-import javax.xml.ws.Endpoint;
-import javax.xml.ws.soap.SOAPFaultException;
-
-import net.geant.perfsonar.helpers.PerfSONARServiceClient;
-import net.geant.perfsonar.helpers.Response;
-import net.geant.perfsonar.ma.RRDMAService;
-import net.geant.perfsonar.templates.NMWG;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.xml.sax.SAXException;
-
-/**
- * RRD MA Web service tests.
- * 
- * @author <a 
href="mailto:">Blazej
 Pietrzak</a>
- */
-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 Endpoint endpoint;
-       
-       @Before
-       public void givenRrdMAService() throws InterruptedException, 
IOException {
-               endpoint = Endpoint.publish(SERVICE_URL, service);
-       }
-               
-       @After
-       public void stopServices() {
-               endpoint.stop();
-               service.stop();
-               endpoint = null;
-               service = null;
-       }
-
-       @Test
-       public void shouldSayEcho() throws SAXException, InterruptedException 
{
-               assertEquals(new Response(NMWG.toEchoResponse(REQUEST_ID)), 
client.echo(REQUEST_ID));
-       }
-
-    @Test(expected=SOAPFaultException.class)
-       public void shouldFail() throws FileNotFoundException, SAXException {
-               client.invoke(new 
FileReader("samples/requests/MetadataKeyRequest-Discards-1.xml"));
-       }
-}