Author: jlmonteiro
Date: Thu Dec 16 08:57:33 2010
New Revision: 1049826
URL: http://svn.apache.org/viewvc?rev=1049826&view=rev
Log:
TomEE bundle helper script only works without a proxy. When using behind a
proxy, ant proxy must be set.
Modified:
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/build.xml
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/pom.xml
Modified:
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/build.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/build.xml?rev=1049826&r1=1049825&r2=1049826&view=diff
==============================================================================
---
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/build.xml
(original)
+++
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/build.xml
Thu Dec 16 08:57:33 2010
@@ -17,20 +17,36 @@
-->
<project name="TomcatBundle">
- <target name="downloadtomcat">
- <!-- create a directory to extract Tomcat to -->
- <mkdir dir="${OUTPUT_DIR}/bundle/extracted"/>
-
- <!-- download Tomcat -->
- <get
src="http://archive.apache.org/dist/tomcat/tomcat-6/v${tomcat.version}/bin/apache-tomcat-${tomcat.version}.zip";
dest="${LOCAL_M2_REPO}/org/apache/openejb/apache-tomcat-${tomcat.version}.zip"
verbose="true" usetimestamp="true"/>
-
- <!-- unzip Tomcat -->
- <unzip
src="${LOCAL_M2_REPO}/org/apache/openejb/apache-tomcat-${tomcat.version}.zip"
dest="${OUTPUT_DIR}/bundle/extracted"/>
-
- <!-- unzip openejb.war -->
- <unzip
src="${LOCAL_M2_REPO}/org/apache/openejb/openejb-tomcat-webapp/${openejb.version}/openejb-tomcat-webapp-${openejb.version}.war"
dest="${OUTPUT_DIR}/bundle/extracted/apache-tomcat-${tomcat.version}/webapps/openejb"/>
-
- <!-- unzip examples.war -->
- <unzip
src="${LOCAL_M2_REPO}/org/superbiz/ejb-examples/${examples.version}/ejb-examples-${examples.version}.war"
dest="${OUTPUT_DIR}/bundle/extracted/apache-tomcat-${tomcat.version}/webapps/ejb-examples"/>
- </target>
+
+ <target name="probe-proxy">
+ <condition property="proxy.set">
+ <or>
+ <isset property="http.proxyHost" />
+ <isset property="http.proxyPort" />
+ </or>
+ </condition>
+ </target>
+
+ <target name="set-proxy" depends="probe-proxy" if="proxy.set">
+ <echo message="Setting proxy host=${http.proxyHost} and proxy
port=${http.proxyPort}" />
+ <setproxy proxyhost="${http.proxyHost}"
proxyport="${http.proxyPort}" />
+ </target>
+
+ <target name="downloadtomcat">
+
+ <!-- create a directory to extract Tomcat to -->
+ <mkdir dir="${OUTPUT_DIR}/bundle/extracted"/>
+
+ <!-- download Tomcat -->
+ <get
src="http://archive.apache.org/dist/tomcat/tomcat-6/v${tomcat.version}/bin/apache-tomcat-${tomcat.version}.zip";
dest="${LOCAL_M2_REPO}/org/apache/openejb/apache-tomcat-${tomcat.version}.zip"
verbose="true" usetimestamp="true"/>
+
+ <!-- unzip Tomcat -->
+ <unzip
src="${LOCAL_M2_REPO}/org/apache/openejb/apache-tomcat-${tomcat.version}.zip"
dest="${OUTPUT_DIR}/bundle/extracted"/>
+
+ <!-- unzip openejb.war -->
+ <unzip
src="${LOCAL_M2_REPO}/org/apache/openejb/openejb-tomcat-webapp/${openejb.version}/openejb-tomcat-webapp-${openejb.version}.war"
dest="${OUTPUT_DIR}/bundle/extracted/apache-tomcat-${tomcat.version}/webapps/openejb"/>
+
+ <!-- unzip examples.war -->
+ <unzip
src="${LOCAL_M2_REPO}/org/superbiz/ejb-examples/${examples.version}/ejb-examples-${examples.version}.war"
dest="${OUTPUT_DIR}/bundle/extracted/apache-tomcat-${tomcat.version}/webapps/ejb-examples"/>
+ </target>
</project>
Modified:
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/pom.xml?rev=1049826&r1=1049825&r2=1049826&view=diff
==============================================================================
---
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/pom.xml
(original)
+++
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/pom.xml
Thu Dec 16 08:57:33 2010
@@ -21,7 +21,7 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
<parent>
<artifactId>openejb-tomcat</artifactId>
<groupId>org.apache.openejb</groupId>
@@ -31,10 +31,7 @@
<artifactId>openejb-tomcat-bundle</artifactId>
<packaging>jar</packaging>
<name>OpenEJB :: Assembly :: Tomcat :: Bundle</name>
- <properties>
- <tomcat.version>6.0.29</tomcat.version>
- <examples.version>1.1-SNAPSHOT</examples.version>
- </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.openejb</groupId>
@@ -67,6 +64,8 @@
<property name="tomcat.version" value="${tomcat.version}" />
<property name="openejb.version" value="${project.version}" />
<property name="examples.version" value="${examples.version}"
/>
+ <property name="http.proxyHost" value="${http.proxyHost}" />
+ <property name="http.proxyPort" value="${http.proxyPort}" />
<ant antfile="${basedir}/build.xml">
<target name="downloadtomcat" />
@@ -78,6 +77,18 @@
</goals>
</execution>
</executions>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-commons-net</artifactId>
+ <version>${ant.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-nodeps</artifactId>
+ <version>${ant.version}</version>
+ </dependency>
+ </dependencies>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
@@ -91,20 +102,20 @@
<mainClass>org.apache.openejb.tomcat.TomcatBundleInstaller</mainClass>
<arguments>
<argument>
-
${basedir}/target/bundle/extracted/apache-tomcat-${tomcat.version}/webapps/openejb
+
${basedir}/target/bundle/extracted/apache-tomcat-${tomcat.version}/webapps/openejb
</argument>
</arguments>
<systemProperties>
<systemProperty>
<key>catalina.home</key>
<value>
-
${basedir}/target/bundle/extracted/apache-tomcat-${tomcat.version}
+
${basedir}/target/bundle/extracted/apache-tomcat-${tomcat.version}
</value>
</systemProperty>
<systemProperty>
<key>catalina.base</key>
<value>
-
${basedir}/target/bundle/extracted/apache-tomcat-${tomcat.version}
+
${basedir}/target/bundle/extracted/apache-tomcat-${tomcat.version}
</value>
</systemProperty>
</systemProperties>
@@ -138,5 +149,12 @@
</plugin>
</plugins>
</build>
+
+ <properties>
+ <tomcat.version>6.0.29</tomcat.version>
+ <examples.version>1.1-SNAPSHOT</examples.version>
+ <ant.version>1.8.1</ant.version>
+ </properties>
+
</project>
