[jboss-cvs] JBossAS SVN: r84787 - in projects/jboss-osgi/trunk: build and 2 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: thomas.diesler at jboss.com
Date: 2009-02-26 05:00:37 -0500 (Thu, 26 Feb 2009)
New Revision: 84787

Added:
   projects/jboss-osgi/trunk/build/
   projects/jboss-osgi/trunk/build/distribution/
   projects/jboss-osgi/trunk/build/eclipse/
   projects/jboss-osgi/trunk/build/hudson/
   projects/jboss-osgi/trunk/profiles.xml.example
Removed:
   projects/jboss-osgi/trunk/distribution/
   projects/jboss-osgi/trunk/eclipse/
   projects/jboss-osgi/trunk/hudson/
Modified:
   projects/jboss-osgi/trunk/build/distribution/pom.xml
   projects/jboss-osgi/trunk/build/hudson/hudson-home/command.sh
   projects/jboss-osgi/trunk/pom.xml
Log:
Move non mvn stuff to build

Copied: projects/jboss-osgi/trunk/build/distribution (from rev 84763, projects/jboss-osgi/trunk/distribution)

Modified: projects/jboss-osgi/trunk/build/distribution/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/pom.xml	2009-02-25 20:12:23 UTC (rev 84763)
+++ projects/jboss-osgi/trunk/build/distribution/pom.xml	2009-02-26 10:00:37 UTC (rev 84787)
@@ -25,6 +25,7 @@
     <groupId>org.jboss.osgi</groupId>
     <artifactId>jboss-osgi</artifactId>
     <version>1.0.0.Alpha3</version>
+    <relativePath>../../pom.xml</relativePath>
   </parent>
 
   <!-- Properties -->

Copied: projects/jboss-osgi/trunk/build/eclipse (from rev 84763, projects/jboss-osgi/trunk/eclipse)

Copied: projects/jboss-osgi/trunk/build/hudson (from rev 84763, projects/jboss-osgi/trunk/hudson)

Modified: projects/jboss-osgi/trunk/build/hudson/hudson-home/command.sh
===================================================================
--- projects/jboss-osgi/trunk/hudson/hudson-home/command.sh	2009-02-25 20:12:23 UTC (rev 84763)
+++ projects/jboss-osgi/trunk/build/hudson/hudson-home/command.sh	2009-02-26 10:00:37 UTC (rev 84787)
@@ -7,7 +7,8 @@
 
 WORKSPACE=`pwd`
 OSGIDIR=$WORKSPACE/jboss-osgi
-DISTRODIR=$OSGIDIR/distribution/target
+DISTRODIR=$OSGIDIR/build/distribution/target
+HUDSONDIR=$OSGIDIR/build/hudson
 
 case "$CONTAINER" in
   jboss501*)
@@ -45,13 +46,13 @@
 #
 # start jbossas
 #
-$OSGIDIR/hudson/jboss/bin/jboss.sh $JBOSS_HOME start $JBOSS_BINDADDR
+$HUDSONDIR/jboss/bin/jboss.sh $JBOSS_HOME start $JBOSS_BINDADDR
 
 # Was it successfully started?
-$OSGIDIR/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
+$HUDSONDIR/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
 if [ -e $WORKSPACE/spider.failed ]; then
   tail -n 100 $JBOSS_HOME/server/$JBOSS_SERVER/log/server.log
-  $OSGIDIR/hudson/jboss/bin/jboss.sh $JBOSS_HOME stop $JBOSS_BINDADDR
+  $HUDSONDIR/jboss/bin/jboss.sh $JBOSS_HOME stop $JBOSS_BINDADDR
   exit 1
 fi
 
@@ -72,6 +73,6 @@
 #
 # stop jbossas
 #
-$OSGIDIR/hudson/jboss/bin/jboss.sh $JBOSS_HOME stop
+$HUDSONDIR/jboss/bin/jboss.sh $JBOSS_HOME stop
 cp $JBOSS_HOME/server/$JBOSS_SERVER/log/boot.log $WORKSPACE/jboss-boot.log
 cp $JBOSS_HOME/server/$JBOSS_SERVER/log/server.log $WORKSPACE/jboss-server.log

Modified: projects/jboss-osgi/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/pom.xml	2009-02-26 08:39:27 UTC (rev 84786)
+++ projects/jboss-osgi/trunk/pom.xml	2009-02-26 10:00:37 UTC (rev 84787)
@@ -317,7 +317,7 @@
     <profile>
       <id>distro</id>
       <modules>
-        <module>distribution</module>
+        <module>build/distribution</module>
       </modules>
       <build>
         <plugins>

Added: projects/jboss-osgi/trunk/profiles.xml.example
===================================================================
--- projects/jboss-osgi/trunk/profiles.xml.example	                        (rev 0)
+++ projects/jboss-osgi/trunk/profiles.xml.example	2009-02-26 10:00:37 UTC (rev 84787)
@@ -0,0 +1,19 @@
+<profilesXml 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/xsd/profiles-1.0.0.xsd">
+  <profiles>
+
+    <!-- This profile can also be defined in ~/.m2/settings.xml -->   
+    <profile>
+      <id>jboss-home-profile</id>
+      <activation>
+        <property>
+          <name>user.name</name>
+        </property>
+      </activation>
+      <properties>
+        <jboss501.home>/home/tdiesler/svn/jbossas/tags/JBoss_5_0_1_GA/build/output/jboss-5.0.1.GA</jboss501.home>
+      </properties>
+    </profile>
+
+  </profiles>
+</profilesXml>