Skip to content
This repository has been archived by the owner on Jan 14, 2020. It is now read-only.

Commit

Permalink
Rename java project to controller
Browse files Browse the repository at this point in the history
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
  • Loading branch information
achandrasekar authored and Gerrit Code Review committed Dec 22, 2016
1 parent ac851d9 commit f9b2476
Show file tree
Hide file tree
Showing 2,365 changed files with 38 additions and 38 deletions.
4 changes: 2 additions & 2 deletions appliances/dhcp-ova/build.sh
Expand Up @@ -17,11 +17,11 @@ if [ -d ovftool ]; then
export PATH=$(pwd)/ovftool:$PATH
fi

cd ../../java/dhcp-agent
cd ../../controller/dhcp-agent
../gradlew disttar
cd ../../appliances/dhcp-ova

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

SSHD_ENABLE_ROOT_LOGIN=${SSHD_ENABLE_ROOT_LOGIN:-"false"}
PHOTON_OVA_URL=${PHOTON_OVA_URL:="../photon-ova/build/photon-ova-virtualbox.ova"}
Expand Down
10 changes: 5 additions & 5 deletions appliances/photon-controller/build-photon-controller-ova.sh
Expand Up @@ -25,7 +25,7 @@ fi
if [ -z "$NO_PHOTON_RPM_REBUILD" ]; then
echo "Building Photon Controller RPM"
rm -rf ${SCRIPT_DIR}/photon-controller*.rpm
pushd ${SCRIPT_DIR}/../../java
pushd ${SCRIPT_DIR}/../../controller
./gradlew :rpm
cp ${SCRIPT_DIR}/../../artifacts/build/RPMS/x86_64/photon-controller-*.rpm ${SCRIPT_DIR}
rm -rf photon-controller-debuginfo*.rpm
Expand All @@ -34,10 +34,10 @@ fi

rm -rf ${SCRIPT_DIR}/photon/config-templates
mkdir -p ${SCRIPT_DIR}/photon/config-templates
cp ${SCRIPT_DIR}/../../java/photon-controller-core/src/dist/configuration/photon-controller-core.yml ${SCRIPT_DIR}/photon/config-templates
cp ${SCRIPT_DIR}/../../java/photon-controller-core/src/dist/configuration/photon-controller-core_release.json ${SCRIPT_DIR}/photon/config-templates
cp ${SCRIPT_DIR}/../../java/photon-controller-core/src/dist/configuration/run.sh ${SCRIPT_DIR}/photon/config-templates
cp ${SCRIPT_DIR}/../../java/photon-controller-core/src/dist/configuration/swagger-config.js ${SCRIPT_DIR}/photon/config-templates
cp ${SCRIPT_DIR}/../../controller/photon-controller-core/src/dist/configuration/photon-controller-core.yml ${SCRIPT_DIR}/photon/config-templates
cp ${SCRIPT_DIR}/../../controller/photon-controller-core/src/dist/configuration/photon-controller-core_release.json ${SCRIPT_DIR}/photon/config-templates
cp ${SCRIPT_DIR}/../../controller/photon-controller-core/src/dist/configuration/run.sh ${SCRIPT_DIR}/photon/config-templates
cp ${SCRIPT_DIR}/../../controller/photon-controller-core/src/dist/configuration/swagger-config.js ${SCRIPT_DIR}/photon/config-templates

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

Expand Down
2 changes: 1 addition & 1 deletion artifacts/create-rpm.sh
Expand Up @@ -22,7 +22,7 @@ SOURCES_DIR="${ROOT}/artifacts/rpms/SOURCES"
SPECS_DIR="${ROOT}/artifacts/rpms/SPECS"
RPMS_DIR="${ROOT}/artifacts/build/RPMS"
TEMP_DIR=$(mktemp -d "${ROOT}/create_tar.XXXXX")
TAR_PATH="/java/photon-controller-core/build/distributions/"
TAR_PATH="/controller/photon-controller-core/build/distributions/"
TAR_PREFIX="photon-controller-core"
RPM_PREFIX="photon-controller"
ENVOY_VIB_URL=${ENVOY_VIB_URL:="http://s3.amazonaws.com/photon-platform/artifacts/vibs/envoy/develop/latest/vmware-envoy-latest.vib"}
Expand Down
File renamed without changes.
File renamed without changes.
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 comments on commit f9b2476

Please sign in to comment.