Changeset 1714 for raptor-distribution


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

Adding raptor-ica v1.1.2 MSI sources

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

Legend:

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

    r1712 r1714  
    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> 
     
    226226                    <File Id="filC6ADFA475B56ADA4686C48EB66DD23DA" KeyPath="yes" Source="source\ica\lib\quartz-1.8.0.jar" /> 
    227227                </Component> 
    228                 <Component Id="cmp667FC812916FF2145C0600DAF7F76E19" Guid="*"> 
    229                     <File Id="filCA368D9A6FB09F373AF8811A8322A328" KeyPath="yes" Source="source\ica\lib\raptor-client-1.1.0.jar" /> 
    230                 </Component> 
    231                 <Component Id="cmpD72F4AE3406FEE83D83A4C8152599EA4" Guid="*"> 
    232                     <File Id="fil36ABB53B7459F16D61E1FC1978356AD6" KeyPath="yes" Source="source\ica\lib\raptor-information-model-1.1.0.jar" /> 
    233                 </Component> 
    234                 <Component Id="cmpAA00399AE66E369EDBD7AECE81F726EA" Guid="*"> 
    235                     <File Id="fil6A200FCDF5D6831563AED2CDE6ECCF98" KeyPath="yes" Source="source\ica\lib\raptor-parse-1.1.0.jar" /> 
     228                <Component Id="cmp2AC7B42CAFD7528F2D500A0355818329" Guid="*"> 
     229                    <File Id="fil8E424E085E57D3E32E4E305E8038C8F0" KeyPath="yes" Source="source\ica\lib\raptor-client-1.1.2.jar" /> 
     230                </Component> 
     231                <Component Id="cmp9CC40435D6C9EA7B178470C6AE8D4775" Guid="*"> 
     232                    <File Id="fil9C792D570ACD19490764312066BB428C" KeyPath="yes" Source="source\ica\lib\raptor-information-model-1.1.2.jar" /> 
     233                </Component> 
     234                <Component Id="cmpE0104DA757288CD43EE21D2635B6A573" Guid="*"> 
     235                    <File Id="fil37F66CBC7F701A47B0B82C5AEDE97CEC" KeyPath="yes" Source="source\ica\lib\raptor-parse-1.1.1.jar" /> 
    236236                </Component> 
    237237                <Component Id="cmp1DCB33D11ECE7FCD8E620951F799DCEA" Guid="*"> 
     
    306306                <Component Id="cmp7DB059958FC245B0D719187E499E576A" Guid="*"> 
    307307                    <File Id="fil9C1A1E8847993A5176A81E202B53758B" KeyPath="yes" Source="source\ica\lib\wagon-provider-api-1.0-beta-2.jar" /> 
     308                </Component> 
     309                <Component Id="cmp79FFBC564442CEEF1529BD648AB17CDB" Guid="*"> 
     310                    <File Id="filEC8B2F15E24FDDD1A8F054282F40A94F" KeyPath="yes" Source="source\ica\lib\wrapper.jar" /> 
    308311                </Component> 
    309312                <Component Id="cmp1EE7EFCD9C74D3F9925992F835D337C9" Guid="*"> 
     
    431434            <ComponentRef Id="cmp0E2501CD4945D223098710C9EE25A00D" /> 
    432435            <ComponentRef Id="cmp944386478C8DFCB6B3E65989A6E14344" /> 
    433             <ComponentRef Id="cmp667FC812916FF2145C0600DAF7F76E19" /> 
    434             <ComponentRef Id="cmpD72F4AE3406FEE83D83A4C8152599EA4" /> 
    435             <ComponentRef Id="cmpAA00399AE66E369EDBD7AECE81F726EA" /> 
     436            <ComponentRef Id="cmp2AC7B42CAFD7528F2D500A0355818329" /> 
     437            <ComponentRef Id="cmp9CC40435D6C9EA7B178470C6AE8D4775" /> 
     438            <ComponentRef Id="cmpE0104DA757288CD43EE21D2635B6A573" /> 
    436439            <ComponentRef Id="cmp1DCB33D11ECE7FCD8E620951F799DCEA" /> 
    437440            <ComponentRef Id="cmp752158F35F65FEF6A6161B006F66C8A1" /> 
     
    458461            <ComponentRef Id="cmpD39DA2558A36B4F447189E7B35692C90" /> 
    459462            <ComponentRef Id="cmp7DB059958FC245B0D719187E499E576A" /> 
     463            <ComponentRef Id="cmp79FFBC564442CEEF1529BD648AB17CDB" /> 
    460464            <ComponentRef Id="cmp1EE7EFCD9C74D3F9925992F835D337C9" /> 
    461465            <ComponentRef Id="cmp2E1AD8CAB2670F3BFE81FB292C2C9F6C" /> 
  • raptor-distribution/MSIs/raptor-ica/trunk/raptor-ica.wxs

    r1712 r1714  
    22<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'> 
    33 
    4     <Product Id='ae11422f-57a8-43e4-a12f-dd6838311631' 
     4    <Product Id='4f83f260-67dc-4d60-8a10-762670e3cf4b' 
    55      Name='Raptor ICA' 
    66      UpgradeCode='e5f71481-37a7-44ac-b315-7285a97561b4' 
     
    88      Language='1033'  
    99      Codepage='1252' 
    10       Version='1.1.0'> 
     10      Version='1.1.2'> 
    1111 
    1212        <Package Id='*' 
    1313          Description='Raptor ICA' 
    14           Comments='Raptor ICA v1.1.0' 
     14          Comments='Raptor ICA v1.1.2' 
    1515          Manufacturer='Cardiff University' 
    1616          InstallerVersion='301' 
     
    5050 
    5151        <InstallExecuteSequence> 
    52             <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>  
     52            <Custom Action='SetINSTALLING' After='FindRelatedProducts'><![CDATA[NOT Installed AND NOT 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="feaRaptorIca,Complete" OR REMOVE="ALL") AND NOT UPGRADING]]></Custom> 
    5555        </InstallExecuteSequence> 
    5656 
    57         <InstallUISequence>  
    58             <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>  
     57        <InstallUISequence> 
     58            <Custom Action='SetINSTALLING' After='FindRelatedProducts'><![CDATA[NOT Installed AND NOT 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="feaRaptorIca,Complete" OR REMOVE="ALL") AND NOT UPGRADING]]></Custom> 
    6161        </InstallUISequence> 
     
    133133 
    134134        <Feature Id='Complete' 
    135           Title='Raptor ICA v1.1.0' 
     135          Title='Raptor ICA v1.1.2' 
    136136          Description='The complete package for the Raptor ICA.' 
    137137          Display='expand' 
     
    139139          ConfigurableDirectory='RAPTORDIR'> 
    140140 
    141             <Feature Id='feaRaptorIca' Title='Raptor ICA v1.1.0' Description='Raptor ICA v1.1.0' Level='1' AllowAdvertise='no' Absent='disallow'> 
     141            <Feature Id='feaRaptorIca' Title='Raptor ICA v1.1.2' Description='Raptor ICA v1.1.2' Level='1' AllowAdvertise='no' Absent='disallow'> 
    142142                <ComponentGroupRef Id='cgrRaptorIcaRoot' /> 
    143143                <ComponentGroupRef Id='cgrRaptorIcaBin' /> 
     
    168168        <CustomAction Id='RestartIcaService' FileKey='filRaptorIcaBinIcaBat' ExeCommand='restart' /> 
    169169 
    170         <!-- Horrible hack. When upgrading, the restarting happens twice. So this stops it happening the first time... --> 
    171         <CustomAction Id='SetAlreadyRun' Property='AlreadyRun' Value='true' />  
    172  
    173  
    174170        <!-- When installing, install service and start it --> 
    175171        <InstallExecuteSequence> 
     
    186182        <!-- When upgrading, restart service --> 
    187183        <InstallExecuteSequence> 
    188             <Custom Action='RestartIcaService' After='StartServices'>UPGRADING AND AlreadyRun</Custom> 
    189             <Custom Action='SetAlreadyRun' After='RestartIcaService'>UPGRADING</Custom> 
     184            <Custom Action='RestartIcaService' After='StartServices'><![CDATA[UPGRADINGPRODUCTCODE <>""]]></Custom> 
    190185        </InstallExecuteSequence> 
    191186 
  • raptor-distribution/MSIs/raptor-ica/trunk/source/ica/conf/event-release.xml

    r1706 r1714  
    2424           </bean> 
    2525       </property> 
     26       <property name="allowedClassTypes"> 
     27            <list> 
     28                <value type="java.lang.Class">uk.ac.cardiff.model.event.ShibbolethIdpAuthenticationEvent</value> 
     29                <value type="java.lang.Class">uk.ac.cardiff.model.event.ShibbolethSpAuthenticationEvent</value> 
     30                <value type="java.lang.Class">uk.ac.cardiff.model.event.EzproxyAuthenticationEvent</value> 
     31                <value type="java.lang.Class">uk.ac.cardiff.model.event.RadiusAuthenticationEvent</value> 
     32                <value type="java.lang.Class">uk.ac.cardiff.model.event.AuthenticationEvent</value> 
     33            </list>         
     34       </property> 
    2635    </bean> 
    2736 
     
    3746                            <value type="java.lang.Class">uk.ac.cardiff.model.event.ShibbolethIdpAuthenticationEvent</value> 
    3847                            <value type="java.lang.Class">uk.ac.cardiff.model.event.EzproxyAuthenticationEvent</value> 
     48                            <value type="java.lang.Class">uk.ac.cardiff.model.event.ShibbolethSpAuthenticationEvent</value> 
    3949                        </list> 
    4050                    </property> 
Note: See TracChangeset for help on using the changeset viewer.