Skip to content

Commit f9b2476

Browse files
achandrasekarGerrit Code Review
authored and
Gerrit Code Review
committed
Rename java project to controller
This change is part of code reorganization to make the code more understandable. This change renames the java project in the code base to controller since it contains all the photon controller management services code. Change-Id: I0be044c11d6ee5425aab6580abd6f978c81538a2
1 parent ac851d9 commit f9b2476

File tree

2,365 files changed

+38
-38
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,365 files changed

+38
-38
lines changed

appliances/dhcp-ova/build.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ if [ -d ovftool ]; then
1717
export PATH=$(pwd)/ovftool:$PATH
1818
fi
1919

20-
cd ../../java/dhcp-agent
20+
cd ../../controller/dhcp-agent
2121
../gradlew disttar
2222
cd ../../appliances/dhcp-ova
2323

24-
DHCP_AGENT_TAR_PATH=(../../java/dhcp-agent/build/distributions/dhcp-agent-*.tar)
24+
DHCP_AGENT_TAR_PATH=(../../controller/dhcp-agent/build/distributions/dhcp-agent-*.tar)
2525

2626
SSHD_ENABLE_ROOT_LOGIN=${SSHD_ENABLE_ROOT_LOGIN:-"false"}
2727
PHOTON_OVA_URL=${PHOTON_OVA_URL:="../photon-ova/build/photon-ova-virtualbox.ova"}

appliances/photon-controller/build-photon-controller-ova.sh

+5-5
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ fi
2525
if [ -z "$NO_PHOTON_RPM_REBUILD" ]; then
2626
echo "Building Photon Controller RPM"
2727
rm -rf ${SCRIPT_DIR}/photon-controller*.rpm
28-
pushd ${SCRIPT_DIR}/../../java
28+
pushd ${SCRIPT_DIR}/../../controller
2929
./gradlew :rpm
3030
cp ${SCRIPT_DIR}/../../artifacts/build/RPMS/x86_64/photon-controller-*.rpm ${SCRIPT_DIR}
3131
rm -rf photon-controller-debuginfo*.rpm
@@ -34,10 +34,10 @@ fi
3434

3535
rm -rf ${SCRIPT_DIR}/photon/config-templates
3636
mkdir -p ${SCRIPT_DIR}/photon/config-templates
37-
cp ${SCRIPT_DIR}/../../java/photon-controller-core/src/dist/configuration/photon-controller-core.yml ${SCRIPT_DIR}/photon/config-templates
38-
cp ${SCRIPT_DIR}/../../java/photon-controller-core/src/dist/configuration/photon-controller-core_release.json ${SCRIPT_DIR}/photon/config-templates
39-
cp ${SCRIPT_DIR}/../../java/photon-controller-core/src/dist/configuration/run.sh ${SCRIPT_DIR}/photon/config-templates
40-
cp ${SCRIPT_DIR}/../../java/photon-controller-core/src/dist/configuration/swagger-config.js ${SCRIPT_DIR}/photon/config-templates
37+
cp ${SCRIPT_DIR}/../../controller/photon-controller-core/src/dist/configuration/photon-controller-core.yml ${SCRIPT_DIR}/photon/config-templates
38+
cp ${SCRIPT_DIR}/../../controller/photon-controller-core/src/dist/configuration/photon-controller-core_release.json ${SCRIPT_DIR}/photon/config-templates
39+
cp ${SCRIPT_DIR}/../../controller/photon-controller-core/src/dist/configuration/run.sh ${SCRIPT_DIR}/photon/config-templates
40+
cp ${SCRIPT_DIR}/../../controller/photon-controller-core/src/dist/configuration/swagger-config.js ${SCRIPT_DIR}/photon/config-templates
4141

4242
export SOURCE_OVA=${SCRIPT_DIR}/../photon-ova/build/`basename ${SCRIPT_DIR}/../photon-ova/build/photon*.ova`
4343

artifacts/create-rpm.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ SOURCES_DIR="${ROOT}/artifacts/rpms/SOURCES"
2222
SPECS_DIR="${ROOT}/artifacts/rpms/SPECS"
2323
RPMS_DIR="${ROOT}/artifacts/build/RPMS"
2424
TEMP_DIR=$(mktemp -d "${ROOT}/create_tar.XXXXX")
25-
TAR_PATH="/java/photon-controller-core/build/distributions/"
25+
TAR_PATH="/controller/photon-controller-core/build/distributions/"
2626
TAR_PREFIX="photon-controller-core"
2727
RPM_PREFIX="photon-controller"
2828
ENVOY_VIB_URL=${ENVOY_VIB_URL:="http://s3.amazonaws.com/photon-platform/artifacts/vibs/envoy/develop/latest/vmware-envoy-latest.vib"}
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)