Changeset 786


Ignore:
Timestamp:
05/12/11 19:06:33 (8 years ago)
Author:
philsmart
Message:
 
Location:
raptor-web/trunk/src/main
Files:
3 edited

Legend:

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

    r724 r786  
    1414/** 
    1515 * @author philsmart 
    16  *  
     16 * 
    1717 */ 
    1818public class MUARegistry { 
     
    3535    } 
    3636 
    37     public List<MUAEntry> getUAEntries() { 
     37    public List<MUAEntry> getMUAEntries() { 
    3838        return MUAEntries; 
    3939    } 
  • raptor-web/trunk/src/main/java/uk/ac/cardiff/raptorweb/engine/RaptorWebEngine.java

    r762 r786  
    6161     */ 
    6262    private RaptorWebEngine(ServiceEndpointClient serviceEndpointClient){ 
    63         //TODO initialise all values after spring bean creation, 
    6463        this.serviceEndpointClient = serviceEndpointClient; 
    6564    } 
     
    6968     */ 
    7069    public List getAttached() { 
    71  
    72         return registry.getUAEntries(); 
     70        return registry.getMUAEntries(); 
    7371    } 
    7472 
    7573    public void setRegistry(MUARegistry registry) { 
    7674        this.registry = registry; 
    77         for (MUAEntry entry : registry.getUAEntries()){ 
     75        for (MUAEntry entry : registry.getMUAEntries()){ 
    7876            if (entry.getIsAttached()) setAttached(entry); 
    7977        } 
     
    114112                attached =attachedMUA; 
    115113            } 
    116             for (MUAEntry entry : registry.getUAEntries()) { 
     114            for (MUAEntry entry : registry.getMUAEntries()) { 
    117115                if (entry.getIsAttached()) { 
    118116                    attached = entry; 
     
    142140 
    143141    public MUAEntry getCurrentlyAttached() { 
    144         for (MUAEntry entry : registry.getUAEntries()) { 
     142        for (MUAEntry entry : registry.getMUAEntries()) { 
    145143            if (entry.getIsAttached()) { 
    146144                return entry; 
  • raptor-web/trunk/src/main/webapp/WEB-INF/config/web-setup.xml

    r768 r786  
    1212                                <bean id="cardiffShibMUA" class="uk.ac.cardiff.raptorweb.model.MUAEntry"> 
    1313                                        <property name="serviceEndpoint"><value>https://localhost:8443/MUA/MultiUnitAggregator</value></property> 
    14                                         <property name="isAttached" value="true"></property> 
     14                                        <property name="isAttached" value="false"></property> 
    1515                                        <property name="publicKey"><value>/Users/philsmart/Documents/Java/RaptorWorkspace/keys/raptor.jks</value></property> 
    1616                    <property name="publicKeyPassword"><value>phil11</value></property> 
    1717                                </bean> 
     18                                <bean id="cardiffShib2MUA" class="uk.ac.cardiff.raptorweb.model.MUAEntry"> 
     19                    <property name="serviceEndpoint"><value>https://localhost:8444/MUA/MultiUnitAggregator</value></property> 
     20                    <property name="isAttached" value="true"></property> 
     21                    <property name="publicKey"><value>/Users/philsmart/Documents/Java/RaptorWorkspace/keys/raptor.jks</value></property> 
     22                    <property name="publicKeyPassword"><value>phil11</value></property> 
     23                </bean> 
    1824                        </list> 
    1925                </property> 
Note: See TracChangeset for help on using the changeset viewer.