[jboss-svn-commits] JBL Code SVN: r21939 - in labs/jbossbuild/buildmagic/trunk: common and 18 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Aug 27 17:01:35 EDT 2008
Author: pgier
Date: 2008-08-27 17:01:35 -0400 (Wed, 27 Aug 2008)
New Revision: 21939
Added:
labs/jbossbuild/buildmagic/trunk/tasks/src/test/
labs/jbossbuild/buildmagic/trunk/tasks/src/test/org/
labs/jbossbuild/buildmagic/trunk/tasks/src/test/org/jboss/
labs/jbossbuild/buildmagic/trunk/tasks/src/test/org/jboss/tools/
labs/jbossbuild/buildmagic/trunk/tasks/src/test/org/jboss/tools/buildmagic/
labs/jbossbuild/buildmagic/trunk/tasks/src/test/org/jboss/tools/buildmagic/task/
labs/jbossbuild/buildmagic/trunk/tasks/src/test/org/jboss/tools/buildmagic/task/ResolvePropertiesTestCase.java
Removed:
labs/jbossbuild/buildmagic/trunk/common/src/main/org/jboss/logging/XPriority.java
labs/jbossbuild/buildmagic/trunk/common/src/main/org/jboss/util/jmx/
labs/jbossbuild/buildmagic/trunk/common/src/main/org/jboss/util/property/jmx/
labs/jbossbuild/buildmagic/trunk/common/src/main/org/jboss/util/propertyeditor/ObjectNameEditor.java
Modified:
labs/jbossbuild/buildmagic/trunk/build/build.xml
labs/jbossbuild/buildmagic/trunk/common/build.xml
labs/jbossbuild/buildmagic/trunk/tasks/build.xml
labs/jbossbuild/buildmagic/trunk/tasks/src/main/org/jboss/tools/buildmagic/task/Ant.java
labs/jbossbuild/buildmagic/trunk/tasks/src/main/org/jboss/tools/buildmagic/task/AppendPath.java
labs/jbossbuild/buildmagic/trunk/tasks/src/main/org/jboss/tools/buildmagic/task/CallTarget.java
labs/jbossbuild/buildmagic/trunk/tasks/src/main/org/jboss/tools/buildmagic/task/ContainerTask.java
labs/jbossbuild/buildmagic/trunk/tasks/src/main/org/jboss/tools/buildmagic/task/FindRoot.java
labs/jbossbuild/buildmagic/trunk/tasks/src/main/org/jboss/tools/buildmagic/task/Loop.java
labs/jbossbuild/buildmagic/trunk/tasks/src/main/org/jboss/tools/buildmagic/task/ProjectHelp.java
labs/jbossbuild/buildmagic/trunk/tasks/src/main/org/jboss/tools/buildmagic/task/Property.java
labs/jbossbuild/buildmagic/trunk/tasks/src/main/org/jboss/tools/buildmagic/task/PropertyFilter.java
labs/jbossbuild/buildmagic/trunk/tasks/src/main/org/jboss/tools/buildmagic/task/Require.java
labs/jbossbuild/buildmagic/trunk/tasks/src/main/org/jboss/tools/buildmagic/task/ResolveProperties.java
labs/jbossbuild/buildmagic/trunk/tasks/src/main/org/jboss/tools/buildmagic/task/ScriptedContainerTask.java
labs/jbossbuild/buildmagic/trunk/tasks/src/main/org/jboss/tools/buildmagic/task/ScriptedTask.java
labs/jbossbuild/buildmagic/trunk/tasks/src/main/org/jboss/tools/buildmagic/task/Set.java
labs/jbossbuild/buildmagic/trunk/tasks/src/main/org/jboss/tools/buildmagic/task/Subst.java
labs/jbossbuild/buildmagic/trunk/tasks/src/main/org/jboss/tools/buildmagic/task/Unset.java
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/LibrarySet.java
labs/jbossbuild/buildmagic/trunk/tasks/src/main/org/jboss/tools/buildmagic/task/module/AbstractInfo.java
labs/jbossbuild/buildmagic/trunk/tasks/src/main/org/jboss/tools/buildmagic/task/module/ExecuteModules.java
labs/jbossbuild/buildmagic/trunk/tasks/src/main/org/jboss/tools/buildmagic/task/module/ModuleConfig.java
labs/jbossbuild/buildmagic/trunk/tasks/src/main/org/jboss/tools/buildmagic/task/module/ModuleInit.java
labs/jbossbuild/buildmagic/trunk/tasks/src/main/org/jboss/tools/buildmagic/task/util/Dump.java
labs/jbossbuild/buildmagic/trunk/tools/etc/buildmagic/buildmagic.ent
labs/jbossbuild/buildmagic/trunk/tools/lib/buildmagic-tasks.jar
Log:
[JBBUILD-485] Some refactoring to remove deprecation warnings and fix issue with printing module names.
Modified: labs/jbossbuild/buildmagic/trunk/build/build.xml
===================================================================
--- labs/jbossbuild/buildmagic/trunk/build/build.xml 2008-08-27 16:53:01 UTC (rev 21938)
+++ labs/jbossbuild/buildmagic/trunk/build/build.xml 2008-08-27 21:01:35 UTC (rev 21939)
@@ -149,12 +149,12 @@
<!-- The header and footer displayed during each module execution -->
<property name="executemodules.header"><![CDATA[
======================================================================
- == Executing '${target}' in module '${module}'...
+ == Header Executing '${target}' in module '${module}'...
==]]></property>
<property name="executemodules.footer"><![CDATA[
==
- == Finished with '${target}' in module '${module}'.
+ == Footer Finished with '${target}' in module '${module}'.
======================================================================
]]></property>
Modified: labs/jbossbuild/buildmagic/trunk/common/build.xml
===================================================================
--- labs/jbossbuild/buildmagic/trunk/common/build.xml 2008-08-27 16:53:01 UTC (rev 21938)
+++ labs/jbossbuild/buildmagic/trunk/common/build.xml 2008-08-27 21:01:35 UTC (rev 21939)
@@ -65,9 +65,6 @@
<!-- Module name(s) & version -->
<property name="module.name" value="common"/>
<property name="module.Name" value="JBoss/Common"/>
-
- <property name="javac.excludes" value="org/jboss/util/**/jmx/*,**/ObjectNameEditor.java"/>
- <echo>javac excludes : ${javac.excludes}</echo>
<!-- Configure thirdparty libraries using maven-->
<artifact:dependencies pathId="library.classpath">
Deleted: labs/jbossbuild/buildmagic/trunk/common/src/main/org/jboss/logging/XPriority.java
===================================================================
--- labs/jbossbuild/buildmagic/trunk/common/src/main/org/jboss/logging/XPriority.java 2008-08-27 16:53:01 UTC (rev 21938)
+++ labs/jbossbuild/buildmagic/trunk/common/src/main/org/jboss/logging/XPriority.java 2008-08-27 21:01:35 UTC (rev 21939)
@@ -1,98 +0,0 @@
-/***************************************
- * *
- * JBoss: The OpenSource J2EE WebOS *
- * *
- * Distributable under LGPL license. *
- * See terms of license at gnu.org. *
- * *
- ***************************************/
-
-package org.jboss.logging;
-
-import org.apache.log4j.Priority;
-
-/**
- * Provides custom extention priorites for use with the
- * Log4j logging framework.
- *
- * Adds a trace priority that is below the standard log4j DEBUG priority.
- * This is a custom priority that is 100 below the Priority.DEBUG_INT and
- * represents a lower priority useful for logging events that should only
- * be displayed when deep debugging is required.
- *
- * @deprecated Use {@link XLevel} instead.
- *
- * @see org.apache.log4j.Category
- * @see org.apache.log4j.Priority
- *
- * @author <a href="mailto:Scott.Stark at jboss.org">Scott Stark</a>
- * @version $Revision$
- */
-public class XPriority
- extends Priority
-{
- /** The integer representation of the priority, (Priority.DEBUG_INT - 100) */
- public static final int TRACE_INT = Priority.DEBUG_INT - 100;
-
- /** The string name of the trace priority. */
- public static String TRACE_STR = "TRACE";
-
- /** The TRACE priority object singleton */
- public static final XPriority TRACE = new XPriority(TRACE_INT, TRACE_STR, 7);
-
- /**
- * Construct a <tt>XPriority</tt>.
- */
- protected XPriority(int level, String strLevel, int syslogEquiv)
- {
- super(level, strLevel, syslogEquiv);
- }
-
-
- /////////////////////////////////////////////////////////////////////////
- // Factory Methods //
- /////////////////////////////////////////////////////////////////////////
-
- /**
- * Convert an integer passed as argument to a priority. If the conversion
- * fails, then this method returns the specified default.
- * @return the Priority object for name if one exists, defaultPriority otherwize.
- */
- public static Priority toPriority(String name, Priority defaultPriority)
- {
- if (name == null)
- return defaultPriority;
-
- String upper = name.toUpperCase();
- if (upper.equals(TRACE_STR)) {
- return TRACE;
- }
-
- return Priority.toPriority(name, defaultPriority);
- }
-
- /**
- * Convert an integer passed as argument to a priority.
- *
- * @return the Priority object for name if one exists
- */
- public static Priority toPriority(String name)
- {
- return toPriority(name, TRACE);
- }
-
- /**
- * Convert an integer passed as argument to a priority. If the conversion
- * fails, then this method returns the specified default.
- * @return the Priority object for i if one exists, defaultPriority otherwize.
- */
- public static Priority toPriority(int i, Priority defaultPriority)
- {
- Priority p;
- if (i == TRACE_INT)
- p = TRACE;
- else
- p = Priority.toPriority(i);
- return p;
- }
-}
Deleted: labs/jbossbuild/buildmagic/trunk/common/src/main/org/jboss/util/propertyeditor/ObjectNameEditor.java
===================================================================
--- labs/jbossbuild/buildmagic/trunk/common/src/main/org/jboss/util/propertyeditor/ObjectNameEditor.java 2008-08-27 16:53:01 UTC (rev 21938)
+++ labs/jbossbuild/buildmagic/trunk/common/src/main/org/jboss/util/propertyeditor/ObjectNameEditor.java 2008-08-27 21:01:35 UTC (rev 21939)
@@ -1,42 +0,0 @@
-/***************************************
- * *
- * JBoss: The OpenSource J2EE WebOS *
- * *
- * Distributable under LGPL license. *
- * See terms of license at gnu.org. *
- * *
- ***************************************/
-
-package org.jboss.util.propertyeditor;
-
-import javax.management.ObjectName;
-import javax.management.MalformedObjectNameException;
-
-import org.jboss.util.NestedRuntimeException;
-
-/**
- * A property editor for {@link javax.management.ObjectName}.
- *
- * @version <tt>$Revision$</tt>
- * @author <a href="mailto:jason at planet57.com">Jason Dillon</a>
- */
-public class ObjectNameEditor
- extends TextPropertyEditorSupport
-{
- /**
- * Returns a ObjectName for the input object converted to a string.
- *
- * @return a ObjectName object
- *
- * @throws NestedRuntimeException An MalformedObjectNameException occured.
- */
- public Object getValue()
- {
- try {
- return new ObjectName(getAsText());
- }
- catch (MalformedObjectNameException e) {
- throw new NestedRuntimeException(e);
- }
- }
-}
Modified: labs/jbossbuild/buildmagic/trunk/tasks/build.xml
===================================================================
--- labs/jbossbuild/buildmagic/trunk/tasks/build.xml 2008-08-27 16:53:01 UTC (rev 21938)
+++ labs/jbossbuild/buildmagic/trunk/tasks/build.xml 2008-08-27 21:01:35 UTC (rev 21939)
@@ -135,7 +135,50 @@
<!-- Add module specific elements here. -->
</target>
+ <!--+====================================================================+-->
+ <!--| Test |-->
+ <!--| |-->
+ <!--| Run unit tests |-->
+ <!--+====================================================================+-->
+ <target name="test"
+ description="Run junit tests."
+ depends="compile">
+
+ <mkdir dir="${build.test}"/>
+ <mkdir dir="${build.reports}"/>
+
+ <javac srcdir="${source.test}"
+ destdir="${build.test}"
+ debug="on">
+ <classpath>
+ <path refid="javac.classpath"/>
+ <pathelement location="${build.classes}"/>
+ </classpath>
+ </javac>
+
+ <junit printsummary="yes" haltonfailure="yes">
+ <classpath>
+ <pathelement location="${build.test}"/>
+ <pathelement location="${build.classes}"/>
+ </classpath>
+
+ <formatter type="plain"/>
+
+ <!--<test name="my.test.TestCase" haltonfailure="no" outfile="result">
+ <formatter type="xml"/>
+ </test>-->
+
+ <batchtest fork="yes" todir="${build.reports}">
+ <fileset dir="${source.test}">
+ <include name="**/*Test*.java"/>
+ <exclude name="**/AllTests.java"/>
+ </fileset>
+ </batchtest>
+ </junit>
+ </target>
+
+
<!--+====================================================================+-->
<!--| Generate Output |-->
<!--| |-->
@@ -146,7 +189,7 @@
<target name="output"
description="Generate all target output."
- depends="compile">
+ depends="compile, test">
<mkdir dir="${build.lib}"/>
Modified: labs/jbossbuild/buildmagic/trunk/tasks/src/main/org/jboss/tools/buildmagic/task/Ant.java
===================================================================
--- labs/jbossbuild/buildmagic/trunk/tasks/src/main/org/jboss/tools/buildmagic/task/Ant.java 2008-08-27 16:53:01 UTC (rev 21938)
+++ labs/jbossbuild/buildmagic/trunk/tasks/src/main/org/jboss/tools/buildmagic/task/Ant.java 2008-08-27 21:01:35 UTC (rev 21939)
@@ -89,20 +89,20 @@
protected Vector properties=new Vector();
protected boolean inheritAll = true;
- protected Project p1;
+ protected Project project;
public void init() {
- p1 = new Project();
- p1.setJavaVersionProperty();
- p1.addTaskDefinition("property",
- (Class)project.getTaskDefinitions().get("property"));
+ project = new Project();
+ project.setJavaVersionProperty();
+ project.addTaskDefinition("property",
+ (Class)getProject().getTaskDefinitions().get("property"));
}
protected void reinit() {
init();
for (int i=0; i<properties.size(); i++) {
Property p = (Property) properties.elementAt(i);
- Property newP = (Property) p1.createTask("property");
+ Property newP = (Property) project.createTask("property");
newP.setName(p.getName());
if (p.getValue() != null) {
newP.setValue(p.getValue());
@@ -118,9 +118,9 @@
}
protected void initializeProject() {
- Vector listeners = project.getBuildListeners();
+ Vector listeners = getProject().getBuildListeners();
for (int i = 0; i < listeners.size(); i++) {
- p1.addBuildListener((BuildListener)listeners.elementAt(i));
+ project.addBuildListener((BuildListener)listeners.elementAt(i));
}
if (output != null) {
@@ -130,37 +130,37 @@
logger.setMessageOutputLevel(Project.MSG_INFO);
logger.setOutputPrintStream(out);
logger.setErrorPrintStream(out);
- p1.addBuildListener(logger);
+ project.addBuildListener(logger);
}
catch( IOException ex ) {
log( "Ant: Can't set output to " + output );
}
}
- Hashtable taskdefs = project.getTaskDefinitions();
+ Hashtable taskdefs = getProject().getTaskDefinitions();
Enumeration et = taskdefs.keys();
while (et.hasMoreElements()) {
String taskName = (String) et.nextElement();
Class taskClass = (Class) taskdefs.get(taskName);
- p1.addTaskDefinition(taskName, taskClass);
+ project.addTaskDefinition(taskName, taskClass);
}
- Hashtable typedefs = project.getDataTypeDefinitions();
+ Hashtable typedefs = getProject().getDataTypeDefinitions();
Enumeration e = typedefs.keys();
while (e.hasMoreElements()) {
String typeName = (String) e.nextElement();
Class typeClass = (Class) typedefs.get(typeName);
- p1.addDataTypeDefinition(typeName, typeClass);
+ project.addDataTypeDefinition(typeName, typeClass);
}
// set user-define properties
Hashtable prop1;
if (inheritAll) {
- prop1 = project.getProperties();
+ prop1 = getProject().getProperties();
}
else {
- prop1 = project.getUserProperties();
- p1.setSystemProperties();
+ prop1 = getProject().getUserProperties();
+ project.setSystemProperties();
}
e = prop1.keys();
@@ -169,10 +169,10 @@
String value = (String) prop1.get(arg);
if (inheritAll) {
- p1.setProperty(arg, value);
+ project.setProperty(arg, value);
}
else {
- p1.setUserProperty(arg, value);
+ project.setUserProperty(arg, value);
}
}
}
@@ -187,7 +187,7 @@
filename = "build.xml";
}
else {
- filename = ResolveProperties.subst(filename, project);
+ filename = ResolveProperties.subst(filename, getProject());
}
File file = new File("build.xml");
@@ -207,17 +207,17 @@
*/
public void execute() throws BuildException {
try {
- if (p1 == null) {
+ if (project == null) {
reinit();
}
if(dir == null)
- dir = project.getBaseDir();
+ dir = getProject().getBaseDir();
initializeProject();
- p1.setBaseDir(dir);
- p1.setUserProperty("basedir" , dir.getAbsolutePath());
+ project.setBaseDir(dir);
+ project.setUserProperty("basedir" , dir.getAbsolutePath());
// Override with local-defined properties
Enumeration e = properties.elements();
@@ -230,7 +230,7 @@
antFile = "build.xml";
}
else {
- antFile = ResolveProperties.subst(antFile, project);
+ antFile = ResolveProperties.subst(antFile, getProject());
}
File file = new File(antFile);
@@ -242,35 +242,35 @@
}
}
- p1.setUserProperty( "ant.file" , antFile );
- ProjectHelper.configureProject(p1, new File(antFile));
+ project.setUserProperty( "ant.file" , antFile );
+ ProjectHelper.getProjectHelper().parse(project, new File(antFile));
if (target == null) {
- target = p1.getDefaultTarget();
+ target = project.getDefaultTarget();
}
// Are we trying to call the target in which we are defined?
- if (p1.getBaseDir().equals(project.getBaseDir()) &&
- p1.getProperty("ant.file").equals(project.getProperty("ant.file")) &&
+ if (project.getBaseDir().equals(getProject().getBaseDir()) &&
+ project.getProperty("ant.file").equals(getProject().getProperty("ant.file")) &&
getOwningTarget() != null &&
target.equals(this.getOwningTarget().getName())) {
throw new BuildException("ant task calling its own parent target");
}
- p1.executeTarget(target);
+ project.executeTarget(target);
} finally {
// help the gc
- p1 = null;
+ project = null;
}
}
public Project getTargetProject() {
- return p1;
+ return project;
}
public void addBuildListener(BuildListener l) {
- p1.addBuildListener(l);
+ project.addBuildListener(l);
}
public void setDir(File d) {
@@ -290,12 +290,11 @@
}
public Property createProperty() {
- if (p1 == null) {
+ if (project == null) {
reinit();
}
- Property p=(Property)p1.createTask("property");
- p.setUserProperty(true);
+ Property p=(Property)project.createTask("property");
properties.addElement( p );
return p;
}
Modified: labs/jbossbuild/buildmagic/trunk/tasks/src/main/org/jboss/tools/buildmagic/task/AppendPath.java
===================================================================
--- labs/jbossbuild/buildmagic/trunk/tasks/src/main/org/jboss/tools/buildmagic/task/AppendPath.java 2008-08-27 16:53:01 UTC (rev 21938)
+++ labs/jbossbuild/buildmagic/trunk/tasks/src/main/org/jboss/tools/buildmagic/task/AppendPath.java 2008-08-27 21:01:35 UTC (rev 21939)
@@ -40,7 +40,7 @@
* Create a nested path.
*/
public Path createPath() {
- Path path = new Path(project);
+ Path path = new Path(getProject());
paths.add(path);
return path;
}
@@ -49,7 +49,7 @@
* Create a nested path element.
*/
public PathElement createPathElement() {
- Path path = new Path(project);
+ Path path = new Path(getProject());
paths.add(path);
return path.createPathElement();
}
@@ -61,7 +61,7 @@
if (refid == null)
throw new MissingAttributeException("refid", this);
- Path target = (Path)project.getReferences().get(refid);
+ Path target = (Path)getProject().getReferences().get(refid);
Iterator iter = paths.iterator();
while (iter.hasNext()) {
Path path = (Path)iter.next();
Modified: labs/jbossbuild/buildmagic/trunk/tasks/src/main/org/jboss/tools/buildmagic/task/CallTarget.java
===================================================================
--- labs/jbossbuild/buildmagic/trunk/tasks/src/main/org/jboss/tools/buildmagic/task/CallTarget.java 2008-08-27 16:53:01 UTC (rev 21938)
+++ labs/jbossbuild/buildmagic/trunk/tasks/src/main/org/jboss/tools/buildmagic/task/CallTarget.java 2008-08-27 21:01:35 UTC (rev 21939)
@@ -15,7 +15,8 @@
import java.util.*;
import java.lang.reflect.*;
-import org.jboss.tools.buildmagic.task.util.*;
+import org.jboss.tools.buildmagic.task.*;
+import org.jboss.tools.buildmagic.task.util.TaskLogger;
/**
* A minimal replacemet for the default CallTarget (aka antcall).
@@ -75,7 +76,7 @@
public Available createAvailable()
{
- Available a = (Available)project.createTask("available");
+ Available a = (Available)getProject().createTask("available");
a.setProperty("null");
availables.add(a);
@@ -110,7 +111,7 @@
if (!a.eval()) return;
}
- Map map = project.getProperties();
+ Map map = getProject().getProperties();
if (_if != null && !map.containsKey(_if)) {
return;
}
@@ -138,14 +139,14 @@
task.execute();
}
- project.executeTarget(target);
+ getProject().executeTarget(target);
}
/**
* Create a nested <tt>param</tt> element.
*/
public Task createParam() {
- Task task = project.createTask("property");
+ Task task = getProject().createTask("property");
params.add(task);
return task;
}
@@ -154,7 +155,7 @@
* Create a nested <tt>property</tt> element.
*/
public Task createProperty() {
- Task task = project.createTask("property");
+ Task task = getProject().createTask("property");
params.add(task);
return task;
}
Modified: labs/jbossbuild/buildmagic/trunk/tasks/src/main/org/jboss/tools/buildmagic/task/ContainerTask.java
===================================================================
--- labs/jbossbuild/buildmagic/trunk/tasks/src/main/org/jboss/tools/buildmagic/task/ContainerTask.java 2008-08-27 16:53:01 UTC (rev 21938)
+++ labs/jbossbuild/buildmagic/trunk/tasks/src/main/org/jboss/tools/buildmagic/task/ContainerTask.java 2008-08-27 21:01:35 UTC (rev 21939)
@@ -13,7 +13,8 @@
import org.apache.tools.ant.*;
-import org.jboss.tools.buildmagic.task.util.*;
+import org.jboss.tools.buildmagic.task.*;
+import org.jboss.tools.buildmagic.task.util.TaskLogger;
/**
* Base class for tasks that can contain other tasks or scripts.
@@ -57,7 +58,7 @@
* Create a nested <tt>call</tt> target.
*/
public CallTarget createCall() {
- CallTarget task = (CallTarget)project.createTask("call");
+ CallTarget task = (CallTarget)getProject().createTask("call");
tasks.add(task);
return task;
}
@@ -66,7 +67,7 @@
* Create a nested <tt>script</tt> target.
*/
public Script createScript() {
- Script task = (Script)project.createTask("script");
+ Script task = (Script)getProject().createTask("script");
tasks.add(task);
return task;
}
Modified: labs/jbossbuild/buildmagic/trunk/tasks/src/main/org/jboss/tools/buildmagic/task/FindRoot.java
===================================================================
--- labs/jbossbuild/buildmagic/trunk/tasks/src/main/org/jboss/tools/buildmagic/task/FindRoot.java 2008-08-27 16:53:01 UTC (rev 21938)
+++ labs/jbossbuild/buildmagic/trunk/tasks/src/main/org/jboss/tools/buildmagic/task/FindRoot.java 2008-08-27 21:01:35 UTC (rev 21939)
@@ -69,7 +69,7 @@
*/
public void execute() throws BuildException {
File root = getRoot();
- project.getProperties().put(property, root.getAbsolutePath());
+ getProject().getProperties().put(property, root.getAbsolutePath());
}
private File getParentFile(File file) {
Modified: labs/jbossbuild/buildmagic/trunk/tasks/src/main/org/jboss/tools/buildmagic/task/Loop.java
===================================================================
--- labs/jbossbuild/buildmagic/trunk/tasks/src/main/org/jboss/tools/buildmagic/task/Loop.java 2008-08-27 16:53:01 UTC (rev 21938)
+++ labs/jbossbuild/buildmagic/trunk/tasks/src/main/org/jboss/tools/buildmagic/task/Loop.java 2008-08-27 21:01:35 UTC (rev 21939)
@@ -50,7 +50,7 @@
public void execute() throws BuildException {
validate();
- log.verbose("looping '" + target + "' for count: " + count);
+ log.verbose("looping '" + getOwningTarget() + "' for count: " + count);
for (int i=0; i<count; i++) {
log.debug("i: " + i);
executeTasks();
Modified: labs/jbossbuild/buildmagic/trunk/tasks/src/main/org/jboss/tools/buildmagic/task/ProjectHelp.java
===================================================================
--- labs/jbossbuild/buildmagic/trunk/tasks/src/main/org/jboss/tools/buildmagic/task/ProjectHelp.java 2008-08-27 16:53:01 UTC (rev 21938)
+++ labs/jbossbuild/buildmagic/trunk/tasks/src/main/org/jboss/tools/buildmagic/task/ProjectHelp.java 2008-08-27 21:01:35 UTC (rev 21939)
@@ -51,7 +51,7 @@
* Execute the task.
*/
public void execute() throws BuildException {
- Map targets = project.getTargets();
+ Map targets = getProject().getTargets();
List names = new LinkedList();
int maxlen = 0;
Iterator iter = targets.keySet().iterator();
@@ -79,13 +79,13 @@
Iterator iter = list.iterator();
while (iter.hasNext()) {
Heading heading = (Heading)iter.next();
- heading.setProject(project);
+ heading.setProject(getProject());
heading.print(out);
}
}
protected String getDescription(String name) {
- Target target = (Target)project.getTargets().get(name);
+ Target target = (Target)getProject().getTargets().get(name);
return target.getDescription();
}
Modified: labs/jbossbuild/buildmagic/trunk/tasks/src/main/org/jboss/tools/buildmagic/task/Property.java
===================================================================
--- labs/jbossbuild/buildmagic/trunk/tasks/src/main/org/jboss/tools/buildmagic/task/Property.java 2008-08-27 16:53:01 UTC (rev 21938)
+++ labs/jbossbuild/buildmagic/trunk/tasks/src/main/org/jboss/tools/buildmagic/task/Property.java 2008-08-27 21:01:35 UTC (rev 21939)
@@ -133,7 +133,7 @@
if (resolve) {
log.debug("resolving property: " + name + "(force: " + force + ")");
- Hashtable props = project.getProperties();
+ Hashtable props = getProject().getProperties();
value = ResolveProperties.subst(value, props, force);
}
@@ -143,7 +143,7 @@
if (system) {
log.verbose("setting system proeprty: " + name + "=" + value);
System.setProperty(name, value);
- project.setUserProperty(name, value);
+ getProject().setUserProperty(name, value);
}
// perform the default operation
@@ -151,14 +151,14 @@
if (filter) {
log.debug("adding filter for property: " + name);
- project.addFilter(name, value);
+ getProject().getGlobalFilterSet().addFilter(name, value);
}
}
protected void addProperty(String n, String v) {
if (userProperty) {
- if (override || project.getUserProperty(n) == null) {
- project.setUserProperty(n, v);
+ if (override || getProject().getUserProperty(n) == null) {
+ getProject().setUserProperty(n, v);
if (override)
log.debug("overrode user property value for " + n);
}
@@ -167,8 +167,8 @@
}
}
else {
- if (override || project.getProperty(n) == null) {
- project.setProperty(n, v);
+ if (override || getProject().getProperty(n) == null) {
+ getProject().setProperty(n, v);
if (override)
log.debug("overrode property value for " + n);
}
Modified: labs/jbossbuild/buildmagic/trunk/tasks/src/main/org/jboss/tools/buildmagic/task/PropertyFilter.java
===================================================================
--- labs/jbossbuild/buildmagic/trunk/tasks/src/main/org/jboss/tools/buildmagic/task/PropertyFilter.java 2008-08-27 16:53:01 UTC (rev 21938)
+++ labs/jbossbuild/buildmagic/trunk/tasks/src/main/org/jboss/tools/buildmagic/task/PropertyFilter.java 2008-08-27 21:01:35 UTC (rev 21939)
@@ -38,7 +38,7 @@
if (all) {
log.verbose("Adding filters for all properties");
- Map props = project.getProperties();
+ Map props = getProject().getProperties();
Iterator iter = props.keySet().iterator();
while (iter.hasNext()) {
@@ -46,7 +46,7 @@
String value = (String)props.get(key);
// log.debug("adding: " + key + "=" + value);
- project.addFilter(key, value);
+ getProject().getGlobalFilterSet().addFilter(key, value);
}
}
}
Modified: labs/jbossbuild/buildmagic/trunk/tasks/src/main/org/jboss/tools/buildmagic/task/Require.java
===================================================================
--- labs/jbossbuild/buildmagic/trunk/tasks/src/main/org/jboss/tools/buildmagic/task/Require.java 2008-08-27 16:53:01 UTC (rev 21938)
+++ labs/jbossbuild/buildmagic/trunk/tasks/src/main/org/jboss/tools/buildmagic/task/Require.java 2008-08-27 21:01:35 UTC (rev 21939)
@@ -15,7 +15,8 @@
import java.io.*;
import java.util.*;
-import org.jboss.tools.buildmagic.task.util.*;
+import org.jboss.tools.buildmagic.task.*;
+import org.jboss.tools.buildmagic.task.util.TaskLogger;
/**
* Task to check for required resources and complain if they are not found.
@@ -121,7 +122,7 @@
*/
public Path createClasspath() {
if (this.classpath == null) {
- this.classpath = new Path(project);
+ this.classpath = new Path(getProject());
}
return this.classpath.createPath();
}
@@ -149,7 +150,7 @@
// load the custom class path if it is not null
if (classpath != null) {
- this.loader = new AntClassLoader(project, classpath, false);
+ this.loader = new AntClassLoader(getProject(), classpath, false);
}
if ((resource != null) && !checkResource(resource)) {
@@ -183,7 +184,7 @@
}
else {
buff.append(ResolveProperties.subst
- (message.toString(), project.getProperties(), false));
+ (message.toString(), getProject().getProperties(), false));
}
throw new BuildException(buff.toString());
Modified: labs/jbossbuild/buildmagic/trunk/tasks/src/main/org/jboss/tools/buildmagic/task/ResolveProperties.java
===================================================================
--- labs/jbossbuild/buildmagic/trunk/tasks/src/main/org/jboss/tools/buildmagic/task/ResolveProperties.java 2008-08-27 16:53:01 UTC (rev 21938)
+++ labs/jbossbuild/buildmagic/trunk/tasks/src/main/org/jboss/tools/buildmagic/task/ResolveProperties.java 2008-08-27 21:01:35 UTC (rev 21939)
@@ -48,7 +48,7 @@
log.verbose("Resolving all properties");
if (force) log.verbose("Unset properties will be forced resolve");
- Map props = project.getProperties();
+ Map props = getProject().getProperties();
// iterator over all of the properties
Iterator iter = props.keySet().iterator();
@@ -56,47 +56,56 @@
String key = (String)iter.next();
String value = (String)props.get(key);
- // log.debug("property: " + key);
- // log.debug(" before: " + value);
+ log.debug("property: " + key);
+ log.debug(" before: " + value);
value = subst(value, props, force);
- // log.debug(" after: " + value);
+ log.debug(" after: " + value);
// replace the property
props.put(key, value);
}
}
-
- public static String subst(final String value,
+
+ /**
+ * Replace any properties in the expression with their values contained
+ * in the properties map.
+ *
+ * @param expression
+ * @param props
+ * @param force If set to true, a null property will be replaced with a space.
+ * @return
+ * @throws BuildException
+ */
+ public static String subst(final String expression,
final Map props,
final boolean force)
throws BuildException
{
StringBuffer buff = new StringBuffer();
Set occured = new HashSet(10);
- int i = 0;
int prev = 0;
int pos;
- while ((pos = value.indexOf("$", prev)) >= 0) {
+ while ((pos = expression.indexOf("$", prev)) >= 0) {
if (pos > 0) {
- buff.append(value.substring(prev, pos));
+ buff.append(expression.substring(prev, pos));
}
- if (pos == (value.length() - 1)) {
+ if (pos == (expression.length() - 1)) {
buff.append('$');
prev = pos + 1;
}
- else if (value.charAt(pos + 1) != '{') {
- buff.append(value.charAt(pos + 1));
+ else if (expression.charAt(pos + 1) != '{') {
+ buff.append(expression.charAt(pos + 1));
prev = pos + 2;
}
else {
- int endName = value.indexOf('}', pos);
+ int endName = expression.indexOf('}', pos);
if (endName < 0) {
- throw new BuildException("Syntax error in prop: " + value);
+ throw new BuildException("Syntax error in prop: " + expression);
}
// get the name of the property
- String n = value.substring(pos + 2, endName);
+ String n = expression.substring(pos + 2, endName);
String v = null;
if (!occured.contains(n)) {
@@ -117,8 +126,8 @@
prev = endName + 1;
}
}
- if (prev < value.length()) {
- buff.append(value.substring(prev));
+ if (prev < expression.length()) {
+ buff.append(expression.substring(prev));
}
return buff.toString();
Modified: labs/jbossbuild/buildmagic/trunk/tasks/src/main/org/jboss/tools/buildmagic/task/ScriptedContainerTask.java
===================================================================
--- labs/jbossbuild/buildmagic/trunk/tasks/src/main/org/jboss/tools/buildmagic/task/ScriptedContainerTask.java 2008-08-27 16:53:01 UTC (rev 21938)
+++ labs/jbossbuild/buildmagic/trunk/tasks/src/main/org/jboss/tools/buildmagic/task/ScriptedContainerTask.java 2008-08-27 21:01:35 UTC (rev 21939)
@@ -52,7 +52,7 @@
*/
public CallTarget createCall() {
log.verbose("creating nested <call> task");
- CallTarget task = (CallTarget)project.createTask("call");
+ CallTarget task = (CallTarget)getProject().createTask("call");
tasks.add(task);
log.verbose("tasks: " + tasks);
return task;
@@ -63,7 +63,7 @@
*/
public Script createScript() {
log.verbose("creating nested <script> task");
- Script task = (Script)project.createTask("script");
+ Script task = (Script)getProject().createTask("script");
tasks.add(task);
log.verbose("tasks: " + tasks);
return task;
Modified: labs/jbossbuild/buildmagic/trunk/tasks/src/main/org/jboss/tools/buildmagic/task/ScriptedTask.java
===================================================================
--- labs/jbossbuild/buildmagic/trunk/tasks/src/main/org/jboss/tools/buildmagic/task/ScriptedTask.java 2008-08-27 16:53:01 UTC (rev 21938)
+++ labs/jbossbuild/buildmagic/trunk/tasks/src/main/org/jboss/tools/buildmagic/task/ScriptedTask.java 2008-08-27 21:01:35 UTC (rev 21939)
@@ -15,7 +15,8 @@
import com.ibm.bsf.*;
-import org.jboss.tools.buildmagic.task.util.*;
+import org.jboss.tools.buildmagic.task.*;
+import org.jboss.tools.buildmagic.task.util.TaskLogger;
/**
* Base class for tasks which use scripting.
@@ -81,12 +82,12 @@
BSFManager manager = getManager();
// update the namespace
- addBeans(project.getProperties());
- addBeans(project.getUserProperties());
- addBeans(project.getTargets());
- addBeans(project.getReferences());
+ addBeans(getProject().getProperties());
+ addBeans(getProject().getUserProperties());
+ addBeans(getProject().getTargets());
+ addBeans(getProject().getReferences());
- beans.put("project", project);
+ beans.put("project", getProject());
Iterator iter = beans.keySet().iterator();
while (iter.hasNext()) {
Modified: labs/jbossbuild/buildmagic/trunk/tasks/src/main/org/jboss/tools/buildmagic/task/Set.java
===================================================================
--- labs/jbossbuild/buildmagic/trunk/tasks/src/main/org/jboss/tools/buildmagic/task/Set.java 2008-08-27 16:53:01 UTC (rev 21938)
+++ labs/jbossbuild/buildmagic/trunk/tasks/src/main/org/jboss/tools/buildmagic/task/Set.java 2008-08-27 21:01:35 UTC (rev 21939)
@@ -51,7 +51,7 @@
// if the type is a ref, then it can be any object
if (type == REFERENCE) {
Object value = getObject();
- project.getReferences().put(name, value);
+ getProject().getReferences().put(name, value);
log.verbose("set reference " + name + "=" + value);
}
else {
@@ -62,12 +62,12 @@
switch (type) {
case PROPERTY:
- map = project.getProperties();
+ map = getProject().getProperties();
ptype = "project";
break;
case USER_PROPERTY:
- map = project.getUserProperties();
+ map = getProject().getUserProperties();
ptype = "user";
break;
@@ -86,7 +86,7 @@
* Return a single object that represents the elements.
*/
protected Object getObject() {
- Path path = new Path(project);
+ Path path = new Path(getProject());
Iterator iter = elements.iterator();
while (iter.hasNext()) {
@@ -95,7 +95,7 @@
path.append((Path)obj);
}
else {
- path.append(new RPath(project, obj.toString()));
+ path.append(new RPath(getProject(), obj.toString()));
}
}
@@ -113,7 +113,7 @@
* Create a nested path element.
*/
public Path createPath() {
- Path path = new Path(project);
+ Path path = new Path(getProject());
elements.add(path);
return path;
}
Modified: labs/jbossbuild/buildmagic/trunk/tasks/src/main/org/jboss/tools/buildmagic/task/Subst.java
===================================================================
--- labs/jbossbuild/buildmagic/trunk/tasks/src/main/org/jboss/tools/buildmagic/task/Subst.java 2008-08-27 16:53:01 UTC (rev 21938)
+++ labs/jbossbuild/buildmagic/trunk/tasks/src/main/org/jboss/tools/buildmagic/task/Subst.java 2008-08-27 21:01:35 UTC (rev 21939)
@@ -13,7 +13,8 @@
import org.apache.tools.ant.*;
-import org.jboss.tools.buildmagic.task.util.*;
+import org.jboss.tools.buildmagic.task.*;
+import org.jboss.tools.buildmagic.task.util.TaskLogger;
/**
* Substitute strings inside of a value and set a property with the result.
@@ -103,6 +104,6 @@
String result = subst(buff, from, to, value);
log.verbose("after: " + result);
- project.setUserProperty(property, result);
+ getProject().setUserProperty(property, result);
}
}
Modified: labs/jbossbuild/buildmagic/trunk/tasks/src/main/org/jboss/tools/buildmagic/task/Unset.java
===================================================================
--- labs/jbossbuild/buildmagic/trunk/tasks/src/main/org/jboss/tools/buildmagic/task/Unset.java 2008-08-27 16:53:01 UTC (rev 21938)
+++ labs/jbossbuild/buildmagic/trunk/tasks/src/main/org/jboss/tools/buildmagic/task/Unset.java 2008-08-27 21:01:35 UTC (rev 21939)
@@ -36,12 +36,12 @@
switch (type) {
case PROPERTY:
- project.getProperties().remove(name);
+ getProject().getProperties().remove(name);
log.verbose("unset property: " + name);
break;
case USER_PROPERTY:
- project.getUserProperties().remove(name);
+ getProject().getUserProperties().remove(name);
log.verbose("unset user property: " + name);
break;
@@ -51,7 +51,7 @@
break;
case REFERENCE:
- project.getReferences().remove(name);
+ getProject().getReferences().remove(name);
log.verbose("unset reference: " + name);
break;
}
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-08-27 16:53:01 UTC (rev 21938)
+++ labs/jbossbuild/buildmagic/trunk/tasks/src/main/org/jboss/tools/buildmagic/task/config/Library.java 2008-08-27 21:01:35 UTC (rev 21939)
@@ -180,12 +180,12 @@
log.debug("root: " + root);
File vendorDir = getVendorDir();
- project.setProperty(vendor + "." + name + ".root", vendorDir.toString());
+ getProject().setProperty(vendor + "." + name + ".root", vendorDir.toString());
log.debug("vendorDir: " + vendorDir);
// make lib dir
File libDir = getLibraryDir();
- project.setProperty(vendor + "." + name + ".lib", libDir.toString());
+ getProject().setProperty(vendor + "." + name + ".lib", libDir.toString());
log.debug("libDir: " + libDir);
// assemple classpath
@@ -195,12 +195,12 @@
log.debug("classpathSet: " + classpathSet);
classpathSet.setDir(libDir);
- classpath = new Path(project);
+ classpath = new Path(getProject());
classpath.addFileset(classpathSet);
log.debug("classpath: " + classpath);
// set classpath ref
- Map refs = project.getReferences();
+ Map refs = getProject().getReferences();
refs.put(vendor + "." + name + ".classpath", classpath);
// help gc
Modified: labs/jbossbuild/buildmagic/trunk/tasks/src/main/org/jboss/tools/buildmagic/task/config/LibrarySet.java
===================================================================
--- labs/jbossbuild/buildmagic/trunk/tasks/src/main/org/jboss/tools/buildmagic/task/config/LibrarySet.java 2008-08-27 16:53:01 UTC (rev 21938)
+++ labs/jbossbuild/buildmagic/trunk/tasks/src/main/org/jboss/tools/buildmagic/task/config/LibrarySet.java 2008-08-27 21:01:35 UTC (rev 21939)
@@ -76,7 +76,7 @@
public Library createLibrary()
{
- Library lib = (Library)project.createTask("library");
+ Library lib = (Library)getProject().createTask("library");
if (libraries == null) {
libraries = new ArrayList();
@@ -88,7 +88,7 @@
public Library createModuleLibrary()
{
- Library lib = (Library)project.createTask("modulelibrary");
+ Library lib = (Library)getProject().createTask("modulelibrary");
if (libraries == null) {
libraries = new ArrayList();
@@ -125,7 +125,7 @@
log.debug("root: " + root);
// setup the classpath
- classpath = new Path(project);
+ classpath = new Path(getProject());
if (libraries != null) {
Iterator iter = libraries.iterator();
@@ -148,7 +148,7 @@
}
// set classpath ref
- Map refs = project.getReferences();
+ Map refs = getProject().getReferences();
refs.put(pathID, classpath);
// help gc
Modified: labs/jbossbuild/buildmagic/trunk/tasks/src/main/org/jboss/tools/buildmagic/task/module/AbstractInfo.java
===================================================================
--- labs/jbossbuild/buildmagic/trunk/tasks/src/main/org/jboss/tools/buildmagic/task/module/AbstractInfo.java 2008-08-27 16:53:01 UTC (rev 21938)
+++ labs/jbossbuild/buildmagic/trunk/tasks/src/main/org/jboss/tools/buildmagic/task/module/AbstractInfo.java 2008-08-27 21:01:35 UTC (rev 21939)
@@ -40,7 +40,7 @@
}
protected boolean canContinue() {
- Map map = project.getProperties();
+ Map map = getProject().getProperties();
if (_if != null && !map.containsKey(_if))
return false;
else if (unless != null && map.containsKey(unless))
@@ -50,6 +50,6 @@
}
protected String getProperty(String name) {
- return project.getProperty(name);
+ return getProject().getProperty(name);
}
}
Modified: labs/jbossbuild/buildmagic/trunk/tasks/src/main/org/jboss/tools/buildmagic/task/module/ExecuteModules.java
===================================================================
--- labs/jbossbuild/buildmagic/trunk/tasks/src/main/org/jboss/tools/buildmagic/task/module/ExecuteModules.java 2008-08-27 16:53:01 UTC (rev 21938)
+++ labs/jbossbuild/buildmagic/trunk/tasks/src/main/org/jboss/tools/buildmagic/task/module/ExecuteModules.java 2008-08-27 21:01:35 UTC (rev 21939)
@@ -129,7 +129,7 @@
public void init() {
_project = new Project();
_project.setJavaVersionProperty();
- Map tasks = project.getTaskDefinitions();
+ Map tasks = getProject().getTaskDefinitions();
_project.addTaskDefinition("property", (Class)tasks.get("property"));
_project.addTaskDefinition("echo", (Class)tasks.get("echo"));
}
@@ -176,7 +176,7 @@
/** Set the modules to execute. */
public void setModules(String names) {
- names = ResolveProperties.subst(names, project, true);
+ names = ResolveProperties.subst(names, getProject(), true);
StringTokenizer stok = new StringTokenizer(names, ",");
modules = new LinkedList();
while (stok.hasMoreTokens()) {
@@ -203,13 +203,13 @@
// need at least one module name
if (modules == null || modules.size() == 0) {
throw new BuildException
- ("No module names were specified", location);
+ ("No module names were specified", getLocation());
}
// need the root directory
if (root == null) {
throw new BuildException
- ("Root directory not specified", location);
+ ("Root directory not specified", getLocation());
}
Iterator iter = modules.iterator();
@@ -230,37 +230,40 @@
throws BuildException
{
this.module = module;
-
+
// create and setup the ant task
- final Ant ant = (Ant)project.createTask("Ant");
+ final Ant ant = (Ant)getProject().createTask("Ant");
ant.setInheritAll(inheritAll);
ant.init();
// add a property for the name of the module (our name that is)
- Property p = createProperty(null);
+ /*Property p = createProperty(null);
p.setName(moduleProperty);
p.setValue(module);
copy(p, ant.createProperty());
- p.execute();
+ System.out.println("Setting propery - " + moduleProperty + ":" + module);
+ p.execute();*/
// project.setUserProperty(moduleProperty, module);
+ _project.setProperty(moduleProperty, module);
// add a property for the target of the module (our name that is)
- String temp = (target == null) ? "<default>" : target;
- resolve(temp);
- p = createProperty(null);
+ String tempTargetName = (target == null) ? "<default>" : target;
+ evaluateExpression(tempTargetName);
+ /*p = createProperty(null);
p.setName(targetProperty);
- p.setValue(temp);
+ p.setValue(tempTargetName);
copy(p, ant.createProperty());
- p.execute();
- // project.setUserProperty(targetProperty, temp);
+ p.execute();*/
+ // project.setUserProperty(targetProperty, tempTargetName);
+ _project.setProperty(targetProperty, tempTargetName);
- ant.setLocation(location);
- temp = ResolveProperties.subst(root, project);
- temp = Strings.subst("@MODULE@", module, temp);
- temp = Strings.subst("@TARGET@", target, temp);
+ ant.setLocation(getLocation());
+ tempTargetName = ResolveProperties.subst(root, getProject());
+ tempTargetName = Strings.subst("@MODULE@", module, tempTargetName);
+ tempTargetName = Strings.subst("@TARGET@", target, tempTargetName);
- File moduleRoot = new File(temp);
+ File moduleRoot = new File(tempTargetName);
log.verbose("module root: " + moduleRoot);
ant.setDir(moduleRoot);
ant.setAntfile(antfile);
@@ -270,7 +273,7 @@
ant.setTarget(target);
}
- Map props = project.getProperties();
+ Map props = getProject().getProperties();
// see if this is a valid ant file
try {
@@ -309,14 +312,14 @@
while (iter.hasNext()) {
String name = (String)iter.next();
String value = (String)props.get(name);
- p = ant.createProperty();
+ Property p = ant.createProperty();
p.setName(name);
p.setValue(value);
log.verbose("Exported property " + name + "=" + value);
}
- final String targetName = temp;
+ final String targetName = tempTargetName;
Runnable runner = new Runnable()
{
@@ -354,11 +357,11 @@
// }
}
- protected void printHeading(List list) {
- Iterator iter = list.iterator();
+ protected void printHeading(List headers) {
+ Iterator iter = headers.iterator();
while (iter.hasNext()) {
- MyEcho echo = (MyEcho)iter.next();
- echo.execute();
+ MyEcho header = (MyEcho)iter.next();
+ header.execute();
}
}
@@ -374,14 +377,13 @@
reinit();
}
- Property temp = (Property)_project.createTask("property");
- temp.setUserProperty(true);
+ Property prop = (Property)_project.createTask("property");
if (list != null) {
- list.add(0, temp);
+ list.add(0, prop);
}
- return temp;
+ return prop;
}
/** Create a nested header. */
@@ -390,7 +392,7 @@
reinit();
}
- MyEcho header = new MyEcho(project);
+ MyEcho header = new MyEcho(getProject());
headers.add(header);
return header;
}
@@ -402,24 +404,42 @@
}
- MyEcho footer = new MyEcho(project);
+ MyEcho footer = new MyEcho(getProject());
footers.add(footer);
return footer;
}
- public String resolve(String property) {
- Map props = project.getUserProperties();
- property = ResolveProperties.subst(property, props, false);
+ /**
+ * Takes a string which may contain properties and
+ * resolves the properties to their values.
+ *
+ * @param expr
+ * @return
+ */
+ public String evaluateExpression(String expr) {
+ Map props = getProject().getUserProperties();
+ expr = ResolveProperties.subst(expr, props, false);
props = _project.getUserProperties();
- property = ResolveProperties.subst(property, props, false);
+ expr = ResolveProperties.subst(expr, props, false);
props = _project.getProperties();
- property = ResolveProperties.subst(property, props, false);
+ expr = ResolveProperties.subst(expr, props, false);
- return property;
+ return expr;
}
+ /*public void printProperties(Map props, String header)
+ {
+ Iterator keys = props.keySet().iterator();
+ System.out.println(header);
+ while(keys.hasNext())
+ {
+ Object key = keys.next();
+ System.out.println(key + ":" + props.get(key));
+ }
+ }*/
+
/**
* Nested echo class to hold header and footer data.
*/
@@ -438,13 +458,18 @@
}
public void execute() throws BuildException {
- String temp = resolve(message);
+ String temp = evaluateExpression(message);
temp = Strings.subst("@MODULE@", module, temp);
temp = Strings.subst("@TARGET@", ExecuteModules.this.target, temp);
project.log(temp, logLevel);
}
+
+ public String getMessage()
+ {
+ return this.message;
+ }
}
public Hook createBefore() {
@@ -475,7 +500,7 @@
public void execute() throws BuildException {
Project project = task.getProject();
- String t = task.resolve(target);
+ String t = task.evaluateExpression(target);
t = Strings.subst("@MODULE@", module, t);
t = Strings.subst("@TARGET@", ExecuteModules.this.target, t);
Modified: labs/jbossbuild/buildmagic/trunk/tasks/src/main/org/jboss/tools/buildmagic/task/module/ModuleConfig.java
===================================================================
--- labs/jbossbuild/buildmagic/trunk/tasks/src/main/org/jboss/tools/buildmagic/task/module/ModuleConfig.java 2008-08-27 16:53:01 UTC (rev 21938)
+++ labs/jbossbuild/buildmagic/trunk/tasks/src/main/org/jboss/tools/buildmagic/task/module/ModuleConfig.java 2008-08-27 21:01:35 UTC (rev 21939)
@@ -119,7 +119,7 @@
log.debug("full module list: " + list);
String value = generatePropertyValue(list);
- project.setProperty(property, value);
+ getProject().setProperty(property, value);
log.verbose("Module list: " + value);
}
Modified: labs/jbossbuild/buildmagic/trunk/tasks/src/main/org/jboss/tools/buildmagic/task/module/ModuleInit.java
===================================================================
--- labs/jbossbuild/buildmagic/trunk/tasks/src/main/org/jboss/tools/buildmagic/task/module/ModuleInit.java 2008-08-27 16:53:01 UTC (rev 21938)
+++ labs/jbossbuild/buildmagic/trunk/tasks/src/main/org/jboss/tools/buildmagic/task/module/ModuleInit.java 2008-08-27 21:01:35 UTC (rev 21939)
@@ -74,20 +74,20 @@
{
validate();
- project.setProperty("module.name", name);
+ getProject().setProperty("module.name", name);
log.debug("name: " + name);
if (title == null) {
title = name;
}
- project.setProperty("module.title", name);
- project.setProperty("module.Name", name); // deprecated
+ getProject().setProperty("module.title", name);
+ getProject().setProperty("module.Name", name); // deprecated
log.debug("title: " + title);
if (version == null) {
version = "DEV";
}
- project.setProperty("module.version", version);
+ getProject().setProperty("module.version", version);
log.debug("version: " + version);
}
}
Modified: labs/jbossbuild/buildmagic/trunk/tasks/src/main/org/jboss/tools/buildmagic/task/util/Dump.java
===================================================================
--- labs/jbossbuild/buildmagic/trunk/tasks/src/main/org/jboss/tools/buildmagic/task/util/Dump.java 2008-08-27 16:53:01 UTC (rev 21938)
+++ labs/jbossbuild/buildmagic/trunk/tasks/src/main/org/jboss/tools/buildmagic/task/util/Dump.java 2008-08-27 21:01:35 UTC (rev 21939)
@@ -63,12 +63,12 @@
}
public void execute() throws BuildException {
- if (refs) dumpMap("References", project.getReferences());
- if (properties) dumpMap("Properties", project.getProperties());
- if (datatypes) dumpMap("DataTypes", project.getDataTypeDefinitions());
- if (targets) dumpMap("Targets", project.getTargets());
- if (taskdefs) dumpMap("Taskdefs", project.getTaskDefinitions());
- if (filters) dumpMap("Filters", project.getFilters());
+ if (refs) dumpMap("References", getProject().getReferences());
+ if (properties) dumpMap("Properties", getProject().getProperties());
+ if (datatypes) dumpMap("DataTypes", getProject().getDataTypeDefinitions());
+ if (targets) dumpMap("Targets", getProject().getTargets());
+ if (taskdefs) dumpMap("Taskdefs", getProject().getTaskDefinitions());
+ if (filters) dumpMap("Filters", getProject().getGlobalFilterSet().getFilterHash());
}
protected void dumpMap(final String name, final Map map) {
Added: labs/jbossbuild/buildmagic/trunk/tasks/src/test/org/jboss/tools/buildmagic/task/ResolvePropertiesTestCase.java
===================================================================
--- labs/jbossbuild/buildmagic/trunk/tasks/src/test/org/jboss/tools/buildmagic/task/ResolvePropertiesTestCase.java (rev 0)
+++ labs/jbossbuild/buildmagic/trunk/tasks/src/test/org/jboss/tools/buildmagic/task/ResolvePropertiesTestCase.java 2008-08-27 21:01:35 UTC (rev 21939)
@@ -0,0 +1,38 @@
+package org.jboss.tools.buildmagic.task;
+
+import java.util.Properties;
+
+import junit.framework.TestCase;
+
+public class ResolvePropertiesTestCase extends TestCase {
+
+ public void testEvalExpr()
+ {
+ Properties props = new Properties();
+ props.put("atest", "test");
+ props.put("test1", "one");
+ props.put("test2", "two");
+
+ String expression = "This is test ${test1} ${test2} ${test3}";
+
+ String evaluatedExpr = ResolveProperties.subst(expression, props, true);
+ this.assertEquals("This is test one two ", evaluatedExpr);
+
+ evaluatedExpr = ResolveProperties.subst(expression, props, false);
+ this.assertEquals("This is test one two ${test3}", evaluatedExpr);
+
+ /*evaluatedExpr = ResolveProperties.evalExpr(expression, props, true);
+ this.assertEquals("This is test one two ", evaluatedExpr);
+
+ evaluatedExpr = ResolveProperties.evalExpr(expression, props, false);
+ this.assertEquals("This is test one two ${test3}", evaluatedExpr);*/
+
+ String nestedExpr = "This is test ${${atest}1} ${test2} ${test3}";
+
+ evaluatedExpr = ResolveProperties.subst(nestedExpr, props, false);
+ //this.assertEquals("This is test one two ${test3}", evaluatedExpr);
+
+
+ //System.out.println(evaluatedExpr);
+ }
+}
Property changes on: labs/jbossbuild/buildmagic/trunk/tasks/src/test/org/jboss/tools/buildmagic/task/ResolvePropertiesTestCase.java
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Modified: labs/jbossbuild/buildmagic/trunk/tools/etc/buildmagic/buildmagic.ent
===================================================================
--- labs/jbossbuild/buildmagic/trunk/tools/etc/buildmagic/buildmagic.ent 2008-08-27 16:53:01 UTC (rev 21938)
+++ labs/jbossbuild/buildmagic/trunk/tools/etc/buildmagic/buildmagic.ent 2008-08-27 21:01:35 UTC (rev 21939)
@@ -1,4 +1,4 @@
-<!-- $Id$ -->
+<!-- $Id:buildmagic.ent 21890 2008-08-25 19:56:03Z pgier $ -->
<!-- ================================================================== -->
<!-- Initialization -->
@@ -125,7 +125,7 @@
<!-- Initialize the build.log -->
<target name="_buildmagic:init:buildlog">
- <property name="buildlog.level" value="info"/>
+ <property name="buildlog.level" value="verbose"/>
<record name="${basedir}/build.log" append="no" loglevel="${buildlog.level}"/>
<property name="init-buildlog.disable" value="true" system="true"/>
</target>
Modified: labs/jbossbuild/buildmagic/trunk/tools/lib/buildmagic-tasks.jar
===================================================================
(Binary files differ)
More information about the jboss-svn-commits
mailing list