Changeset 36653


Ignore:
Timestamp:
2022-09-23T13:38:28+12:00 (11 days ago)
Author:
davidb
Message:

Working through a set of changes where config values need to be expressed in unix (URL, really) format to work with the Java programs that read in the config files

Location:
gs3-extensions/webswing/trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • gs3-extensions/webswing/trunk/build.xml

    r36584 r36653  
    3939  <!-- greenstone3 paths -->
    4040  <property name="gsdl3srchome"     location="${basedir}/../.."/>     <!-- location property creates an absolute path -->
    41   <property name="web.home"         location="${basedir}/../../web"/> <!-- location property creates an absolute path, default if not set with -D argument -->
    42   <property name="web.writablehome" location="${basedir}/../../web"/> <!-- location property creates an absolute path, default if not set with -D argument -->
    43   <property name="web.extdir" value="${web.writablehome}/ext/webswing"/>
    44  
     41  <pathconvert targetos="unix" property="gsdl3srchome.unix">
     42    <path path="${gsdl3srchome}"/>
     43  </pathconvert>
     44
     45  <!-- location property creates an absolute path, default if not set with -D argument -->
     46  <property name="web.home"         location="${basedir}/../../web"/>
     47  <pathconvert targetos="unix" property="web.home.unix">
     48    <path path="${web.home}"/>
     49  </pathconvert>
     50
     51  <!-- location property creates an absolute path, default if not set with -D argument -->
     52  <property name="web.writablehome" location="${basedir}/../../web"/>
     53  <pathconvert targetos="unix" property="web.writablehome.unix">
     54    <path path="${web.writablehome}"/>
     55  </pathconvert>
     56
     57  <property name="web.extdir" value="${web.writablehome.unix}/ext/webswing"/>
     58  <pathconvert targetos="unix" property="web.extdir.unix">
     59    <path path="${web.extdir}"/>
     60  </pathconvert>
     61
    4562  <!-- local ext paths -->
    4663  <loadproperties prefix="gs3." srcFile="${basedir}/../../build.properties"/>
     
    105122    </if>
    106123    <if>
    107       <bool><not><available file="${web.extdir}/etc" type="dir"/></not></bool>       
    108       <echo>Creating web extension directory: ${web.extdir}/etc</echo>
    109       <mkdir dir="${web.extdir}/etc"/>
     124      <bool><not><available file="${web.extdir.unix}/etc" type="dir"/></not></bool>       
     125      <echo>Creating web extension directory: ${web.extdir.unix}/etc</echo>
     126      <mkdir dir="${web.extdir.unix}/etc"/>
    110127    </if>
    111128
     
    113130      <sequential>
    114131    <echo message="Installing ${basedir}/web/etc/@{configFile}.in"/>
    115     <copy file="${basedir}/web/etc/@{configFile}.in" tofile="${web.extdir}/etc/@{configFile}.in" overwrite="true" />
     132    <copy file="${basedir}/web/etc/@{configFile}.in" tofile="${web.extdir.unix}/etc/@{configFile}.in" overwrite="true" />
    116133      </sequential>
    117134    </for>
     
    144161    <for param="configFile" list="${etc-config-files}">
    145162      <sequential>
    146     <echo message="Configuring ${web.extdir}/etc/@{configFile}"/> 
    147     <copy file="${web.extdir}/etc/@{configFile}.in" tofile="${web.extdir}/etc/@{configFile}" filtering="true" overwrite="true">
     163    <echo message="Configuring ${web.extdir.unix}/etc/@{configFile}"/> 
     164    <copy file="${web.extdir.unix}/etc/@{configFile}.in" tofile="${web.extdir.unix}/etc/@{configFile}" filtering="true" overwrite="true">
    148165      <filterset>
    149166        <filter token="gsdl3srchome" value="${gsdl3srchome}"/>
     167        <filter token="gsdl3srchomeunix" value="${gsdl3srchome.unix}"/>
    150168      </filterset>
    151169    </copy>
     
    171189    <echo>Removing 'webswing' from ${web.extdir}</echo>
    172190    <echo>
    173        delete failonerror="false" includeEmptyDirs="true" dir="${web.extdir}/webswing"
     191       delete failonerror="false" includeEmptyDirs="true" dir="${web.extdir.unix}/webswing"
    174192    </echo>
    175193  </target>
  • gs3-extensions/webswing/trunk/web/etc/catalina-opts-extra.args.in

    r36631 r36653  
    1 -Dwebswing.warLocation="@gsdl3srchome@/packages/tomcat/webapps/webswing-server.war" -Dwebswing.configFile="@gsdl3srchome@/web/ext/webswing/etc/webswing.config" -Dwebswing.propertiesFile="@gsdl3srchome@/web/ext/webswing/etc/webswing.properties" -Dwebswing.tempDirBase="@gsdl3srchome@/web/ext/webswing/tmp" -Dwebswing.rootDir="@gsdl3srchome@/web/ext/webswing"
     1-Dwebswing.warLocation="@gsdl3srchomeunix@/packages/tomcat/webapps/webswing-server.war" -Dwebswing.configFile="@gsdl3srchomeunix@/web/ext/webswing/etc/webswing.config" -Dwebswing.propertiesFile="@gsdl3srchomeunix@/web/ext/webswing/etc/webswing.properties" -Dwebswing.tempDirBase="@gsdl3srchomeunix@/web/ext/webswing/tmp" -Dwebswing.rootDir="@gsdl3srchomeunix@/web/ext/webswing"
  • gs3-extensions/webswing/trunk/web/etc/webswing.config.in

    r36504 r36653  
    5858      "launcherConfig" : {
    5959        "mainClass" : "org.greenstone.gatherer.GathererProg",
    60     "args": "-gsdl @gsdl3srchome@/gs2build -gsdlos linux -gsdl3 @gsdl3srchome@/web -gsdl3src @gsdl3srchome@"
     60    "args": "-gsdl @gsdl3srchomeunix@/gs2build -gsdlos linux -gsdl3 @gsdl3srchomeunix@/web -gsdl3src @gsdl3srchomeunix@"
    6161      },
    62       "homeDir" : "@gsdl3srchome@/gli"
     62      "homeDir" : "@gsdl3srchomeunix@/gli"
    6363    },
    6464    "maxClients" : 1,
     
    6767    "sessionMode" : "CONTINUE_FOR_BROWSER",
    6868    "uploadMaxSize" : 5,
    69     "webHomeDir" : "@gsdl3srchome@/gli"
     69    "webHomeDir" : "@gsdl3srchomeunix@/gli"
    7070  }
    7171}
  • gs3-extensions/webswing/trunk/web/etc/webswing.properties.in

    r36490 r36653  
    1111#Custom ssl context configuration for websocket connection to Webswing server
    1212webswing.server.websocket.truststore.type = jks
    13 webswing.server.websocket.truststore = @gsdl3srchome@/web/ext/webswing/ssl/gs3-webswing-truststore.jks
     13webswing.server.websocket.truststore = @gsdl3srchomeunix@/web/ext/webswing/ssl/gs3-webswing-truststore.jks
    1414webswing.server.websocket.truststore.password = 123123
    1515webswing.server.websocket.hostnameVerifier.disabled = true
Note: See TracChangeset for help on using the changeset viewer.