Changeset 1724 for raptor-distribution


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

Adding raptor-mua v1.0.1 MSI sources

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

Legend:

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

    r1722 r1724  
    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> 
     
    3131                    <File Id="fil4D9BC576FF4A406E4CA7897D468ACE8F" KeyPath="yes" Source="source\mua\lib\asm-attrs-1.5.3.jar" /> 
    3232                </Component> 
     33                <Component Id="cmp9A65F938D3AF6E51B27166990FD43F33" Guid="*"> 
     34                    <File Id="fil9E96DD2DCD52050B587B3D8C59A24F6E" KeyPath="yes" Source="source\mua\lib\aspectjweaver-1.6.12.jar" /> 
     35                </Component> 
    3336                <Component Id="cmpF23B020EB2A71B7FEBC335920A9ED735" Guid="*"> 
    3437                    <File Id="fil6A9296D3704781683EA24294AC2B8C1B" KeyPath="yes" Source="source\mua\lib\axiom-api-1.2.7.jar" /> 
     
    274277                    <File Id="fil5FA543379BC30DB8612C7A2FDB310293" KeyPath="yes" Source="source\mua\lib\quartz-1.8.4.jar" /> 
    275278                </Component> 
    276                 <Component Id="cmpFE3CBE7D498953BFBC055D1C4A3E9478" Guid="*"> 
    277                     <File Id="fil04C4D888D18F88DCC0603E669C1A3C67" KeyPath="yes" Source="source\mua\lib\raptor-client-1.0.0.jar" /> 
    278                 </Component> 
    279                 <Component Id="cmpB86CFFA5574750D8621F295E1E785464" Guid="*"> 
    280                     <File Id="fil5648EAC7A3672F51EF40302B7EB880A4" KeyPath="yes" Source="source\mua\lib\raptor-information-model-1.0.0.jar" /> 
    281                 </Component> 
    282                 <Component Id="cmp608CF979A36CBE0CA73A7EB9F1A4F076" Guid="*"> 
    283                     <File Id="filC57CA755F08161C7419D3853073AF2A7" KeyPath="yes" Source="source\mua\lib\raptor-parse-1.0.0.jar" /> 
     279                <Component Id="cmp4D7B551DA91A65E0B5006EDE553DD3A8" Guid="*"> 
     280                    <File Id="filFC756918746368CCAB4CD4872918C91F" KeyPath="yes" Source="source\mua\lib\raptor-client-1.0.1.jar" /> 
     281                </Component> 
     282                <Component Id="cmp16A722F6F40A9E1964D2BD8C35411279" Guid="*"> 
     283                    <File Id="filCDDD5C33B17E64C1C4F22A163F89F9D9" KeyPath="yes" Source="source\mua\lib\raptor-information-model-1.0.1.jar" /> 
     284                </Component> 
     285                <Component Id="cmp84E49D8A16019B757CDD9BD097672155" Guid="*"> 
     286                    <File Id="filCE0DC5CC32822D699BA7688C04BDD0A4" KeyPath="yes" Source="source\mua\lib\raptor-parse-1.0.1.jar" /> 
    284287                </Component> 
    285288                <Component Id="cmp4723F5AA79924F806CCE5754252DC0BC" Guid="*"> 
     
    423426            <ComponentRef Id="cmpE5A641A9BD5AFE2E9AD74F4FD33DDEC8" /> 
    424427            <ComponentRef Id="cmpE8AE16F46B5B1DE460C7970D7B3D1948" /> 
     428            <ComponentRef Id="cmp9A65F938D3AF6E51B27166990FD43F33" /> 
    425429            <ComponentRef Id="cmpF23B020EB2A71B7FEBC335920A9ED735" /> 
    426430            <ComponentRef Id="cmp7E548B3C6111C44CF358BFEEFCE0675F" /> 
     
    504508            <ComponentRef Id="cmpF4BA7EF5F3A07258B418B77775994BBA" /> 
    505509            <ComponentRef Id="cmp59B8D543587394FDCEC6854AAD0F8CEB" /> 
    506             <ComponentRef Id="cmpFE3CBE7D498953BFBC055D1C4A3E9478" /> 
    507             <ComponentRef Id="cmpB86CFFA5574750D8621F295E1E785464" /> 
    508             <ComponentRef Id="cmp608CF979A36CBE0CA73A7EB9F1A4F076" /> 
     510            <ComponentRef Id="cmp4D7B551DA91A65E0B5006EDE553DD3A8" /> 
     511            <ComponentRef Id="cmp16A722F6F40A9E1964D2BD8C35411279" /> 
     512            <ComponentRef Id="cmp84E49D8A16019B757CDD9BD097672155" /> 
    509513            <ComponentRef Id="cmp4723F5AA79924F806CCE5754252DC0BC" /> 
    510514            <ComponentRef Id="cmp7D713A85E53D04F783CBB38D3966058F" /> 
  • raptor-distribution/MSIs/raptor-mua/trunk/raptor-mua.wxs

    r1722 r1724  
    22<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'> 
    33 
    4     <Product Id='74df22fa-0028-4de1-93eb-045f552f52bd' 
     4    <Product Id='65a54353-a655-4347-badf-bbe005fdd3bd' 
    55      Name='Raptor MUA' 
    66      UpgradeCode='e5bc6976-ce2f-4a02-9332-47c5f7b3ecc7' 
     
    88      Language='1033'  
    99      Codepage='1252' 
    10       Version='1.0.0'> 
     10      Version='1.0.1'> 
    1111 
    1212        <Package Id='*' 
    1313          Description='Raptor MUA' 
    14           Comments='Raptor MUA v1.0.0' 
     14          Comments='Raptor MUA v1.0.1' 
    1515          Manufacturer='Cardiff University' 
    1616          InstallerVersion='301' 
     
    3636        <!-- Embeds all source into a single .cab file in the MSI --> 
    3737        <Media Id='1' Cabinet='Product.cab' EmbedCab='yes' /> 
     38 
     39 
     40 
     41        <!-- 
     42            ##################################### 
     43            # Figure out what the MSI is doing... 
     44            ##################################### 
     45        --> 
     46 
     47        <CustomAction Id='SetInstalling' Property='Installing' Value='true' />  
     48        <CustomAction Id='SetUpgrading' Property='Upgrading' Value='true' />  
     49        <CustomAction Id='SetUninstalling' Property='Uninstalling' Value='true' /> 
     50 
     51        <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>  
     54            <Custom Action='SetUninstalling' After='SetUpgrading'><![CDATA[(REMOVE="feaRaptorMua,Complete" OR REMOVE="ALL") AND NOT Upgrading]]></Custom> 
     55        </InstallExecuteSequence> 
     56 
     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>  
     60            <Custom Action='SetUninstalling' After='SetUpgrading'><![CDATA[(REMOVE="feaRaptorMua,Complete" OR REMOVE="ALL") AND NOT Upgrading]]></Custom> 
     61        </InstallUISequence> 
    3862 
    3963 
     
    109133 
    110134        <Feature Id='Complete' 
    111           Title='Raptor MUA v1.0.0' 
     135          Title='Raptor MUA v1.0.1' 
    112136          Description='The complete package for the Raptor MUA.' 
    113137          Display='expand' 
     
    115139          ConfigurableDirectory='RAPTORDIR'> 
    116140       
    117             <Feature Id='feaRaptorMua' Title='Raptor MUA v1.0.0' Description='Raptor MUA v1.0.0' Level='1' AllowAdvertise='no' Absent='disallow'> 
     141            <Feature Id='feaRaptorMua' Title='Raptor MUA v1.0.1' Description='Raptor MUA v1.0.1' Level='1' AllowAdvertise='no' Absent='disallow'> 
    118142                <ComponentGroupRef Id='cgrRaptorMuaRoot' /> 
    119143                <ComponentGroupRef Id='cgrRaptorMuaBatchImport' /> 
     
    145169        <CustomAction Id='RestartMuaService' FileKey='filRaptorMuaBinMuaBat' ExeCommand='restart' /> 
    146170 
     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 
     174 
    147175        <!-- When installing, install service and start it --> 
    148176        <InstallExecuteSequence> 
    149             <Custom Action='InstallMuaService' After='InstallFinalize'>NOT Installed</Custom> 
    150             <Custom Action='StartMuaService' After='InstallFinalize'>NOT Installed</Custom> 
     177            <Custom Action='InstallMuaService' After='RunKeytoolExportMuaPublicKey'>Installing</Custom> 
     178            <Custom Action='StartMuaService' After='InstallMuaService'>Installing</Custom> 
    151179        </InstallExecuteSequence> 
    152180 
    153181        <!-- When uninstalling, uninstall service (automagically stops it first) --> 
    154182        <InstallExecuteSequence> 
    155             <Custom Action='UninstallMuaService' Before='UnpublishFeatures'>Installed AND NOT UPGRADINGPRODUCTCODE</Custom> 
    156         </InstallExecuteSequence> 
    157  
    158         <!-- When upgrading, restart service --> 
    159         <InstallExecuteSequence> 
    160             <Custom Action='RestartMuaService' Before='UnpublishFeatures'>Installed AND UPGRADINGPRODUCTCODE</Custom> 
     183            <Custom Action='StopMuaService' After='UnpublishFeatures'>Uninstalling</Custom> 
     184            <Custom Action='UninstallMuaService' After='StopMuaService'>Uninstalling</Custom> 
     185        </InstallExecuteSequence> 
     186 
     187        <!-- When upgrading, restart service (the second time this part of the IES happens) --> 
     188        <InstallExecuteSequence> 
     189            <Custom Action='RestartMuaService' After='StartServices'>Upgrading AND AlreadyRun</Custom> 
     190            <Custom Action='SetAlreadyRun' After='RestartMuaService'>Upgrading</Custom> 
    161191        </InstallExecuteSequence> 
    162192 
     
    180210        <InstallExecuteSequence> 
    181211            <Custom Action='SetKeytoolPath' After='AppSearch'>JAVA_HOME</Custom> 
    182             <Custom Action='RunKeytoolCreateMuaPrivateKey' After='InstallFinalize'>JAVA_HOME And Not Installed</Custom> 
    183             <Custom Action='RunKeytoolExportMuaPublicKey' After='InstallFinalize'>JAVA_HOME And Not Installed</Custom> 
    184         </InstallExecuteSequence>         
     212            <Custom Action='RunKeytoolCreateMuaPrivateKey' After='InstallFinalize'>JAVA_HOME And Installing</Custom> 
     213            <Custom Action='RunKeytoolExportMuaPublicKey' After='RunKeytoolCreateMuaPrivateKey'>JAVA_HOME And Installing</Custom> 
     214        </InstallExecuteSequence> 
    185215 
    186216 
     
    207237   
    208238        <!-- Add/Remove Programs Stuff --> 
    209         <Icon Id='Raptor.ico' SourceFile='source\installer\raptor.ico' /> 
    210         <Property Id='ARPPRODUCTICON' Value='Raptor.ico' /> 
     239        <Icon Id='Raptor.exe' SourceFile='source\installer\raptor.ico' /> 
     240        <Property Id='ARPPRODUCTICON' Value='Raptor.exe' /> 
    211241        <Property Id='ARPHELPLINK' Value='http://iam.cf.ac.uk/Raptor' /> 
    212242 
     
    223253            <DialogRef Id='RaptorMsiDlgMuaMetadata' /> 
    224254 
    225             <Publish Dialog='CustomizeDlg' Control='Next' Event='NewDialog' Value='RaptorMsiDlgMuaMetadata'>1</Publish> 
    226             <Publish Dialog='VerifyReadyDlg' Control='Back' Event='NewDialog' Value='RaptorMsiDlgMuaMetadata'>1</Publish> 
     255            <Publish Dialog='CustomizeDlg' Control='Next' Event='NewDialog' Value='RaptorMsiDlgMuaMetadata'>Installing</Publish> 
     256            <Publish Dialog='VerifyReadyDlg' Control='Back' Event='NewDialog' Value='RaptorMsiDlgMuaMetadata'>Installing</Publish> 
    227257        </UI> 
    228258 
  • raptor-distribution/MSIs/raptor-mua/trunk/source/mua/conf/batch-event-parse-formats-system.xml

    r1722 r1724  
    227227                                <bean class="uk.ac.cardiff.raptor.parse.external.file.format.Header"> 
    228228                                        <property name="fieldName"> 
    229                                                 <value>releasedAttributes</value> 
     229                                                <value>attributes</value> 
    230230                                        </property> 
    231231                                        <property name="fieldNo"> 
     
    241241                <bean class="uk.ac.cardiff.raptor.parse.external.file.format.Header"> 
    242242                                        <property name="fieldName"> 
    243                                                 <value>assertionId</value> 
     243                                                <value>assertions</value> 
    244244                                        </property> 
    245245                                        <property name="fieldNo"> 
  • raptor-distribution/MSIs/raptor-mua/trunk/source/mua/conf/mua-core.xml

    r1722 r1724  
    139139    </bean> 
    140140 
    141     <bean id="capabilitiesConstructor" class="uk.ac.cardiff.raptormua.engine.CapabilitiesConstructor"> 
    142         <property name="cacheEnabled"> 
    143             <value>true</value> 
     141   <bean id="capabilitiesConstructor" class="uk.ac.cardiff.raptormua.engine.CapabilitiesConstructor"> 
     142         <property name="statisticsHandler"> 
     143            <ref bean="statisticalUnits" /> 
     144        </property> 
     145        <property name="storageEngine"> 
     146            <ref bean="storageEngine"></ref> 
     147        </property> 
     148         <property name="metadata"> 
     149            <ref bean="MUAMetadata"></ref> 
    144150        </property> 
    145151        <property name="cacheTimeoutMs"> 
     
    254260    </bean> 
    255261 
    256     <bean name="resourceStorageEngine" class="uk.ac.cardiff.raptor.store.ResourceStorageEngine"> 
     262    <bean name="resourceStorageEngine" class="uk.ac.cardiff.raptor.store.DefaultResourceStorageEngine"> 
    257263        <property name="dataConnection"> 
    258264            <ref bean="dataConnectionImpl" /> 
  • raptor-distribution/MSIs/raptor-mua/trunk/source/mua/conf/statistical-processors.xml

    r1722 r1724  
    4444                                <bean 
    4545                                        class="uk.ac.cardiff.raptormua.engine.statistics.processor.ProcessorTemplate"> 
    46                                         <property name="processorId" value="XValuePercentage"/> 
    47                                         <property name="processorFriendlyName" value="X-Value as Percentages" /> 
     46                                        <property name="processorId" value="YValuePercentage"/> 
     47                                        <property name="processorFriendlyName" value="YValue as Percentage" /> 
    4848                                        <property name="processorClass"> 
    4949                                                <value type="java.lang.Class">uk.ac.cardiff.raptormua.engine.statistics.processor.PercentagePostProcessor 
     
    5353                                <bean 
    5454                                        class="uk.ac.cardiff.raptormua.engine.statistics.processor.ProcessorTemplate"> 
    55                                         <property name="processorId" value="YValueSortAlphabetically"/> 
    56                                         <property name="processorFriendlyName" value="Sort Y-Axis Alphabetically" /> 
     55                                        <property name="processorId" value="XValueSortAlphabetically"/> 
     56                                        <property name="processorFriendlyName" value="Sort X-Axis Alphabetically" /> 
    5757                                        <property name="processorClass"> 
    5858                                                <value type="java.lang.Class">uk.ac.cardiff.raptormua.engine.statistics.processor.SortGroupsAlphabeticallyPostProcessor 
     
    7171                                <bean 
    7272                                        class="uk.ac.cardiff.raptormua.engine.statistics.processor.ProcessorTemplate"> 
    73                                         <property name="processorId" value="XValueSort"/> 
    74                                         <property name="processorFriendlyName" value="Sort X-axis by value" /> 
     73                                        <property name="processorId" value="YValueSort"/> 
     74                                        <property name="processorFriendlyName" value="Sort Y-axis by value" /> 
    7575                                        <property name="processorClass"> 
    7676                                                <value type="java.lang.Class">uk.ac.cardiff.raptormua.engine.statistics.processor.RowSortPostProcessor 
Note: See TracChangeset for help on using the changeset viewer.