Skip to content

Commit a8e3c65

Browse files
Joseph KimGitHub Enterprise
Joseph Kim
authored and
GitHub Enterprise
committed
#Issue 229: Code clean up (#243)
* Code cleanup
1 parent 70ce323 commit a8e3c65

18 files changed

+97
-120
lines changed

‎dev/.gradle-wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-5.0-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

‎dev/ant_build/.project‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

dev/ant_build/build-olt.xml renamed to dev/ant_build/build-mdt.xml

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -7,61 +7,61 @@
77
been deposited with the U.S. Copyright Office.
88
-->
99

10-
<project name="olt_build" default="generateOpenLTUpdateSite">
10+
<project name="mdt_build" default="generateOpenMDTUpdateSite">
1111
<property name="level_tag" value="18.12"/>
1212
<property name="delegate.build.dir" location="${basedir}/../" />
1313
<property name="disable.run.executeMetatypeValidation" value="true"/>
1414
<property name="disable.run.unzipIfixReleaseZip" value="true"/>
1515
<property name="javac.source.file.encoding" value="Cp1252" />
1616
<property name="tools.image" value="true" />
1717

18-
<dirname property="olt_build.basedir" file="${ant.file.olt_build}" />
18+
<dirname property="mdt_build.basedir" file="${ant.file.mdt_build}" />
1919

20-
<import file="${olt_build.basedir}/resources/build_imports/liberty-macros.xml" />
21-
<import file="${olt_build.basedir}/resources/build_imports/liberty-all.xml" />
22-
<import file="${olt_build.basedir}/olt_imports.xml"/>
23-
<import file="${olt_build.basedir}/olt_test_imports.xml"/>
24-
<import file="${olt_build.basedir}/prereqs/prereqs.xml" />
20+
<import file="${mdt_build.basedir}/resources/build_imports/liberty-macros.xml" />
21+
<import file="${mdt_build.basedir}/resources/build_imports/liberty-all.xml" />
22+
<import file="${mdt_build.basedir}/mdt_imports.xml"/>
23+
<import file="${mdt_build.basedir}/mdt_test_imports.xml"/>
24+
<import file="${mdt_build.basedir}/prereqs/prereqs.xml" />
2525

26-
<target name="getOLTBuildLabel" depends="createBuildLabelFile">
27-
<loadproperties srcFile="${olt_build.basedir}/buildLabel.properties"/>
26+
<target name="getMDTBuildLabel" depends="createBuildLabelFile">
27+
<loadproperties srcFile="${mdt_build.basedir}/buildLabel.properties"/>
2828
<echo>Build label is "${buildLabel}"</echo>
2929
</target>
3030

3131
<target name="checkBuildLabelFile" >
32-
<available file="${olt_build.basedir}/buildLabel.properties" property="buildLabel.present"/>
32+
<available file="${mdt_build.basedir}/buildLabel.properties" property="buildLabel.present"/>
3333
</target>
3434

3535
<target name="createBuildLabelFile" depends="checkBuildLabelFile" unless="buildLabel.present">
3636
<tstamp>
3737
<format property="buildLabel" pattern="yyyyMMdd_HHmm" timezone="UTC"/>
3838
</tstamp>
3939

40-
<propertyfile file="${olt_build.basedir}/buildLabel.properties" comment="Creating buildlabel.propertiess">
40+
<propertyfile file="${mdt_build.basedir}/buildLabel.properties" comment="Creating buildlabel.propertiess">
4141
<entry key="buildLabel" value="${buildLabel}"/>
4242
</propertyfile>
4343
</target>
4444

