[jboss-svn-commits] JBL Code SVN: r24355 - in labs/jbossbuild/buildmagic/trunk: tasks and 3 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Dec 11 12:03:23 EST 2008
Author: pgier
Date: 2008-12-11 12:03:22 -0500 (Thu, 11 Dec 2008)
New Revision: 24355
Added:
labs/jbossbuild/buildmagic/trunk/tools/buildmagic/lib/bsf-2.4.0.jar
labs/jbossbuild/buildmagic/trunk/tools/buildmagic/lib/jboss-common-core-2.2.10.GA.jar
Removed:
labs/jbossbuild/buildmagic/trunk/common/
labs/jbossbuild/buildmagic/trunk/thirdparty/
Modified:
labs/jbossbuild/buildmagic/trunk/tasks/build.xml
labs/jbossbuild/buildmagic/trunk/tasks/ivy.xml
labs/jbossbuild/buildmagic/trunk/tasks/src/main/org/jboss/tools/buildmagic/task/config/Library.java
labs/jbossbuild/buildmagic/trunk/tasks/src/main/org/jboss/tools/buildmagic/task/config/ModuleLibrary.java
labs/jbossbuild/buildmagic/trunk/tools/buildmagic/lib/buildmagic-tasks.jar
labs/jbossbuild/buildmagic/trunk/tools/etc/buildmagic/buildmagic.ent
Log:
[JBBUILD-500] Remove common module. Update dependency to recent jboss-common-core.
Modified: labs/jbossbuild/buildmagic/trunk/tasks/build.xml
===================================================================
--- labs/jbossbuild/buildmagic/trunk/tasks/build.xml 2008-12-11 15:18:18 UTC (rev 24354)
+++ labs/jbossbuild/buildmagic/trunk/tasks/build.xml 2008-12-11 17:03:22 UTC (rev 24355)
@@ -34,22 +34,27 @@
&defaults;
&tools;
+ <!-- Initialize Ivy Tasks -->
<path id="ivy.classpath" path="../tools/apache-ivy/ivy-2.0.0-rc2.jar" />
<typedef resource="org/apache/ivy/ant/antlib.xml"
uri="antlib:org.apache.ivy.ant"
classpathref="ivy.classpath" />
- <target name="resolve-dependencies" description="Retreive dependencies with ivy">
+ <target name="resolve-compile-dependencies" description="Retreive dependencies with ivy">
<ivy:settings file="../tools/etc/ivy/ivysettings.xml"></ivy:settings>
- <ivy:cachefileset setid="dependencies.classpath"/>
+ <ivy:cachefileset setid="compile-dependencies" conf="compile"/>
<path id="library.classpath">
- <fileset refid="dependencies.classpath"/>
+ <fileset refid="compile-dependencies"/>
</path>
</target>
- <!--<typedef resource="org/apache/maven/artifact/ant/antlib.xml"
- uri="urn:maven-artifact-ant"
- classpathref="maven-ant-tasks.classpath" />-->
+ <target name="resolve-test-dependencies" description="Retreive dependencies with ivy">
+ <ivy:settings file="../tools/etc/ivy/ivysettings.xml"></ivy:settings>
+ <ivy:cachefileset setid="test-dependencies" conf="test"/>
+ <path id="test.dependencies.classpath">
+ <fileset refid="test-dependencies"/>
+ </path>
+ </target>
<!--+====================================================================+-->
<!--| Initialization |-->
@@ -59,7 +64,7 @@
<!--+====================================================================+-->
<target name="init" depends="_buildmagic:init">
-
+
</target>
@@ -70,7 +75,7 @@
<!--| and should contain module specific configuration elements. |-->
<!--+====================================================================+-->
- <target name="configure" unless="configure.disable" depends="resolve-dependencies">
+ <target name="configure" unless="configure.disable">
<!-- Module name(s) & version -->
<property name="module.name" value="tasks"/>
@@ -121,7 +126,8 @@
<target name="compile"
description="Compile all source files."
- depends="_default:compile-classes,
+ depends="resolve-compile-dependencies,
+ _default:compile-classes,
_default:compile-etc,
_default:compile-resources">
<!-- Add module specific elements here. -->
@@ -135,7 +141,7 @@
<target name="test"
description="Run junit tests."
- depends="compile">
+ depends="compile, resolve-test-dependencies">
<mkdir dir="${build.test}"/>
<mkdir dir="${build.reports}"/>
@@ -144,9 +150,8 @@
destdir="${build.test}"
debug="on">
<classpath>
- <path refid="javac.classpath"/>
<pathelement location="${build.classes}"/>
- <path refid="library.classpath"/>
+ <path refid="test.dependencies.classpath"/>
</classpath>
</javac>
@@ -154,7 +159,7 @@
<classpath>
<pathelement location="${build.test}"/>
<pathelement location="${build.classes}"/>
- <path refid="library.classpath"/>
+ <path refid="test.dependencies.classpath"/>
</classpath>
<formatter type="plain"/>
@@ -196,21 +201,11 @@
<include name="**"/>
</fileset>
- <!-- Include required classes from common -->
- <!--<fileset dir="${jboss.common.root}/output/classes">
- <include name="org/jboss/net/protocol/**"/>
- <include name="org/jboss/logging/*.class"/>
- <include name="org/jboss/util/DirectoryBuilder*.class"/>
- <include name="org/jboss/util/Strings*.class"/>
- <include name="org/jboss/util/Objects*.class"/>
- <include name="org/jboss/util/*Exception*.class"/>
- <include name="org/jboss/util/*Error*.class"/>
- <include name="org/jboss/util/*Throwable*.class"/>
- <include name="org/jboss/util/platform/Constants.class"/>
- <include name="org/jboss/util/property/**"/>
- </fileset>-->
</jar>
+ <ivy:retrieve pattern="${build.lib}/[artifact]-[revision].[ext]" conf="compile"/>
+
+
</target>
Modified: labs/jbossbuild/buildmagic/trunk/tasks/ivy.xml
===================================================================
--- labs/jbossbuild/buildmagic/trunk/tasks/ivy.xml 2008-12-11 15:18:18 UTC (rev 24354)
+++ labs/jbossbuild/buildmagic/trunk/tasks/ivy.xml 2008-12-11 17:03:22 UTC (rev 24355)
@@ -1,9 +1,14 @@
-<ivy-module version="2.0">
+<ivy-module version="2.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd">
<info organisation="jboss" module="tasks"/>
- <dependencies>
- <dependency org="log4j" name="log4j" rev="1.2.14"/>
+ <configurations>
+ <conf name="compile"/>
+ <conf name="test" extends="compile"/>
+ </configurations>
+ <dependencies defaultconf="compile" defaultconfmapping="*->default">
<dependency org="bsf" name="bsf" rev="2.4.0"/>
- <dependency org="jboss" name="jboss-common" rev="1.0.3.GA"/>
- <dependency org="junit" name="junit" rev="3.8.1"/>
+ <dependency org="org.jboss" name="jboss-common-core" rev="2.2.10.GA"/>
+ <dependency org="junit" name="junit" rev="3.8.1" conf="test"/>
</dependencies>
</ivy-module>
Modified: labs/jbossbuild/buildmagic/trunk/tasks/src/main/org/jboss/tools/buildmagic/task/config/Library.java
===================================================================
--- labs/jbossbuild/buildmagic/trunk/tasks/src/main/org/jboss/tools/buildmagic/task/config/Library.java 2008-12-11 15:18:18 UTC (rev 24354)
+++ labs/jbossbuild/buildmagic/trunk/tasks/src/main/org/jboss/tools/buildmagic/task/config/Library.java 2008-12-11 17:03:22 UTC (rev 24355)
@@ -21,8 +21,6 @@
import org.jboss.tools.buildmagic.task.MissingAttributeException;
import org.jboss.tools.buildmagic.task.util.TaskLogger;
-import org.jboss.util.DirectoryBuilder;
-
/**
* A helper task to setup library the properties and path
* elements for using a thirdparty library.
@@ -143,24 +141,15 @@
protected File getVendorDir()
{
- DirectoryBuilder builder = new DirectoryBuilder(root);
-
- // make vendor dir
- builder.cd(vendor).cd(name);
- File dir = builder.get();
-
- return dir;
+ File vendorDir = new File( root, vendor);
+ File vendorNameDir = new File( vendorDir, name );
+ return vendorNameDir;
}
protected File getLibraryDir()
{
- DirectoryBuilder builder = new DirectoryBuilder(getVendorDir());
-
- // make vendor dir
- builder.cd("lib");
- File dir = builder.get();
-
- return dir;
+ File libraryDir = new File( getVendorDir(), "lib" );
+ return libraryDir;
}
/**
Modified: labs/jbossbuild/buildmagic/trunk/tasks/src/main/org/jboss/tools/buildmagic/task/config/ModuleLibrary.java
===================================================================
--- labs/jbossbuild/buildmagic/trunk/tasks/src/main/org/jboss/tools/buildmagic/task/config/ModuleLibrary.java 2008-12-11 15:18:18 UTC (rev 24354)
+++ labs/jbossbuild/buildmagic/trunk/tasks/src/main/org/jboss/tools/buildmagic/task/config/ModuleLibrary.java 2008-12-11 17:03:22 UTC (rev 24355)
@@ -11,8 +11,6 @@
import java.io.File;
-import org.jboss.util.DirectoryBuilder;
-
/**
* A special extention of {@link Library} for modules. It sets
* up the namespace differently.
@@ -27,11 +25,8 @@
{
protected File getVendorDir()
{
- DirectoryBuilder builder = new DirectoryBuilder(root);
-
- builder.cd(name).cd("output");
- File dir = builder.get();
-
- return dir;
+ File vendorNameDir = new File( root, name );
+ File vendorOutputDir = new File ( vendorNameDir, "output" );
+ return vendorOutputDir;
}
}
Added: labs/jbossbuild/buildmagic/trunk/tools/buildmagic/lib/bsf-2.4.0.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbossbuild/buildmagic/trunk/tools/buildmagic/lib/bsf-2.4.0.jar
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Modified: labs/jbossbuild/buildmagic/trunk/tools/buildmagic/lib/buildmagic-tasks.jar
===================================================================
(Binary files differ)
Added: labs/jbossbuild/buildmagic/trunk/tools/buildmagic/lib/jboss-common-core-2.2.10.GA.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbossbuild/buildmagic/trunk/tools/buildmagic/lib/jboss-common-core-2.2.10.GA.jar
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Modified: labs/jbossbuild/buildmagic/trunk/tools/etc/buildmagic/buildmagic.ent
===================================================================
--- labs/jbossbuild/buildmagic/trunk/tools/etc/buildmagic/buildmagic.ent 2008-12-11 15:18:18 UTC (rev 24354)
+++ labs/jbossbuild/buildmagic/trunk/tools/etc/buildmagic/buildmagic.ent 2008-12-11 17:03:22 UTC (rev 24355)
@@ -61,10 +61,6 @@
<fileset dir="${project.tools}/buildmagic/lib">
<include name="*"/>
</fileset>
- <!--<pathelement location="${project.tools}/lib"/>
- <pathelement location="${project.tools}/etc"/>
- <pathelement location="${project.tools}"/>
- <pathelement path="${buildmagic.local.classpath}"/>-->
</path>
<taskdef file="${project.tools}/etc/buildmagic/autoload.properties"
classpathref="buildmagic.task.classpath"/>
More information about the jboss-svn-commits
mailing list