Expand all tabs

Previously we use tab spaces for indent in java and c sources,
while we use 4 spaces for indent in python sources, but it is
sometimes confusing.

This patch expands all tab spaces to 4 spaces, to use 4 spaces
for general way to indent.

Bonus:
This patch also removes trailing white spaces.

Change-Id: I1b9e7688d606c0da1bc015b1a4d396d19f4dc18a
This commit is contained in:
Takashi Kajinami 2016-09-06 09:48:11 +09:00
parent b59319ab72
commit 2fdd244dce
71 changed files with 2586 additions and 2608 deletions

View File

@ -56,5 +56,4 @@
<target name="build" depends="clean, jar"> <target name="build" depends="clean, jar">
</target> </target>
</project> </project>

View File

@ -23,8 +23,8 @@
<target name="build"> <target name="build">
<exec executable="python" dir="." failonerror="true"> <exec executable="python" dir="." failonerror="true">
<arg value="setup.py"/> <arg value="setup.py" />
<arg value="bdist"/> <arg value="bdist" />
</exec> </exec>
</target> </target>

View File

@ -23,8 +23,8 @@
<target name="build"> <target name="build">
<exec executable="python" dir="." failonerror="true"> <exec executable="python" dir="." failonerror="true">
<arg value="setup.py"/> <arg value="setup.py" />
<arg value="bdist"/> <arg value="bdist" />
</exec> </exec>
</target> </target>

View File

@ -14,29 +14,24 @@
--> -->
<project> <project>
<target name="clean"> <target name="clean">
<delete dir="bin" /> <delete dir="bin" />
</target> </target>
<target name="java"> <target name="java">
<mkdir dir="bin" /> <mkdir dir="bin" />
<javac srcdir="src" destdir="bin" <javac srcdir="src" destdir="bin"
classpath="../../Engine/SCommon/bin/SCommon.jar" classpath="../../Engine/SCommon/bin/SCommon.jar"
includeantruntime="false" /> includeantruntime="false" />
</target> </target>
<target name="csrc" depends="jar"> <target name="csrc" depends="jar">
<echo message="int main(){return 42;}" file="bin/get42.c" /> <echo message="int main(){return 42;}" file="bin/get42.c" />
</target> </target>
<target name="exe" depends="csrc"> <target name="exe" depends="csrc">
<exec dir="." executable="gcc"> <exec dir="." executable="gcc">
<arg line="-o bin/get42 " /> <arg line="-o bin/get42 " />
<arg line="bin/get42.c" /> <arg line="bin/get42.c" />
</exec> </exec>
</target> </target>
<target name="jar" depends="java"> <target name="jar" depends="java">
<jar destfile="execdepstorlet-1.0.jar" basedir="bin"> <jar destfile="execdepstorlet-1.0.jar" basedir="bin">
<manifest> <manifest>
@ -46,11 +41,9 @@
</jar> </jar>
<move file="execdepstorlet-1.0.jar" todir="bin" /> <move file="execdepstorlet-1.0.jar" todir="bin" />
</target> </target>
<target name="text" depends="jar"> <target name="text" depends="jar">
<echo message="Some junk content" file="bin/junk.txt" /> <echo message="Some junk content" file="bin/junk.txt" />
</target> </target>
<target name="build" depends="clean,jar,exe,text"> <target name="build" depends="clean,jar,exe,text">
</target> </target>
</project> </project>

View File

@ -14,11 +14,9 @@
--> -->
<project> <project>
<target name="common"> <target name="common">
<mkdir dir="bin" /> <mkdir dir="bin" />
</target> </target>
<target name="testmetadatastorlet"> <target name="testmetadatastorlet">
<javac srcdir="src/org/openstack/storlet/testmetadatastorlet" destdir="bin" includeantruntime="false"> <javac srcdir="src/org/openstack/storlet/testmetadatastorlet" destdir="bin" includeantruntime="false">
<classpath> <classpath>
@ -32,15 +30,11 @@
includes="org/openstack/storlet/testmetadatastorlet/*"> includes="org/openstack/storlet/testmetadatastorlet/*">
</jar> </jar>
</target> </target>
<target name="text"> <target name="text">
<echo message="Some content to copy" file="bin/source.txt" /> <echo message="Some content to copy" file="bin/source.txt" />
</target> </target>
<target name="clean"> <target name="clean">
<delete dir="bin" /> <delete dir="bin" />
</target> </target>
<target name="build" depends="clean, common, text, testmetadatastorlet"/> <target name="build" depends="clean, common, text, testmetadatastorlet"/>
</project> </project>

View File

@ -14,11 +14,9 @@
--> -->
<project> <project>
<target name="common"> <target name="common">
<mkdir dir="bin" /> <mkdir dir="bin" />
</target> </target>
<target name="test"> <target name="test">
<javac srcdir="src/org/openstack/storlet/test" destdir="bin" includeantruntime="false"> <javac srcdir="src/org/openstack/storlet/test" destdir="bin" includeantruntime="false">
<classpath> <classpath>
@ -26,17 +24,13 @@
path="../../Engine/SCommon/bin/SCommon.jar"/> path="../../Engine/SCommon/bin/SCommon.jar"/>
</classpath> </classpath>
</javac> </javac>
<jar destfile="bin/test-10.jar" <jar destfile="bin/test-10.jar"
basedir="bin" basedir="bin"
includes="org/openstack/storlet/test/*"> includes="org/openstack/storlet/test/*">
</jar> </jar>
</target> </target>
<target name="clean"> <target name="clean">
<delete dir="bin" /> <delete dir="bin" />
</target> </target>
<target name="build" depends="clean, common, test"/> <target name="build" depends="clean, common, test"/>
</project> </project>

View File

@ -33,8 +33,8 @@ Below are the steps of this flow:
the installed software stack, and upload it back to the docker_images container. the installed software stack, and upload it back to the docker_images container.
#. Once uploaded, the account manager must notify the Swift Storlet engine manager #. Once uploaded, the account manager must notify the Swift Storlet engine manager
of the update. The storlets manager would take care of testing and deploying of the update. The storlets manager would take care of testing and deploying
it to all Swift nodes. Again, <https://github.com/openstack/storlets/blob/master/doc/source/storlets_management.rst> describes the provided tool it to all Swift nodes. Again, <https://github.com/openstack/storlets/blob/master/doc/source/storlets_management.rst>
the Storlet manager can use for the actual deployment. describes the provided tool the Storlet manager can use for the actual deployment.
The sections below describe in detail the steps taken by the account manager. The sections below describe in detail the steps taken by the account manager.

View File

@ -12,7 +12,6 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# Limitations under the License. # Limitations under the License.
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
ansible_ssh_user: <ANSIBLE_USER> ansible_ssh_user: <ANSIBLE_USER>
repo_root: <STORLETS_REPO_ROOT> repo_root: <STORLETS_REPO_ROOT>
mgmt_group: [ "127.0.0.1" ] mgmt_group: [ "127.0.0.1" ]

View File

@ -12,7 +12,6 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# Limitations under the License. # Limitations under the License.
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
swift_install_reop_dir: <set dir!> swift_install_reop_dir: <set dir!>
#swift_install_repo_url: https://github.com/Open-I-Beam/swift-install.git #swift_install_repo_url: https://github.com/Open-I-Beam/swift-install.git
swift_install_repo_url: https://github.com/eranr/storlets-swift-install.git swift_install_repo_url: https://github.com/eranr/storlets-swift-install.git