[jboss-osgi-commits] JBoss-OSGI SVN: r97727 - in projects/jboss-osgi/trunk: hudson and 2 other directories.

Author: thomas.diesler(a)jboss.com Date: 2009-12-11 08:12:37 -0500 (Fri, 11 Dec 2009) New Revision: 97727 Removed: projects/jboss-osgi/trunk/hudson/apache-tomcat/conf/tomcat-users.xml projects/jboss-osgi/trunk/hudson/hudson-home/jobs/JBoss-6.0.0/ Modified: projects/jboss-osgi/trunk/hudson/ant.properties.example projects/jboss-osgi/trunk/hudson/build.xml projects/jboss-osgi/trunk/pom.xml Log: Update to new Deployment API Modified: projects/jboss-osgi/trunk/hudson/ant.properties.example =================================================================== --- projects/jboss-osgi/trunk/hudson/ant.properties.example 2009-12-11 13:12:03 UTC (rev 97726) +++ projects/jboss-osgi/trunk/hudson/ant.properties.example 2009-12-11 13:12:37 UTC (rev 97727) @@ -13,12 +13,12 @@ # Hudson QA Environment hudson.username=changeme -hudson.password=changeme hudson.maven.name=apache-maven-2.2.1 hudson.maven.path=/usr/java/apache-maven-2.2.1 -hudson.root=/home/hudson/workspace/hudson/jboss-osgi +# Hudson Workspace Root +# hudson.root=/home/username/workspace/hudson/jboss-osgi hudson.maven.profile=$HUDSONDIR/profiles.xml.local.qa @@ -28,15 +28,12 @@ #hudson.jboss501.zip=file:///home/hudson/download/java/jboss/jboss-5.0.1.GA.zip #hudson.jboss510.zip=file:///home/hudson/download/java/jboss/jboss-5.1.0.GA.zip +#hudson.jboss600.zip=file:///home/hudson/download/java/jboss/jboss-6.0.0.M1.zip hudson.mail.recipients= hudson.mail.admin=yourname(a)yourdomain.com hudson.smtp.host=localhost -# Hudson (1.290) apache-tomcat=5.5.27 -sun-hudson=2402/128862 +sun-hudson=1.336 -# authentication cancelled error -# https://hudson.dev.java.net/issues/show_bug.cgi?id=3936 - Deleted: projects/jboss-osgi/trunk/hudson/apache-tomcat/conf/tomcat-users.xml =================================================================== --- projects/jboss-osgi/trunk/hudson/apache-tomcat/conf/tomcat-users.xml 2009-12-11 13:12:03 UTC (rev 97726) +++ projects/jboss-osgi/trunk/hudson/apache-tomcat/conf/tomcat-users.xml 2009-12-11 13:12:37 UTC (rev 97727) @@ -1,5 +0,0 @@ -<?xml version='1.0' encoding='utf-8'?> -<tomcat-users> - <role rolename="admin"/> - <user username=&quot;@hudson.username(a)&quot; password=&quot;@hudson.password(a)&quot; roles="admin"/> -</tomcat-users> Modified: projects/jboss-osgi/trunk/hudson/build.xml =================================================================== --- projects/jboss-osgi/trunk/hudson/build.xml 2009-12-11 13:12:03 UTC (rev 97726) +++ projects/jboss-osgi/trunk/hudson/build.xml 2009-12-11 13:12:37 UTC (rev 97727) @@ -46,6 +46,11 @@ <property file="${basedir}/ant.properties"/> + <!-- Setup property defaults --> + <property environment="env"/> + <property name="hudson.username" value="${env.USER}" /> + <property name="hudson.root" value="/home/${hudson.username}/workspace/osgitck" /> + <xmlproperty file="${project.root.dir}/pom.xml"/> <property name="version.id" value="${project.version}"/> </target> @@ -66,8 +71,6 @@ <property name="hudson.username.${hudson.username}" value="true"/> <fail message="Cannot use default hudson username: ${hudson.username}" if="hudson.username.changeme"/> - <property name="hudson.password.${hudson.password}" value="true"/> - <fail message="Cannot use default hudson password: ${hudson.password}" if="hudson.password.changeme"/> </target> <target name="init-thirdparty" depends="init-hudson"> @@ -77,6 +80,7 @@ <available property="sun.hudson.available" file="${thirdparty.dir}/hudson.war"/> <available property="jboss501.available" file="${thirdparty.dir}/jboss-5.0.1.GA.zip"/> <available property="jboss510.available" file="${thirdparty.dir}/jboss-5.1.0.GA.zip"/> + <available property="jboss600.available" file="${thirdparty.dir}/jboss-6.0.0.M1.zip"/> </target> <!-- @@ -90,7 +94,7 @@ <get src="http://www.apache.org/dist/tomcat/tomcat-5/v${apache-tomcat}/bi... dest="${thirdparty.dir}/apache-tomcat.zip" usetimestamp="true" verbose="true"/> </target> <target name="get-hudson" depends="init-thirdparty" unless="sun.hudson.available"> - <get src="https://hudson.dev.java.net/files/documents/${sun-hudson}/hudso... dest="${thirdparty.dir}/hudson.war" usetimestamp="true" verbose="true"/> + <get src="http://hudson-ci.org/download/war/${sun-hudson}/hudson.war" dest="${thirdparty.dir}/hudson.war" usetimestamp="true" verbose="true"/> </target> <target name="get-jboss501" depends="init-thirdparty" unless="jboss501.available"> <property name="hudson.jboss501.zip" value="http://downloads.sourceforge.net/jboss/jboss-5.0.1.GA.zip&quo... @@ -100,6 +104,10 @@ <property name="hudson.jboss510.zip" value="http://downloads.sourceforge.net/jboss/jboss-5.1.0.GA.zip&quo... <get src="${hudson.jboss510.zip}" dest="${thirdparty.dir}/jboss-5.1.0.GA.zip" usetimestamp="true" verbose="true"/> </target> + <target name="get-jboss600" depends="init-thirdparty" unless="jboss600.available"> + <property name="hudson.jboss600.zip" value="http://downloads.sourceforge.net/jboss/jboss-6.0.0.M1.zip&quo... + <get src="${hudson.jboss600.zip}" dest="${thirdparty.dir}/jboss-6.0.0.M1.zip" usetimestamp="true" verbose="true"/> + </target> <!-- Setup the Hudson Tomcat instance Modified: projects/jboss-osgi/trunk/pom.xml =================================================================== --- projects/jboss-osgi/trunk/pom.xml 2009-12-11 13:12:03 UTC (rev 97726) +++ projects/jboss-osgi/trunk/pom.xml 2009-12-11 13:12:37 UTC (rev 97727) @@ -54,7 +54,7 @@ <version.jboss.osgi.common>1.0.3</version.jboss.osgi.common> <version.jboss.osgi.common.core>2.2.13.GA</version.jboss.osgi.common.core> <version.jboss.osgi.deployment>1.0.1-SNAPSHOT</version.jboss.osgi.deployment> - <version.jboss.osgi.framework>1.0.0.Alpha2</version.jboss.osgi.framework> + <version.jboss.osgi.framework>1.0.0.Alpha2-SNAPSHOT</version.jboss.osgi.framework> <version.jboss.osgi.hotdeploy>1.0.3</version.jboss.osgi.hotdeploy> <version.jboss.osgi.husky>1.0.3-SNAPSHOT</version.jboss.osgi.husky> <version.jboss.osgi.jaxb>2.1.10.SP3</version.jboss.osgi.jaxb>