45-
<target name="compile" depends="getOLTBuildLabel, preparePrereqsIvy" unless="${env.skip_compile_olt}">
45+
<target name="compile" depends="getMDTBuildLabel, preparePrereqsIvy" unless="${env.skip_compile_mdt}">
4646
<echo message="Build label is ${buildLabel}"/>
4747
<antcall target="liberty-all.compile" />
48-
<echo message="olt_imports.generateOLTSuppliersUpdateSite call"/>
49-
<antcall target="olt_imports.generateOLTSuppliersUpdateSite"/>
48+
<echo message="mdt_imports.generateMDTSuppliersUpdateSite call"/>
49+
<antcall target="mdt_imports.generateMDTSuppliersUpdateSite"/>
5050
</target>
5151

52-
<property name="artifacts.dir" value="${olt_build.basedir}/artifacts"/>
52+
<property name="artifacts.dir" value="${mdt_build.basedir}/artifacts"/>
5353
<mkdir dir="${artifacts.dir}"/>
5454

55-
<target name="generateOpenLTUpdateSite" depends="getOLTBuildLabel" unless="${env.skip_generate_olt}">
55+
<target name="generateOpenMDTUpdateSite" depends="getMDTBuildLabel" unless="${env.skip_generate_mdt}">
5656
<echo message="Build label is ${buildLabel}"/>
5757

58-
<antcall target="olt_imports.generateOLTSuppliersUpdateSiteRestore"/>
58+
<antcall target="mdt_imports.generateMDTSuppliersUpdateSiteRestore"/>
5959

60-
<antcall target="olt_imports.generateOLTUpdateSite"/>
61-
<!-- <antcall target="olt_test_imports.generateOLTTestUpdateSite"/> -->
60+
<antcall target="mdt_imports.generateMDTUpdateSite"/>
61+
<!-- <antcall target="mdt_test_imports.generateMDTTestUpdateSite"/> -->
6262

6363
<echo message="Delete tools.image"/>
64-
<delete dir="${olt_build.basedir}/tools.image" failonerror="false"/>
64+
<delete dir="${mdt_build.basedir}/tools.image" failonerror="false"/>
6565
</target>
6666

6767
</project>

dev/ant_build/olt_imports.xml renamed to dev/ant_build/mdt_imports.xml

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -7,25 +7,25 @@
77
been deposited with the U.S. Copyright Office.
88
-->
99

10-
<project name="olt_imports">
10+
<project name="mdt_imports">
1111

12-
<dirname property="olt_imports.basedir" file="${ant.file.olt_imports}" />
12+
<dirname property="mdt_imports.basedir" file="${ant.file.mdt_imports}" />
1313

14-
<import file="${olt_imports.basedir}/public_imports/internal_imports/buildtasks.xml" />
15-
<import file="${olt_imports.basedir}/public_imports/updatesite_imports.xml"/>
16-
<import file="olt_suppliers_updatesite.xml"/>
14+
<import file="${mdt_imports.basedir}/public_imports/internal_imports/buildtasks.xml" />
15+
<import file="${mdt_imports.basedir}/public_imports/updatesite_imports.xml"/>
16+
<import file="mdt_suppliers_updatesite.xml"/>
1717

18-
<target name="setOLTUpdateSiteProperties">
18+
<target name="setMDTUpdateSiteProperties">
1919

20-
<echo>Open OLT setOLTUpdateSiteProperties call</echo>
20+
<echo>Open MDT setMDTUpdateSiteProperties call</echo>
2121

2222
<condition property="java.executable" value="java" else="java.exe">
2323
<not>
2424
<os family="windows" />
2525
</not>
2626
</condition>
2727

28-
<property name="local.workspace" location="${olt_imports.basedir}/.."/>
28+
<property name="local.workspace" location="${mdt_imports.basedir}/.."/>
2929
<property name="target.jvm" location="${java.home}/bin/${java.executable}" />
3030
<property name="equinox.launcher" value="org.eclipse.equinox.app_1.3.100.v20120522-1841.jar" />
3131
<property name="delegate.build.dir" location = "${local.workspace}"/>
@@ -49,26 +49,26 @@
4949
</loadresource>
5050

