426603 - Converts tabs to spaces in build-nano.xml
diff --git a/build-packaging/nano/build-nano.xml b/build-packaging/nano/build-nano.xml
index 73d8e88..a9fcc5b 100644
--- a/build-packaging/nano/build-nano.xml
+++ b/build-packaging/nano/build-nano.xml
@@ -3,14 +3,14 @@
<path id="bundles">
</path>
- <property file="${basedir}/../build.properties"/>
- <property file="${basedir}/../build.versions"/>
- <import file="${basedir}/../virgo-build/multi-bundle/default.xml"/>
+ <property file="${basedir}/../build.properties"/>
+ <property file="${basedir}/../build.versions"/>
+ <import file="${basedir}/../virgo-build/multi-bundle/default.xml"/>
<property name="nano-full-package" value="virgo-nano-full"/>
<property name="nano-package" value="virgo-nano"/>
<property name="nano-rap-package" value="virgo-nano-rap"/>
<property name="nano.basedir" value="${basedir}/nano"/>
-
+
<target name="nano.package-resources-and-products" depends="ivy.init">
<property name="common.resources.location" value="${nano.target.dir}/common_resources_zipped"/>
<property name="specific.resources.location" value="${nano.target.dir}/specific_resources_zipped"/>
@@ -28,7 +28,7 @@
<antcall target="install-packages"/>
<antcall target="assemble-zips"/>
</target>
-
+
<target name="nano.clean-up">
<delete dir="${nano.target.dir}/assembly" quiet="true"/>
<delete dir="${common.resources.location}" quiet="true"/>
@@ -37,32 +37,31 @@
<delete dir="${nano.target.dir}" quiet="true"/>
</target>
- <target name="assemble-zips">
+ <target name="assemble-zips">
<property name="nano.package.dir" value="${package.dir}/VN"/>
-
<delete dir="${nano.package.dir}/${nano-package}-${bundle.version}/Eclipse.app" quiet="true"/>
<mkdir dir="${artifacts.dir}"/>
<zip destfile="${artifacts.dir}/${nano-package}-${bundle.version}.zip">
- <zipfileset dir="${nano.package.dir}" includes="${nano-package}-${bundle.version}/bin/*.sh" filemode="755"/>
- <zipfileset dir="${nano.package.dir}" includes="${nano-package}-${bundle.version}/configuration/org.eclipse.virgo.kernel.jmxremote.access.properties" filemode="600"/>
- <zipfileset dir="${nano.package.dir}">
- <exclude name="${nano-package}-${bundle.version}/bin/*.sh"/>
- <exclude name="${nano-package}-${bundle.version}/configuration/org.eclipse.virgo.kernel.jmxremote.access.properties"/>
- </zipfileset>
- </zip>
+ <zipfileset dir="${nano.package.dir}" includes="${nano-package}-${bundle.version}/bin/*.sh" filemode="755"/>
+ <zipfileset dir="${nano.package.dir}" includes="${nano-package}-${bundle.version}/configuration/org.eclipse.virgo.kernel.jmxremote.access.properties" filemode="600"/>
+ <zipfileset dir="${nano.package.dir}">
+ <exclude name="${nano-package}-${bundle.version}/bin/*.sh"/>
+ <exclude name="${nano-package}-${bundle.version}/configuration/org.eclipse.virgo.kernel.jmxremote.access.properties"/>
+ </zipfileset>
+ </zip>
<property name="nano.full.package.dir" value="${package.dir}/VNF"/>
<delete dir="${nano.full.package.dir}/${nano-full-package}-${bundle.version}/Eclipse.app" quiet="true"/>
<zip destfile="${artifacts.dir}/${nano-full-package}-${bundle.version}.zip">
- <zipfileset dir="${nano.full.package.dir}" includes="${nano-full-package}-${bundle.version}/bin/*.sh" filemode="755"/>
- <zipfileset dir="${nano.full.package.dir}" includes="${nano-full-package}-${bundle.version}/configuration/org.eclipse.virgo.kernel.jmxremote.access.properties" filemode="600"/>
- <zipfileset dir="${nano.full.package.dir}">
- <exclude name="${nano-full-package}-${bundle.version}/bin/*.sh"/>
- <exclude name="${nano-full-package}-${bundle.version}/configuration/org.eclipse.virgo.kernel.jmxremote.access.properties"/>
- </zipfileset>
- </zip>
+ <zipfileset dir="${nano.full.package.dir}" includes="${nano-full-package}-${bundle.version}/bin/*.sh" filemode="755"/>
+ <zipfileset dir="${nano.full.package.dir}" includes="${nano-full-package}-${bundle.version}/configuration/org.eclipse.virgo.kernel.jmxremote.access.properties" filemode="600"/>
+ <zipfileset dir="${nano.full.package.dir}">
+ <exclude name="${nano-full-package}-${bundle.version}/bin/*.sh"/>
+ <exclude name="${nano-full-package}-${bundle.version}/configuration/org.eclipse.virgo.kernel.jmxremote.access.properties"/>
+ </zipfileset>
+ </zip>
<property name="nano.rap.package.dir" value="${package.dir}/VNR"/>
<delete dir="${nano.rap.package.dir}/${nano-rap-package}-${bundle.version}/Eclipse.app" quiet="true"/>
@@ -75,7 +74,7 @@
<exclude name="${nano-rap-package}-${bundle.version}/configuration/org.eclipse.virgo.kernel.jmxremote.access.properties"/>
</zipfileset>
</zip>
- </target>
+ </target>
<target name="nano.prepare-bundles-and-features">
<!-- Copy the nano kernel artifacts to a prepared for publishing location - a p2 repo will be built around them -->
@@ -83,18 +82,18 @@
<ivy:retrieve resolveId="copy.path" pattern="${nano.target.dir}/assembly/plugins/[artifact]_[revision].[ext]" conf="nano-runtime" type="jar"/>
<ivy:retrieve resolveId="copy.path" pattern="${nano.target.dir}/assembly/plugins/[artifact]_[revision].[ext]" conf="nano-runtime" type="wab"/>
- <ivy:resolve resolveId="copy.path" file="${nano.basedir}/p2runtime-ivy.xml" transitive="true"/>
- <ivy:retrieve resolveId="copy.path" pattern="${nano.target.dir}/assembly/plugins/[artifact]_[revision].[ext]" conf="p2-runtime" type="jar"/>
+ <ivy:resolve resolveId="copy.path" file="${nano.basedir}/p2runtime-ivy.xml" transitive="true"/>
+ <ivy:retrieve resolveId="copy.path" pattern="${nano.target.dir}/assembly/plugins/[artifact]_[revision].[ext]" conf="p2-runtime" type="jar"/>
<ivy:resolve resolveId="copy.path" file="${nano.basedir}/gemini-web-ivy.xml" transitive="false"/>
- <ivy:retrieve resolveId="copy.path" pattern="${nano.target.dir}/assembly/plugins/[artifact]_[revision].[ext]" conf="gemini-web" type="jar"/>
+ <ivy:retrieve resolveId="copy.path" pattern="${nano.target.dir}/assembly/plugins/[artifact]_[revision].[ext]" conf="gemini-web" type="jar"/>
<ivy:resolve resolveId="copy.path" file="${nano.basedir}/enterprise-ivy.xml" transitive="false"/>
<ivy:retrieve resolveId="copy.path" pattern="${nano.target.dir}/assembly/plugins/[artifact]_[revision].[ext]" conf="enterprise" type="jar"/>
<!-- Prepare the features for publishing -->
<copy todir="${nano.target.dir}/assembly/features" failonerror="false">
- <fileset dir="${nano.basedir}/publish_resources/features" excludes="keystore"/>
+ <fileset dir="${nano.basedir}/publish_resources/features" excludes="keystore"/>
<filterset>
<filter token="OSGI" value="${org.eclipse.osgi}"/>
<filter token="ASPECTJ" value="${org.aspectj}"/>
@@ -245,8 +244,8 @@
<filter token="C.IO.VERSION" value="${org.apache.commons.io}"/>
<filter token="JOLOKIA.VERSION" value="${org.jolokia.osgi}"/>
<filter token="OBJECTWEB.ASM" value="${org.objectweb.asm}"/>
- </filterset>
- </copy>
+ </filterset>
+ </copy>
</target>
<target name="publish-resources-and-products">
@@ -290,7 +289,7 @@
</antcall>
<echo message="Published nano-base product to ${p2.repository.dir}."/>
- <antcall target="p2.publish-product">
+ <antcall target="p2.publish-product">
<param name="repository" value="${p2.repository.dir}"/>
<param name="product.file.location" value="${p2.products.location}/nano/nano.product"/>
</antcall>
@@ -346,52 +345,52 @@
<target name="prepare-common-resources">
<property name="common.resources" value="${nano.target.dir}/common_resources"/>
- <ivy:resolve resolveId="copy.path" file="${nano.basedir}/lib-ivy.xml" transitive="true"/>
- <ivy:retrieve resolveId="copy.path" pattern="${common.resources}/lib/[artifact]_[revision].[ext]" conf="lib" type="jar"/>
-
+ <ivy:resolve resolveId="copy.path" file="${nano.basedir}/lib-ivy.xml" transitive="true"/>
+ <ivy:retrieve resolveId="copy.path" pattern="${common.resources}/lib/[artifact]_[revision].[ext]" conf="lib" type="jar"/>
+
<property name="common.resources" value="${nano.target.dir}/common_resources"/>
<ivy:resolve resolveId="copy.path" file="${nano.basedir}/endorsed-ivy.xml" transitive="false"/>
<ivy:retrieve resolveId="copy.path" pattern="${common.resources}/lib/endorsed/[artifact]_[revision].[ext]" conf="endorsed" type="jar"/>
- <property name="common.resources" value="${nano.target.dir}/common_resources"/>
- <ivy:resolve resolveId="copy.path" file="${nano.basedir}/lib-ivy.xml" transitive="false"/>
- <ivy:retrieve resolveId="copy.path" pattern="${common.resources}/lib/persistence/[artifact]_[revision].[ext]" conf="persistence" type="jar"/>
+ <property name="common.resources" value="${nano.target.dir}/common_resources"/>
+ <ivy:resolve resolveId="copy.path" file="${nano.basedir}/lib-ivy.xml" transitive="false"/>
+ <ivy:retrieve resolveId="copy.path" pattern="${common.resources}/lib/persistence/[artifact]_[revision].[ext]" conf="persistence" type="jar"/>
- <mkdir dir="${common.resources}/configuration"/>
- <mkdir dir="${common.resources}/pickup"/>
+ <mkdir dir="${common.resources}/configuration"/>
+ <mkdir dir="${common.resources}/pickup"/>
- <copy todir="${common.resources}" failonerror="false">
- <fileset dir="${nano.basedir}/resources"/>
- </copy>
+ <copy todir="${common.resources}" failonerror="false">
+ <fileset dir="${nano.basedir}/resources"/>
+ </copy>
<copy todir="${common.resources}/configuration" failonerror="false">
- <fileset dir="${nano.basedir}/configuration" excludes="keystore,serviceability.xml"/>
- </copy>
-
- <copy file="${nano.basedir}/configuration/keystore" todir="${common.resources}/configuration" failonerror="false"/>
-
+ <fileset dir="${nano.basedir}/configuration" excludes="keystore,serviceability.xml"/>
+ </copy>
+
+ <copy file="${nano.basedir}/configuration/keystore" todir="${common.resources}/configuration" failonerror="false"/>
+
<mkdir dir="${common.resources.location}/binary"/>
<zip destfile="${common.resources.location}/binary/nano_common_resources">
- <zipfileset dir="${common.resources}"/>
- </zip>
+ <zipfileset dir="${common.resources}"/>
+ </zip>
<delete dir="${common.resources}" quiet="true"/>
</target>
-
+
<target name="prepare-enterprise-resources">
<property name="enterprise.resources" value="${nano.target.dir}/enterprise_resources"/>
- <mkdir dir="${enterprise.resources}/configuration"/>
+ <mkdir dir="${enterprise.resources}/configuration"/>
- <copy todir="${enterprise.resources}/configuration" failonerror="false">
- <fileset dir="${nano.basedir}/enterprise_resources"/>
- </copy>
-
+ <copy todir="${enterprise.resources}/configuration" failonerror="false">
+ <fileset dir="${nano.basedir}/enterprise_resources"/>
+ </copy>
+
<copy file="${nano.basedir}/abouts/AboutNanoWeb.html" todir="${enterprise.resources}" failonerror="false"/>
-
+
<mkdir dir="${enterprise.resources.location}/binary"/>
<zip destfile="${enterprise.resources.location}/binary/nano_enterprise_resources">
- <zipfileset dir="${enterprise.resources}"/>
- </zip>
+ <zipfileset dir="${enterprise.resources}"/>
+ </zip>
<delete dir="${enterprise.resources}" quiet="true"/>
</target>
@@ -401,32 +400,32 @@
<echo file="${specific.resources}/lib/.version"
message="virgo.nano.version=${bundle.version}
"/>
<copy todir="${specific.resources}/configuration" failonerror="false">
- <fileset dir="${nano.basedir}/configuration">
- <include name="serviceability.xml"/>
- </fileset>
- </copy>
+ <fileset dir="${nano.basedir}/configuration">
+ <include name="serviceability.xml"/>
+ </fileset>
+ </copy>
<!-- Package the Web Admin Console in both Nano's -->
<ivy:resolve resolveId="copy.path" file="${nano.basedir}/pickup-ivy.xml" transitive="true"/>
- <ivy:retrieve resolveId="copy.path" pattern="${specific.resources}/pickup/[artifact]_[revision].[ext]" type="jar, war, wab" conf="pickup"/>
+ <ivy:retrieve resolveId="copy.path" pattern="${specific.resources}/pickup/[artifact]_[revision].[ext]" type="jar, war, wab" conf="pickup"/>
<mkdir dir="${specific.resources.location}/binary"/>
<zip destfile="${specific.resources.location}/binary/nano_specific_resources">
- <zipfileset dir="${specific.resources}"/>
- </zip>
+ <zipfileset dir="${specific.resources}"/>
+ </zip>
<delete dir="${specific.resources}" quiet="true"/>
</target>
<target name="prepare-scripts">
<property name="scripts" value="${nano.target.dir}/scripts"/>
- <copy todir="${scripts}/bin" failonerror="false">
- <fileset dir="${nano.basedir}/bin"/>
- </copy>
+ <copy todir="${scripts}/bin" failonerror="false">
+ <fileset dir="${nano.basedir}/bin"/>
+ </copy>
<mkdir dir="${scripts.location}/binary"/>
- <zip destfile="${scripts.location}/binary/scripts">
- <zipfileset dir="${scripts}"/>
- </zip>
+ <zip destfile="${scripts.location}/binary/scripts">
+ <zipfileset dir="${scripts}"/>
+ </zip>
<delete dir="${scripts}" quiet="true"/>
</target>
@@ -443,15 +442,15 @@
</target>
<target name="simrel-package" depends="ivy.init">
- <delete dir="${package.output.dir}" quiet="true"/>
- <mkdir dir="${package.output.dir}"/>
+ <delete dir="${package.output.dir}" quiet="true"/>
+ <mkdir dir="${package.output.dir}"/>
<property name="common.resources.location" value="${nano.target.dir}/common_resources_zipped"/>
<property name="specific.resources.location" value="${nano.target.dir}/specific_resources_zipped"/>
<property name="enterprise.resources.location" value="${nano.target.dir}/enterprise_resources_zipped"/>
<property name="scripts.location" value="${nano.target.dir}/scripts_zipped"/>
<antcall target="simrel-common-resources"/>
- <antcall target="simrel-bundles-and-features"/>
+ <antcall target="simrel-bundles-and-features"/>
<antcall target="simrel-publish-p2-repo"/>
</target>
@@ -475,21 +474,21 @@
<target name="simrel-bundles-and-features">
<!-- Copy the nano kernel artifacts to a prepared for publishing location - a p2 repo will be built around them -->
- <ivy:resolve resolveId="copy.path" file="${nano.basedir}/nano-ivy.xml" transitive="false"/>
- <ivy:retrieve resolveId="copy.path" pattern="${nano.target.dir}/assembly/plugins/[artifact]_[revision].[ext]" conf="nano-runtime" type="jar"/>
-
- <ivy:resolve resolveId="copy.path" file="${nano.basedir}/orbit-ivy.xml" transitive="false"/>
- <ivy:retrieve resolveId="copy.path" pattern="${nano.target.dir}/assembly/plugins/[artifact]_[revision].[ext]" conf="orbit-runtime" type="jar"/>
-
+ <ivy:resolve resolveId="copy.path" file="${nano.basedir}/nano-ivy.xml" transitive="false"/>
+ <ivy:retrieve resolveId="copy.path" pattern="${nano.target.dir}/assembly/plugins/[artifact]_[revision].[ext]" conf="nano-runtime" type="jar"/>
+
+ <ivy:resolve resolveId="copy.path" file="${nano.basedir}/orbit-ivy.xml" transitive="false"/>
+ <ivy:retrieve resolveId="copy.path" pattern="${nano.target.dir}/assembly/plugins/[artifact]_[revision].[ext]" conf="orbit-runtime" type="jar"/>
+
<ivy:resolve resolveId="copy.path" file="${nano.basedir}/gemini-web-ivy.xml" transitive="false"/>
- <ivy:retrieve resolveId="copy.path" pattern="${nano.target.dir}/assembly/plugins/[artifact]_[revision].[ext]" conf="gemini-web" type="jar"/>
+ <ivy:retrieve resolveId="copy.path" pattern="${nano.target.dir}/assembly/plugins/[artifact]_[revision].[ext]" conf="gemini-web" type="jar"/>
</target>
<target name="simrel-common-resources">
<copy todir="${nano.target.dir}/assembly/plugins/org.eclipse.virgo.common.resources_${bundle.version}" failonerror="false">
<fileset dir="${nano.basedir}/publish_resources/org.eclipse.virgo.common.resources"/>
<filterset>
- <filter token="NANO.VERSION" value="${bundle.version}"/>
+ <filter token="NANO.VERSION" value="${bundle.version}"/>
</filterset>
</copy>
@@ -499,21 +498,21 @@
<fileset dir="${nano.basedir}/bin"/>
</copy>
- <ivy:resolve resolveId="copy.path" file="${nano.basedir}/lib-ivy.xml" transitive="true"/>
- <ivy:retrieve resolveId="copy.path" pattern="${common.resources}/lib/[artifact]_[revision].[ext]" conf="lib" type="jar"/>
+ <ivy:resolve resolveId="copy.path" file="${nano.basedir}/lib-ivy.xml" transitive="true"/>
+ <ivy:retrieve resolveId="copy.path" pattern="${common.resources}/lib/[artifact]_[revision].[ext]" conf="lib" type="jar"/>
- <mkdir dir="${common.resources}/configuration"/>
- <mkdir dir="${common.resources}/pickup"/>
-
- <copy todir="${common.resources}" failonerror="false">
- <fileset dir="${nano.basedir}/resources"/>
- </copy>
+ <mkdir dir="${common.resources}/configuration"/>
+ <mkdir dir="${common.resources}/pickup"/>
+
+ <copy todir="${common.resources}" failonerror="false">
+ <fileset dir="${nano.basedir}/resources"/>
+ </copy>
<copy todir="${common.resources}/configuration" failonerror="false">
- <fileset dir="${nano.basedir}/configuration" excludes="keystore,serviceability.xml"/>
- </copy>
-
- <copy file="${nano.basedir}/configuration/keystore" todir="${common.resources}/configuration" failonerror="false"/>
+ <fileset dir="${nano.basedir}/configuration" excludes="keystore,serviceability.xml"/>
+ </copy>
+
+ <copy file="${nano.basedir}/configuration/keystore" todir="${common.resources}/configuration" failonerror="false"/>
<mkdir dir="${common.resources}/lib"/>
<echo file="${common.resources}/lib/.version"
@@ -525,7 +524,7 @@
</copy>
</target>
- <target name="publish-multiple-nano-packages-download" description="Uploads all Nano zipped packages to download.eclipse.org">
+ <target name="publish-multiple-nano-packages-download" description="Uploads all Nano zipped packages to download.eclipse.org">
<antcall target="publish-package-download">
<param name="package.output.file" value="${package.output.file}"/>
</antcall>
@@ -535,28 +534,26 @@
<antcall target="publish-package-download">
<param name="package.output.file" value="${artifacts.dir}/${nano-rap-package}-${bundle.version}.zip"/>
</antcall>
- </target>
+ </target>
<target name="ci.publish.nightly" description="Publishes nightly repository to download.eclipse.org. Can be executed on Hudson only!">
-
<delete dir="${nightly.updatesite.dir}"/>
-
+
<copy toDir="${nightly.updatesite.dir}">
<fileset dir="${p2.repository.dir}"/>
</copy>
-
</target>
-
+
<target name="smoke-test-nano" description="Runs a smoke test on the nano packaged build">
- <path id="smoke.test.bundles">
- <pathelement location="${nano.basedir}/org.eclipse.virgo.nano.smoketest" />
- </path>
- <antcall target="test.pre"/>
- <all-bundles target="test-package" buildpathRef="smoke.test.bundles">
- <property name="package.output.file" value="${artifacts.dir}/${nano-full-package}-${bundle.version}.zip"/>
- <property name="package.basename" value="${nano-full-package}-${bundle.version}"/>
- </all-bundles>
- <antcall target="test.post"/>
- </target>
+ <path id="smoke.test.bundles">
+ <pathelement location="${nano.basedir}/org.eclipse.virgo.nano.smoketest" />
+ </path>
+ <antcall target="test.pre"/>
+ <all-bundles target="test-package" buildpathRef="smoke.test.bundles">
+ <property name="package.output.file" value="${artifacts.dir}/${nano-full-package}-${bundle.version}.zip"/>
+ <property name="package.basename" value="${nano-full-package}-${bundle.version}"/>
+ </all-bundles>
+ <antcall target="test.post"/>
+ </target>
</project>
