[jboss-svn-commits] JBoss Common SVN: r1991 - common-logging-jdk/trunk
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Aug 29 14:39:15 EDT 2006
Author: ruel.loehr at jboss.com
Date: 2006-08-29 14:39:14 -0400 (Tue, 29 Aug 2006)
New Revision: 1991
Removed:
common-logging-jdk/trunk/build-compile.xml
common-logging-jdk/trunk/build-thirdparty.xml
common-logging-jdk/trunk/build.bat
common-logging-jdk/trunk/build.sh
common-logging-jdk/trunk/build.xml
common-logging-jdk/trunk/tools/
Log:
remove jbossbuild
Deleted: common-logging-jdk/trunk/build-compile.xml
===================================================================
--- common-logging-jdk/trunk/build-compile.xml 2006-08-29 18:36:19 UTC (rev 1990)
+++ common-logging-jdk/trunk/build-compile.xml 2006-08-29 18:39:14 UTC (rev 1991)
@@ -1,26 +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="jboss.common.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>
Deleted: common-logging-jdk/trunk/build-thirdparty.xml
===================================================================
--- common-logging-jdk/trunk/build-thirdparty.xml 2006-08-29 18:36:19 UTC (rev 1990)
+++ common-logging-jdk/trunk/build-thirdparty.xml 2006-08-29 18:39:14 UTC (rev 1991)
@@ -1,67 +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="jboss/common-logging-spi" version="1.0"/>
- <componentref name="jboss/common-core" version="1.0"/>
-
- </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: common-logging-jdk/trunk/build.bat
===================================================================
--- common-logging-jdk/trunk/build.bat 2006-08-29 18:36:19 UTC (rev 1990)
+++ common-logging-jdk/trunk/build.bat 2006-08-29 18:39:14 UTC (rev 1991)
@@ -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: common-logging-jdk/trunk/build.sh
===================================================================
--- common-logging-jdk/trunk/build.sh 2006-08-29 18:36:19 UTC (rev 1990)
+++ common-logging-jdk/trunk/build.sh 2006-08-29 18:39:14 UTC (rev 1991)
@@ -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: common-logging-jdk/trunk/build.xml
===================================================================
--- common-logging-jdk/trunk/build.xml 2006-08-29 18:36:19 UTC (rev 1990)
+++ common-logging-jdk/trunk/build.xml 2006-08-29 18:39:14 UTC (rev 1991)
@@ -1,180 +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">
-
- <!-- 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>
More information about the jboss-svn-commits
mailing list