5151
<var name="fileNameVersion" unset="true" />
52-
<property name="fileName" value="microclimate-eclipse-plugin" />
52+
<property name="fileName" value="microclimate-eclipse-tools" />
5353
<property name="fileNameVersion" value="${newVersion}" />
5454
<property name="qualifier" value="${buildLabel}"/>
5555
<property name="updatesite-name" value="${fileName}-${fileNameVersion}.v${qualifier}" />
5656
<property name="metadata-updatesite-name" value="${fileName}-metadata-${fileNameVersion}.v${qualifier}" />
57-
<property name="gen.updatesite.file" location="${olt_imports.basedir}/resources/olt_updatesite-properties/generateP2Metadata.xml" />
57+
<property name="gen.updatesite.file" location="${mdt_imports.basedir}/resources/mdt_updatesite-properties/generateP2Metadata.xml" />
5858
<property name="target.updatesite.repository" location="${updateSiteDir}/repository" />
5959

6060
<mkdir dir="${target.updatesite.repository}"/>
6161

62-
<property name="olt.product.toplevelfeatures.list"
63-
location="olt_product_updatesite_toplevel_features.properties" />
64-
<property name="olt.product.features.list"
65-
location="olt_product_updatesite_features.properties" />
62+
<property name="mdt.product.toplevelfeatures.list"
63+
location="mdt_product_updatesite_toplevel_features.properties" />
64+
<property name="mdt.product.features.list"
65+
location="mdt_product_updatesite_features.properties" />
6666

6767
</target>
6868

69-
<target name="generateOLTUpdateSite" depends="setOLTUpdateSiteProperties">
69+
<target name="generateMDTUpdateSite" depends="setMDTUpdateSiteProperties">
7070

71-
<echo>Call generateOLTUpdateSite...</echo>
71+
<echo>Call generateMDTUpdateSite...</echo>
7272

7373
<!-- Step 1 -->
7474
<!-- Create site.xml with top level feature(s) -->
@@ -84,8 +84,8 @@
8484
description="Tools for working with Microclimate applications in Eclipse">
8585

8686
<!-- Features list file -->
87-
<featuresFile id="Open OLT product updatesite toplevel features"
88-
file="${olt.product.toplevelfeatures.list}" />
87+
<featuresFile id="Open MDT product updatesite toplevel features"
88+
file="${mdt.product.toplevelfeatures.list}" />
8989

9090
</category>
9191
</generateUpdateSite>
@@ -99,8 +99,8 @@
9999
addIncludedFeatures="true">
100100

101101
<!-- Features list file -->
102-
<featuresFile id="Open OLT product updatesite features"
103-
file="${olt.product.features.list}" />
102+
<featuresFile id="Open MDT product updatesite features"
103+
file="${mdt.product.features.list}" />
104104

105105
</generateUpdateSite>
106106

@@ -144,9 +144,9 @@
144144

145145
</target>
146146

147-
<target name="generateOLTSuppliersUpdateSite" depends="setOLTUpdateSiteProperties">
147+
<target name="generateMDTSuppliersUpdateSite" depends="setMDTUpdateSiteProperties">
148148

149-
<echo>Call generateOLTSuppliersUpdateSite...</echo>
149+
<echo>Call generateMDTSuppliersUpdateSite...</echo>
150150
<antcall target="generateSuppliersUpdateSite"/>
151151

152152
<!-- Copy com.ibm.ws.kernel.feature.resolver_*.jar into ${local.workspace}/tools.image/update/plugins to have them signed -->
@@ -158,9 +158,9 @@
158158

159159
</target>
160160

161-
<target name="generateOLTSuppliersUpdateSiteRestore" depends="setOLTUpdateSiteProperties">
161+
<target name="generateMDTSuppliersUpdateSiteRestore" depends="setMDTUpdateSiteProperties">
162162

163-
<echo>Call generateOLTSuppliersUpdateSiteRestore...</echo>
163+
<echo>Call generateMDTSuppliersUpdateSiteRestore...</echo>
164164

