[Jboss-cvs] JBossAS SVN: r55332 - in branches/MC_VDF_WORK: system/src/resources/tests system-jmx system-jmx/src system-jmx/src/resources system-jmx/src/resources/tests system-jmx/src/resources/tests/org system-jmx/src/resources/tests/org/jboss system-jmx/src/resources/tests/org/jboss/test system-jmx/src/resources/tests/org/jboss/test/system system-jmx/src/resources/tests/org/jboss/test/system/controller system-jmx/src/resources/tests/org/jboss/test/system/controller/basic system-jmx/src/resources/tests/org/jboss/test/system/controller/configure system-jmx/src/resources/tests/org/jboss/test/system/controller/instantiate system-jmx/src/resources/tests/org/jboss/test/system/controller/instantiate/plain system-jmx/src/resources/tests/org/jboss/test/system/controller/instantiate/standard system-jmx/src/resources/tests/org/jboss/test/system/controller/lifecycle system-jmx/src/resources/tests/org/jboss/test/system/controller/lifecycle/basic system-jmx/src/resources/tests/org/jboss/te! st/system/controller/lifecycle/seperated system-jmx/src/resources/tests/org/jboss/test/system/controller/parse system-jmx/src/resources/tests/org/jboss/test/system/metadata system-jmx/src/resources/tests/org/jboss/test/system/metadata/basic system-jmx/src/resources/tests/org/jboss/test/system/metadata/constructor system-jmx/src/resources/tests/org/jboss/test/system/metadata/depends
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Sat Aug 5 10:02:54 EDT 2006
Author: adrian at jboss.org
Date: 2006-08-05 10:02:42 -0400 (Sat, 05 Aug 2006)
New Revision: 55332
Added:
branches/MC_VDF_WORK/system-jmx/src/resources/
branches/MC_VDF_WORK/system-jmx/src/resources/tests/
branches/MC_VDF_WORK/system-jmx/src/resources/tests/org/
branches/MC_VDF_WORK/system-jmx/src/resources/tests/org/jboss/
branches/MC_VDF_WORK/system-jmx/src/resources/tests/org/jboss/test/
branches/MC_VDF_WORK/system-jmx/src/resources/tests/org/jboss/test/system/
branches/MC_VDF_WORK/system-jmx/src/resources/tests/org/jboss/test/system/controller/
branches/MC_VDF_WORK/system-jmx/src/resources/tests/org/jboss/test/system/controller/basic/
branches/MC_VDF_WORK/system-jmx/src/resources/tests/org/jboss/test/system/controller/basic/test/
branches/MC_VDF_WORK/system-jmx/src/resources/tests/org/jboss/test/system/controller/configure/
branches/MC_VDF_WORK/system-jmx/src/resources/tests/org/jboss/test/system/controller/configure/test/
branches/MC_VDF_WORK/system-jmx/src/resources/tests/org/jboss/test/system/controller/instantiate/
branches/MC_VDF_WORK/system-jmx/src/resources/tests/org/jboss/test/system/controller/instantiate/plain/
branches/MC_VDF_WORK/system-jmx/src/resources/tests/org/jboss/test/system/controller/instantiate/plain/test/
branches/MC_VDF_WORK/system-jmx/src/resources/tests/org/jboss/test/system/controller/instantiate/standard/
branches/MC_VDF_WORK/system-jmx/src/resources/tests/org/jboss/test/system/controller/instantiate/standard/test/
branches/MC_VDF_WORK/system-jmx/src/resources/tests/org/jboss/test/system/controller/instantiate/test/
branches/MC_VDF_WORK/system-jmx/src/resources/tests/org/jboss/test/system/controller/lifecycle/
branches/MC_VDF_WORK/system-jmx/src/resources/tests/org/jboss/test/system/controller/lifecycle/basic/
branches/MC_VDF_WORK/system-jmx/src/resources/tests/org/jboss/test/system/controller/lifecycle/basic/test/
branches/MC_VDF_WORK/system-jmx/src/resources/tests/org/jboss/test/system/controller/lifecycle/seperated/
branches/MC_VDF_WORK/system-jmx/src/resources/tests/org/jboss/test/system/controller/lifecycle/seperated/test/
branches/MC_VDF_WORK/system-jmx/src/resources/tests/org/jboss/test/system/controller/parse/
branches/MC_VDF_WORK/system-jmx/src/resources/tests/org/jboss/test/system/controller/parse/test/
branches/MC_VDF_WORK/system-jmx/src/resources/tests/org/jboss/test/system/metadata/
branches/MC_VDF_WORK/system-jmx/src/resources/tests/org/jboss/test/system/metadata/basic/
branches/MC_VDF_WORK/system-jmx/src/resources/tests/org/jboss/test/system/metadata/basic/test/
branches/MC_VDF_WORK/system-jmx/src/resources/tests/org/jboss/test/system/metadata/constructor/
branches/MC_VDF_WORK/system-jmx/src/resources/tests/org/jboss/test/system/metadata/constructor/test/
branches/MC_VDF_WORK/system-jmx/src/resources/tests/org/jboss/test/system/metadata/depends/
branches/MC_VDF_WORK/system-jmx/src/resources/tests/org/jboss/test/system/metadata/depends/test/
Removed:
branches/MC_VDF_WORK/system/src/resources/tests/org/
Modified:
branches/MC_VDF_WORK/system-jmx/.classpath
branches/MC_VDF_WORK/system-jmx/build-test.xml
branches/MC_VDF_WORK/system-jmx/build.sh
branches/MC_VDF_WORK/system-jmx/build.xml
Log:
Fixup system-jmx so that it builds and you can run the tests
Modified: branches/MC_VDF_WORK/system-jmx/.classpath
===================================================================
--- branches/MC_VDF_WORK/system-jmx/.classpath 2006-08-05 05:38:19 UTC (rev 55331)
+++ branches/MC_VDF_WORK/system-jmx/.classpath 2006-08-05 14:02:42 UTC (rev 55332)
@@ -2,6 +2,7 @@
<classpath>
<classpathentry kind="src" path="src/main"/>
<classpathentry output="output/eclipse-test-classes" kind="src" path="src/tests"/>
+ <classpathentry kind="lib" path="src/resources/tests"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry combineaccessrules="false" kind="src" path="/j2se"/>
<classpathentry combineaccessrules="false" kind="src" path="/mbeans"/>
Modified: branches/MC_VDF_WORK/system-jmx/build-test.xml
===================================================================
--- branches/MC_VDF_WORK/system-jmx/build-test.xml 2006-08-05 05:38:19 UTC (rev 55331)
+++ branches/MC_VDF_WORK/system-jmx/build-test.xml 2006-08-05 14:02:42 UTC (rev 55332)
@@ -53,23 +53,6 @@
<property name="build.classes" value="${module.output}/classes-tests" />
<property name="build.testlog" value="${module.output}/log" />
<property name="build-bypass.disabled" value="true" />
- <property name="tests.support.classes" value="output/tests-support/classes" />
- <property name="tests.support.lib" value="output/tests-support/lib" />
- <!-- jbosstest.deploy.dir is a URI -->
- <pathconvert targetos="unix" property="jbosstest.deploy.path">
- <path>
- <pathelement location="${module.output}/lib" />
- </path>
- </pathconvert>
- <!-- Test hotdeployment root directory -->
- <property name="jbosstest.deploy.dir" value="file:${jbosstest.deploy.path}" />
- <!-- Support test classes lib root -->
- <pathconvert targetos="unix" property="jbosstest.support.path">
- <path>
- <pathelement location="${module.output}/tests-support/lib" />
- </path>
- </pathconvert>
- <property name="jbosstest.support.dir" value="file:${jbosstest.support.path}" />
<!-- ========= -->
<!-- Libraries -->
@@ -109,11 +92,9 @@
<path refid="jboss.microcontainer.classpath"/>
<path refid="jboss.j2se.classpath" />
<path refid="jboss.mbeans.classpath" />
+ <path refid="jboss.system.classpath" />
<path refid="jboss.test.classpath" />
<pathelement location="output/classes" />
- <pathelement location="src/resources/tests/bootstrap" />
- <pathelement location="src/resources/tests/conf" />
- <pathelement location="src/resources/tests/xml" />
</path>
<!-- ===== -->
@@ -150,38 +131,14 @@
<!-- Archives -->
<!-- ================================================================== -->
- <target name="module-jars" depends="init, tests-support-jars" />
-
- <target name="tests-support-jars" depends="init"
- description="Compiles and creates the tests-support tree jars">
-
-
- <path id="tests-support.classpath">
- <path refid="library.classpath" />
- <path refid="dependentmodule.classpath" />
- </path>
- <mkdir dir="${tests.support.classes}" />
- <mkdir dir="${tests.support.lib}" />
- <javac destdir="${tests.support.classes}"
- target="${javac.target}"
- source="${javac.source}"
- debug="${javac.debug}"
- failonerror="true">
- <src path="src/tests-support"/>
- <classpath refid="tests-support.classpath"/>
- </javac>
-
- <jar destfile="${tests.support.lib}/org.jboss.server.support.jar">
- <manifest>
- <attribute name="Specification-Title" value="Support" />
- <attribute name="Specification-Version" value="1.0.0.GA" />
- <attribute name="Specification-Vendor" value="JBoss Inc." />
- </manifest>
- <zipfileset dir="${tests.support.classes}">
- <include name="org/jboss/test/server/support/**" />
- </zipfileset>
- </jar>
-
+ <target name="module-jars" depends="init">
+ <!-- Build jboss-system-jmx-test.jar -->
+ <jar jarfile="${build.lib}/jboss-system-jmx-test.jar" manifest="${build.etc}/default.mf">
+ <fileset dir="${build.classes}"/>
+ <fileset dir="${build.resources}/tests">
+ <include name="org/**"/>
+ </fileset>
+ </jar>
</target>
<!-- ================================================================== -->
Modified: branches/MC_VDF_WORK/system-jmx/build.sh
===================================================================
--- branches/MC_VDF_WORK/system-jmx/build.sh 2006-08-05 05:38:19 UTC (rev 55331)
+++ branches/MC_VDF_WORK/system-jmx/build.sh 2006-08-05 14:02:42 UTC (rev 55332)
@@ -1,172 +1,172 @@
-#!/bin/sh
-### ====================================================================== ###
-## ##
-## This is the main entry point for the build system. ##
-## ##
-## Users should be sure to execute this file rather than 'ant' to ensure ##
-## the correct version is being used with the correct configuration. ##
-## ##
-### ====================================================================== ###
-
-# $Id: build.sh 24242 2004-10-04 20:13:37Z andd $
-
-PROGNAME=`basename $0`
-DIRNAME=`dirname $0`
-GREP="grep"
-ROOT="/"
-
-# Ignore user's ANT_HOME if it is set
-ANT_HOME=""
-
-# the default search path for ant
-ANT_SEARCH_PATH="\
- tools
- tools/ant \
- tools/apache/ant \
- ant"
-
-# the default build file name
-ANT_BUILD_FILE="build.xml"
-
-# the default arguments
-ANT_OPTIONS="-find $ANT_BUILD_FILE"
-
-# Use the maximum available, or set MAX_FD != -1 to use that
-MAX_FD="maximum"
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false;
-darwin=false;
-case "`uname`" in
- CYGWIN*)
- cygwin=true
- ;;
-
- Darwin*)
- darwin=true
- ;;
-esac
-
-#
-# Helper to complain.
-#
-die() {
- echo "${PROGNAME}: $*"
- exit 1
-}
-
-#
-# Helper to complain.
-#
-warn() {
- echo "${PROGNAME}: $*"
-}
-
-#
-# Helper to source a file if it exists.
-#
-maybe_source() {
- for file in $*; do
- if [ -f "$file" ]; then
- . $file
- fi
- done
-}
-
-search() {
- search="$*"
- for d in $search; do
- ANT_HOME="`pwd`/$d"
- ANT="$ANT_HOME/bin/ant"
- if [ -x "$ANT" ]; then
- # found one
- echo $ANT_HOME
- break
- fi
- done
-}
-
-#
-# Main function.
-#
-main() {
- # if there is a build config file. then source it
- maybe_source "$DIRNAME/build.conf" "$HOME/.build.conf"
-
- # Increase the maximum file descriptors if we can
- if [ $cygwin = "false" ]; then
- MAX_FD_LIMIT=`ulimit -H -n`
- if [ $? -eq 0 ]; then
- if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ]; then
- # use the system max
- MAX_FD="$MAX_FD_LIMIT"
- fi
-
- ulimit -n $MAX_FD
- if [ $? -ne 0 ]; then
- warn "Could not set maximum file descriptor limit: $MAX_FD"
- fi
- else
- warn "Could not query system maximum file descriptor limit: $MAX_FD_LIMIT"
- fi
- fi
-
- # try the search path
- ANT_HOME=`search $ANT_SEARCH_PATH`
-
- # try looking up to root
- if [ "x$ANT_HOME" = "x" ]; then
- target="build"
- _cwd=`pwd`
-
- while [ "x$ANT_HOME" = "x" ] && [ "$cwd" != "$ROOT" ]; do
- cd ..
- cwd=`pwd`
- ANT_HOME=`search $ANT_SEARCH_PATH`
- done
-
- # make sure we get back
- cd $_cwd
-
- if [ "$cwd" != "$ROOT" ]; then
- found="true"
- fi
-
- # complain if we did not find anything
- if [ "$found" != "true" ]; then
- die "Could not locate Ant; check \$ANT or \$ANT_HOME."
- fi
- fi
-
- # make sure we have one
- ANT=$ANT_HOME/bin/ant
- if [ ! -x "$ANT" ]; then
- die "Ant file is not executable: $ANT"
- fi
-
- # need to specify planet57/buildmagic protocol handler package
- ANT_OPTS="-Djava.protocol.handler.pkgs=org.jboss.net.protocol"
-
- # setup some build properties
- ANT_OPTS="$ANT_OPTS -Dbuild.script=$0"
-
- # change to the directory where the script lives so users are not forced
- # to be in the same directory as build.xml
- cd $DIRNAME
-
- # export some stuff for ant
- export ANT ANT_HOME ANT_OPTS
-
- # execute in debug mode, or simply execute
- if [ "x$ANT_DEBUG" != "x" ]; then
- /bin/sh -x $ANT $ANT_OPTIONS "$@"
- else
- exec $ANT $ANT_OPTIONS "$@"
- fi
-}
-
-##
-## Bootstrap
-##
-
-main "$@"
+#!/bin/sh
+### ====================================================================== ###
+## ##
+## This is the main entry point for the build system. ##
+## ##
+## Users should be sure to execute this file rather than 'ant' to ensure ##
+## the correct version is being used with the correct configuration. ##
+## ##
+### ====================================================================== ###
+
+# $Id: build.sh 24242 2004-10-04 20:13:37Z andd $
+
+PROGNAME=`basename $0`
+DIRNAME=`dirname $0`
+GREP="grep"
+ROOT="/"
+
+# Ignore user's ANT_HOME if it is set
+ANT_HOME=""
+
+# the default search path for ant
+ANT_SEARCH_PATH="\
+ tools
+ tools/ant \
+ tools/apache/ant \
+ ant"
+
+# the default build file name
+ANT_BUILD_FILE="build.xml"
+
+# the default arguments
+ANT_OPTIONS="-find $ANT_BUILD_FILE"
+
+# Use the maximum available, or set MAX_FD != -1 to use that
+MAX_FD="maximum"
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false;
+darwin=false;
+case "`uname`" in
+ CYGWIN*)
+ cygwin=true
+ ;;
+
+ Darwin*)
+ darwin=true
+ ;;
+esac
+
+#
+# Helper to complain.
+#
+die() {
+ echo "${PROGNAME}: $*"
+ exit 1
+}
+
+#
+# Helper to complain.
+#
+warn() {
+ echo "${PROGNAME}: $*"
+}
+
+#
+# Helper to source a file if it exists.
+#
+maybe_source() {
+ for file in $*; do
+ if [ -f "$file" ]; then
+ . $file
+ fi
+ done
+}
+
+search() {
+ search="$*"
+ for d in $search; do
+ ANT_HOME="`pwd`/$d"
+ ANT="$ANT_HOME/bin/ant"
+ if [ -x "$ANT" ]; then
+ # found one
+ echo $ANT_HOME
+ break
+ fi
+ done
+}
+
+#
+# Main function.
+#
+main() {
+ # if there is a build config file. then source it
+ maybe_source "$DIRNAME/build.conf" "$HOME/.build.conf"
+
+ # Increase the maximum file descriptors if we can
+ if [ $cygwin = "false" ]; then
+ MAX_FD_LIMIT=`ulimit -H -n`
+ if [ $? -eq 0 ]; then
+ if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ]; then
+ # use the system max
+ MAX_FD="$MAX_FD_LIMIT"
+ fi
+
+ ulimit -n $MAX_FD
+ if [ $? -ne 0 ]; then
+ warn "Could not set maximum file descriptor limit: $MAX_FD"
+ fi
+ else
+ warn "Could not query system maximum file descriptor limit: $MAX_FD_LIMIT"
+ fi
+ fi
+
+ # try the search path
+ ANT_HOME=`search $ANT_SEARCH_PATH`
+
+ # try looking up to root
+ if [ "x$ANT_HOME" = "x" ]; then
+ target="build"
+ _cwd=`pwd`
+
+ while [ "x$ANT_HOME" = "x" ] && [ "$cwd" != "$ROOT" ]; do
+ cd ..
+ cwd=`pwd`
+ ANT_HOME=`search $ANT_SEARCH_PATH`
+ done
+
+ # make sure we get back
+ cd $_cwd
+
+ if [ "$cwd" != "$ROOT" ]; then
+ found="true"
+ fi
+
+ # complain if we did not find anything
+ if [ "$found" != "true" ]; then
+ die "Could not locate Ant; check \$ANT or \$ANT_HOME."
+ fi
+ fi
+
+ # make sure we have one
+ ANT=$ANT_HOME/bin/ant
+ if [ ! -x "$ANT" ]; then
+ die "Ant file is not executable: $ANT"
+ fi
+
+ # need to specify planet57/buildmagic protocol handler package
+ ANT_OPTS="-Djava.protocol.handler.pkgs=org.jboss.net.protocol"
+
+ # setup some build properties
+ ANT_OPTS="$ANT_OPTS -Dbuild.script=$0"
+
+ # change to the directory where the script lives so users are not forced
+ # to be in the same directory as build.xml
+ cd $DIRNAME
+
+ # export some stuff for ant
+ export ANT ANT_HOME ANT_OPTS
+
+ # execute in debug mode, or simply execute
+ if [ "x$ANT_DEBUG" != "x" ]; then
+ /bin/sh -x $ANT $ANT_OPTIONS "$@"
+ else
+ exec $ANT $ANT_OPTIONS "$@"
+ fi
+}
+
+##
+## Bootstrap
+##
+
+main "$@"
Modified: branches/MC_VDF_WORK/system-jmx/build.xml
===================================================================
--- branches/MC_VDF_WORK/system-jmx/build.xml 2006-08-05 05:38:19 UTC (rev 55331)
+++ branches/MC_VDF_WORK/system-jmx/build.xml 2006-08-05 14:02:42 UTC (rev 55332)
@@ -83,10 +83,13 @@
<!-- Modules -->
<!-- ======= -->
+ &modules;
+
<!-- The combined dependant module classpath -->
<path id="dependentmodule.classpath">
<path refid="jboss.j2se.classpath"/>
<path refid="jboss.mbeans.classpath"/>
+ <path refid="jboss.system.classpath"/>
</path>
<!-- ===== -->
@@ -127,8 +130,7 @@
description="Compile all source files."
depends="_default:compile-classes,
_default:compile-resources,
- _default:compile-etc,
- _default:compile-bin"/>
+ _default:compile-etc"/>
<!-- ================================================================== -->
<!-- Archives -->
Copied: branches/MC_VDF_WORK/system-jmx/src/resources/tests/org/jboss/test/system/controller/basic/test (from rev 55331, branches/MC_VDF_WORK/system/src/resources/tests/org/jboss/test/system/controller/basic/test)
Copied: branches/MC_VDF_WORK/system-jmx/src/resources/tests/org/jboss/test/system/controller/configure/test (from rev 55331, branches/MC_VDF_WORK/system/src/resources/tests/org/jboss/test/system/controller/configure/test)
Copied: branches/MC_VDF_WORK/system-jmx/src/resources/tests/org/jboss/test/system/controller/instantiate/plain/test (from rev 55331, branches/MC_VDF_WORK/system/src/resources/tests/org/jboss/test/system/controller/instantiate/plain/test)
Copied: branches/MC_VDF_WORK/system-jmx/src/resources/tests/org/jboss/test/system/controller/instantiate/standard/test (from rev 55331, branches/MC_VDF_WORK/system/src/resources/tests/org/jboss/test/system/controller/instantiate/standard/test)
Copied: branches/MC_VDF_WORK/system-jmx/src/resources/tests/org/jboss/test/system/controller/instantiate/test (from rev 55331, branches/MC_VDF_WORK/system/src/resources/tests/org/jboss/test/system/controller/instantiate/test)
Copied: branches/MC_VDF_WORK/system-jmx/src/resources/tests/org/jboss/test/system/controller/lifecycle/basic/test (from rev 55331, branches/MC_VDF_WORK/system/src/resources/tests/org/jboss/test/system/controller/lifecycle/basic/test)
Copied: branches/MC_VDF_WORK/system-jmx/src/resources/tests/org/jboss/test/system/controller/lifecycle/seperated/test (from rev 55331, branches/MC_VDF_WORK/system/src/resources/tests/org/jboss/test/system/controller/lifecycle/seperated/test)
Copied: branches/MC_VDF_WORK/system-jmx/src/resources/tests/org/jboss/test/system/controller/parse/test (from rev 55331, branches/MC_VDF_WORK/system/src/resources/tests/org/jboss/test/system/controller/parse/test)
Copied: branches/MC_VDF_WORK/system-jmx/src/resources/tests/org/jboss/test/system/metadata/basic/test (from rev 55331, branches/MC_VDF_WORK/system/src/resources/tests/org/jboss/test/system/metadata/basic/test)
Copied: branches/MC_VDF_WORK/system-jmx/src/resources/tests/org/jboss/test/system/metadata/constructor/test (from rev 55331, branches/MC_VDF_WORK/system/src/resources/tests/org/jboss/test/system/metadata/constructor/test)
Copied: branches/MC_VDF_WORK/system-jmx/src/resources/tests/org/jboss/test/system/metadata/depends/test (from rev 55331, branches/MC_VDF_WORK/system/src/resources/tests/org/jboss/test/system/metadata/depends/test)
More information about the jboss-cvs-commits
mailing list