Changeset 745


Ignore:
Timestamp:
05/05/11 18:59:44 (8 years ago)
Author:
philsmart
Message:
 
Location:
raptor-web/trunk/src/main
Files:
1 deleted
3 edited

Legend:

Unmodified
Added
Removed
  • raptor-web/trunk/src/main/java/uk/ac/cardiff/raptorweb/engine/RaptorWebEngine.java

    r731 r745  
    1111 
    1212import uk.ac.cardiff.model.AdministrativeFunction; 
    13 import uk.ac.cardiff.model.ServerMetadata; 
     13import uk.ac.cardiff.model.ServiceMetadata; 
    1414import uk.ac.cardiff.model.report.AggregatorGraphModel; 
    1515import uk.ac.cardiff.model.wsmodel.Capabilities; 
     
    5050 
    5151    /** holds basic metadata about this particular RaptorWeb engine instance*/ 
    52     private ServerMetadata webMetadata; 
     52    private ServiceMetadata webMetadata; 
    5353 
    5454    /** The client used to set up, connect to, action and return results from the attached MUA*/ 
     
    222222    } 
    223223 
    224     public void setWebMetadata(ServerMetadata webMetadata) { 
     224    public void setWebMetadata(ServiceMetadata webMetadata) { 
    225225        this.webMetadata = webMetadata; 
    226226    } 
    227227 
    228     public ServerMetadata getWebMetadata() { 
     228    public ServiceMetadata getWebMetadata() { 
    229229        return webMetadata; 
    230230    } 
  • raptor-web/trunk/src/main/webapp/WEB-INF/config/web-setup.xml

    r724 r745  
    3939 
    4040        <!-- MUA Metadata --> 
    41         <bean id="webMetadata" class="uk.ac.cardiff.model.ServerMetadata"> 
     41        <bean id="webMetadata" class="uk.ac.cardiff.model.ServiceMetadata"> 
    4242                <property name="serverName"><value>Cardiff University's RaptorWeb Instance</value></property> 
    4343                <property name="organisationName"><value>Cardiff University</value></property> 
     
    9292            <property name="baseDirectory"><value>/</value></property> <!-- the above is the absolute path, this is the same but as a relative path--> 
    9393    </bean> 
    94      
     94 
    9595 
    9696        <!-- Set up the start page background stats generator --> 
  • raptor-web/trunk/src/main/webapp/WEB-INF/flows/reports/setupRaptorWeb.xhtml

    r741 r745  
    117117                                        <h:outputText 
    118118                                                value="Endpoint: #{setupService.currentlyAttached.serviceEndpoint}" /> 
    119                                         <h:outputText value="Stored Authentications: #{setupService.attachedCapabilities.numberOfAuthenticationsStored}"/> 
     119                                        <h:outputText value="Stored Events #{setupService.attachedCapabilities.numberOfAuthenticationsStored}"/> 
    120120                                </h:panelGrid> 
    121121                                <rich:spacer height="15px" /> 
Note: See TracChangeset for help on using the changeset viewer.