165165
<mkdir dir="${local.workspace}/tools.image/update/features"/>
166166
<mkdir dir="${sourceDir}/features"/>

dev/ant_build/olt_product_updatesite_features.properties renamed to dev/ant_build/mdt_product_updatesite_features.properties

File renamed without changes.

dev/ant_build/olt_product_updatesite_toplevel_features.properties renamed to dev/ant_build/mdt_product_updatesite_toplevel_features.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@
77
# been deposited with the U.S. Copyright Office.
88
###############################################################################
99

10-
# MEP product updatesite top level features
10+
# MDT product updatesite top level features
1111
com.ibm.microclimate

dev/ant_build/olt_suppliers_updatesite.xml renamed to dev/ant_build/mdt_suppliers_updatesite.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
been deposited with the U.S. Copyright Office.
88
-->
99

10-
<project name="olt_suppliers_updatesite">
10+
<project name="mdt_suppliers_updatesite">
1111
<!--target name="doGenerateSuppliersUpdateSite"-->
1212
<target name="generateSuppliersUpdateSite">
1313

14-
<property name="gen.suppliers.updatesite.file" location="${basedir}/resources/olt_updatesite-properties/generateSuppliersP2Metadata.xml" />
14+
<property name="gen.suppliers.updatesite.file" location="${basedir}/resources/mdt_updatesite-properties/generateSuppliersP2Metadata.xml" />
1515
<echo message="Script location at ${gen.suppliers.updatesite.file}" />
1616

1717
<property name="suppliersUpdateSiteDir" value="${sourceDir}/suppliers/update-site" />

dev/ant_build/olt_test_imports.xml renamed to dev/ant_build/mdt_test_imports.xml

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,22 +7,22 @@
77
been deposited with the U.S. Copyright Office.
88
-->
99

10-
<project name="olt_test_imports">
10+
<project name="mdt_test_imports">
1111

12-
<dirname property="olt_test_imports.basedir" file="${ant.file.olt_imports}" />
13-
<import file="${olt_test_imports.basedir}/public_imports/updatesite_imports.xml"/>
12+
<dirname property="mdt_test_imports.basedir" file="${ant.file.mdt_imports}" />
13+
<import file="${mdt_test_imports.basedir}/public_imports/updatesite_imports.xml"/>
1414

15-
<target name="generateOLTTestUpdateSite">
15+
<target name="generateMDTTestUpdateSite">
1616

17-
<echo>Open OLT generate Test updateSite call</echo>
17+
<echo>Open MDT generate Test updateSite call</echo>
1818

1919
<condition property="java.executable" value="java" else="java.exe">
2020
<not>
2121
<os family="windows" />
2222
</not>
2323
</condition>
2424

25-
<property name="local.workspace" location="${olt_test_imports.basedir}/.."/>
25+
<property name="local.workspace" location="${mdt_test_imports.basedir}/.."/>
2626
<property name="target.jvm" location="${java.home}/bin/${java.executable}" />
2727
<property name="delegate.build.dir" location = "${local.workspace}"/>
2828

@@ -43,13 +43,13 @@
4343
</filterchain>
4444
</loadresource>
4545
<var name="fileNameVersion" unset="true" />
46-
<property name="fileName" value="microclimate-eclipse-plugin-test" />
46+
<property name="fileName" value="microclimate-eclipse-tools-test" />
4747
<property name="fileNameVersion" value="${newVersion}" />
4848
<property name="qualifier" value="${buildLabel}"/>
4949
<property name="updatesite-test-name" value="${fileName}-${fileNameVersion}.v${qualifier}" />
5050
<property file="${eclipse.properties.file}" />
5151

52-
<property name="gen.updatesite.file" location="${olt_test_imports.basedir}/resources/olt_updatesite-properties/generateP2Metadata.xml" />
52+
<property name="gen.updatesite.file" location="${mdt_test_imports.basedir}/resources/mdt_updatesite-properties/generateP2Metadata.xml" />
5353
<echo message="Script location at ${gen.updatesite.file}" />
5454

