Changeset 1728 for raptor-distribution


Ignore:
Timestamp:
03/27/14 15:05:06 (5 years ago)
Author:
rhyssmith
Message:

Adding raptor-mua v1.1.4 MSI sources

Location:
raptor-distribution/MSIs/raptor-mua/trunk
Files:
4 added
3 deleted
7 edited

Legend:

Unmodified
Added
Removed
  • raptor-distribution/MSIs/raptor-mua/trunk/frag-mua-libdir.wxs

    r1726 r1728  
    1 <?xml version="1.0" encoding="utf-8"?> 
     1<?xml version="1.0" encoding="utf-8"?> 
    22<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> 
    33    <Fragment> 
     
    283283                    <File Id="fil5FA543379BC30DB8612C7A2FDB310293" KeyPath="yes" Source="source\mua\lib\quartz-1.8.4.jar" /> 
    284284                </Component> 
    285                 <Component Id="cmp2113FABB0A1B1943F67A7964FB077630" Guid="*"> 
    286                     <File Id="fil514C5BACC7FC50DAA0609C277A0ABB37" KeyPath="yes" Source="source\mua\lib\raptor-client-1.1.1.jar" /> 
    287                 </Component> 
    288                 <Component Id="cmpF48F09B78A1F886061EC7304D40F7028" Guid="*"> 
    289                     <File Id="filA49942148B3003F6E810ACC252E9A811" KeyPath="yes" Source="source\mua\lib\raptor-information-model-1.1.1.jar" /> 
    290                 </Component> 
    291                 <Component Id="cmp00CFC84A876774081A1B2058E3141ED8" Guid="*"> 
    292                     <File Id="filED49A9512FEDCFE24BF060FF5F03A9FC" KeyPath="yes" Source="source\mua\lib\raptor-parse-1.1.0.jar" /> 
     285                <Component Id="cmp32B56E23D29286F0A889AFA26C232840" Guid="*"> 
     286                    <File Id="fil4DC139D5802EFC3B71FC89CFE64248F9" KeyPath="yes" Source="source\mua\lib\raptor-client-1.1.4.jar" /> 
     287                </Component> 
     288                <Component Id="cmp76F921F06C32C0679B275FAC09406A25" Guid="*"> 
     289                    <File Id="filD643A4896FD3A70063C338FA00DEA962" KeyPath="yes" Source="source\mua\lib\raptor-information-model-1.1.2.jar" /> 
     290                </Component> 
     291                <Component Id="cmp1991F0DA4FA94A5F27006BC1ED4B8906" Guid="*"> 
     292                    <File Id="filC3DCD7B72650567A28D205C587B097A0" KeyPath="yes" Source="source\mua\lib\raptor-parse-1.1.1.jar" /> 
    293293                </Component> 
    294294                <Component Id="cmp4723F5AA79924F806CCE5754252DC0BC" Guid="*"> 
     
    369369                <Component Id="cmpDE409A606E5B5AEABB5D4B6BFF05CE29" Guid="*"> 
    370370                    <File Id="filF0A9F197C86679152E00AFA964414058" KeyPath="yes" Source="source\mua\lib\wagon-provider-api-1.0-beta-2.jar" /> 
     371                </Component> 
     372                <Component Id="cmp9EC581054B75BEE3ECF6FB3CF23A2CA2" Guid="*"> 
     373                    <File Id="fil166D4B6325475FE422E907A962C69DD7" KeyPath="yes" Source="source\mua\lib\wrapper.jar" /> 
    371374                </Component> 
    372375                <Component Id="cmpD396DFCDCCCD7E03FBCFE5FD8D26297F" Guid="*"> 
     
    513516            <ComponentRef Id="cmpF4BA7EF5F3A07258B418B77775994BBA" /> 
    514517            <ComponentRef Id="cmp59B8D543587394FDCEC6854AAD0F8CEB" /> 
    515             <ComponentRef Id="cmp2113FABB0A1B1943F67A7964FB077630" /> 
    516             <ComponentRef Id="cmpF48F09B78A1F886061EC7304D40F7028" /> 
    517             <ComponentRef Id="cmp00CFC84A876774081A1B2058E3141ED8" /> 
     518            <ComponentRef Id="cmp32B56E23D29286F0A889AFA26C232840" /> 
     519            <ComponentRef Id="cmp76F921F06C32C0679B275FAC09406A25" /> 
     520            <ComponentRef Id="cmp1991F0DA4FA94A5F27006BC1ED4B8906" /> 
    518521            <ComponentRef Id="cmp4723F5AA79924F806CCE5754252DC0BC" /> 
    519522            <ComponentRef Id="cmp7D713A85E53D04F783CBB38D3966058F" /> 
     
    542545            <ComponentRef Id="cmpCE18CB3838A535BE1AFB8170175A4D97" /> 
    543546            <ComponentRef Id="cmpDE409A606E5B5AEABB5D4B6BFF05CE29" /> 
     547            <ComponentRef Id="cmp9EC581054B75BEE3ECF6FB3CF23A2CA2" /> 
    544548            <ComponentRef Id="cmpD396DFCDCCCD7E03FBCFE5FD8D26297F" /> 
    545549            <ComponentRef Id="cmpA45BD75B46A09C0691C5D43AD75F21E8" /> 
  • raptor-distribution/MSIs/raptor-mua/trunk/raptor-mua.wxs

    r1726 r1728  
    88      Language='1033'  
    99      Codepage='1252' 
    10       Version='1.1.1'> 
     10      Version='1.1.4'> 
    1111 
    1212        <Package Id='*' 
    1313          Description='Raptor MUA' 
    14           Comments='Raptor MUA v1.1.1' 
     14          Comments='Raptor MUA v1.1.4' 
    1515          Manufacturer='Cardiff University' 
    1616          InstallerVersion='301' 
     
    5151        <InstallExecuteSequence>  
    5252            <Custom Action='SetINSTALLING' After='FindRelatedProducts'><![CDATA[NOT Installed AND NOT WIX_UPGRADE_DETECTED <>""]]></Custom>  
    53             <Custom Action='SetUPGRADING' After='SetINSTALLING'><![CDATA[WIX_UPGRADE_DETECTED <>""]]></Custom>  
     53            <Custom Action='SetUPGRADING' After='SetINSTALLING'><![CDATA[WIX_UPGRADE_DETECTED <>"" OR UPGRADINGPRODUCTCODE <>""]]></Custom>  
    5454            <Custom Action='SetUNINSTALLING' After='SetUPGRADING'><![CDATA[(REMOVE="feaRaptorMua,Complete" OR REMOVE="ALL") AND NOT UPGRADING]]></Custom> 
    5555        </InstallExecuteSequence> 
     
    5757        <InstallUISequence>  
    5858            <Custom Action='SetINSTALLING' After='FindRelatedProducts'><![CDATA[NOT Installed AND NOT WIX_UPGRADE_DETECTED <>""]]></Custom>  
    59             <Custom Action='SetUPGRADING' After='SetINSTALLING'><![CDATA[WIX_UPGRADE_DETECTED <>""]]></Custom>  
     59            <Custom Action='SetUPGRADING' After='SetINSTALLING'><![CDATA[WIX_UPGRADE_DETECTED <>"" OR UPGRADINGPRODUCTCODE <>""]]></Custom>  
    6060            <Custom Action='SetUNINSTALLING' After='SetUPGRADING'><![CDATA[(REMOVE="feaRaptorMua,Complete" OR REMOVE="ALL") AND NOT UPGRADING]]></Custom> 
    6161        </InstallUISequence> 
     
    133133 
    134134        <Feature Id='Complete' 
    135           Title='Raptor MUA v1.1.1' 
     135          Title='Raptor MUA v1.1.4' 
    136136          Description='The complete package for the Raptor MUA.' 
    137137          Display='expand' 
     
    139139          ConfigurableDirectory='RAPTORDIR'> 
    140140       
    141             <Feature Id='feaRaptorMua' Title='Raptor MUA v1.1.1' Description='Raptor MUA v1.1.1' Level='1' AllowAdvertise='no' Absent='disallow'> 
     141            <Feature Id='feaRaptorMua' Title='Raptor MUA v1.1.4' Description='Raptor MUA v1.1.4' Level='1' AllowAdvertise='no' Absent='disallow'> 
    142142                <ComponentGroupRef Id='cgrRaptorMuaRoot' /> 
    143143                <ComponentGroupRef Id='cgrRaptorMuaBatchImport' /> 
     
    169169        <CustomAction Id='RestartMuaService' FileKey='filRaptorMuaBinMuaBat' ExeCommand='restart' /> 
    170170 
    171         <!-- Horrible hack. When upgrading, the restarting happens twice. So this stops it happening the first time... --> 
    172         <CustomAction Id='SetAlreadyRun' Property='AlreadyRun' Value='true' />  
    173  
    174171 
    175172        <!-- When installing, install service and start it --> 
     
    187184        <!-- When upgrading, restart service (the second time this part of the IES happens) --> 
    188185        <InstallExecuteSequence> 
    189             <Custom Action='RestartMuaService' After='StartServices'>UPGRADING AND AlreadyRun</Custom> 
    190             <Custom Action='SetAlreadyRun' After='RestartMuaService'>UPGRADING</Custom> 
     186            <Custom Action='RestartMuaService' After='StartServices'><![CDATA[UPGRADINGPRODUCTCODE <>""]]></Custom> 
    191187        </InstallExecuteSequence> 
    192188 
  • raptor-distribution/MSIs/raptor-mua/trunk/source/mua/conf/batch-event-parse.xml

    r1726 r1728  
    105105                    <property name="eventHandler"><ref bean="memoryEventHandler"></ref></property> 
    106106                    <property name="eventTypeFriendlyName"> 
    107                        <value>Shibboleth 2.4 or earlier SP</value> 
     107                       <value>Shibboleth SP LT2.4</value> 
    108108                    </property> 
    109109                    <property name="format"> 
     
    134134                                        <property name="eventHandler"><ref bean="memoryEventHandler"></ref></property> 
    135135                                        <property name="eventTypeFriendlyName"> 
    136                        <value>Shibboleth 2 IdP</value> 
     136                       <value>Shibboleth 2</value> 
    137137                    </property> 
    138138                                        <property name="format"> 
  • raptor-distribution/MSIs/raptor-mua/trunk/source/mua/conf/event-release.xml

    r1726 r1728  
    6060                        </bean> 
    6161                </property> 
     62        <property name="allowedClassTypes"> 
     63            <list> 
     64                <value type="java.lang.Class">uk.ac.cardiff.model.event.ShibbolethIdpAuthenticationEvent</value> 
     65                <value type="java.lang.Class">uk.ac.cardiff.model.event.ShibbolethSpAuthenticationEvent</value> 
     66                <value type="java.lang.Class">uk.ac.cardiff.model.event.EzproxyAuthenticationEvent</value> 
     67                <value type="java.lang.Class">uk.ac.cardiff.model.event.RadiusAuthenticationEvent</value> 
     68                <value type="java.lang.Class">uk.ac.cardiff.model.event.AuthenticationEvent</value> 
     69            </list> 
     70        </property> 
    6271        </bean> 
    6372 
     
    98107        </bean> 
    99108 
    100         <!--  policy for release of events. Every 5000 events or every 12 hours. Max event push size is < 10,000 records --> 
     109        <!--  policy for release of events. Every 2000 events or every 12 hours. Max event push size is < 10,000 records --> 
    101110 
    102111        <bean id="entryNoElapsedTimePushPolicy" 
    103112                class="uk.ac.cardiff.raptor.remoting.policy.EntryNoElapsedTimePushPolicy"> 
    104113                <property name="pushOnOrAfterNoEntries"> 
    105                         <value>5000</value> 
     114                        <value>2000</value> 
    106115                </property> 
    107116                <property name="pushInterval"> 
  • raptor-distribution/MSIs/raptor-mua/trunk/source/mua/conf/mua-core.xml

    r1726 r1728  
    1818 
    1919    <!-- WEB SERVICE ENDPOINT INTERFACE (SEI) SETUP --> 
    20     <jaxws:endpoint id="muaEndpoint"  
    21             implementor="#muaEndpointInterface" address="/MultiUnitAggregator"> 
     20    <jaxws:endpoint id="muaEndpoint" implementor="#muaEndpointInterface" address="/MultiUnitAggregator"> 
    2221        <jaxws:serviceFactory> 
    2322            <ref bean='jaxws-and-aegis-service-factory' /> 
     
    3231        </property> 
    3332    </bean> 
    34      
     33 
    3534    <!-- Types of events supported in this system, removing need for reflection (as this becomes to difficult to manage) --> 
    3635    <bean id="registeredConcreteEventTypes" class="uk.ac.cardiff.raptor.registry.EventTypeRegistry"> 
     
    3837            <list> 
    3938                <bean class="uk.ac.cardiff.raptor.registry.RegisteredEventType"> 
    40                     <property name="eventType"> <value type="java.lang.Class">uk.ac.cardiff.model.event.ShibbolethIdpAuthenticationEvent</value></property> 
    41                     <property name="concrete" value="true"/> 
    42                 </bean> 
    43                 <bean class="uk.ac.cardiff.raptor.registry.RegisteredEventType"> 
    44                     <property name="eventType"> <value type="java.lang.Class" >uk.ac.cardiff.model.event.ShibbolethSpAuthenticationEvent</value></property> 
    45                     <property name="concrete" value="true"/> 
    46                 </bean> 
    47                 <bean class="uk.ac.cardiff.raptor.registry.RegisteredEventType"> 
    48                     <property name="eventType"> <value type="java.lang.Class">uk.ac.cardiff.model.event.EzproxyAuthenticationEvent</value></property>                     
    49                     <property name="concrete" value="true"/> 
    50                 </bean> 
    51                  <bean class="uk.ac.cardiff.raptor.registry.RegisteredEventType"> 
    52                     <property name="eventType"> <value type="java.lang.Class">uk.ac.cardiff.model.event.RadiusAuthenticationEvent</value></property>                     
    53                     <property name="concrete" value="true"/> 
    54                 </bean> 
    55                 <bean class="uk.ac.cardiff.raptor.registry.RegisteredEventType"> 
    56                     <property name="eventType"> <value type="java.lang.Class">uk.ac.cardiff.model.event.AuthenticationEvent</value></property>                     
    57                     <property name="concrete" value="false"/> 
    58                 </bean> 
    59                 <bean class="uk.ac.cardiff.raptor.registry.RegisteredEventType"> 
    60                     <property name="eventType"> <value type="java.lang.Class">uk.ac.cardiff.model.event.Event</value></property>                     
    61                     <property name="concrete" value="false"/> 
     39                    <property name="eventType"> 
     40                        <value type="java.lang.Class">uk.ac.cardiff.model.event.ShibbolethIdpAuthenticationEvent</value> 
     41                    </property> 
     42                    <property name="concrete" value="true" /> 
     43                </bean> 
     44                <bean class="uk.ac.cardiff.raptor.registry.RegisteredEventType"> 
     45                    <property name="eventType"> 
     46                        <value type="java.lang.Class">uk.ac.cardiff.model.event.ShibbolethSpAuthenticationEvent 
     47                        </value> 
     48                    </property> 
     49                    <property name="concrete" value="true" /> 
     50                </bean> 
     51                <bean class="uk.ac.cardiff.raptor.registry.RegisteredEventType"> 
     52                    <property name="eventType"> 
     53                        <value type="java.lang.Class">uk.ac.cardiff.model.event.EzproxyAuthenticationEvent</value> 
     54                    </property> 
     55                    <property name="concrete" value="true" /> 
     56                </bean> 
     57                <bean class="uk.ac.cardiff.raptor.registry.RegisteredEventType"> 
     58                    <property name="eventType"> 
     59                        <value type="java.lang.Class">uk.ac.cardiff.model.event.RadiusAuthenticationEvent</value> 
     60                    </property> 
     61                    <property name="concrete" value="true" /> 
     62                </bean> 
     63                <bean class="uk.ac.cardiff.raptor.registry.RegisteredEventType"> 
     64                    <property name="eventType"> 
     65                        <value type="java.lang.Class">uk.ac.cardiff.model.event.AuthenticationEvent</value> 
     66                    </property> 
     67                    <property name="concrete" value="false" /> 
     68                </bean> 
     69                <bean class="uk.ac.cardiff.raptor.registry.RegisteredEventType"> 
     70                    <property name="eventType"> 
     71                        <value type="java.lang.Class">uk.ac.cardiff.model.event.Event</value> 
     72                    </property> 
     73                    <property name="concrete" value="false" /> 
    6274                </bean> 
    6375            </list> 
     
    129141                    </property> 
    130142                </bean> 
     143                <bean id="shibSp24BelowUploadDirectory" class="uk.ac.cardiff.raptormua.upload.UploadDirectory"> 
     144                    <property name="allowedFileExtensions"> 
     145                        <list> 
     146                            <value>txt</value> 
     147                            <value>log</value> 
     148                        </list> 
     149                    </property> 
     150                    <property name="uploadDirectory" value="/opt/raptor/mua/batchimport/shibsp_upto24/" /> 
     151                    <property name="eventType"> 
     152                        <value>SHIBBOLETHSP24</value> 
     153                    </property> 
     154                </bean> 
    131155                <bean id="ezproxyUploadDirectory" class="uk.ac.cardiff.raptormua.upload.UploadDirectory"> 
    132156                    <property name="allowedFileExtensions"> 
     
    148172    <bean id="MUAEngine" class="uk.ac.cardiff.raptormua.engine.MUAEngine"> 
    149173        <property name="eventReleaseClient"> 
    150             <ref bean="eventReleaseClient"/> 
     174            <ref bean="eventReleaseClient" /> 
    151175        </property> 
    152176        <property name="eventTypeRegistry"> 
    153             <ref bean="registeredConcreteEventTypes"/> 
     177            <ref bean="registeredConcreteEventTypes" /> 
    154178        </property> 
    155179        <property name="statisticsHandler"> 
     
    176200    </bean> 
    177201 
    178    <bean id="capabilitiesConstructor" class="uk.ac.cardiff.raptormua.engine.CapabilitiesConstructor"> 
    179          <property name="statisticsHandler"> 
     202    <bean id="capabilitiesConstructor" class="uk.ac.cardiff.raptormua.engine.CapabilitiesConstructor"> 
     203        <property name="statisticsHandler"> 
    180204            <ref bean="statisticalUnits" /> 
    181205        </property> 
     
    183207            <ref bean="storageEngine"></ref> 
    184208        </property> 
    185          <property name="metadata"> 
     209        <property name="metadata"> 
    186210            <ref bean="MUAMetadata"></ref> 
    187211        </property> 
     
    309333            <ref bean="dataConnectionImpl"></ref> 
    310334        </constructor-arg> 
    311         <!-- <property name="optimiseCountQueries"><value>true</value></property> <property name="countClassNames"> <list>  
    312             <value>ShibbolethIdpAuthenticationEvent</value> <value>EzproxyAuthenticationEvent</value> </list> </property> --> 
     335        <property name="optimiseCountQueries"> 
     336            <value>true</value> 
     337        </property> 
     338        <property name="countClassNames"> 
     339            <list> 
     340                <value>ShibbolethIdpAuthenticationEvent</value> 
     341                <value>EzproxyAuthenticationEvent</value> 
     342                <value>ShibbolethSpAuthenticationEvent</value> 
     343            </list> 
     344        </property> 
    313345    </bean> 
    314346 
Note: See TracChangeset for help on using the changeset viewer.