notify-dpml AT lists.ibiblio.org

Subject: DPML Notify

List archive

svn commit: r1593 - in development/main/magic/core/src/main/net/dpml/magic: model tasks

From: mcconnell AT netcompartner.com
To: notify-dpml AT lists.ibiblio.org
Subject: svn commit: r1593 - in development/main/magic/core/src/main/net/dpml/magic: model tasks
Date: Fri, 28 Jan 2005 05:12:11 +0100

Author: mcconnell
Date: Fri Jan 28 05:12:10 2005
New Revision: 1593

Modified:
development/main/magic/core/src/main/net/dpml/magic/model/Module.java
development/main/magic/core/src/main/net/dpml/magic/tasks/BlockTask.java
development/main/magic/core/src/main/net/dpml/magic/tasks/PrepareTask.java
Log:
Housekeeping - update the prepare task to exlude dlls in the default
non-filtered content, and rimporved error handling in the module task.

Modified:
development/main/magic/core/src/main/net/dpml/magic/model/Module.java
==============================================================================
--- development/main/magic/core/src/main/net/dpml/magic/model/Module.java
(original)
+++ development/main/magic/core/src/main/net/dpml/magic/model/Module.java
Fri Jan 28 05:12:10 2005
@@ -137,7 +137,26 @@
}
else
{
- return new URL( ElementHelper.getAttribute( child,
"href" ) );
+ final String href = ElementHelper.getAttribute( child,
"href" );
+ if( "".equals( href ) )
+ {
+ return null;
+ }
+
+ try
+ {
+ return new URL( href );
+ }
+ catch( Throwable e )
+ {
+ final String error =
+ "Invalid href attribute value ["
+ + href
+ + "] in the element ["
+ + name
+ + "]";
+ throw new BuildException( error, e );
+ }
}
}
}
@@ -150,10 +169,19 @@
}
else
{
- Element legal = ElementHelper.getChild( header, "legal" );
- URL license = createHref( legal, "license" );
- URL notice = createHref( legal, "notice" );
- return new Legal( license, notice );
+ try
+ {
+ Element legal = ElementHelper.getChild( header, "legal"
);
+ URL license = createHref( legal, "license" );
+ URL notice = createHref( legal, "notice" );
+ return new Legal( license, notice );
+ }
+ catch( BuildException e )
+ {
+ final String error =
+ "Error while attempt to construct legel element in
module.";
+ throw new BuildException( error, e );
+ }
}
}

Modified:
development/main/magic/core/src/main/net/dpml/magic/tasks/BlockTask.java
==============================================================================
--- development/main/magic/core/src/main/net/dpml/magic/tasks/BlockTask.java
(original)
+++ development/main/magic/core/src/main/net/dpml/magic/tasks/BlockTask.java
Fri Jan 28 05:12:10 2005
@@ -24,6 +24,7 @@
import net.dpml.magic.model.Resource;
import net.dpml.magic.model.ResourceRef;
import net.dpml.magic.project.DeliverableHelper;
+
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.DynamicConfiguratorNS;

Modified:
development/main/magic/core/src/main/net/dpml/magic/tasks/PrepareTask.java
==============================================================================
---
development/main/magic/core/src/main/net/dpml/magic/tasks/PrepareTask.java
(original)
+++
development/main/magic/core/src/main/net/dpml/magic/tasks/PrepareTask.java
Fri Jan 28 05:12:10 2005
@@ -46,7 +46,7 @@
private static final String ETC_FILTERED_EXCLUDES_KEY =
"project.prepare.etc.filtered.excludes";
private static final String ETC_FILTERED_EXCLUDES_VALUE =
- "**/*.exe,**/*.jar*,**/*.gif,**/*.jpeg,**/*.jpg";
+ "**/*.exe,**/*.jar*,**/*.dll,**/*.gif,**/*.jpeg,**/*.jpg";

public void init() throws BuildException
{

svn commit: r1593 - in development/main/magic/core/src/main/net/dpml/magic: model tasks, mcconnell, 01/27/2005