5555
<property name="target.updatesite.repository" location="${updateSiteDir}/repository" />
@@ -95,7 +95,7 @@
9595
<category name="was4d"
9696
label="Microclimate Developer Tools V${version} Unit Tests"
9797
description="Microclimate Developer Tools V${version} Unit Tests">
98-
<feature id="com.ibm.ws.st.liberty.tools.test" />
98+
<feature id="com.ibm.microclimate.test" />
9999
</category>
100100
</generateUpdateSite>
101101

@@ -108,8 +108,7 @@
108108
addIncludedFeatures="true">
109109

110110
<!-- Add Main feature here -->
111-
<feature id="com.ibm.ws.st.liberty.tools.test" />
112-
<feature id="com.ibm.xwt.dde.tests.feature"/>
111+
<feature id="com.ibm.microclimate.test" />
113112
</generateUpdateSite>
114113

115114
<!-- Step 3 -->

‎dev/ant_build/prereqs/ivysettings-remote.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@
88
-->
99

1010
<ivy-settings>
11-
<settings defaultResolver="oltResolver" />
11+
<settings defaultResolver="mdtResolver" />
1212

1313
<!--'Artifactory Realm' is the realm used by Artifactory so don't change it.-->
1414
<credentials realm="Artifactory Realm" host="${artifactory_download_server}" username="${artifactory_download_user}"
1515
passwd="${artifactory_download_apikey}" />
1616

1717
<resolvers>
18-
<chain name="oltResolver" returnFirst="true" >
18+
<chain name="mdtResolver" returnFirst="true" >
1919
<ibiblio name="artifactory"
2020
m2compatible="true"
2121
root="https://na.artifactory.swg-devops.com:443/artifactory/wasliberty-open-liberty" />
@@ -27,10 +27,10 @@
2727
</resolvers>
2828

2929
<modules>
30-
<module organisation="dev" name="ivy-bootstrapping" resolver="oltResolver" />
30+
<module organisation="dev" name="ivy-bootstrapping" resolver="mdtResolver" />
3131
</modules>
3232

3333
<modules>
34-
<module organisation="dev" name="prereq.published" resolver="oltResolver"/>
34+
<module organisation="dev" name="prereq.published" resolver="mdtResolver"/>
3535
</modules>
3636
</ivy-settings>

‎dev/ant_build/prereqs/prereqs.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,23 +29,23 @@
2929
- these DO take precedence over the above file -->
3030
<property environment="env"/>
3131

32-
<!-- olt_build_type is 'personal' by default -->
32+
<!-- mdt_build_type is 'personal' by default -->
3333
<contrib:if>
3434
<and>
35-
<not><equals arg1="nightly" arg2="${env.olt_build_type}"/></not>
36-
<not><equals arg1="release" arg2="${env.olt_build_type}"/></not>
35+
<not><equals arg1="nightly" arg2="${env.mdt_build_type}"/></not>
36+
<not><equals arg1="release" arg2="${env.mdt_build_type}"/></not>
3737
</and>
3838
<then>
39-
<property name="olt_build_type" value="personal"/>
39+
<property name="mdt_build_type" value="personal"/>
4040
</then>
4141
<else>
42-
<property name="olt_build_type" value="${env.olt_build_type}"/>
42+
<property name="mdt_build_type" value="${env.mdt_build_type}"/>
4343
</else>
4444
</contrib:if>
4545

4646
<!-- for a personal test build, we don't use artifactory -->
4747
<contrib:if>
48-
<equals arg1="personal" arg2="${olt_build_type}"/>
48+
<equals arg1="personal" arg2="${mdt_build_type}"/>
4949
<then>
5050
<var name="artifactory_download_server" unset="true"/>
5151
<var name="artifactory_download_user" unset="true"/>

0 commit comments

Comments
 (0)