diff options
author | Roberto E. Escobar | 2012-04-04 14:56:29 -0400 |
---|---|---|
committer | Roberto E. Escobar | 2012-04-04 14:56:29 -0400 |
commit | c56fed99bc4de04dcc704fc1766c41d6063bcdd3 (patch) | |
tree | ea785b14918bc598e6df7bab004a9b6db5959a04 | |
parent | 854fd75d1d18cbca8ea2d67366811f311b77b493 (diff) | |
download | org.eclipse.osee-c56fed99bc4de04dcc704fc1766c41d6063bcdd3.tar.gz org.eclipse.osee-c56fed99bc4de04dcc704fc1766c41d6063bcdd3.tar.xz org.eclipse.osee-c56fed99bc4de04dcc704fc1766c41d6063bcdd3.zip |
feature[ats_0ZVNB]: Add proxy settings to build help generation
-rw-r--r-- | plugins/org.eclipse.osee.ats.help.ui/pom.xml | 71 | ||||
-rw-r--r-- | plugins/org.eclipse.osee.coverage.help.ui/pom.xml | 73 | ||||
-rw-r--r-- | plugins/org.eclipse.osee.framework.dev.help.ui/pom.xml | 63 | ||||
-rw-r--r-- | plugins/org.eclipse.osee.framework.help.ui/pom.xml | 71 | ||||
-rw-r--r-- | plugins/org.eclipse.osee.ote.help.ui/pom.xml | 73 |
5 files changed, 253 insertions, 98 deletions
diff --git a/plugins/org.eclipse.osee.ats.help.ui/pom.xml b/plugins/org.eclipse.osee.ats.help.ui/pom.xml index 95264eea2f..4ca9684bc2 100644 --- a/plugins/org.eclipse.osee.ats.help.ui/pom.xml +++ b/plugins/org.eclipse.osee.ats.help.ui/pom.xml @@ -26,24 +26,35 @@ </resources> <plugins> <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-source-plugin</artifactId> + </plugin> + <plugin> <artifactId>maven-antrun-plugin</artifactId> - <dependencies> - <dependency> - <groupId>ant</groupId> - <artifactId>optional</artifactId> - <version>1.5.4</version> - </dependency> - </dependencies> + <version>${maven-antrun-version}</version> <executions> <execution> <id>help-clean-up</id> <phase>clean</phase> <configuration> - <tasks if="update.osee.doc"> - <property name="compile_classpath" refid="maven.compile.classpath" /> - <delete dir="images" /> - <delete dir="OSEE" /> - </tasks> + <target> + <property name="plugin_classpath" refid="maven.plugin.classpath" /> + <taskdef resource="net/sf/antcontrib/antlib.xml"> + <classpath> + <pathelement path="${classpath}" /> + <pathelement path="${plugin_classpath}" /> + </classpath> + </taskdef> + + <if> + <equals arg1="${update.osee.doc}" arg2="true" /> + <then> + <property name="compile_classpath" refid="maven.compile.classpath" /> + <delete dir="images" /> + <delete dir="OSEE" /> + </then> + </if> + </target> </configuration> <goals> <goal>run</goal> @@ -54,10 +65,34 @@ <id>help-build</id> <phase>generate-sources</phase> <configuration> - <tasks if="update.osee.doc"> - <property name="compile_classpath" refid="maven.compile.classpath" /> - <ant target="all" inheritRefs="true" antfile="build-helper.xml" /> - </tasks> + <target> + <property name="plugin_classpath" refid="maven.plugin.classpath" /> + <taskdef resource="net/sf/antcontrib/antlib.xml"> + <classpath> + <pathelement path="${classpath}" /> + <pathelement path="${plugin_classpath}" /> + </classpath> + </taskdef> + + <if> + <equals arg1="${update.osee.doc}" arg2="true" /> + <then> + + <if> + <isset property="http.proxyHost" /> + <then> + <echo message="Set Proxy: [${http.proxyHost}:${http.proxyPort}]" /> + <echo message="Exclude ProxyHosts: [${http.nonProxyHosts}]" /> + <setproxy nonproxyhosts="${http.nonProxyHosts}" + proxyhost="${http.proxyHost}" proxyport="${http.proxyPort}" /> + </then> + </if> + + <property name="compile_classpath" refid="maven.compile.classpath" /> + <ant target="all" inheritRefs="true" antfile="build-helper.xml" /> + </then> + </if> + </target> </configuration> <goals> <goal>run</goal> @@ -65,10 +100,6 @@ </execution> </executions> </plugin> - <plugin> - <groupId>org.eclipse.tycho</groupId> - <artifactId>tycho-source-plugin</artifactId> - </plugin> </plugins> </build> diff --git a/plugins/org.eclipse.osee.coverage.help.ui/pom.xml b/plugins/org.eclipse.osee.coverage.help.ui/pom.xml index 14d733b0b8..22643f9c2a 100644 --- a/plugins/org.eclipse.osee.coverage.help.ui/pom.xml +++ b/plugins/org.eclipse.osee.coverage.help.ui/pom.xml @@ -9,7 +9,7 @@ <version>0.9.9-SNAPSHOT</version> <relativePath>../../plugins/org.eclipse.osee.client.parent</relativePath> </parent> - + <artifactId>org.eclipse.osee.coverage.help.ui</artifactId> <packaging>eclipse-plugin</packaging> <name>OSEE Coverage Help (Incubation)</name> @@ -27,24 +27,35 @@ </resources> <plugins> <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-source-plugin</artifactId> + </plugin> + <plugin> <artifactId>maven-antrun-plugin</artifactId> - <dependencies> - <dependency> - <groupId>ant</groupId> - <artifactId>optional</artifactId> - <version>1.5.4</version> - </dependency> - </dependencies> + <version>${maven-antrun-version}</version> <executions> <execution> <id>help-clean-up</id> <phase>clean</phase> <configuration> - <tasks if="update.osee.doc"> - <property name="compile_classpath" refid="maven.compile.classpath" /> - <delete dir="images" /> - <delete dir="OSEE" /> - </tasks> + <target> + <property name="plugin_classpath" refid="maven.plugin.classpath" /> + <taskdef resource="net/sf/antcontrib/antlib.xml"> + <classpath> + <pathelement path="${classpath}" /> + <pathelement path="${plugin_classpath}" /> + </classpath> + </taskdef> + + <if> + <equals arg1="${update.osee.doc}" arg2="true" /> + <then> + <property name="compile_classpath" refid="maven.compile.classpath" /> + <delete dir="images" /> + <delete dir="OSEE" /> + </then> + </if> + </target> </configuration> <goals> <goal>run</goal> @@ -55,10 +66,34 @@ <id>help-build</id> <phase>generate-sources</phase> <configuration> - <tasks if="update.osee.doc"> - <property name="compile_classpath" refid="maven.compile.classpath" /> - <ant target="all" inheritRefs="true" antfile="build-helper.xml" /> - </tasks> + <target> + <property name="plugin_classpath" refid="maven.plugin.classpath" /> + <taskdef resource="net/sf/antcontrib/antlib.xml"> + <classpath> + <pathelement path="${classpath}" /> + <pathelement path="${plugin_classpath}" /> + </classpath> + </taskdef> + + <if> + <equals arg1="${update.osee.doc}" arg2="true" /> + <then> + + <if> + <isset property="http.proxyHost" /> + <then> + <echo message="Set Proxy: [${http.proxyHost}:${http.proxyPort}]" /> + <echo message="Exclude ProxyHosts: [${http.nonProxyHosts}]" /> + <setproxy nonproxyhosts="${http.nonProxyHosts}" + proxyhost="${http.proxyHost}" proxyport="${http.proxyPort}" /> + </then> + </if> + + <property name="compile_classpath" refid="maven.compile.classpath" /> + <ant target="all" inheritRefs="true" antfile="build-helper.xml" /> + </then> + </if> + </target> </configuration> <goals> <goal>run</goal> @@ -66,10 +101,6 @@ </execution> </executions> </plugin> - <plugin> - <groupId>org.eclipse.tycho</groupId> - <artifactId>tycho-source-plugin</artifactId> - </plugin> </plugins> </build> diff --git a/plugins/org.eclipse.osee.framework.dev.help.ui/pom.xml b/plugins/org.eclipse.osee.framework.dev.help.ui/pom.xml index 22bfdea568..ce3ecf0c13 100644 --- a/plugins/org.eclipse.osee.framework.dev.help.ui/pom.xml +++ b/plugins/org.eclipse.osee.framework.dev.help.ui/pom.xml @@ -18,23 +18,30 @@ <plugins> <plugin> <artifactId>maven-antrun-plugin</artifactId> - <dependencies> - <dependency> - <groupId>ant</groupId> - <artifactId>optional</artifactId> - <version>1.5.4</version> - </dependency> - </dependencies> + <version>${maven-antrun-version}</version> <executions> <execution> <id>help-clean-up</id> <phase>clean</phase> <configuration> - <tasks if="update.osee.doc"> - <property name="compile_classpath" refid="maven.compile.classpath" /> - <delete dir="images" /> - <delete dir="OSEE" /> - </tasks> + <target> + <property name="plugin_classpath" refid="maven.plugin.classpath" /> + <taskdef resource="net/sf/antcontrib/antlib.xml"> + <classpath> + <pathelement path="${classpath}" /> + <pathelement path="${plugin_classpath}" /> + </classpath> + </taskdef> + + <if> + <equals arg1="${update.osee.doc}" arg2="true" /> + <then> + <property name="compile_classpath" refid="maven.compile.classpath" /> + <delete dir="images" /> + <delete dir="OSEE" /> + </then> + </if> + </target> </configuration> <goals> <goal>run</goal> @@ -45,10 +52,34 @@ <id>help-build</id> <phase>generate-sources</phase> <configuration> - <tasks if="update.osee.doc"> - <property name="compile_classpath" refid="maven.compile.classpath" /> - <ant target="all" inheritRefs="true" antfile="build-helper.xml" /> - </tasks> + <target> + <property name="plugin_classpath" refid="maven.plugin.classpath" /> + <taskdef resource="net/sf/antcontrib/antlib.xml"> + <classpath> + <pathelement path="${classpath}" /> + <pathelement path="${plugin_classpath}" /> + </classpath> + </taskdef> + + <if> + <equals arg1="${update.osee.doc}" arg2="true" /> + <then> + + <if> + <isset property="http.proxyHost" /> + <then> + <echo message="Set Proxy: [${http.proxyHost}:${http.proxyPort}]" /> + <echo message="Exclude ProxyHosts: [${http.nonProxyHosts}]" /> + <setproxy nonproxyhosts="${http.nonProxyHosts}" + proxyhost="${http.proxyHost}" proxyport="${http.proxyPort}" /> + </then> + </if> + + <property name="compile_classpath" refid="maven.compile.classpath" /> + <ant target="all" inheritRefs="true" antfile="build-helper.xml" /> + </then> + </if> + </target> </configuration> <goals> <goal>run</goal> diff --git a/plugins/org.eclipse.osee.framework.help.ui/pom.xml b/plugins/org.eclipse.osee.framework.help.ui/pom.xml index ccab217e78..8a75a376de 100644 --- a/plugins/org.eclipse.osee.framework.help.ui/pom.xml +++ b/plugins/org.eclipse.osee.framework.help.ui/pom.xml @@ -26,24 +26,35 @@ </resources> <plugins> <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-source-plugin</artifactId> + </plugin> + <plugin> <artifactId>maven-antrun-plugin</artifactId> - <dependencies> - <dependency> - <groupId>ant</groupId> - <artifactId>optional</artifactId> - <version>1.5.4</version> - </dependency> - </dependencies> + <version>${maven-antrun-version}</version> <executions> <execution> <id>help-clean-up</id> <phase>clean</phase> <configuration> - <tasks if="update.osee.doc"> - <property name="compile_classpath" refid="maven.compile.classpath" /> - <delete dir="images" /> - <delete dir="OSEE" /> - </tasks> + <target> + <property name="plugin_classpath" refid="maven.plugin.classpath" /> + <taskdef resource="net/sf/antcontrib/antlib.xml"> + <classpath> + <pathelement path="${classpath}" /> + <pathelement path="${plugin_classpath}" /> + </classpath> + </taskdef> + + <if> + <equals arg1="${update.osee.doc}" arg2="true" /> + <then> + <property name="compile_classpath" refid="maven.compile.classpath" /> + <delete dir="images" /> + <delete dir="OSEE" /> + </then> + </if> + </target> </configuration> <goals> <goal>run</goal> @@ -54,10 +65,34 @@ <id>help-build</id> <phase>generate-sources</phase> <configuration> - <tasks if="update.osee.doc"> - <property name="compile_classpath" refid="maven.compile.classpath" /> - <ant target="all" inheritRefs="true" antfile="build-helper.xml" /> - </tasks> + <target> + <property name="plugin_classpath" refid="maven.plugin.classpath" /> + <taskdef resource="net/sf/antcontrib/antlib.xml"> + <classpath> + <pathelement path="${classpath}" /> + <pathelement path="${plugin_classpath}" /> + </classpath> + </taskdef> + + <if> + <equals arg1="${update.osee.doc}" arg2="true" /> + <then> + + <if> + <isset property="http.proxyHost" /> + <then> + <echo message="Set Proxy: [${http.proxyHost}:${http.proxyPort}]" /> + <echo message="Exclude ProxyHosts: [${http.nonProxyHosts}]" /> + <setproxy nonproxyhosts="${http.nonProxyHosts}" + proxyhost="${http.proxyHost}" proxyport="${http.proxyPort}" /> + </then> + </if> + + <property name="compile_classpath" refid="maven.compile.classpath" /> + <ant target="all" inheritRefs="true" antfile="build-helper.xml" /> + </then> + </if> + </target> </configuration> <goals> <goal>run</goal> @@ -65,10 +100,6 @@ </execution> </executions> </plugin> - <plugin> - <groupId>org.eclipse.tycho</groupId> - <artifactId>tycho-source-plugin</artifactId> - </plugin> </plugins> </build> diff --git a/plugins/org.eclipse.osee.ote.help.ui/pom.xml b/plugins/org.eclipse.osee.ote.help.ui/pom.xml index df75c37709..a4b547c89c 100644 --- a/plugins/org.eclipse.osee.ote.help.ui/pom.xml +++ b/plugins/org.eclipse.osee.ote.help.ui/pom.xml @@ -26,24 +26,35 @@ </resources> <plugins> <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-source-plugin</artifactId> + </plugin> + <plugin> <artifactId>maven-antrun-plugin</artifactId> - <dependencies> - <dependency> - <groupId>ant</groupId> - <artifactId>optional</artifactId> - <version>1.5.4</version> - </dependency> - </dependencies> + <version>${maven-antrun-version}</version> <executions> <execution> <id>help-clean-up</id> <phase>clean</phase> <configuration> - <tasks if="update.osee.doc"> - <property name="compile_classpath" refid="maven.compile.classpath" /> - <delete dir="images" /> - <delete dir="OSEE" /> - </tasks> + <target> + <property name="plugin_classpath" refid="maven.plugin.classpath" /> + <taskdef resource="net/sf/antcontrib/antlib.xml"> + <classpath> + <pathelement path="${classpath}" /> + <pathelement path="${plugin_classpath}" /> + </classpath> + </taskdef> + + <if> + <equals arg1="${update.osee.doc}" arg2="true" /> + <then> + <property name="compile_classpath" refid="maven.compile.classpath" /> + <delete dir="images" /> + <delete dir="OSEE" /> + </then> + </if> + </target> </configuration> <goals> <goal>run</goal> @@ -54,10 +65,34 @@ <id>help-build</id> <phase>generate-sources</phase> <configuration> - <tasks if="update.osee.doc"> - <property name="compile_classpath" refid="maven.compile.classpath" /> - <ant target="all" inheritRefs="true" antfile="build-helper.xml" /> - </tasks> + <target> + <property name="plugin_classpath" refid="maven.plugin.classpath" /> + <taskdef resource="net/sf/antcontrib/antlib.xml"> + <classpath> + <pathelement path="${classpath}" /> + <pathelement path="${plugin_classpath}" /> + </classpath> + </taskdef> + + <if> + <equals arg1="${update.osee.doc}" arg2="true" /> + <then> + + <if> + <isset property="http.proxyHost" /> + <then> + <echo message="Set Proxy: [${http.proxyHost}:${http.proxyPort}]" /> + <echo message="Exclude ProxyHosts: [${http.nonProxyHosts}]" /> + <setproxy nonproxyhosts="${http.nonProxyHosts}" + proxyhost="${http.proxyHost}" proxyport="${http.proxyPort}" /> + </then> + </if> + + <property name="compile_classpath" refid="maven.compile.classpath" /> + <ant target="all" inheritRefs="true" antfile="build-helper.xml" /> + </then> + </if> + </target> </configuration> <goals> <goal>run</goal> @@ -65,11 +100,7 @@ </execution> </executions> </plugin> - <plugin> - <groupId>org.eclipse.tycho</groupId> - <artifactId>tycho-source-plugin</artifactId> - </plugin> </plugins> </build> - + </project>
\ No newline at end of file |