User: user57
Date: 02/02/27 22:47:41
Modified: tasks/src/main/org/jboss/tools/buildmagic/task/config
Library.java LibrarySet.java
Added: tasks/src/main/org/jboss/tools/buildmagic/task/config
ModuleLibrary.java
Log:
o Added ModuleLibrary, a minor hack of Library to reuse Library+
LibrarySet functionality for module classpath config
o Added ModuleInit
Revision Changes Path
1.3 +39 -10
buildmagic/tasks/src/main/org/jboss/tools/buildmagic/task/config/Library.java
Index: Library.java
===================================================================
RCS file:
/cvsroot/jboss/buildmagic/tasks/src/main/org/jboss/tools/buildmagic/task/config/Library.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Library.java 28 Feb 2002 05:54:08 -0000 1.2
+++ Library.java 28 Feb 2002 06:47:41 -0000 1.3
@@ -48,7 +48,7 @@
* </library>
*
* <library vendor="sun" name="jaxp" root="${project.thirdparty}">
- * <classpath includes="*.jar"/>
+ * <include name="*.jar"/>
* </library>
*
* <library vendor="sun" name="jaax" root="${project.thirdparty}"
includes="*.jar"/>
@@ -58,7 +58,7 @@
* <p>If no includes/excludes or classpath elements are specified,
* then a default includes of "*" is used.
*
- * @version <tt>$Revision: 1.2 $</tt>
+ * @version <tt>$Revision: 1.3 $</tt>
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason Dillon</a>
*/
public class Library
@@ -114,6 +114,18 @@
return classpathSet;
}
+ /** Helpers */
+ public PatternSet.NameEntry createInclude()
+ {
+ return createClasspath().createInclude();
+ }
+
+ /** Helpers */
+ public PatternSet.NameEntry createExclude()
+ {
+ return createClasspath().createExclude();
+ }
+
/**
* Validate the attributes for this task.
*
@@ -129,6 +141,28 @@
throw new MissingAttributeException("root", this);
}
+ protected File getVendorDir()
+ {
+ DirectoryBuilder builder = new DirectoryBuilder(root);
+
+ // make vendor dir
+ builder.cd(vendor).cd(name);
+ File dir = builder.get();
+
+ return dir;
+ }
+
+ protected File getLibraryDir()
+ {
+ DirectoryBuilder builder = new DirectoryBuilder(getVendorDir());
+
+ // make vendor dir
+ builder.cd("lib");
+ File dir = builder.get();
+
+ return dir;
+ }
+
/**
* Execute the task.
*
@@ -144,18 +178,13 @@
log.debug("vendor: " + vendor);
log.debug("name: " + name);
log.debug("root: " + root);
-
- DirectoryBuilder builder = new DirectoryBuilder(root);
-
- // make vendor dir
- builder.cd(vendor).cd(name);
- File vendorDir = builder.get();
+
+ File vendorDir = getVendorDir();
project.setProperty(vendor + "." + name + ".root", vendorDir.toString());
log.debug("vendorDir: " + vendorDir);
// make lib dir
- builder.cd("lib");
- File libDir = builder.get();
+ File libDir = getLibraryDir();
project.setProperty(vendor + "." + name + ".lib", libDir.toString());
log.debug("libDir: " + libDir);
1.2 +26 -0
buildmagic/tasks/src/main/org/jboss/tools/buildmagic/task/config/LibrarySet.java
Index: LibrarySet.java
===================================================================
RCS file:
/cvsroot/jboss/buildmagic/tasks/src/main/org/jboss/tools/buildmagic/task/config/LibrarySet.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LibrarySet.java 28 Feb 2002 05:54:08 -0000 1.1
+++ LibrarySet.java 28 Feb 2002 06:47:41 -0000 1.2
@@ -31,11 +31,25 @@
* <p>Usage:
* <xmp>
*
+ * <libraryset name="library" root="${project.thirdparty}">
*
+ * <!-- Java API for XML Processing (JAXP) -->
+ * <library vendor="sun" name="jaxp"/>
+ *
+ * <!-- IBM Bean Scripting Framework (BSF) -->
+ * <library vendor="ibm" name="bsf"/>
+ *
+ * <!-- JUnit -->
+ * <library vendor="junit" name="junit"/>
+ *
+ * <!-- Log4j -->
+ * <library vendor="apache" name="log4j"/>
+ *
+ * </libraryset>
*
* </xmp>
*
- * @version <tt>$Revision: 1.1 $</tt>
+ * @version <tt>$Revision: 1.2 $</tt>
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason Dillon</a>
*/
public class LibrarySet
@@ -63,6 +77,18 @@
public Library createLibrary()
{
Library lib = (Library)project.createTask("library");
+
+ if (libraries == null) {
+ libraries = new ArrayList();
+ }
+ libraries.add(lib);
+
+ return lib;
+ }
+
+ public Library createModuleLibrary()
+ {
+ Library lib = (Library)project.createTask("modulelibrary");
if (libraries == null) {
libraries = new ArrayList();
1.1
buildmagic/tasks/src/main/org/jboss/tools/buildmagic/task/config/ModuleLibrary.java
Index: ModuleLibrary.java
===================================================================
/***************************************
* *
* JBoss: The OpenSource J2EE WebOS *
* *
* Distributable under LGPL license. *
* See terms of license at gnu.org. *
* *
***************************************/
package org.jboss.tools.buildmagic.task.config;
import java.io.File;
import org.jboss.util.DirectoryBuilder;
/**
* A special extention of {@link Library} for modules. It sets
* up the namespace differently.
*
* <p>Expects vendor dir to be under <tt><em>name</em>/output</tt>.
*
* @version <tt>$Revision: 1.1 $</tt>
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason Dillon</a>
*/
public class ModuleLibrary
extends Library
{
protected File getVendorDir()
{
DirectoryBuilder builder = new DirectoryBuilder(root);
builder.cd(name).cd("output");
File dir = builder.get();
return dir;
}
}
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development
