[jboss-svn-commits] JBoss Common SVN: r1921 - in branches/logging_refactoring/common-logging-spi: . trunk trunk/src trunk/src/etc trunk/tools/etc/buildmagic
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Aug 3 11:56:09 EDT 2006
Author: ruel.loehr at jboss.com
Date: 2006-08-03 11:55:49 -0400 (Thu, 03 Aug 2006)
New Revision: 1921
Added:
branches/logging_refactoring/common-logging-spi/trunk/
branches/logging_refactoring/common-logging-spi/trunk/build-compile.xml
branches/logging_refactoring/common-logging-spi/trunk/build-thirdparty.xml
branches/logging_refactoring/common-logging-spi/trunk/build.bat
branches/logging_refactoring/common-logging-spi/trunk/build.sh
branches/logging_refactoring/common-logging-spi/trunk/build.xml
branches/logging_refactoring/common-logging-spi/trunk/pom.xml
branches/logging_refactoring/common-logging-spi/trunk/src/
branches/logging_refactoring/common-logging-spi/trunk/src/etc/
branches/logging_refactoring/common-logging-spi/trunk/src/etc/default.mf
branches/logging_refactoring/common-logging-spi/trunk/tools/
Removed:
branches/logging_refactoring/common-logging-spi/src/
Modified:
branches/logging_refactoring/common-logging-spi/trunk/tools/etc/buildmagic/buildmagic.ent
Log:
add build capabilities for independent proj
Copied: branches/logging_refactoring/common-logging-spi/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-spi/trunk/build-compile.xml 2006-08-03 15:55:49 UTC (rev 1921)
@@ -0,0 +1,24 @@
+<?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>
+
+ <!-- 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-spi/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-spi/trunk/build-thirdparty.xml 2006-08-03 15:55:49 UTC (rev 1921)
@@ -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-spi/trunk/build.bat (from rev 1920, branches/logging_refactoring/build.bat)
Copied: branches/logging_refactoring/common-logging-spi/trunk/build.sh (from rev 1920, branches/logging_refactoring/build.sh)
Copied: branches/logging_refactoring/common-logging-spi/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-spi/trunk/build.xml 2006-08-03 15:55:49 UTC (rev 1921)
@@ -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-spi.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>
Added: branches/logging_refactoring/common-logging-spi/trunk/pom.xml
===================================================================
--- branches/logging_refactoring/common-logging-spi/trunk/pom.xml 2006-08-03 13:37:17 UTC (rev 1920)
+++ branches/logging_refactoring/common-logging-spi/trunk/pom.xml 2006-08-03 15:55:49 UTC (rev 1921)
@@ -0,0 +1,95 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ <packaging>jar</packaging>
+ <version>1.0.2</version>
+ <name>JBoss Logging Programming Interface</name>
+ <url>http://www.jboss.org</url>
+ <description>The JBoss Logging Framework Programming Interface</description>
+ <licenses>
+ <license>
+ <name>lgpl</name>
+ <url>http://repository.jboss.com/licenses/lgpl.txt</url>
+ </license>
+ </licenses>
+ <organization>
+ <name>JBoss Inc.</name>
+ <url>http://www.jboss.org</url>
+ </organization>
+
+ <repositories>
+ <repository>
+ <id>jboss</id>
+ <name>JBoss Inc. Repository</name>
+ <layout>default</layout>
+ <url>http://repository.jboss.com/maven2/</url>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+
+ <pluginRepositories>
+ <pluginRepository>
+ <id>jbosspluginrepo</id>
+ <name>jboss plugin repository</name>
+ <url>http://repository.jboss.com/maven2</url>
+ <layout>default</layout>
+ <snapshots>
+ <enabled>false</enabled>
+ <updatePolicy>never</updatePolicy>
+ </snapshots>
+ </pluginRepository>
+ <pluginRepository>
+ <id>central</id>
+ <name>LSU maven2 mirror</name>
+ <url>http://ibiblio.lsu.edu/main/pub/packages/maven2</url>
+ <layout>default</layout>
+ <snapshots>
+ <enabled>false</enabled>
+ <updatePolicy>never</updatePolicy>
+ </snapshots>
+ </pluginRepository>
+ </pluginRepositories>
+
+
+ <build>
+ <sourceDirectory>src/main/java</sourceDirectory>
+ <plugins>
+
+
+
+ <!-- define how we want compilation to take place
+ here, we accept most of the defaults but say that we want the
+ optimization flag set, and define the source and target to be 1.4,
+ these setting will be inherited by child projects -->
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.0</version>
+ <configuration>
+ <optimize>true</optimize>
+ <source>1.4</source>
+ <target>1.4</target>
+ </configuration>
+ </plugin>
+
+ <!-- define that we wish to create src jars -->
+ <plugin>
+ <artifactId>maven-source-plugin</artifactId>
+ <inherited>true</inherited>
+ <executions>
+ <execution>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ </plugins>
+ </build>
+
+</project>
+
Copied: branches/logging_refactoring/common-logging-spi/trunk/src (from rev 1920, branches/logging_refactoring/common-logging-spi/src)
Copied: branches/logging_refactoring/common-logging-spi/trunk/src/etc/default.mf (from rev 1920, branches/logging_refactoring/src/etc/default.mf)
Copied: branches/logging_refactoring/common-logging-spi/trunk/tools (from rev 1920, branches/logging_refactoring/tools)
Modified: branches/logging_refactoring/common-logging-spi/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-spi/trunk/tools/etc/buildmagic/buildmagic.ent 2006-08-03 15:55:49 UTC (rev 1921)
@@ -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,7 +436,8 @@
<include name="${javac.includes}"/>
<exclude name="${javac.excludes}"/>
</depend>
-
+
+
<javac destdir="${build.classes}"
optimize="on"
target="${javac.target}"
@@ -1046,6 +1048,7 @@
<!-- Invoke the 'main' on all configured modules -->
<target name="_buildmagic:modules:main" depends="init">
+ <echo message="calling maoini"/>
<execmodules target="main"
modules="${modules}"
root="${project.root}/@MODULE@"
More information about the jboss-svn-commits
mailing list