Changeset 1561 for trunk


Ignore:
Timestamp:
06/10/14 15:08:22 (10 years ago)
Author:
pharms
Message:
  • update of namespaces for HTTP logfiles
Location:
trunk
Files:
21 edited

Legend:

Unmodified
Added
Removed

  • trunk/autoquest-httpmonitor-test/src/test/java/de/ugoe/cs/autoquest/httpmonitor/AbstractTC.java

    r1392 r1561  
    4040 
    4141import de.ugoe.cs.autoquest.eventcore.Event; 
    42 import de.ugoe.cs.autoquest.httpmonitor.exchange.HttpExchange; 
    43 import de.ugoe.cs.autoquest.httpmonitor.exchange.Method; 
    4442import de.ugoe.cs.autoquest.plugin.http.eventcore.HTTPEventType; 
    4543import de.ugoe.cs.autoquest.plugin.http.eventcore.HTTPTarget; 
     44import de.ugoe.cs.autoquest.plugin.http.logdata.HttpExchange; 
     45import de.ugoe.cs.autoquest.plugin.http.logdata.Method; 
    4646import de.ugoe.cs.util.console.TextConsole; 
    4747 

  • trunk/autoquest-httpmonitor-test/src/test/java/de/ugoe/cs/autoquest/httpmonitor/HttpMonitorTest.java

    r1392 r1561  
    4040import de.ugoe.cs.autoquest.eventcore.Event; 
    4141import de.ugoe.cs.autoquest.http.HTTPTestUtils; 
    42 import de.ugoe.cs.autoquest.httpmonitor.exchange.HttpExchange; 
    43 import de.ugoe.cs.autoquest.httpmonitor.exchange.ObjectFactory; 
    44 import de.ugoe.cs.autoquest.httpmonitor.exchange.Session; 
    4542import de.ugoe.cs.autoquest.httpmonitor.proxy.HttpMonitoringProxy; 
    4643import de.ugoe.cs.autoquest.plugin.http.HTTPLogParser; 
    … …  
    4845import de.ugoe.cs.autoquest.plugin.http.eventcore.HTTPEventType; 
    4946import de.ugoe.cs.autoquest.plugin.http.eventcore.HTTPTarget; 
     47import de.ugoe.cs.autoquest.plugin.http.logdata.HttpExchange; 
     48import de.ugoe.cs.autoquest.plugin.http.logdata.ObjectFactory; 
     49import de.ugoe.cs.autoquest.plugin.http.logdata.Session; 
    5050import dummyservice.DummyService; 
    5151import dummyservice.DummyServicePortType; 

  • trunk/autoquest-httpmonitor-test/src/test/java/de/ugoe/cs/autoquest/httpmonitor/HttpMonitoringProxyTest.java

    r1392 r1561  
    4545 
    4646import de.ugoe.cs.autoquest.eventcore.Event; 
    47 import de.ugoe.cs.autoquest.httpmonitor.exchange.HttpExchange; 
    48 import de.ugoe.cs.autoquest.httpmonitor.exchange.Method; 
    4947import de.ugoe.cs.autoquest.httpmonitor.proxy.HttpMonitoringProxy; 
    5048import de.ugoe.cs.autoquest.plugin.http.HTTPLogParser; 
     49import de.ugoe.cs.autoquest.plugin.http.logdata.HttpExchange; 
     50import de.ugoe.cs.autoquest.plugin.http.logdata.Method; 
    5151import dummyservice.DummyService; 
    5252import dummyservice.DummyServicePortType; 

  • trunk/autoquest-httpmonitor/src/main/java/de/ugoe/cs/autoquest/httpmonitor/HttpMonitorExchangeHandler.java

    r1374 r1561  
    1515package de.ugoe.cs.autoquest.httpmonitor; 
    1616 
    17 import de.ugoe.cs.autoquest.httpmonitor.exchange.HttpExchange; 
     17import de.ugoe.cs.autoquest.plugin.http.logdata.HttpExchange; 
    1818 
    1919/** 

  • trunk/autoquest-httpmonitor/src/main/java/de/ugoe/cs/autoquest/httpmonitor/HttpMonitorLogManager.java

    r1418 r1561  
    1818import java.util.TimerTask; 
    1919 
    20 import de.ugoe.cs.autoquest.httpmonitor.exchange.HttpExchange; 
     20import de.ugoe.cs.autoquest.plugin.http.logdata.HttpExchange; 
    2121import de.ugoe.cs.util.console.Console; 
    2222 

  • trunk/autoquest-httpmonitor/src/main/java/de/ugoe/cs/autoquest/httpmonitor/HttpMonitorOutputWriter.java

    r1444 r1561  
    2727import javax.xml.bind.Marshaller; 
    2828 
    29 import de.ugoe.cs.autoquest.httpmonitor.exchange.HttpExchange; 
    30 import de.ugoe.cs.autoquest.httpmonitor.exchange.ObjectFactory; 
     29import de.ugoe.cs.autoquest.plugin.http.logdata.HttpExchange; 
     30import de.ugoe.cs.autoquest.plugin.http.logdata.ObjectFactory; 
    3131import de.ugoe.cs.util.console.Console; 
    3232 
    … …  
    254254        outputWriter.println("<?xml version=\"1.0\" encoding=\"UTF-8\"?>"); 
    255255        outputWriter.println 
    256             ("<session xmlns=\"http://autoquest.informatik.uni-goettingen.de/httpsession\" >"); 
     256            ("<session xmlns=\"http://autoquest.informatik.uni-goettingen.de/httpexchange\" >"); 
    257257    } 
    258258 

  • trunk/autoquest-httpmonitor/src/main/java/de/ugoe/cs/autoquest/httpmonitor/HttpMonitorServlet.java

    r1374 r1561  
    2626import javax.xml.bind.Unmarshaller; 
    2727 
    28 import de.ugoe.cs.autoquest.httpmonitor.exchange.HttpExchange; 
     28import de.ugoe.cs.autoquest.plugin.http.logdata.HttpExchange; 
    2929import de.ugoe.cs.util.console.Console; 
    3030 

  • trunk/autoquest-httpmonitor/src/main/java/de/ugoe/cs/autoquest/httpmonitor/proxy/ExchangeListener.java

    r1382 r1561  
    2727 
    2828import de.ugoe.cs.autoquest.httpmonitor.HttpMonitorExchangeHandler; 
    29 import de.ugoe.cs.autoquest.httpmonitor.exchange.Address; 
    30 import de.ugoe.cs.autoquest.httpmonitor.exchange.Content; 
    31 import de.ugoe.cs.autoquest.httpmonitor.exchange.Cookie; 
    32 import de.ugoe.cs.autoquest.httpmonitor.exchange.Cookies; 
    33 import de.ugoe.cs.autoquest.httpmonitor.exchange.Header; 
    34 import de.ugoe.cs.autoquest.httpmonitor.exchange.Headers; 
    35 import de.ugoe.cs.autoquest.httpmonitor.exchange.HttpExchange; 
    36 import de.ugoe.cs.autoquest.httpmonitor.exchange.HttpRequest; 
    37 import de.ugoe.cs.autoquest.httpmonitor.exchange.HttpResponse; 
    38 import de.ugoe.cs.autoquest.httpmonitor.exchange.Method; 
    39 import de.ugoe.cs.autoquest.httpmonitor.exchange.ObjectFactory; 
    40 import de.ugoe.cs.autoquest.httpmonitor.exchange.Protocol; 
    41 import de.ugoe.cs.autoquest.httpmonitor.exchange.Status; 
     29import de.ugoe.cs.autoquest.plugin.http.logdata.Address; 
     30import de.ugoe.cs.autoquest.plugin.http.logdata.Content; 
     31import de.ugoe.cs.autoquest.plugin.http.logdata.Cookie; 
     32import de.ugoe.cs.autoquest.plugin.http.logdata.Cookies; 
     33import de.ugoe.cs.autoquest.plugin.http.logdata.Header; 
     34import de.ugoe.cs.autoquest.plugin.http.logdata.Headers; 
     35import de.ugoe.cs.autoquest.plugin.http.logdata.HttpExchange; 
     36import de.ugoe.cs.autoquest.plugin.http.logdata.HttpRequest; 
     37import de.ugoe.cs.autoquest.plugin.http.logdata.HttpResponse; 
     38import de.ugoe.cs.autoquest.plugin.http.logdata.Method; 
     39import de.ugoe.cs.autoquest.plugin.http.logdata.ObjectFactory; 
     40import de.ugoe.cs.autoquest.plugin.http.logdata.Protocol; 
     41import de.ugoe.cs.autoquest.plugin.http.logdata.Status; 
    4242import de.ugoe.cs.util.console.Console; 
    4343 

  • trunk/autoquest-httpmonitor/src/main/java/de/ugoe/cs/autoquest/httpmonitor/proxy/ExchangeListenerManager.java

    r1384 r1561  
    3030import de.ugoe.cs.autoquest.httpmonitor.HttpMonitorException; 
    3131import de.ugoe.cs.autoquest.httpmonitor.HttpMonitorExchangeHandler; 
    32 import de.ugoe.cs.autoquest.httpmonitor.exchange.Status; 
     32import de.ugoe.cs.autoquest.plugin.http.logdata.Status; 
    3333import de.ugoe.cs.util.console.Console; 
    3434 

  • trunk/autoquest-httpmonitor/src/main/java/de/ugoe/cs/autoquest/httpmonitor/proxy/HttpMonitorRemoteExchangeHandler.java

    r1395 r1561  
    3838import de.ugoe.cs.autoquest.httpmonitor.HttpMonitorException; 
    3939import de.ugoe.cs.autoquest.httpmonitor.HttpMonitorExchangeHandler; 
    40 import de.ugoe.cs.autoquest.httpmonitor.exchange.HttpExchange; 
    41 import de.ugoe.cs.autoquest.httpmonitor.exchange.ObjectFactory; 
     40import de.ugoe.cs.autoquest.plugin.http.logdata.HttpExchange; 
     41import de.ugoe.cs.autoquest.plugin.http.logdata.ObjectFactory; 
    4242import de.ugoe.cs.util.console.Console; 
    4343 

  • trunk/autoquest-httpmonitor/src/main/java/de/ugoe/cs/autoquest/httpmonitor/proxy/HttpMonitoringProxyServlet.java

    r1420 r1561  
    3737import org.eclipse.jetty.util.Fields; 
    3838 
    39 import de.ugoe.cs.autoquest.httpmonitor.exchange.Status; 
     39import de.ugoe.cs.autoquest.plugin.http.logdata.Status; 
    4040import de.ugoe.cs.util.console.Console; 
    4141 

  • trunk/autoquest-plugin-http-test/src/test/java/de/ugoe/cs/autoquest/http/HTTPLogParserTest.java

    r1417 r1561  
    3434 
    3535import de.ugoe.cs.autoquest.eventcore.Event; 
    36 import de.ugoe.cs.autoquest.httpmonitor.exchange.ObjectFactory; 
    37 import de.ugoe.cs.autoquest.httpmonitor.exchange.Session; 
    3836import de.ugoe.cs.autoquest.plugin.http.HTTPLogParser; 
    3937import de.ugoe.cs.autoquest.plugin.http.HTTPUtils; 
    … …  
    4139import de.ugoe.cs.autoquest.plugin.http.eventcore.HTTPTarget; 
    4240import de.ugoe.cs.autoquest.plugin.http.eventcore.SOAPEventType; 
     41import de.ugoe.cs.autoquest.plugin.http.logdata.ObjectFactory; 
     42import de.ugoe.cs.autoquest.plugin.http.logdata.Session; 
    4343import de.ugoe.cs.util.console.TextConsole; 
    4444 

  • trunk/autoquest-plugin-http-test/src/test/resources/httpmonitor_testtrace_1.xml

    r1444 r1561  
    11<?xml version="1.0" encoding="UTF-8"?> 
    2 <session xmlns="http://autoquest.informatik.uni-goettingen.de/httpsession" xmlns:session="http://autoquest.informatik.uni-goettingen.de/httpsession"> 
     2<session xmlns="http://autoquest.informatik.uni-goettingen.de/httpexchange" xmlns:session="http://autoquest.informatik.uni-goettingen.de/httpexchange"> 
    33 
    44 

  • trunk/autoquest-plugin-http/pom.xml

    r1541 r1561  
    4343                <version>0.8.2</version> 
    4444                <configuration> 
    45                     <generatePackage>de.ugoe.cs.autoquest.httpmonitor.exchange</generatePackage> 
     45                    <generatePackage>de.ugoe.cs.autoquest.plugin.http.logdata</generatePackage> 
    4646                </configuration> 
    4747                <executions> 

  • trunk/autoquest-plugin-http/src/main/java/de/ugoe/cs/autoquest/plugin/http/HTTPLogParser.java

    r1440 r1561  
    3737import de.ugoe.cs.autoquest.eventcore.Event; 
    3838import de.ugoe.cs.autoquest.eventcore.IEventType; 
    39 import de.ugoe.cs.autoquest.httpmonitor.exchange.Content; 
    40 import de.ugoe.cs.autoquest.httpmonitor.exchange.HttpExchange; 
    41 import de.ugoe.cs.autoquest.httpmonitor.exchange.Session; 
    4239import de.ugoe.cs.autoquest.plugin.http.eventcore.HTTPEventType; 
    4340import de.ugoe.cs.autoquest.plugin.http.eventcore.HTTPTarget; 
    4441import de.ugoe.cs.autoquest.plugin.http.eventcore.SOAPEventType; 
     42import de.ugoe.cs.autoquest.plugin.http.logdata.Content; 
     43import de.ugoe.cs.autoquest.plugin.http.logdata.HttpExchange; 
     44import de.ugoe.cs.autoquest.plugin.http.logdata.Session; 
    4545import de.ugoe.cs.util.console.Console; 
    4646 

  • trunk/autoquest-plugin-http/src/main/java/de/ugoe/cs/autoquest/plugin/http/HTTPUtils.java

    r1417 r1561  
    1515package de.ugoe.cs.autoquest.plugin.http; 
    1616 
    17 import de.ugoe.cs.autoquest.httpmonitor.exchange.Address; 
     17import de.ugoe.cs.autoquest.plugin.http.logdata.Address; 
    1818 
    1919/** 

  • trunk/autoquest-plugin-http/src/main/java/de/ugoe/cs/autoquest/plugin/http/eventcore/HTTPEventType.java

    r1417 r1561  
    1616 
    1717import de.ugoe.cs.autoquest.eventcore.IEventType; 
    18 import de.ugoe.cs.autoquest.httpmonitor.exchange.HttpExchange; 
    19 import de.ugoe.cs.autoquest.httpmonitor.exchange.HttpRequest; 
    2018import de.ugoe.cs.autoquest.plugin.http.HTTPUtils; 
     19import de.ugoe.cs.autoquest.plugin.http.logdata.HttpExchange; 
     20import de.ugoe.cs.autoquest.plugin.http.logdata.HttpRequest; 
    2121 
    2222/** 

  • trunk/autoquest-plugin-http/src/main/java/de/ugoe/cs/autoquest/plugin/http/eventcore/HTTPTarget.java

    r1417 r1561  
    1616 
    1717import de.ugoe.cs.autoquest.eventcore.IEventTarget; 
    18 import de.ugoe.cs.autoquest.httpmonitor.exchange.Address; 
    1918import de.ugoe.cs.autoquest.plugin.http.HTTPUtils; 
     19import de.ugoe.cs.autoquest.plugin.http.logdata.Address; 
    2020 
    2121/** 

  • trunk/autoquest-plugin-http/src/main/java/de/ugoe/cs/autoquest/plugin/http/eventcore/SOAPEventType.java

    r1417 r1561  
    2222import javax.xml.soap.SOAPMessage; 
    2323 
    24 import de.ugoe.cs.autoquest.httpmonitor.exchange.Header; 
    25 import de.ugoe.cs.autoquest.httpmonitor.exchange.HttpExchange; 
    2624import de.ugoe.cs.autoquest.plugin.http.HTTPUtils; 
     25import de.ugoe.cs.autoquest.plugin.http.logdata.Header; 
     26import de.ugoe.cs.autoquest.plugin.http.logdata.HttpExchange; 
    2727import de.ugoe.cs.util.console.Console; 
    2828 

  • trunk/autoquest-plugin-http/src/main/resources/HttpSession.xsd

    r1437 r1561  
    11<?xml version="1.0" encoding="UTF-8"?> 
    22<xsd:schema 
    3   targetNamespace="http://autoquest.informatik.uni-goettingen.de/httpsession" 
    4   xmlns:tns="http://autoquest.informatik.uni-goettingen.de/httpsession" 
     3  targetNamespace="http://autoquest.informatik.uni-goettingen.de/httpexchange" 
     4  xmlns:tns="http://autoquest.informatik.uni-goettingen.de/httpexchange" 
    55  xmlns:exchange="http://autoquest.informatik.uni-goettingen.de/httpexchange" 
    66  xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
    … …  
    99  elementFormDefault="qualified"> 
    1010   
    11   <xsd:import 
     11  <xsd:include 
    1212    namespace="http://autoquest.informatik.uni-goettingen.de/httpexchange" 
    1313    schemaLocation="HttpExchangeStructure.xsd" /> 

  • trunk/autoquest-test-utils/src/main/java/de/ugoe/cs/autoquest/http/HTTPTestUtils.java

    r1372 r1561  
    2020import java.math.BigInteger; 
    2121 
    22 import de.ugoe.cs.autoquest.httpmonitor.exchange.Address; 
    23 import de.ugoe.cs.autoquest.httpmonitor.exchange.Content; 
    24 import de.ugoe.cs.autoquest.httpmonitor.exchange.Cookie; 
    25 import de.ugoe.cs.autoquest.httpmonitor.exchange.Cookies; 
    26 import de.ugoe.cs.autoquest.httpmonitor.exchange.Header; 
    27 import de.ugoe.cs.autoquest.httpmonitor.exchange.Headers; 
    28 import de.ugoe.cs.autoquest.httpmonitor.exchange.HttpExchange; 
    29 import de.ugoe.cs.autoquest.httpmonitor.exchange.HttpRequest; 
    30 import de.ugoe.cs.autoquest.httpmonitor.exchange.HttpResponse; 
    31 import de.ugoe.cs.autoquest.httpmonitor.exchange.Method; 
    32 import de.ugoe.cs.autoquest.httpmonitor.exchange.ObjectFactory; 
    33 import de.ugoe.cs.autoquest.httpmonitor.exchange.Protocol; 
    34 import de.ugoe.cs.autoquest.httpmonitor.exchange.Session; 
    35 import de.ugoe.cs.autoquest.httpmonitor.exchange.Status; 
     22import de.ugoe.cs.autoquest.plugin.http.logdata.Address; 
     23import de.ugoe.cs.autoquest.plugin.http.logdata.Content; 
     24import de.ugoe.cs.autoquest.plugin.http.logdata.Cookie; 
     25import de.ugoe.cs.autoquest.plugin.http.logdata.Cookies; 
     26import de.ugoe.cs.autoquest.plugin.http.logdata.Header; 
     27import de.ugoe.cs.autoquest.plugin.http.logdata.Headers; 
     28import de.ugoe.cs.autoquest.plugin.http.logdata.HttpExchange; 
     29import de.ugoe.cs.autoquest.plugin.http.logdata.HttpRequest; 
     30import de.ugoe.cs.autoquest.plugin.http.logdata.HttpResponse; 
     31import de.ugoe.cs.autoquest.plugin.http.logdata.Method; 
     32import de.ugoe.cs.autoquest.plugin.http.logdata.ObjectFactory; 
     33import de.ugoe.cs.autoquest.plugin.http.logdata.Protocol; 
     34import de.ugoe.cs.autoquest.plugin.http.logdata.Session; 
     35import de.ugoe.cs.autoquest.plugin.http.logdata.Status; 
    3636 
    3737/** 
Note: See TracChangeset for help on using the changeset viewer.