[jboss-svn-commits] JBoss Common SVN: r1924 - in branches/logging_refactoring: . common-core common-core/trunk common-core/trunk/src common-core/trunk/src/etc common-core/trunk/tools/etc/buildmagic common-logging common-logging/trunk common-logging/trunk/src common-logging/trunk/tools/etc/buildmagic common-logging-jdk common-logging-jdk/trunk common-logging-jdk/trunk/src common-logging-jdk/trunk/src/etc common-logging-jdk/trunk/tools/etc/buildmagic common-logging-log4j common-logging-log4j/trunk common-logging-log4j/trunk/src common-logging-log4j/trunk/src/etc common-logging-log4j/trunk/tools/etc/buildmagic jbossxb jbossxb/trunk jbossxb/trunk/src jbossxb/trunk/src/etc jbossxb/trunk/src/main jbossxb/trunk/tools/etc/buildmagic
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Aug 9 10:55:44 EDT 2006
Author: ruel.loehr at jboss.com
Date: 2006-08-09 10:55:27 -0400 (Wed, 09 Aug 2006)
New Revision: 1924
Added:
branches/logging_refactoring/common-core/trunk/
branches/logging_refactoring/common-core/trunk/build-compile.xml
branches/logging_refactoring/common-core/trunk/build-thirdparty.xml
branches/logging_refactoring/common-core/trunk/build.bat
branches/logging_refactoring/common-core/trunk/build.sh
branches/logging_refactoring/common-core/trunk/build.xml
branches/logging_refactoring/common-core/trunk/src/
branches/logging_refactoring/common-core/trunk/src/etc/
branches/logging_refactoring/common-core/trunk/src/etc/default.mf
branches/logging_refactoring/common-core/trunk/tools/
branches/logging_refactoring/common-logging-jdk/trunk/
branches/logging_refactoring/common-logging-jdk/trunk/build-compile.xml
branches/logging_refactoring/common-logging-jdk/trunk/build-thirdparty.xml
branches/logging_refactoring/common-logging-jdk/trunk/build.bat
branches/logging_refactoring/common-logging-jdk/trunk/build.sh
branches/logging_refactoring/common-logging-jdk/trunk/build.xml
branches/logging_refactoring/common-logging-jdk/trunk/src/
branches/logging_refactoring/common-logging-jdk/trunk/src/etc/
branches/logging_refactoring/common-logging-jdk/trunk/src/etc/default.mf
branches/logging_refactoring/common-logging-jdk/trunk/tools/
branches/logging_refactoring/common-logging-log4j/trunk/
branches/logging_refactoring/common-logging-log4j/trunk/build-compile.xml
branches/logging_refactoring/common-logging-log4j/trunk/build-thirdparty.xml
branches/logging_refactoring/common-logging-log4j/trunk/build.bat
branches/logging_refactoring/common-logging-log4j/trunk/build.sh
branches/logging_refactoring/common-logging-log4j/trunk/build.xml
branches/logging_refactoring/common-logging-log4j/trunk/src/
branches/logging_refactoring/common-logging-log4j/trunk/src/etc/
branches/logging_refactoring/common-logging-log4j/trunk/src/etc/default.mf
branches/logging_refactoring/common-logging-log4j/trunk/tools/
branches/logging_refactoring/common-logging/trunk/
branches/logging_refactoring/common-logging/trunk/build-compile.xml
branches/logging_refactoring/common-logging/trunk/build-thirdparty.xml
branches/logging_refactoring/common-logging/trunk/build.sh
branches/logging_refactoring/common-logging/trunk/build.xml
branches/logging_refactoring/common-logging/trunk/src/
branches/logging_refactoring/common-logging/trunk/src/etc/
branches/logging_refactoring/common-logging/trunk/tools/
branches/logging_refactoring/jbossxb/trunk/
branches/logging_refactoring/jbossxb/trunk/build-compile.xml
branches/logging_refactoring/jbossxb/trunk/build-thirdparty.xml
branches/logging_refactoring/jbossxb/trunk/build.bat
branches/logging_refactoring/jbossxb/trunk/build.sh
branches/logging_refactoring/jbossxb/trunk/build.xml
branches/logging_refactoring/jbossxb/trunk/src/
branches/logging_refactoring/jbossxb/trunk/src/etc/
branches/logging_refactoring/jbossxb/trunk/src/etc/default.mf
branches/logging_refactoring/jbossxb/trunk/tools/
Removed:
branches/logging_refactoring/build-compile.xml
branches/logging_refactoring/build-thirdparty.xml
branches/logging_refactoring/build.bat
branches/logging_refactoring/build.sh
branches/logging_refactoring/build.xml
branches/logging_refactoring/common-core/src/
branches/logging_refactoring/common-logging-jdk/src/
branches/logging_refactoring/common-logging-log4j/src/
branches/logging_refactoring/common-logging/src/
branches/logging_refactoring/component-info.xml
branches/logging_refactoring/jbossbuild.xml
branches/logging_refactoring/jbossxb/src/
branches/logging_refactoring/jbossxb/trunk/src/main/org/
branches/logging_refactoring/src/
branches/logging_refactoring/tools/
Modified:
branches/logging_refactoring/common-core/trunk/tools/etc/buildmagic/aliases.ent
branches/logging_refactoring/common-core/trunk/tools/etc/buildmagic/buildmagic.ent
branches/logging_refactoring/common-core/trunk/tools/etc/buildmagic/buildmagic.ent~
branches/logging_refactoring/common-logging-jdk/trunk/tools/etc/buildmagic/aliases.ent
branches/logging_refactoring/common-logging-jdk/trunk/tools/etc/buildmagic/buildmagic.ent
branches/logging_refactoring/common-logging-log4j/trunk/tools/etc/buildmagic/aliases.ent
branches/logging_refactoring/common-logging-log4j/trunk/tools/etc/buildmagic/buildmagic.ent
branches/logging_refactoring/common-logging/trunk/tools/etc/buildmagic/buildmagic.ent
branches/logging_refactoring/jbossxb/trunk/tools/etc/buildmagic/aliases.ent
branches/logging_refactoring/jbossxb/trunk/tools/etc/buildmagic/buildmagic.ent
branches/logging_refactoring/jbossxb/trunk/tools/etc/buildmagic/buildmagic.ent~
Log:
split up common projects
Deleted: branches/logging_refactoring/build-compile.xml
===================================================================
--- branches/logging_refactoring/build-compile.xml 2006-08-07 14:47:40 UTC (rev 1923)
+++ branches/logging_refactoring/build-compile.xml 2006-08-09 14:55:27 UTC (rev 1924)
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE project [
- <!ENTITY buildmagic SYSTEM "tools/etc/buildmagic/buildmagic.ent">
- <!ENTITY libraries SYSTEM "thirdparty/libraries.ent">
- <!ENTITY targets SYSTEM "tools/etc/buildmagic/targets.ent">
-]>
-
-<project default="main" name="JBoss/Build">
-
- &buildmagic;
- &libraries;
- &targets;
- <!-- The combined library classpath -->
- <path id="library.classpath">
- <path refid="apache.xerces.classpath"/>
- <path refid="apache.commons.classpath"/>
- <path refid="apache.log4j.classpath"/>
- <path refid="apache.slide.classpath"/>
- <path refid="dom4j.dom4j.classpath"/>
- <path refid="wutka.dtdparser.classpath"/>
- <path refid="oswego.concurrent.classpath"/>
- <path refid="sun.jaf.classpath"/>
- </path>
-
- <!-- The combined dependent module classpath -->
- <path id="dependentmodule.classpath">
- </path>
-
- <target name="compile-classes"
- depends="_default:compile-classes"/>
-
-</project>
Deleted: branches/logging_refactoring/build-thirdparty.xml
===================================================================
--- branches/logging_refactoring/build-thirdparty.xml 2006-08-07 14:47:40 UTC (rev 1923)
+++ branches/logging_refactoring/build-thirdparty.xml 2006-08-09 14:55:27 UTC (rev 1924)
@@ -1,73 +0,0 @@
-<?xml version="1.0"?>
-<!-- $Id: build-thirdparty.xml,v 1.113 2006/05/23 23:19:24 jgreene Exp $ -->
-<project name="main.build"
- default="synchronize"
- basedir=".">
-
- <!-- Property File definitions -->
- <property file="local.properties"/>
- <property file="synchronize.properties"/>
- <property environment="env"/>
-
- <!-- Property Definitions -->
- <property name="generatedLibrariesFiles" value="thirdparty/libraries.ent"/>
-
- <!-- Allow jbossbuild.repository to be set from (in order or priority)
- + Command line -Djbossbuild.repository=...
- + synchronize.properties jbossbuild.repository setting
- + JBOSS_REPOSITORY environment variable
- -->
- <condition property="jbossbuild.repository" value="${env.JBOSS_REPOSITORY}">
- <isset property="env.JBOSS_REPOSITORY"/>
- </condition>
- <!-- Fall back to default -->
- <property name="jbossbuild.repository" value="http://repository.jboss.com"/>
-
- <!-- File Imports -->
- <import file="tools/etc/jbossbuild/tasks.xml"/>
-
-
- <!-- Main Definition of dependencies -->
- <build id="jbossas-thirdparty"
- impltitle="JBossAS"
- implversion="jboss-head"
- implvendor="JBoss Inc."
- implurl="http://www.jboss.org"
- description="JBoss Application Server"
- cvsroot="${cvs.prefix}@cvs.forge.jboss.com:/cvsroot/jboss"
- thirdpartypath="thirdparty/"
- location="${jbossbuild.repository}"
- targetdefs="targets">
-
- <!--
- The repository is in CVS under the module repository.jboss.com whose contents
- are pushed to the http://repository.jboss.com site.
- -->
-
- <componentref name="apache-xerces" version="2.7.1"/>
- <componentref name="apache-log4j" version="1.2.8"/>
- <componentref name="apache-slide" version="2.0"/>
- <componentref name="dom4j" version="1.5"/>
- <componentref name="wutka-dtdparser" version="1.2.1"/>
- <componentref name="oswego-concurrent" version="1.3.4"/>
- <componentref name="sun-jaf" version="1.0.2"/>
- <componentref name="apache-httpclient" version="2.0.2"/>
-
-
- </build>
-
- <synchronizeinfo/>
-
- <!-- Generate the targets -->
- <generate generate="jbossas-thirdparty"/>
-
-
- <target name="generate-lib-file"
- description="generate libraries.ent and thirdparty license info"
- depends="synchronize">
- <gen-lib-file filename="${generatedLibrariesFiles}" path="tools/etc/buildmagic/" />
- <visit-componentref-graph
- componentVisitor="org.jboss.ant.util.graph.ComponentRefGraphLicenseVisitor" />
- </target>
-
-</project>
Deleted: branches/logging_refactoring/build.bat
===================================================================
--- branches/logging_refactoring/build.bat 2006-08-07 14:47:40 UTC (rev 1923)
+++ branches/logging_refactoring/build.bat 2006-08-09 14:55:27 UTC (rev 1924)
@@ -1,89 +0,0 @@
- at echo off
-REM ======================================================================
-REM
-REM This is the main entry point for the build system.
-REM
-REM Users should be sure to execute this file rather than 'ant' to ensure
-REM the correct version is being used with the correct configuration.
-REM
-REM ======================================================================
-REM
-REM $Id$
-REM
-REM Authors:
-REM Jason Dillon <jason at planet57.com>
-REM Sacha Labourey <sacha.labourey at cogito-info.ch>
-REM
-
-REM ******************************************************
-REM Ignore the ANT_HOME variable: we want to use *our*
-REM ANT version and associated JARs.
-REM ******************************************************
-REM Ignore the users classpath, cause it might mess
-REM things up
-REM ******************************************************
-
-SETLOCAL
-
-set CLASSPATH=
-set ANT_HOME=
-set ANT_OPTS=-Djava.protocol.handler.pkgs=org.jboss.net.protocol -Dbuild.script=build.bat
-
-REM ******************************************************
-REM - "for" loops have been unrolled for compatibility
-REM with some WIN32 systems.
-REM ******************************************************
-
-set NAMES=tools;tools\ant;tools\apache\ant
-set SUBFOLDERS=..;..\..;..\..\..;..\..\..\..
-
-REM ******************************************************
-REM ******************************************************
-
-SET EXECUTED=FALSE
-for %%i in (%NAMES%) do call :subLoop %%i %1 %2 %3 %4 %5 %6
-
-goto :EOF
-
-
-REM ******************************************************
-REM ********* Search for names in the subfolders *********
-REM ******************************************************
-
-:subLoop
-for %%j in (%SUBFOLDERS%) do call :testIfExists %%j\%1\bin\ant.bat %2 %3 %4 %5 %6 %7
-
-goto :EOF
-
-
-REM ******************************************************
-REM ************ Test if ANT Batch file exists ***********
-REM ******************************************************
-
-:testIfExists
-if exist %1 call :BatchFound %1 %2 %3 %4 %5 %6 %7 %8
-
-goto :EOF
-
-
-REM ******************************************************
-REM ************** Batch file has been found *************
-REM ******************************************************
-
-:BatchFound
-if (%EXECUTED%)==(FALSE) call :ExecuteBatch %1 %2 %3 %4 %5 %6 %7 %8
-set EXECUTED=TRUE
-
-goto :EOF
-
-REM ******************************************************
-REM ************* Execute Batch file only once ***********
-REM ******************************************************
-
-:ExecuteBatch
-echo Calling %1 %2 %3 %4 %5 %6 %7 %8
-call %1 %2 %3 %4 %5 %6 %7 %8
-
-:end
-
-if "%NOPAUSE%" == "" pause
Deleted: branches/logging_refactoring/build.sh
===================================================================
--- branches/logging_refactoring/build.sh 2006-08-07 14:47:40 UTC (rev 1923)
+++ branches/logging_refactoring/build.sh 2006-08-09 14:55:27 UTC (rev 1924)
@@ -1,173 +0,0 @@
-#!/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$
-
-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 "$@"
Deleted: branches/logging_refactoring/build.xml
===================================================================
--- branches/logging_refactoring/build.xml 2006-08-07 14:47:40 UTC (rev 1923)
+++ branches/logging_refactoring/build.xml 2006-08-09 14:55:27 UTC (rev 1924)
@@ -1,250 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE project [
- <!ENTITY buildmagic SYSTEM "tools/etc/buildmagic/buildmagic.ent">
- <!ENTITY targets SYSTEM "tools/etc/buildmagic/targets.ent">
-]>
-
-<!-- ====================================================================== -->
-<!-- -->
-<!-- JBoss, the OpenSource J2EE webOS -->
-<!-- -->
-<!-- Distributable under LGPL license. -->
-<!-- See terms of license at http://www.gnu.org. -->
-<!-- -->
-<!-- ====================================================================== -->
-
-<!-- $Id$ -->
-
-<project default="build" name="JBoss/Common">
-
- <!-- ================================================================== -->
- <!-- Setup -->
- <!-- ================================================================== -->
-
- <!--
- | Include the common Buildmagic elements.
- |
- | This defines several different targets, properties and paths.
- | It also sets up the basic extention tasks amoung other things.
- -->
-
- &buildmagic;
-
- <!--
- | Include the normal targets.
- -->
- &targets;
-
- <!-- ================================================================== -->
- <!-- Configuration -->
- <!-- ================================================================== -->
-
- <!--
- | Configure the build system.
- |
- | This target is invoked by the Buildmagic initialization logic and
- | should contain module specific configuration elements.
- -->
-
- <target name="configure" unless="configure.disable">
-
- <!-- =================== -->
- <!-- Basic Configuration -->
- <!-- =================== -->
-
- <!-- Module name(s) & version -->
- <property name="module.name" value="common"/>
- <property name="module.Name" value="JBoss/Common"/>
- <property name="module.version" value="DEV"/>
-
-
-
- <!-- The combined dependent module classpath -->
- <path id="dependentmodule.classpath">
- </path>
-
- <!-- ===== -->
- <!-- Tasks -->
- <!-- ===== -->
-
- <call target="_default:task-init"/>
-
- <!-- Set project specific properties -->
- <property name="jboss.home" value="../build/output/jboss-${version.major}.${version.minor}.${version.revision}.${version.tag}"/>
- <property name="server" value="default"/>
-
- </target>
-
- <!-- ================================================================== -->
- <!-- Compile -->
- <!-- ================================================================== -->
-
- <!--
- | Compile everything.
- |
- | This target should depend on other compile-* targets for each
- | different type of compile that needs to be performed, short of
- | documentation compiles.
- -->
-
- <target name="compile" depends="_default:compile-etc"
- description="Compile all source files.">
- <ant antfile="build-compile.xml" target="compile-classes"/>
- </target>
-
-
- <!-- ================================================================== -->
- <!-- Archives -->
- <!-- ================================================================== -->
-
- <!--
- | Build all jar files.
- -->
- <target name="module-jars" depends="compile">
-
- <!-- Build jboss-common.jar -->
- <jar jarfile="${build.lib}/${jar.server.name}"
- manifest="${build.etc}/default.mf">
- <fileset dir="${build.classes}">
- <include name="org/jboss/**"/>
- <include name="org/apache/xerces/**"/>
- <exclude name="org/jboss/xb/**"/>
- </fileset>
- </jar>
-
- <!-- Build jboss-xml-binding.jar -->
- <jar jarfile="${build.lib}/jboss-xml-binding.jar"
- manifest="${build.etc}/default.mf">
- <fileset dir="${build.classes}">
- <include name="org/jboss/xb/**"/>
- </fileset>
- </jar>
-
- <!-- Build jboss-common-client.jar -->
- <jar jarfile="${build.lib}/${jar.client.name}"
- manifest="${build.etc}/default.mf">
- <fileset dir="${build.classes}">
- <include name="org/jboss/**"/>
- <include name="org/apache/xerces/**"/>
- <exclude name="org/jboss/deployment/**"/>
- <exclude name="org/jboss/xb/**"/>
- </fileset>
- </jar>
-
- <!-- Build namespace.jar -->
- <jar jarfile="${build.lib}/namespace.jar"
- manifest="${build.etc}/default.mf">
- <fileset dir="${build.classes}">
- <include name="javax/xml/namespace/*"/>
- </fileset>
- </jar>
-
- <!-- Build browsing.jar -->
- <jar jarfile="${build.lib}/jboss-archive-browsing.jar"
- manifest="${build.etc}/default.mf">
- <fileset dir="${build.classes}">
- <include name="org/jboss/util/file/*"/>
- </fileset>
- </jar>
-
- <!--
- | JBoss/Testsuite Support
- -->
-
- <!-- testsuite-support.jar -->
- <jar jarfile="${build.lib}/testsuite-support.jar" manifest="${build.etc}/default.mf">
- <fileset dir="${build.classes}">
- <include name="org/jboss/logging/**"/>
- </fileset>
- </jar>
- </target>
-
- <target name="deploy" depends="module-jars" >
- <copy todir="${jboss.home}/client" overwrite="true">
- <fileset dir="${build.lib}">
- <include name="jboss-xml-binding.jar"/>
- <include name="jboss-common-client.jar"/>
- <include name="namespace.jar"/>
- </fileset>
- </copy>
- <copy todir="${jboss.home}/lib" overwrite="true">
- <fileset dir="${build.lib}">
- <include name="jboss-xml-binding.jar"/>
- <include name="namespace.jar"/>
- </fileset>
- </copy>
- <copy todir="${jboss.home}/server/${server}/lib" overwrite="true">
- <fileset dir="${build.lib}">
- <include name="jboss.jar"/>
- </fileset>
- </copy>
- </target>
-
- <target name="build" depends="createthirdparty, main"/>
-
- <!-- create the thirdparty folder from items in the repository -->
- <!-- then generate a new libraries.ent file and include it in -->
- <!-- the build -->
- <target name="createthirdparty" unless="inhibit.downloads"
- depends="check.inhibit.downloads, set.proxy">
-
- <ant antfile="build-thirdparty.xml" target="generate-lib-file"/>
- </target>
-
- <!-- check if thirdparty libraries are to be downloaded -->
- <target name="check.inhibit.downloads">
- <condition property="inhibit.downloads">
- <or>
- <uptodate property="dependencies.current"
- srcfile="build-thirdparty.xml"
- targetfile="thirdparty/libraries.ent"/>
- <istrue value="${nodownload}"/>
- </or>
- </condition>
- </target>
-
- <!-- check if the the user has specied proxy settings -->
- <target name="check.proxy">
- <condition property="hasproxy">
- <and>
- <isset property="proxy.host"/>
- <isset property="proxy.port"/>
- <not>
- <equals arg1="" arg2="${proxy.host}" trim="true"/>
- </not>
- <not>
- <equals arg1="" arg2="${proxy.port}" trim="true"/>
- </not>
- </and>
- </condition>
- </target>
-
- <!-- set proxy settings -->
- <condition property="hasproxyauth">
- <and>
- <isset property="hasproxy"/>
- <isset property="proxy.username"/>
- <isset property="proxy.password"/>
- <not>
- <equals arg1="" arg2="${proxy.username}" trim="true"/>
- </not>
- <not>
- <equals arg1="" arg2="${proxy.password}" trim="true"/>
- </not>
- </and>
- </condition>
- <target name="set.proxy" depends="set.proxy.withoutauth, set.proxy.auth"/>
-
- <!-- set proxy settings without auth -->
- <target name="set.proxy.withoutauth" if="hasproxy" unless="hasproxyauth" depends="check.proxy">
- <echo>Proxy is set to ${proxy.host}:${proxy.port}</echo>
- <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"/>
- </target>
-
- <!-- set proxy settings using auth -->
- <target name="set.proxy.auth" if="hasproxyauth" depends="check.proxy">
- <echo>Auth Proxy is set to ${proxy.host}:${proxy.port} username=[${proxy.username}]</echo>
- <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}" proxyuser="${proxy.username}" proxypassword="${proxy.password}"/>
- </target>
-
-</project>
Copied: branches/logging_refactoring/common-core/trunk/build-compile.xml (from rev 1920, branches/logging_refactoring/build-compile.xml)
===================================================================
--- branches/logging_refactoring/build-compile.xml 2006-08-03 13:37:17 UTC (rev 1920)
+++ branches/logging_refactoring/common-core/trunk/build-compile.xml 2006-08-09 14:55:27 UTC (rev 1924)
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE project [
+ <!ENTITY buildmagic SYSTEM "tools/etc/buildmagic/buildmagic.ent">
+ <!ENTITY libraries SYSTEM "thirdparty/libraries.ent">
+ <!ENTITY targets SYSTEM "tools/etc/buildmagic/targets.ent">
+]>
+
+<project default="main" name="JBoss/Build">
+
+ &buildmagic;
+ &libraries;
+ &targets;
+ <!-- The combined library classpath -->
+ <path id="library.classpath">
+ <path refid="jboss.logging.spi.classpath"/>
+ <path refid="apache.httpclient.classpath"/>
+ <path refid="apache.slide.classpath"/>
+ <path refid="oswego.concurrent.classpath"/>
+ <path refid="dom4j.dom4j.classpath"/>
+ <path refid="apache.log4j.classpath"/>
+ <path refid="wutka.dtdparser.classpath"/>
+ <path refid="apache.xerces.classpath"/>
+<!--
+ <path refid="apache.commons.classpath"/>
+
+
+
+
+
+ <path refid="sun.jaf.classpath"/>-->
+ </path>
+
+ <!-- The combined dependent module classpath -->
+ <path id="dependentmodule.classpath">
+ </path>
+
+ <target name="compile-classes" depends="_default:compile-classes">
+
+ <property name="myclasspath" refid="jboss.logging.spi.classpath"/>
+ <echo message="classpath= ${myclasspath}"/>
+
+ <!-- depends="_default:compile-classes"/> -->
+ </target>
+
+</project>
Copied: branches/logging_refactoring/common-core/trunk/build-thirdparty.xml (from rev 1920, branches/logging_refactoring/build-thirdparty.xml)
===================================================================
--- branches/logging_refactoring/build-thirdparty.xml 2006-08-03 13:37:17 UTC (rev 1920)
+++ branches/logging_refactoring/common-core/trunk/build-thirdparty.xml 2006-08-09 14:55:27 UTC (rev 1924)
@@ -0,0 +1,79 @@
+<?xml version="1.0"?>
+<!-- $Id: build-thirdparty.xml,v 1.113 2006/05/23 23:19:24 jgreene Exp $ -->
+<project name="main.build"
+ default="synchronize"
+ basedir=".">
+
+ <!-- Property File definitions -->
+ <property file="local.properties"/>
+ <property file="synchronize.properties"/>
+ <property environment="env"/>
+
+ <!-- Property Definitions -->
+ <property name="generatedLibrariesFiles" value="thirdparty/libraries.ent"/>
+
+ <!-- Allow jbossbuild.repository to be set from (in order or priority)
+ + Command line -Djbossbuild.repository=...
+ + synchronize.properties jbossbuild.repository setting
+ + JBOSS_REPOSITORY environment variable
+ -->
+ <condition property="jbossbuild.repository" value="${env.JBOSS_REPOSITORY}">
+ <isset property="env.JBOSS_REPOSITORY"/>
+ </condition>
+ <!-- Fall back to default -->
+ <property name="jbossbuild.repository" value="http://repository.jboss.com"/>
+
+ <!-- File Imports -->
+ <import file="tools/etc/jbossbuild/tasks.xml"/>
+
+
+ <!-- Main Definition of dependencies -->
+ <build id="jbossas-thirdparty"
+ impltitle="JBossAS"
+ implversion="jboss-head"
+ implvendor="JBoss Inc."
+ implurl="http://www.jboss.org"
+ description="JBoss Application Server"
+ cvsroot="${cvs.prefix}@cvs.forge.jboss.com:/cvsroot/jboss"
+ thirdpartypath="thirdparty/"
+ location="${jbossbuild.repository}"
+ targetdefs="targets">
+
+ <!--
+ The repository is in CVS under the module repository.jboss.com whose contents
+ are pushed to the http://repository.jboss.com site.
+ -->
+ <componentref name="apache-httpclient" version="2.0.2"/>
+ <componentref name="apache-slide" version="2.0"/>
+ <componentref name="oswego-concurrent" version="1.3.4"/>
+ <componentref name="dom4j" version="1.5"/>
+ <componentref name="apache-log4j" version="1.2.8"/>
+ <componentref name="wutka-dtdparser" version="1.2.1"/>
+ <componentref name="apache-xerces" version="2.7.1"/>
+<!--
+
+
+
+
+
+ <componentref name="sun-jaf" version="1.0.2"/>
+ -->
+
+
+ </build>
+
+ <synchronizeinfo/>
+
+ <!-- Generate the targets -->
+ <generate generate="jbossas-thirdparty"/>
+
+
+ <target name="generate-lib-file"
+ description="generate libraries.ent and thirdparty license info"
+ depends="synchronize">
+ <gen-lib-file filename="${generatedLibrariesFiles}" path="tools/etc/buildmagic/" />
+ <visit-componentref-graph
+ componentVisitor="org.jboss.ant.util.graph.ComponentRefGraphLicenseVisitor" />
+ </target>
+
+</project>
Copied: branches/logging_refactoring/common-core/trunk/build.bat (from rev 1920, branches/logging_refactoring/build.bat)
Copied: branches/logging_refactoring/common-core/trunk/build.sh (from rev 1920, branches/logging_refactoring/build.sh)
Copied: branches/logging_refactoring/common-core/trunk/build.xml (from rev 1920, branches/logging_refactoring/build.xml)
===================================================================
--- branches/logging_refactoring/build.xml 2006-08-03 13:37:17 UTC (rev 1920)
+++ branches/logging_refactoring/common-core/trunk/build.xml 2006-08-09 14:55:27 UTC (rev 1924)
@@ -0,0 +1,180 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE project [
+ <!ENTITY buildmagic SYSTEM "tools/etc/buildmagic/buildmagic.ent">
+ <!ENTITY targets SYSTEM "tools/etc/buildmagic/targets.ent">
+]>
+
+<!-- ====================================================================== -->
+<!-- -->
+<!-- JBoss, the OpenSource J2EE webOS -->
+<!-- -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- -->
+<!-- ====================================================================== -->
+
+<!-- $Id$ -->
+
+<project default="build" name="JBoss/Common">
+
+ <!-- ================================================================== -->
+ <!-- Setup -->
+ <!-- ================================================================== -->
+
+ <!--
+ | Include the common Buildmagic elements.
+ |
+ | This defines several different targets, properties and paths.
+ | It also sets up the basic extention tasks amoung other things.
+ -->
+
+ &buildmagic;
+
+ <!--
+ | Include the normal targets.
+ -->
+ &targets;
+
+ <!-- ================================================================== -->
+ <!-- Configuration -->
+ <!-- ================================================================== -->
+
+ <!--
+ | Configure the build system.
+ |
+ | This target is invoked by the Buildmagic initialization logic and
+ | should contain module specific configuration elements.
+ -->
+
+ <target name="configure" unless="configure.disable">
+
+ <!-- =================== -->
+ <!-- Basic Configuration -->
+ <!-- =================== -->
+
+ <!-- Module name(s) & version -->
+ <property name="module.name" value="common"/>
+ <property name="module.Name" value="JBoss/Common"/>
+ <property name="module.version" value="DEV"/>
+
+
+
+ <!-- The combined dependent module classpath -->
+ <path id="dependentmodule.classpath">
+ </path>
+
+ <!-- ===== -->
+ <!-- Tasks -->
+ <!-- ===== -->
+
+ <call target="_default:task-init"/>
+
+ <!-- Set project specific properties -->
+ <property name="jboss.home" value="../build/output/jboss-${version.major}.${version.minor}.${version.revision}.${version.tag}"/>
+ <property name="server" value="default"/>
+
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Compile -->
+ <!-- ================================================================== -->
+
+ <!--
+ | Compile everything.
+ |
+ | This target should depend on other compile-* targets for each
+ | different type of compile that needs to be performed, short of
+ | documentation compiles.
+ -->
+
+ <target name="compile" depends="_default:compile-etc"
+ description="Compile all source files.">
+ <ant antfile="build-compile.xml" target="compile-classes"/>
+ </target>
+
+
+ <!-- ================================================================== -->
+ <!-- Archives -->
+ <!-- ================================================================== -->
+
+ <!--
+ | Build all jar files.
+ -->
+ <target name="module-jars">
+
+ <!-- Build jboss-common.jar -->
+ <jar jarfile="${build.lib}/jboss-common-core.jar"
+ manifest="${build.etc}/default.mf">
+ <fileset dir="${build.classes}"/>
+ </jar>
+
+ </target>
+
+ <target name="build" depends="createthirdparty, main"/>
+
+ <!-- create the thirdparty folder from items in the repository -->
+ <!-- then generate a new libraries.ent file and include it in -->
+ <!-- the build -->
+ <target name="createthirdparty" unless="inhibit.downloads"
+ depends="check.inhibit.downloads, set.proxy">
+
+ <ant antfile="build-thirdparty.xml" target="generate-lib-file"/>
+ </target>
+
+ <!-- check if thirdparty libraries are to be downloaded -->
+ <target name="check.inhibit.downloads">
+ <condition property="inhibit.downloads">
+ <or>
+ <uptodate property="dependencies.current"
+ srcfile="build-thirdparty.xml"
+ targetfile="thirdparty/libraries.ent"/>
+ <istrue value="${nodownload}"/>
+ </or>
+ </condition>
+ </target>
+
+ <!-- check if the the user has specied proxy settings -->
+ <target name="check.proxy">
+ <condition property="hasproxy">
+ <and>
+ <isset property="proxy.host"/>
+ <isset property="proxy.port"/>
+ <not>
+ <equals arg1="" arg2="${proxy.host}" trim="true"/>
+ </not>
+ <not>
+ <equals arg1="" arg2="${proxy.port}" trim="true"/>
+ </not>
+ </and>
+ </condition>
+ </target>
+
+ <!-- set proxy settings -->
+ <condition property="hasproxyauth">
+ <and>
+ <isset property="hasproxy"/>
+ <isset property="proxy.username"/>
+ <isset property="proxy.password"/>
+ <not>
+ <equals arg1="" arg2="${proxy.username}" trim="true"/>
+ </not>
+ <not>
+ <equals arg1="" arg2="${proxy.password}" trim="true"/>
+ </not>
+ </and>
+ </condition>
+ <target name="set.proxy" depends="set.proxy.withoutauth, set.proxy.auth"/>
+
+ <!-- set proxy settings without auth -->
+ <target name="set.proxy.withoutauth" if="hasproxy" unless="hasproxyauth" depends="check.proxy">
+ <echo>Proxy is set to ${proxy.host}:${proxy.port}</echo>
+ <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"/>
+ </target>
+
+ <!-- set proxy settings using auth -->
+ <target name="set.proxy.auth" if="hasproxyauth" depends="check.proxy">
+ <echo>Auth Proxy is set to ${proxy.host}:${proxy.port} username=[${proxy.username}]</echo>
+ <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}" proxyuser="${proxy.username}" proxypassword="${proxy.password}"/>
+ </target>
+
+</project>
Copied: branches/logging_refactoring/common-core/trunk/src (from rev 1920, branches/logging_refactoring/common-core/src)
Copied: branches/logging_refactoring/common-core/trunk/src/etc/default.mf (from rev 1920, branches/logging_refactoring/src/etc/default.mf)
Copied: branches/logging_refactoring/common-core/trunk/tools (from rev 1920, branches/logging_refactoring/tools)
Modified: branches/logging_refactoring/common-core/trunk/tools/etc/buildmagic/aliases.ent
===================================================================
--- branches/logging_refactoring/tools/etc/buildmagic/aliases.ent 2006-08-03 13:37:17 UTC (rev 1920)
+++ branches/logging_refactoring/common-core/trunk/tools/etc/buildmagic/aliases.ent 2006-08-09 14:55:27 UTC (rev 1924)
@@ -78,6 +78,7 @@
<path refid="cglib.cglib.classpath"/>
</path>
+
<path id="ejb3-persistence.classpath">
<path refid="hibernate.annotations.classpath"/>
<path refid="hibernate.entitymanager.classpath"/>
@@ -94,4 +95,12 @@
<path id="apache.ant.classpath">
<pathelement path="${apache.ant.lib}/ant.jar"/>
</path>
+
+ <!-- delete this junk -->
+ <!--delete this junk -->
+
+ <property name="jboss.logging.spi" value="${project.thirdparty}/jboss/common-logging-spi"/>
+ <path id="jboss.logging.spi.classpath">
+ <pathelement path="${jboss.logging.spi}/jboss-logging-spi-1.0.2.jar"/>
+</path>
\ No newline at end of file
Modified: branches/logging_refactoring/common-core/trunk/tools/etc/buildmagic/buildmagic.ent
===================================================================
--- branches/logging_refactoring/tools/etc/buildmagic/buildmagic.ent 2006-08-03 13:37:17 UTC (rev 1920)
+++ branches/logging_refactoring/common-core/trunk/tools/etc/buildmagic/buildmagic.ent 2006-08-09 14:55:27 UTC (rev 1924)
@@ -378,7 +378,8 @@
<!-- This module is based on Java 1.4 -->
<property name="javac.target" value="1.4"/>
<property name="javac.source" value="1.4"/>
-
+ <property name="javac.debug" value="true"/>
+
<!-- RMIC should generate stubs compatible with Java 1.2+ -->
<property name="rmic.stubVersion" value="1.2"/>
Modified: branches/logging_refactoring/common-core/trunk/tools/etc/buildmagic/buildmagic.ent~
===================================================================
--- branches/logging_refactoring/tools/etc/buildmagic/buildmagic.ent~ 2006-08-03 13:37:17 UTC (rev 1920)
+++ branches/logging_refactoring/common-core/trunk/tools/etc/buildmagic/buildmagic.ent~ 2006-08-09 14:55:27 UTC (rev 1924)
@@ -436,14 +436,11 @@
<exclude name="${javac.excludes}"/>
</depend>
-
- <echo message="hereiam"/>
-
<javac destdir="${build.classes}"
optimize="on"
target="${javac.target}"
source="${javac.source}"
- debug="off"
+ debug="${javac.debug}"
depend="${javac.depend}"
verbose="${javac.verbose}"
deprecation="${javac.deprecation}"
Copied: branches/logging_refactoring/common-logging/trunk/build-compile.xml (from rev 1920, branches/logging_refactoring/build-compile.xml)
===================================================================
--- branches/logging_refactoring/build-compile.xml 2006-08-03 13:37:17 UTC (rev 1920)
+++ branches/logging_refactoring/common-logging/trunk/build-compile.xml 2006-08-09 14:55:27 UTC (rev 1924)
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE project [
+ <!ENTITY buildmagic SYSTEM "tools/etc/buildmagic/buildmagic.ent">
+ <!ENTITY libraries SYSTEM "thirdparty/libraries.ent">
+ <!ENTITY targets SYSTEM "tools/etc/buildmagic/targets.ent">
+]>
+
+<project>
+
+ &buildmagic;
+ &libraries;
+ &targets;
+ <!-- The combined library classpath -->
+ <path id="library.classpath">
+ <!-- <path refid="apache.xerces.classpath"/>
+ <path refid="apache.commons.classpath"/>
+ <path refid="apache.log4j.classpath"/>
+ <path refid="apache.slide.classpath"/>
+ <path refid="dom4j.dom4j.classpath"/>
+ <path refid="wutka.dtdparser.classpath"/>
+ <path refid="oswego.concurrent.classpath"/>
+ <path refid="sun.jaf.classpath"/> -->
+ </path>
+
+ <!-- The combined dependent module classpath -->
+ <path id="dependentmodule.classpath">
+ </path>
+
+ <target name="compile-classes">
+
+ <echo message="in compile-classes!!!!!!!!!!"/>
+
+ <call target="_default:compile-classes"/>
+
+ <echo message="done calling default target"/>
+
+ </target>
+
+</project>
Copied: branches/logging_refactoring/common-logging/trunk/build-thirdparty.xml (from rev 1920, branches/logging_refactoring/build-thirdparty.xml)
===================================================================
--- branches/logging_refactoring/build-thirdparty.xml 2006-08-03 13:37:17 UTC (rev 1920)
+++ branches/logging_refactoring/common-logging/trunk/build-thirdparty.xml 2006-08-09 14:55:27 UTC (rev 1924)
@@ -0,0 +1,73 @@
+<?xml version="1.0"?>
+<!-- $Id: build-thirdparty.xml,v 1.113 2006/05/23 23:19:24 jgreene Exp $ -->
+<project name="main.build"
+ default="synchronize"
+ basedir=".">
+
+ <!-- Property File definitions -->
+ <property file="local.properties"/>
+ <property file="synchronize.properties"/>
+ <property environment="env"/>
+
+ <!-- Property Definitions -->
+ <property name="generatedLibrariesFiles" value="thirdparty/libraries.ent"/>
+
+ <!-- Allow jbossbuild.repository to be set from (in order or priority)
+ + Command line -Djbossbuild.repository=...
+ + synchronize.properties jbossbuild.repository setting
+ + JBOSS_REPOSITORY environment variable
+ -->
+ <condition property="jbossbuild.repository" value="${env.JBOSS_REPOSITORY}">
+ <isset property="env.JBOSS_REPOSITORY"/>
+ </condition>
+ <!-- Fall back to default -->
+ <property name="jbossbuild.repository" value="http://repository.jboss.com"/>
+
+ <!-- File Imports -->
+ <import file="tools/etc/jbossbuild/tasks.xml"/>
+
+
+ <!-- Main Definition of dependencies -->
+ <build id="jbossas-thirdparty"
+ impltitle="JBossAS"
+ implversion="jboss-head"
+ implvendor="JBoss Inc."
+ implurl="http://www.jboss.org"
+ description="JBoss Application Server"
+ cvsroot="${cvs.prefix}@cvs.forge.jboss.com:/cvsroot/jboss"
+ thirdpartypath="thirdparty/"
+ location="${jbossbuild.repository}"
+ targetdefs="targets">
+
+ <!--
+ The repository is in CVS under the module repository.jboss.com whose contents
+ are pushed to the http://repository.jboss.com site.
+ -->
+
+ <componentref name="apache-xerces" version="2.7.1"/>
+ <!-- <componentref name="apache-log4j" version="1.2.8"/>
+ <componentref name="apache-slide" version="2.0"/>
+ <componentref name="dom4j" version="1.5"/>
+ <componentref name="wutka-dtdparser" version="1.2.1"/>
+ <componentref name="oswego-concurrent" version="1.3.4"/>
+ <componentref name="sun-jaf" version="1.0.2"/>
+ <componentref name="apache-httpclient" version="2.0.2"/> -->
+
+
+ </build>
+
+ <synchronizeinfo/>
+
+ <!-- Generate the targets -->
+ <generate generate="jbossas-thirdparty"/>
+
+
+ <target name="generate-lib-file"
+ description="generate libraries.ent and thirdparty license info"
+ depends="synchronize">
+ <gen-lib-file filename="${generatedLibrariesFiles}" path="tools/etc/buildmagic/" />
+ <visit-componentref-graph
+ componentVisitor="org.jboss.ant.util.graph.ComponentRefGraphLicenseVisitor" />
+ </target>
+
+</project>
Copied: branches/logging_refactoring/common-logging/trunk/build.sh (from rev 1920, branches/logging_refactoring/build.sh)
Copied: branches/logging_refactoring/common-logging/trunk/build.xml (from rev 1920, branches/logging_refactoring/build.xml)
Copied: branches/logging_refactoring/common-logging/trunk/src (from rev 1920, branches/logging_refactoring/common-logging/src)
Copied: branches/logging_refactoring/common-logging/trunk/tools (from rev 1920, branches/logging_refactoring/tools)
Modified: branches/logging_refactoring/common-logging/trunk/tools/etc/buildmagic/buildmagic.ent
===================================================================
--- branches/logging_refactoring/tools/etc/buildmagic/buildmagic.ent 2006-08-03 13:37:17 UTC (rev 1920)
+++ branches/logging_refactoring/common-logging/trunk/tools/etc/buildmagic/buildmagic.ent 2006-08-09 14:55:27 UTC (rev 1924)
@@ -363,6 +363,7 @@
<property name="build.gen" value="${module.output}/gen"/>
<property name="build.gen-src" value="${module.output}/gen-src"/>
<property name="build.todo" value="${module.output}/todo"/>
+ <property name="javac.debug" value="true"/>
<!-- Install/Release structure -->
<property name="install.id" value="${module.name}-${module.version}"/>
@@ -436,6 +437,8 @@
<exclude name="${javac.excludes}"/>
</depend>
+
+
<javac destdir="${build.classes}"
optimize="on"
target="${javac.target}"
Copied: branches/logging_refactoring/common-logging-jdk/trunk/build-compile.xml (from rev 1920, branches/logging_refactoring/build-compile.xml)
===================================================================
--- branches/logging_refactoring/build-compile.xml 2006-08-03 13:37:17 UTC (rev 1920)
+++ branches/logging_refactoring/common-logging-jdk/trunk/build-compile.xml 2006-08-09 14:55:27 UTC (rev 1924)
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE project [
+ <!ENTITY buildmagic SYSTEM "tools/etc/buildmagic/buildmagic.ent">
+ <!ENTITY libraries SYSTEM "thirdparty/libraries.ent">
+ <!ENTITY targets SYSTEM "tools/etc/buildmagic/targets.ent">
+]>
+
+<project default="main" name="JBoss/Build">
+
+ &buildmagic;
+ &libraries;
+ &targets;
+ <!-- The combined library classpath -->
+ <path id="library.classpath">
+ <path refid="jboss.logging.spi.classpath"/>
+ <path refid="jboss.common.core.classpath"/>
+ </path>
+
+ <!-- The combined dependent module classpath -->
+ <path id="dependentmodule.classpath">
+ </path>
+
+ <target name="compile-classes"
+ depends="_default:compile-classes"/>
+
+</project>
Copied: branches/logging_refactoring/common-logging-jdk/trunk/build-thirdparty.xml (from rev 1920, branches/logging_refactoring/build-thirdparty.xml)
===================================================================
--- branches/logging_refactoring/build-thirdparty.xml 2006-08-03 13:37:17 UTC (rev 1920)
+++ branches/logging_refactoring/common-logging-jdk/trunk/build-thirdparty.xml 2006-08-09 14:55:27 UTC (rev 1924)
@@ -0,0 +1,73 @@
+<?xml version="1.0"?>
+<!-- $Id: build-thirdparty.xml,v 1.113 2006/05/23 23:19:24 jgreene Exp $ -->
+<project name="main.build"
+ default="synchronize"
+ basedir=".">
+
+ <!-- Property File definitions -->
+ <property file="local.properties"/>
+ <property file="synchronize.properties"/>
+ <property environment="env"/>
+
+ <!-- Property Definitions -->
+ <property name="generatedLibrariesFiles" value="thirdparty/libraries.ent"/>
+
+ <!-- Allow jbossbuild.repository to be set from (in order or priority)
+ + Command line -Djbossbuild.repository=...
+ + synchronize.properties jbossbuild.repository setting
+ + JBOSS_REPOSITORY environment variable
+ -->
+ <condition property="jbossbuild.repository" value="${env.JBOSS_REPOSITORY}">
+ <isset property="env.JBOSS_REPOSITORY"/>
+ </condition>
+ <!-- Fall back to default -->
+ <property name="jbossbuild.repository" value="http://repository.jboss.com"/>
+
+ <!-- File Imports -->
+ <import file="tools/etc/jbossbuild/tasks.xml"/>
+
+
+ <!-- Main Definition of dependencies -->
+ <build id="jbossas-thirdparty"
+ impltitle="JBossAS"
+ implversion="jboss-head"
+ implvendor="JBoss Inc."
+ implurl="http://www.jboss.org"
+ description="JBoss Application Server"
+ cvsroot="${cvs.prefix}@cvs.forge.jboss.com:/cvsroot/jboss"
+ thirdpartypath="thirdparty/"
+ location="${jbossbuild.repository}"
+ targetdefs="targets">
+
+ <!--
+ The repository is in CVS under the module repository.jboss.com whose contents
+ are pushed to the http://repository.jboss.com site.
+ -->
+
+ <!--<componentref name="apache-xerces" version="2.7.1"/>
+ <componentref name="apache-log4j" version="1.2.8"/>
+ <componentref name="apache-slide" version="2.0"/>
+ <componentref name="dom4j" version="1.5"/>
+ <componentref name="wutka-dtdparser" version="1.2.1"/>
+ <componentref name="oswego-concurrent" version="1.3.4"/>
+ <componentref name="sun-jaf" version="1.0.2"/>
+ <componentref name="apache-httpclient" version="2.0.2"/>-->
+
+
+ </build>
+
+ <synchronizeinfo/>
+
+ <!-- Generate the targets -->
+ <generate generate="jbossas-thirdparty"/>
+
+
+ <target name="generate-lib-file"
+ description="generate libraries.ent and thirdparty license info"
+ depends="synchronize">
+ <gen-lib-file filename="${generatedLibrariesFiles}" path="tools/etc/buildmagic/" />
+ <visit-componentref-graph
+ componentVisitor="org.jboss.ant.util.graph.ComponentRefGraphLicenseVisitor" />
+ </target>
+
+</project>
Copied: branches/logging_refactoring/common-logging-jdk/trunk/build.bat (from rev 1920, branches/logging_refactoring/build.bat)
Copied: branches/logging_refactoring/common-logging-jdk/trunk/build.sh (from rev 1920, branches/logging_refactoring/build.sh)
Copied: branches/logging_refactoring/common-logging-jdk/trunk/build.xml (from rev 1920, branches/logging_refactoring/build.xml)
===================================================================
--- branches/logging_refactoring/build.xml 2006-08-03 13:37:17 UTC (rev 1920)
+++ branches/logging_refactoring/common-logging-jdk/trunk/build.xml 2006-08-09 14:55:27 UTC (rev 1924)
@@ -0,0 +1,180 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE project [
+ <!ENTITY buildmagic SYSTEM "tools/etc/buildmagic/buildmagic.ent">
+ <!ENTITY targets SYSTEM "tools/etc/buildmagic/targets.ent">
+]>
+
+<!-- ====================================================================== -->
+<!-- -->
+<!-- JBoss, the OpenSource J2EE webOS -->
+<!-- -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- -->
+<!-- ====================================================================== -->
+
+<!-- $Id$ -->
+
+<project default="build" name="JBoss/Common">
+
+ <!-- ================================================================== -->
+ <!-- Setup -->
+ <!-- ================================================================== -->
+
+ <!--
+ | Include the common Buildmagic elements.
+ |
+ | This defines several different targets, properties and paths.
+ | It also sets up the basic extention tasks amoung other things.
+ -->
+
+ &buildmagic;
+
+ <!--
+ | Include the normal targets.
+ -->
+ &targets;
+
+ <!-- ================================================================== -->
+ <!-- Configuration -->
+ <!-- ================================================================== -->
+
+ <!--
+ | Configure the build system.
+ |
+ | This target is invoked by the Buildmagic initialization logic and
+ | should contain module specific configuration elements.
+ -->
+
+ <target name="configure" unless="configure.disable">
+
+ <!-- =================== -->
+ <!-- Basic Configuration -->
+ <!-- =================== -->
+
+ <!-- Module name(s) & version -->
+ <property name="module.name" value="common"/>
+ <property name="module.Name" value="JBoss/Common"/>
+ <property name="module.version" value="DEV"/>
+
+
+
+ <!-- The combined dependent module classpath -->
+ <path id="dependentmodule.classpath">
+ </path>
+
+ <!-- ===== -->
+ <!-- Tasks -->
+ <!-- ===== -->
+
+ <call target="_default:task-init"/>
+
+ <!-- Set project specific properties -->
+ <property name="jboss.home" value="../build/output/jboss-${version.major}.${version.minor}.${version.revision}.${version.tag}"/>
+ <property name="server" value="default"/>
+
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Compile -->
+ <!-- ================================================================== -->
+
+ <!--
+ | Compile everything.
+ |
+ | This target should depend on other compile-* targets for each
+ | different type of compile that needs to be performed, short of
+ | documentation compiles.
+ -->
+
+ <target name="compile" depends="_default:compile-etc"
+ description="Compile all source files.">
+ <ant antfile="build-compile.xml" target="compile-classes"/>
+ </target>
+
+
+ <!-- ================================================================== -->
+ <!-- Archives -->
+ <!-- ================================================================== -->
+
+ <!--
+ | Build all jar files.
+ -->
+ <target name="module-jars">
+
+ <!-- Build jboss-common.jar -->
+ <jar jarfile="${build.lib}/common-logging-jdk.jar"
+ manifest="${build.etc}/default.mf">
+ <fileset dir="${build.classes}"/>
+ </jar>
+
+ </target>
+
+ <target name="build" depends="createthirdparty, main"/>
+
+ <!-- create the thirdparty folder from items in the repository -->
+ <!-- then generate a new libraries.ent file and include it in -->
+ <!-- the build -->
+ <target name="createthirdparty" unless="inhibit.downloads"
+ depends="check.inhibit.downloads, set.proxy">
+
+ <ant antfile="build-thirdparty.xml" target="generate-lib-file"/>
+ </target>
+
+ <!-- check if thirdparty libraries are to be downloaded -->
+ <target name="check.inhibit.downloads">
+ <condition property="inhibit.downloads">
+ <or>
+ <uptodate property="dependencies.current"
+ srcfile="build-thirdparty.xml"
+ targetfile="thirdparty/libraries.ent"/>
+ <istrue value="${nodownload}"/>
+ </or>
+ </condition>
+ </target>
+
+ <!-- check if the the user has specied proxy settings -->
+ <target name="check.proxy">
+ <condition property="hasproxy">
+ <and>
+ <isset property="proxy.host"/>
+ <isset property="proxy.port"/>
+ <not>
+ <equals arg1="" arg2="${proxy.host}" trim="true"/>
+ </not>
+ <not>
+ <equals arg1="" arg2="${proxy.port}" trim="true"/>
+ </not>
+ </and>
+ </condition>
+ </target>
+
+ <!-- set proxy settings -->
+ <condition property="hasproxyauth">
+ <and>
+ <isset property="hasproxy"/>
+ <isset property="proxy.username"/>
+ <isset property="proxy.password"/>
+ <not>
+ <equals arg1="" arg2="${proxy.username}" trim="true"/>
+ </not>
+ <not>
+ <equals arg1="" arg2="${proxy.password}" trim="true"/>
+ </not>
+ </and>
+ </condition>
+ <target name="set.proxy" depends="set.proxy.withoutauth, set.proxy.auth"/>
+
+ <!-- set proxy settings without auth -->
+ <target name="set.proxy.withoutauth" if="hasproxy" unless="hasproxyauth" depends="check.proxy">
+ <echo>Proxy is set to ${proxy.host}:${proxy.port}</echo>
+ <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"/>
+ </target>
+
+ <!-- set proxy settings using auth -->
+ <target name="set.proxy.auth" if="hasproxyauth" depends="check.proxy">
+ <echo>Auth Proxy is set to ${proxy.host}:${proxy.port} username=[${proxy.username}]</echo>
+ <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}" proxyuser="${proxy.username}" proxypassword="${proxy.password}"/>
+ </target>
+
+</project>
Copied: branches/logging_refactoring/common-logging-jdk/trunk/src (from rev 1920, branches/logging_refactoring/common-logging-jdk/src)
Copied: branches/logging_refactoring/common-logging-jdk/trunk/src/etc/default.mf (from rev 1920, branches/logging_refactoring/src/etc/default.mf)
Copied: branches/logging_refactoring/common-logging-jdk/trunk/tools (from rev 1920, branches/logging_refactoring/tools)
Modified: branches/logging_refactoring/common-logging-jdk/trunk/tools/etc/buildmagic/aliases.ent
===================================================================
--- branches/logging_refactoring/tools/etc/buildmagic/aliases.ent 2006-08-03 13:37:17 UTC (rev 1920)
+++ branches/logging_refactoring/common-logging-jdk/trunk/tools/etc/buildmagic/aliases.ent 2006-08-09 14:55:27 UTC (rev 1924)
@@ -94,4 +94,17 @@
<path id="apache.ant.classpath">
<pathelement path="${apache.ant.lib}/ant.jar"/>
</path>
-
\ No newline at end of file
+
+<!--delete this junk -->
+
+ <!--delete this junk -->
+
+ <property name="jboss.logging.spi" value="${project.thirdparty}/jboss/common-logging-spi"/>
+ <path id="jboss.logging.spi.classpath">
+ <pathelement path="${jboss.logging.spi}/jboss-logging-spi-1.0.2.jar"/>
+</path>
+
+ <property name="jboss.common.core" value="${project.thirdparty}/jboss/common-core"/>
+ <path id="jboss.common.core.classpath">
+ <pathelement path="${jboss.common.core}/jboss-common-core-1.0.2.jar"/>
+</path>
Modified: branches/logging_refactoring/common-logging-jdk/trunk/tools/etc/buildmagic/buildmagic.ent
===================================================================
--- branches/logging_refactoring/tools/etc/buildmagic/buildmagic.ent 2006-08-03 13:37:17 UTC (rev 1920)
+++ branches/logging_refactoring/common-logging-jdk/trunk/tools/etc/buildmagic/buildmagic.ent 2006-08-09 14:55:27 UTC (rev 1924)
@@ -378,6 +378,7 @@
<!-- This module is based on Java 1.4 -->
<property name="javac.target" value="1.4"/>
<property name="javac.source" value="1.4"/>
+ <property name="javac.debug" value="true"/>
<!-- RMIC should generate stubs compatible with Java 1.2+ -->
<property name="rmic.stubVersion" value="1.2"/>
@@ -435,6 +436,8 @@
<include name="${javac.includes}"/>
<exclude name="${javac.excludes}"/>
</depend>
+
+
<javac destdir="${build.classes}"
optimize="on"
Copied: branches/logging_refactoring/common-logging-log4j/trunk/build-compile.xml (from rev 1920, branches/logging_refactoring/build-compile.xml)
===================================================================
--- branches/logging_refactoring/build-compile.xml 2006-08-03 13:37:17 UTC (rev 1920)
+++ branches/logging_refactoring/common-logging-log4j/trunk/build-compile.xml 2006-08-09 14:55:27 UTC (rev 1924)
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE project [
+ <!ENTITY buildmagic SYSTEM "tools/etc/buildmagic/buildmagic.ent">
+ <!ENTITY libraries SYSTEM "thirdparty/libraries.ent">
+ <!ENTITY targets SYSTEM "tools/etc/buildmagic/targets.ent">
+]>
+
+<project default="main" name="JBoss/Build">
+
+ &buildmagic;
+ &libraries;
+ &targets;
+ <!-- The combined library classpath -->
+ <path id="library.classpath">
+ <path refid="jboss.logging.spi.classpath"/>
+ <path refid="jboss.common.core.classpath"/>
+ <path refid="apache.log4j.classpath"/>
+ <!--<path refid="apache.xerces.classpath"/>
+ <path refid="apache.commons.classpath"/>
+
+ <path refid="apache.slide.classpath"/>
+ <path refid="dom4j.dom4j.classpath"/>
+ <path refid="wutka.dtdparser.classpath"/>
+ <path refid="oswego.concurrent.classpath"/>
+ <path refid="sun.jaf.classpath"/> -->
+ </path>
+
+ <!-- The combined dependent module classpath -->
+ <path id="dependentmodule.classpath">
+ </path>
+
+ <target name="compile-classes"
+ depends="_default:compile-classes"/>
+
+</project>
Copied: branches/logging_refactoring/common-logging-log4j/trunk/build-thirdparty.xml (from rev 1920, branches/logging_refactoring/build-thirdparty.xml)
===================================================================
--- branches/logging_refactoring/build-thirdparty.xml 2006-08-03 13:37:17 UTC (rev 1920)
+++ branches/logging_refactoring/common-logging-log4j/trunk/build-thirdparty.xml 2006-08-09 14:55:27 UTC (rev 1924)
@@ -0,0 +1,73 @@
+<?xml version="1.0"?>
+<!-- $Id: build-thirdparty.xml,v 1.113 2006/05/23 23:19:24 jgreene Exp $ -->
+<project name="main.build"
+ default="synchronize"
+ basedir=".">
+
+ <!-- Property File definitions -->
+ <property file="local.properties"/>
+ <property file="synchronize.properties"/>
+ <property environment="env"/>
+
+ <!-- Property Definitions -->
+ <property name="generatedLibrariesFiles" value="thirdparty/libraries.ent"/>
+
+ <!-- Allow jbossbuild.repository to be set from (in order or priority)
+ + Command line -Djbossbuild.repository=...
+ + synchronize.properties jbossbuild.repository setting
+ + JBOSS_REPOSITORY environment variable
+ -->
+ <condition property="jbossbuild.repository" value="${env.JBOSS_REPOSITORY}">
+ <isset property="env.JBOSS_REPOSITORY"/>
+ </condition>
+ <!-- Fall back to default -->
+ <property name="jbossbuild.repository" value="http://repository.jboss.com"/>
+
+ <!-- File Imports -->
+ <import file="tools/etc/jbossbuild/tasks.xml"/>
+
+
+ <!-- Main Definition of dependencies -->
+ <build id="jbossas-thirdparty"
+ impltitle="JBossAS"
+ implversion="jboss-head"
+ implvendor="JBoss Inc."
+ implurl="http://www.jboss.org"
+ description="JBoss Application Server"
+ cvsroot="${cvs.prefix}@cvs.forge.jboss.com:/cvsroot/jboss"
+ thirdpartypath="thirdparty/"
+ location="${jbossbuild.repository}"
+ targetdefs="targets">
+
+ <!--
+ The repository is in CVS under the module repository.jboss.com whose contents
+ are pushed to the http://repository.jboss.com site.
+ -->
+<componentref name="apache-log4j" version="1.2.8"/>
+ <!--<componentref name="apache-xerces" version="2.7.1"/>
+
+ <componentref name="apache-slide" version="2.0"/>
+ <componentref name="dom4j" version="1.5"/>
+ <componentref name="wutka-dtdparser" version="1.2.1"/>
+ <componentref name="oswego-concurrent" version="1.3.4"/>
+ <componentref name="sun-jaf" version="1.0.2"/>
+ <componentref name="apache-httpclient" version="2.0.2"/>-->
+
+
+ </build>
+
+ <synchronizeinfo/>
+
+ <!-- Generate the targets -->
+ <generate generate="jbossas-thirdparty"/>
+
+
+ <target name="generate-lib-file"
+ description="generate libraries.ent and thirdparty license info"
+ depends="synchronize">
+ <gen-lib-file filename="${generatedLibrariesFiles}" path="tools/etc/buildmagic/" />
+ <visit-componentref-graph
+ componentVisitor="org.jboss.ant.util.graph.ComponentRefGraphLicenseVisitor" />
+ </target>
+
+</project>
Copied: branches/logging_refactoring/common-logging-log4j/trunk/build.bat (from rev 1920, branches/logging_refactoring/build.bat)
Copied: branches/logging_refactoring/common-logging-log4j/trunk/build.sh (from rev 1920, branches/logging_refactoring/build.sh)
Copied: branches/logging_refactoring/common-logging-log4j/trunk/build.xml (from rev 1920, branches/logging_refactoring/build.xml)
===================================================================
--- branches/logging_refactoring/build.xml 2006-08-03 13:37:17 UTC (rev 1920)
+++ branches/logging_refactoring/common-logging-log4j/trunk/build.xml 2006-08-09 14:55:27 UTC (rev 1924)
@@ -0,0 +1,179 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE project [
+ <!ENTITY buildmagic SYSTEM "tools/etc/buildmagic/buildmagic.ent">
+ <!ENTITY targets SYSTEM "tools/etc/buildmagic/targets.ent">
+]>
+
+<!-- ====================================================================== -->
+<!-- -->
+<!-- JBoss, the OpenSource J2EE webOS -->
+<!-- -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- -->
+<!-- ====================================================================== -->
+
+<!-- $Id$ -->
+
+<project default="build" name="JBoss/Common">
+
+ <!-- ================================================================== -->
+ <!-- Setup -->
+ <!-- ================================================================== -->
+
+ <!--
+ | Include the common Buildmagic elements.
+ |
+ | This defines several different targets, properties and paths.
+ | It also sets up the basic extention tasks amoung other things.
+ -->
+
+ &buildmagic;
+
+ <!--
+ | Include the normal targets.
+ -->
+ &targets;
+
+ <!-- ================================================================== -->
+ <!-- Configuration -->
+ <!-- ================================================================== -->
+
+ <!--
+ | Configure the build system.
+ |
+ | This target is invoked by the Buildmagic initialization logic and
+ | should contain module specific configuration elements.
+ -->
+
+ <target name="configure" unless="configure.disable">
+
+ <!-- =================== -->
+ <!-- Basic Configuration -->
+ <!-- =================== -->
+
+ <!-- Module name(s) & version -->
+ <property name="module.name" value="common"/>
+ <property name="module.Name" value="JBoss/Common"/>
+ <property name="module.version" value="DEV"/>
+
+
+
+ <!-- The combined dependent module classpath -->
+ <path id="dependentmodule.classpath">
+ </path>
+
+ <!-- ===== -->
+ <!-- Tasks -->
+ <!-- ===== -->
+
+ <call target="_default:task-init"/>
+
+ <!-- Set project specific properties -->
+ <property name="jboss.home" value="../build/output/jboss-${version.major}.${version.minor}.${version.revision}.${version.tag}"/>
+ <property name="server" value="default"/>
+
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Compile -->
+ <!-- ================================================================== -->
+
+ <!--
+ | Compile everything.
+ |
+ | This target should depend on other compile-* targets for each
+ | different type of compile that needs to be performed, short of
+ | documentation compiles.
+ -->
+
+ <target name="compile" depends="_default:compile-etc"
+ description="Compile all source files.">
+ <ant antfile="build-compile.xml" target="compile-classes"/>
+ </target>
+
+
+ <!-- ================================================================== -->
+ <!-- Archives -->
+ <!-- ================================================================== -->
+
+ <!--
+ | Build all jar files.
+ -->
+ <target name="module-jars">
+ <!-- Build jboss-common.jar -->
+ <jar jarfile="${build.lib}/common-logging-log4j.jar"
+ manifest="${build.etc}/default.mf">
+ <fileset dir="${build.classes}"/>
+ </jar>
+
+ </target>
+
+ <target name="build" depends="createthirdparty, main"/>
+
+ <!-- create the thirdparty folder from items in the repository -->
+ <!-- then generate a new libraries.ent file and include it in -->
+ <!-- the build -->
+ <target name="createthirdparty" unless="inhibit.downloads"
+ depends="check.inhibit.downloads, set.proxy">
+
+ <ant antfile="build-thirdparty.xml" target="generate-lib-file"/>
+ </target>
+
+ <!-- check if thirdparty libraries are to be downloaded -->
+ <target name="check.inhibit.downloads">
+ <condition property="inhibit.downloads">
+ <or>
+ <uptodate property="dependencies.current"
+ srcfile="build-thirdparty.xml"
+ targetfile="thirdparty/libraries.ent"/>
+ <istrue value="${nodownload}"/>
+ </or>
+ </condition>
+ </target>
+
+ <!-- check if the the user has specied proxy settings -->
+ <target name="check.proxy">
+ <condition property="hasproxy">
+ <and>
+ <isset property="proxy.host"/>
+ <isset property="proxy.port"/>
+ <not>
+ <equals arg1="" arg2="${proxy.host}" trim="true"/>
+ </not>
+ <not>
+ <equals arg1="" arg2="${proxy.port}" trim="true"/>
+ </not>
+ </and>
+ </condition>
+ </target>
+
+ <!-- set proxy settings -->
+ <condition property="hasproxyauth">
+ <and>
+ <isset property="hasproxy"/>
+ <isset property="proxy.username"/>
+ <isset property="proxy.password"/>
+ <not>
+ <equals arg1="" arg2="${proxy.username}" trim="true"/>
+ </not>
+ <not>
+ <equals arg1="" arg2="${proxy.password}" trim="true"/>
+ </not>
+ </and>
+ </condition>
+ <target name="set.proxy" depends="set.proxy.withoutauth, set.proxy.auth"/>
+
+ <!-- set proxy settings without auth -->
+ <target name="set.proxy.withoutauth" if="hasproxy" unless="hasproxyauth" depends="check.proxy">
+ <echo>Proxy is set to ${proxy.host}:${proxy.port}</echo>
+ <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"/>
+ </target>
+
+ <!-- set proxy settings using auth -->
+ <target name="set.proxy.auth" if="hasproxyauth" depends="check.proxy">
+ <echo>Auth Proxy is set to ${proxy.host}:${proxy.port} username=[${proxy.username}]</echo>
+ <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}" proxyuser="${proxy.username}" proxypassword="${proxy.password}"/>
+ </target>
+
+</project>
Copied: branches/logging_refactoring/common-logging-log4j/trunk/src (from rev 1920, branches/logging_refactoring/common-logging-log4j/src)
Copied: branches/logging_refactoring/common-logging-log4j/trunk/src/etc/default.mf (from rev 1920, branches/logging_refactoring/src/etc/default.mf)
Copied: branches/logging_refactoring/common-logging-log4j/trunk/tools (from rev 1920, branches/logging_refactoring/tools)
Modified: branches/logging_refactoring/common-logging-log4j/trunk/tools/etc/buildmagic/aliases.ent
===================================================================
--- branches/logging_refactoring/tools/etc/buildmagic/aliases.ent 2006-08-03 13:37:17 UTC (rev 1920)
+++ branches/logging_refactoring/common-logging-log4j/trunk/tools/etc/buildmagic/aliases.ent 2006-08-09 14:55:27 UTC (rev 1924)
@@ -94,4 +94,16 @@
<path id="apache.ant.classpath">
<pathelement path="${apache.ant.lib}/ant.jar"/>
</path>
-
\ No newline at end of file
+
+
+ <!--delete this junk -->
+
+ <property name="jboss.logging.spi" value="${project.thirdparty}/jboss/common-logging-spi"/>
+ <path id="jboss.logging.spi.classpath">
+ <pathelement path="${jboss.logging.spi}/jboss-logging-spi-1.0.2.jar"/>
+</path>
+
+ <property name="jboss.common.core" value="${project.thirdparty}/jboss/common-core"/>
+ <path id="jboss.common.core.classpath">
+ <pathelement path="${jboss.common.core}/jboss-common-core-1.0.2.jar"/>
+</path>
\ No newline at end of file
Modified: branches/logging_refactoring/common-logging-log4j/trunk/tools/etc/buildmagic/buildmagic.ent
===================================================================
--- branches/logging_refactoring/tools/etc/buildmagic/buildmagic.ent 2006-08-03 13:37:17 UTC (rev 1920)
+++ branches/logging_refactoring/common-logging-log4j/trunk/tools/etc/buildmagic/buildmagic.ent 2006-08-09 14:55:27 UTC (rev 1924)
@@ -378,6 +378,7 @@
<!-- This module is based on Java 1.4 -->
<property name="javac.target" value="1.4"/>
<property name="javac.source" value="1.4"/>
+ <property name="javac.debug" value="true"/>
<!-- RMIC should generate stubs compatible with Java 1.2+ -->
<property name="rmic.stubVersion" value="1.2"/>
Deleted: branches/logging_refactoring/component-info.xml
===================================================================
--- branches/logging_refactoring/component-info.xml 2006-08-07 14:47:40 UTC (rev 1923)
+++ branches/logging_refactoring/component-info.xml 2006-08-09 14:55:27 UTC (rev 1924)
@@ -1,17 +0,0 @@
-<project name="common-component-info">
- <component id="common"
- module="jboss-common"
- version="5.0-SNAPSHOT"
- >
- <artifact id="jboss-common.jar"/>
- <artifact id="jboss-common-client.jar"/>
- <artifact id="namespace.jar"/>
- <artifact id="jboss-archive-browsing.jar"/>
- <artifact id="testsuite-support.jar"/>
- <export>
- <include input="jboss-common.jar"/>
- <include input="namespace.jar"/>
- <include input="jboss-common-client.jar"/>
- </export>
- </component>
-</project>
\ No newline at end of file
Deleted: branches/logging_refactoring/jbossbuild.xml
===================================================================
--- branches/logging_refactoring/jbossbuild.xml 2006-08-07 14:47:40 UTC (rev 1923)
+++ branches/logging_refactoring/jbossbuild.xml 2006-08-09 14:55:27 UTC (rev 1924)
@@ -1,105 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
- JBoss, the OpenSource J2EE webOS
-
- Distributable under LGPL license.
- See terms of license at gnu.org.
--->
-
-<!-- ================================================================== -->
-<!-- Common component definition -->
-<!-- ================================================================== -->
-
-<project name="project"
- default="build"
- basedir="."
->
- <!-- The main build -->
- <import file="../tools/etc/jbossbuild/tasks.xml"/>
- <import file="component-info.xml"/>
-
- <!-- =============================================================== -->
- <!-- The component definition -->
- <!-- =============================================================== -->
-
- <componentdef component="common"
- description="JBoss Common">
-
- <!-- ============================================================ -->
- <!-- The main source -->
- <!-- ============================================================ -->
-
- <source id="main">
- <include component="oswego-concurrent"/>
- <include component="dom4j"/>
- <include component="apache-jaxme"/>
- <include component="apache-log4j"/>
- <include component="gnu-regexp"/>
- <include component="apache-slide"/>
- <include component="wutka-dtdparser"/>
- <include component="apache-xerces"/>
- <include component="apache-httpclient"/>
- </source>
-
- <!-- ============================================================ -->
- <!-- jboss-common.jar -->
- <!-- ============================================================ -->
-
- <artifactdef artifact="jboss-common.jar">
- <include input="main">
- <include pattern="org/jboss/**"/>
- <include pattern="org/apache/xerces/**"/>
- </include>
- </artifactdef>
-
- <!-- ============================================================ -->
- <!-- jboss-common-client.jar -->
- <!-- ============================================================ -->
-
- <artifactdef artifact="jboss-common-client.jar">
- <include input="main">
- <include pattern="org/jboss/**"/>
- <include pattern="org/apache/xerces/**"/>
- <exclude pattern="org/jboss/deployment/**"/>
- </include>
- </artifactdef>
-
- <!-- ============================================================ -->
- <!-- namespace.jar -->
- <!-- ============================================================ -->
-
- <artifactdef artifact="namespace.jar">
- <include input="main">
- <include pattern="javax/xml/namespace/*"/>
- </include>
- </artifactdef>
-
-
- <!-- ============================================================ -->
- <!-- jboss-archiving-browsing.jar -->
- <!-- ============================================================ -->
-
- <artifactdef artifact="jboss-archive-browsing.jar">
- <include input="main">
- <include pattern="org/jboss/util/file/*"/>
- </include>
- </artifactdef>
-
- <!-- ============================================================ -->
- <!-- testsuite-support.jar -->
- <!-- ============================================================ -->
-
- <artifactdef artifact="testsuite-support.jar">
- <include input="main">
- <include pattern="org/jboss/logging/**"/>
- </include>
- </artifactdef>
-
-
- </componentdef>
-
- <!-- Generate the targets -->
- <generate generate="common"/>
-
-</project>
Copied: branches/logging_refactoring/jbossxb/trunk/build-compile.xml (from rev 1920, branches/logging_refactoring/build-compile.xml)
===================================================================
--- branches/logging_refactoring/build-compile.xml 2006-08-03 13:37:17 UTC (rev 1920)
+++ branches/logging_refactoring/jbossxb/trunk/build-compile.xml 2006-08-09 14:55:27 UTC (rev 1924)
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE project [
+ <!ENTITY buildmagic SYSTEM "tools/etc/buildmagic/buildmagic.ent">
+ <!ENTITY libraries SYSTEM "thirdparty/libraries.ent">
+ <!ENTITY targets SYSTEM "tools/etc/buildmagic/targets.ent">
+]>
+
+<project default="main" name="JBoss/Build">
+
+ &buildmagic;
+ &libraries;
+ &targets;
+ <!-- The combined library classpath -->
+ <path id="library.classpath">
+ <path refid="jboss.logging.spi.classpath"/>
+ <path refid="wutka.dtdparser.classpath"/>
+ <path refid="apache.slide.classpath"/>
+ <path refid="sun.jaf.classpath"/>
+ <path refid="apache.xerces.classpath"/>
+ <path refid="jboss.common.core.classpath"/>
+ <path refid="oswego.concurrent.classpath"/>
+<!--
+ <path refid="apache.commons.classpath"/>
+ <path refid="apache.log4j.classpath"/>
+
+ <path refid="dom4j.dom4j.classpath"/>
+
+
+ -->
+ </path>
+
+ <!-- The combined dependent module classpath -->
+ <path id="dependentmodule.classpath">
+ </path>
+
+ <target name="compile-classes"
+ depends="_default:compile-classes"/>
+
+</project>
Copied: branches/logging_refactoring/jbossxb/trunk/build-thirdparty.xml (from rev 1920, branches/logging_refactoring/build-thirdparty.xml)
===================================================================
--- branches/logging_refactoring/build-thirdparty.xml 2006-08-03 13:37:17 UTC (rev 1920)
+++ branches/logging_refactoring/jbossxb/trunk/build-thirdparty.xml 2006-08-09 14:55:27 UTC (rev 1924)
@@ -0,0 +1,79 @@
+<?xml version="1.0"?>
+<!-- $Id: build-thirdparty.xml,v 1.113 2006/05/23 23:19:24 jgreene Exp $ -->
+<project name="main.build"
+ default="synchronize"
+ basedir=".">
+
+ <!-- Property File definitions -->
+ <property file="local.properties"/>
+ <property file="synchronize.properties"/>
+ <property environment="env"/>
+
+ <!-- Property Definitions -->
+ <property name="generatedLibrariesFiles" value="thirdparty/libraries.ent"/>
+
+ <!-- Allow jbossbuild.repository to be set from (in order or priority)
+ + Command line -Djbossbuild.repository=...
+ + synchronize.properties jbossbuild.repository setting
+ + JBOSS_REPOSITORY environment variable
+ -->
+ <condition property="jbossbuild.repository" value="${env.JBOSS_REPOSITORY}">
+ <isset property="env.JBOSS_REPOSITORY"/>
+ </condition>
+ <!-- Fall back to default -->
+ <property name="jbossbuild.repository" value="http://repository.jboss.com"/>
+
+ <!-- File Imports -->
+ <import file="tools/etc/jbossbuild/tasks.xml"/>
+
+
+ <!-- Main Definition of dependencies -->
+ <build id="jbossas-thirdparty"
+ impltitle="JBossAS"
+ implversion="jboss-head"
+ implvendor="JBoss Inc."
+ implurl="http://www.jboss.org"
+ description="JBoss Application Server"
+ cvsroot="${cvs.prefix}@cvs.forge.jboss.com:/cvsroot/jboss"
+ thirdpartypath="thirdparty/"
+ location="${jbossbuild.repository}"
+ targetdefs="targets">
+
+ <!--
+ The repository is in CVS under the module repository.jboss.com whose contents
+ are pushed to the http://repository.jboss.com site.
+ -->
+ <componentref name="apache-slide" version="2.0"/>
+ <componentref name="wutka-dtdparser" version="1.2.1"/>
+ <componentref name="sun-jaf" version="1.0.2"/>
+ <componentref name="apache-xerces" version="2.7.1"/>
+ <componentref name="oswego-concurrent" version="1.3.4"/>
+<!--
+
+
+ <componentref name="apache-log4j" version="1.2.8"/>
+
+ <componentref name="dom4j" version="1.5"/>
+
+
+
+ <componentref name="apache-httpclient" version="2.0.2"/>-->
+
+
+ </build>
+
+ <synchronizeinfo/>
+
+ <!-- Generate the targets -->
+ <generate generate="jbossas-thirdparty"/>
+
+
+ <target name="generate-lib-file"
+ description="generate libraries.ent and thirdparty license info"
+ depends="synchronize">
+ <gen-lib-file filename="${generatedLibrariesFiles}" path="tools/etc/buildmagic/" />
+ <visit-componentref-graph
+ componentVisitor="org.jboss.ant.util.graph.ComponentRefGraphLicenseVisitor" />
+ </target>
+
+</project>
Copied: branches/logging_refactoring/jbossxb/trunk/build.bat (from rev 1920, branches/logging_refactoring/build.bat)
Copied: branches/logging_refactoring/jbossxb/trunk/build.sh (from rev 1920, branches/logging_refactoring/build.sh)
Copied: branches/logging_refactoring/jbossxb/trunk/build.xml (from rev 1920, branches/logging_refactoring/build.xml)
===================================================================
--- branches/logging_refactoring/build.xml 2006-08-03 13:37:17 UTC (rev 1920)
+++ branches/logging_refactoring/jbossxb/trunk/build.xml 2006-08-09 14:55:27 UTC (rev 1924)
@@ -0,0 +1,181 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE project [
+ <!ENTITY buildmagic SYSTEM "tools/etc/buildmagic/buildmagic.ent">
+ <!ENTITY targets SYSTEM "tools/etc/buildmagic/targets.ent">
+]>
+
+<!-- ====================================================================== -->
+<!-- -->
+<!-- JBoss, the OpenSource J2EE webOS -->
+<!-- -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- -->
+<!-- ====================================================================== -->
+
+<!-- $Id$ -->
+
+<project default="build" name="JBoss/Common">
+
+ <!-- ================================================================== -->
+ <!-- Setup -->
+ <!-- ================================================================== -->
+
+ <!--
+ | Include the common Buildmagic elements.
+ |
+ | This defines several different targets, properties and paths.
+ | It also sets up the basic extention tasks amoung other things.
+ -->
+
+ &buildmagic;
+
+ <!--
+ | Include the normal targets.
+ -->
+ &targets;
+
+ <!-- ================================================================== -->
+ <!-- Configuration -->
+ <!-- ================================================================== -->
+
+ <!--
+ | Configure the build system.
+ |
+ | This target is invoked by the Buildmagic initialization logic and
+ | should contain module specific configuration elements.
+ -->
+
+ <target name="configure" unless="configure.disable">
+
+ <!-- =================== -->
+ <!-- Basic Configuration -->
+ <!-- =================== -->
+
+ <!-- Module name(s) & version -->
+ <property name="module.name" value="common"/>
+ <property name="module.Name" value="JBoss/Common"/>
+ <property name="module.version" value="DEV"/>
+
+
+
+ <!-- The combined dependent module classpath -->
+ <path id="dependentmodule.classpath">
+ </path>
+
+ <!-- ===== -->
+ <!-- Tasks -->
+ <!-- ===== -->
+
+ <call target="_default:task-init"/>
+
+ <!-- Set project specific properties -->
+ <property name="jboss.home" value="../build/output/jboss-${version.major}.${version.minor}.${version.revision}.${version.tag}"/>
+ <property name="server" value="default"/>
+
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Compile -->
+ <!-- ================================================================== -->
+
+ <!--
+ | Compile everything.
+ |
+ | This target should depend on other compile-* targets for each
+ | different type of compile that needs to be performed, short of
+ | documentation compiles.
+ -->
+
+ <target name="compile" depends="_default:compile-etc"
+ description="Compile all source files.">
+ <ant antfile="build-compile.xml" target="compile-classes"/>
+ </target>
+
+
+ <!-- ================================================================== -->
+ <!-- Archives -->
+ <!-- ================================================================== -->
+
+ <!--
+ | Build all jar files.
+ -->
+ <target name="module-jars">
+
+ <!-- Build jboss-common.jar -->
+ <jar jarfile="${build.lib}/jbossxb.jar"
+ manifest="${build.etc}/default.mf">
+ <fileset dir="${build.classes}"/>
+
+ </jar>
+ </target>
+
+
+ <target name="build" depends="createthirdparty, main"/>
+
+ <!-- create the thirdparty folder from items in the repository -->
+ <!-- then generate a new libraries.ent file and include it in -->
+ <!-- the build -->
+ <target name="createthirdparty" unless="inhibit.downloads"
+ depends="check.inhibit.downloads, set.proxy">
+
+ <ant antfile="build-thirdparty.xml" target="generate-lib-file"/>
+ </target>
+
+ <!-- check if thirdparty libraries are to be downloaded -->
+ <target name="check.inhibit.downloads">
+ <condition property="inhibit.downloads">
+ <or>
+ <uptodate property="dependencies.current"
+ srcfile="build-thirdparty.xml"
+ targetfile="thirdparty/libraries.ent"/>
+ <istrue value="${nodownload}"/>
+ </or>
+ </condition>
+ </target>
+
+ <!-- check if the the user has specied proxy settings -->
+ <target name="check.proxy">
+ <condition property="hasproxy">
+ <and>
+ <isset property="proxy.host"/>
+ <isset property="proxy.port"/>
+ <not>
+ <equals arg1="" arg2="${proxy.host}" trim="true"/>
+ </not>
+ <not>
+ <equals arg1="" arg2="${proxy.port}" trim="true"/>
+ </not>
+ </and>
+ </condition>
+ </target>
+
+ <!-- set proxy settings -->
+ <condition property="hasproxyauth">
+ <and>
+ <isset property="hasproxy"/>
+ <isset property="proxy.username"/>
+ <isset property="proxy.password"/>
+ <not>
+ <equals arg1="" arg2="${proxy.username}" trim="true"/>
+ </not>
+ <not>
+ <equals arg1="" arg2="${proxy.password}" trim="true"/>
+ </not>
+ </and>
+ </condition>
+ <target name="set.proxy" depends="set.proxy.withoutauth, set.proxy.auth"/>
+
+ <!-- set proxy settings without auth -->
+ <target name="set.proxy.withoutauth" if="hasproxy" unless="hasproxyauth" depends="check.proxy">
+ <echo>Proxy is set to ${proxy.host}:${proxy.port}</echo>
+ <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"/>
+ </target>
+
+ <!-- set proxy settings using auth -->
+ <target name="set.proxy.auth" if="hasproxyauth" depends="check.proxy">
+ <echo>Auth Proxy is set to ${proxy.host}:${proxy.port} username=[${proxy.username}]</echo>
+ <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}" proxyuser="${proxy.username}" proxypassword="${proxy.password}"/>
+ </target>
+
+</project>
Copied: branches/logging_refactoring/jbossxb/trunk/src (from rev 1920, branches/logging_refactoring/jbossxb/src)
Copied: branches/logging_refactoring/jbossxb/trunk/src/etc/default.mf (from rev 1920, branches/logging_refactoring/src/etc/default.mf)
Copied: branches/logging_refactoring/jbossxb/trunk/tools (from rev 1920, branches/logging_refactoring/tools)
Modified: branches/logging_refactoring/jbossxb/trunk/tools/etc/buildmagic/aliases.ent
===================================================================
--- branches/logging_refactoring/tools/etc/buildmagic/aliases.ent 2006-08-03 13:37:17 UTC (rev 1920)
+++ branches/logging_refactoring/jbossxb/trunk/tools/etc/buildmagic/aliases.ent 2006-08-09 14:55:27 UTC (rev 1924)
@@ -94,4 +94,17 @@
<path id="apache.ant.classpath">
<pathelement path="${apache.ant.lib}/ant.jar"/>
</path>
-
\ No newline at end of file
+
+
+
+ <!--delete this junk -->
+
+ <property name="jboss.logging.spi" value="${project.thirdparty}/jboss/common-logging-spi"/>
+ <path id="jboss.logging.spi.classpath">
+ <pathelement path="${jboss.logging.spi}/jboss-logging-spi-1.0.2.jar"/>
+</path>
+
+ <property name="jboss.common.core" value="${project.thirdparty}/jboss/common-core"/>
+ <path id="jboss.common.core.classpath">
+ <pathelement path="${jboss.common.core}/jboss-common-core-1.0.2.jar"/>
+</path>
\ No newline at end of file
Modified: branches/logging_refactoring/jbossxb/trunk/tools/etc/buildmagic/buildmagic.ent
===================================================================
--- branches/logging_refactoring/tools/etc/buildmagic/buildmagic.ent 2006-08-03 13:37:17 UTC (rev 1920)
+++ branches/logging_refactoring/jbossxb/trunk/tools/etc/buildmagic/buildmagic.ent 2006-08-09 14:55:27 UTC (rev 1924)
@@ -378,6 +378,7 @@
<!-- This module is based on Java 1.4 -->
<property name="javac.target" value="1.4"/>
<property name="javac.source" value="1.4"/>
+ <property name="javac.debug" value="true"/>
<!-- RMIC should generate stubs compatible with Java 1.2+ -->
<property name="rmic.stubVersion" value="1.2"/>
Modified: branches/logging_refactoring/jbossxb/trunk/tools/etc/buildmagic/buildmagic.ent~
===================================================================
--- branches/logging_refactoring/tools/etc/buildmagic/buildmagic.ent~ 2006-08-03 13:37:17 UTC (rev 1920)
+++ branches/logging_refactoring/jbossxb/trunk/tools/etc/buildmagic/buildmagic.ent~ 2006-08-09 14:55:27 UTC (rev 1924)
@@ -436,14 +436,11 @@
<exclude name="${javac.excludes}"/>
</depend>
-
- <echo message="hereiam"/>
-
<javac destdir="${build.classes}"
optimize="on"
target="${javac.target}"
source="${javac.source}"
- debug="off"
+ debug="${javac.debug}"
depend="${javac.depend}"
verbose="${javac.verbose}"
deprecation="${javac.deprecation}"
More information about the jboss-svn-commits
mailing list