Skip to Content.
Sympa Menu

notify-dpml - r1987 - in trunk: central/site main/depot/build/src/main/dpml/build main/depot/library/src/main/dpml/library main/depot/library/src/main/dpml/library/impl main/depot/library/src/main/dpml/library/info main/depot/library/src/test main/depot/library/src/test/dpml/library main/depot/library/src/test/dpml/library/impl main/depot/plugins/checkstyle/etc/prefs/formats main/depot/tools/src/main/dpml/tools main/depot/tools/src/main/dpml/tools/impl main/depot/tools/src/main/dpml/tools/tasks main/depot/tools/src/main/dpml/tools/transit main/metro/testing/plus

notify-dpml AT lists.ibiblio.org

Subject: DPML Notify

List archive

r1987 - in trunk: central/site main/depot/build/src/main/dpml/build main/depot/library/src/main/dpml/library main/depot/library/src/main/dpml/library/impl main/depot/library/src/main/dpml/library/info main/depot/library/src/test main/depot/library/src/test/dpml/library main/depot/library/src/test/dpml/library/impl main/depot/plugins/checkstyle/etc/prefs/formats main/depot/tools/src/main/dpml/tools main/depot/tools/src/main/dpml/tools/impl main/depot/tools/src/main/dpml/tools/tasks main/depot/tools/src/main/dpml/tools/transit main/metro/testing/plus

Chronological Thread  
    < Chronological >       < Thread >
  • From: mcconnell at BerliOS <mcconnell AT mail.berlios.de>
  • To: notify-dpml AT lists.ibiblio.org
  • Subject: r1987 - in trunk: central/site main/depot/build/src/main/dpml/build main/depot/library/src/main/dpml/library main/depot/library/src/main/dpml/library/impl main/depot/library/src/main/dpml/library/info main/depot/library/src/test main/depot/library/src/test/dpml/library main/depot/library/src/test/dpml/library/impl main/depot/plugins/checkstyle/etc/prefs/formats main/depot/tools/src/main/dpml/tools main/depot/tools/src/main/dpml/tools/impl main/depot/tools/src/main/dpml/tools/tasks main/depot/tools/src/main/dpml/tools/transit main/metro/testing/plus
  • Date: Mon, 23 Apr 2007 19:37:59 +0200
Author: mcconnell
Date: 2007-04-23 19:37:55 +0200 (Mon, 23 Apr 2007)
New Revision: 1987

Removed:
trunk/main/depot/library/src/test/net/
Modified:
trunk/central/site/build.xml
trunk/main/depot/build/src/main/dpml/build/Main.java
trunk/main/depot/library/src/main/dpml/library/Resource.java
trunk/main/depot/library/src/main/dpml/library/Type.java
trunk/main/depot/library/src/main/dpml/library/impl/DefaultModule.java
trunk/main/depot/library/src/main/dpml/library/impl/DefaultResource.java
trunk/main/depot/library/src/main/dpml/library/impl/DefaultType.java
trunk/main/depot/library/src/main/dpml/library/info/LibraryDecoder.java
trunk/main/depot/library/src/main/dpml/library/info/LibraryEncoder.java
trunk/main/depot/library/src/main/dpml/library/info/ModuleDirective.java
trunk/main/depot/library/src/main/dpml/library/info/ResourceDirective.java
trunk/main/depot/library/src/main/dpml/library/info/TypeDirective.java
trunk/main/depot/library/src/test/dpml/library/XMLTestCase.java

trunk/main/depot/library/src/test/dpml/library/impl/DefaultLibraryTestCase.java
trunk/main/depot/plugins/checkstyle/etc/prefs/formats/dpml.format
trunk/main/depot/tools/src/main/dpml/tools/Context.java
trunk/main/depot/tools/src/main/dpml/tools/impl/DefaultContext.java
trunk/main/depot/tools/src/main/dpml/tools/impl/StandardBuilder.java
trunk/main/depot/tools/src/main/dpml/tools/tasks/GenericTask.java
trunk/main/depot/tools/src/main/dpml/tools/tasks/InstallTask.java
trunk/main/depot/tools/src/main/dpml/tools/tasks/JUnitTestTask.java
trunk/main/depot/tools/src/main/dpml/tools/tasks/JavadocTask.java
trunk/main/depot/tools/src/main/dpml/tools/tasks/ModuleTask.java
trunk/main/depot/tools/src/main/dpml/tools/tasks/PackageTask.java
trunk/main/depot/tools/src/main/dpml/tools/tasks/PluginTask.java
trunk/main/depot/tools/src/main/dpml/tools/tasks/RMICTask.java
trunk/main/depot/tools/src/main/dpml/tools/tasks/ReactorTask.java
trunk/main/depot/tools/src/main/dpml/tools/transit/ImportArtifactTask.java
trunk/main/depot/tools/src/main/dpml/tools/transit/PluginTask.java

trunk/main/depot/tools/src/main/dpml/tools/transit/TransitComponentHelper.java
trunk/main/metro/testing/plus/
Log:
checkstyle cleanup

Modified: trunk/central/site/build.xml
===================================================================
--- trunk/central/site/build.xml 2007-04-23 16:29:19 UTC (rev 1986)
+++ trunk/central/site/build.xml 2007-04-23 17:37:55 UTC (rev 1987)
@@ -87,6 +87,7 @@
<fileset dir="../../main">
<include name="**/target/build/main/**/*.java"/>
<include name="**/target/build/test/**/*.java"/>
+ <exclude name="**/javac/target/**"/>
</fileset>
</checkstyle>
<xslt style="${dpml.prefs}/dpml/tools/xsls/checkstyle-frames.xsl"

Modified: trunk/main/depot/build/src/main/dpml/build/Main.java
===================================================================
--- trunk/main/depot/build/src/main/dpml/build/Main.java 2007-04-23
16:29:19 UTC (rev 1986)
+++ trunk/main/depot/build/src/main/dpml/build/Main.java 2007-04-23
17:37:55 UTC (rev 1987)
@@ -32,7 +32,11 @@
import dpml.cli.option.PropertyOption;
import dpml.cli.validation.URIValidator;

-import dpml.build.Builder;
+import dpml.library.Module;
+import dpml.library.Resource;
+import dpml.library.Type;
+import dpml.library.Classifier;
+import dpml.library.Scope;

import dpml.library.impl.DefaultLibrary;

@@ -52,23 +56,12 @@
import javax.tools.Tool;
import javax.lang.model.SourceVersion;

-import static net.dpml.annotation.LifestylePolicy.SINGLETON;
-
+import net.dpml.annotation.Component;
import net.dpml.lang.Strategy;
import net.dpml.lang.ServiceRegistry;
import net.dpml.lang.SimpleServiceRegistry;
-import net.dpml.lang.DecodingException;
-
-import dpml.library.Module;
-import dpml.library.Resource;
-import dpml.library.Type;
-import dpml.library.Classifier;
-import dpml.library.Scope;
-import dpml.library.Library;
-
import net.dpml.util.Logger;

-import net.dpml.annotation.Component;
import static net.dpml.annotation.LifestylePolicy.SINGLETON;


@@ -137,6 +130,7 @@
* @param out the output stream
* @param err the error stream
* @param arguments the tool arguments
+ * @return the logical result of executation - a value less than zero
indicates failure
*/
public int run( InputStream in, OutputStream out, OutputStream err,
String... arguments )
{
@@ -151,7 +145,6 @@
final String error =
"Unable to load library index.";
m_logger.error( error, e );
- //m_logger.error( e.getMessage(), e.getCause() );
return -1;
}


Modified: trunk/main/depot/library/src/main/dpml/library/Resource.java
===================================================================
--- trunk/main/depot/library/src/main/dpml/library/Resource.java
2007-04-23 16:29:19 UTC (rev 1986)
+++ trunk/main/depot/library/src/main/dpml/library/Resource.java
2007-04-23 17:37:55 UTC (rev 1987)
@@ -22,8 +22,6 @@

import java.io.File;

-import net.dpml.transit.Artifact;
-
import net.dpml.lang.Version;

import net.dpml.util.Resolver;

Modified: trunk/main/depot/library/src/main/dpml/library/Type.java
===================================================================
--- trunk/main/depot/library/src/main/dpml/library/Type.java 2007-04-23
16:29:19 UTC (rev 1986)
+++ trunk/main/depot/library/src/main/dpml/library/Type.java 2007-04-23
17:37:55 UTC (rev 1987)
@@ -49,14 +49,34 @@
*/
String getVersion();

+ /**
+ * Return the type name.
+ * @return the type name
+ */
String getName();

+ /**
+ * Return the compound name.
+ * @return the compound name
+ */
String getCompoundName();

+ /**
+ * Return the source for type (may be null).
+ * @return the type source attribute value
+ */
String getSource();

+ /**
+ * Return TRUE if the type is exported.
+ * @return the export policy
+ */
boolean getExport();

+ /**
+ * Return TRUE if the type is a test type.
+ * @return the test policy
+ */
boolean getTest();

/**
@@ -65,15 +85,37 @@
*/
boolean getAliasProduction();

+ /**
+ * Return a file reference for the cache type.
+ * @return the file representing the produced artifact type
+ */
File getFile();

+ /**
+ * Return a file reference for the type.
+ * @param local if true return the local deliverable file otherwise
return the cached file
+ * @return the file representing the produced artifact type
+ */
File getFile( boolean local );

+ /**
+ * Return the artifact for the type ensuring that the artifact is fully
resolved.
+ * @return the resolved artifact
+ * @exception IOException if an IO error occurs
+ */
Artifact getResolvedArtifact() throws IOException;

+ /**
+ * Return the artifact for the type.
+ * @return the artifact
+ */
Artifact getArtifact();

- Artifact getLinkArtifact(); // resolve option?
+ /**
+ * Return the link artifact for the type.
+ * @return the link artifact
+ */
+ Artifact getLinkArtifact();

/**
* Return a filename using the layout strategy employed by the cache.

Modified:
trunk/main/depot/library/src/main/dpml/library/impl/DefaultModule.java
===================================================================
--- trunk/main/depot/library/src/main/dpml/library/impl/DefaultModule.java
2007-04-23 16:29:19 UTC (rev 1986)
+++ trunk/main/depot/library/src/main/dpml/library/impl/DefaultModule.java
2007-04-23 17:37:55 UTC (rev 1987)
@@ -336,6 +336,7 @@
/**
* Publish the module to the output stream.
* @param output the output stream
+ * @exception IOException if an IO error occurs
*/
public void export( OutputStream output ) throws IOException
{
@@ -344,6 +345,10 @@
encoder.export( directive, output );
}

+ /**
+ * Returns a reduced module definition suitable for publication..
+ * @return the module directive for export
+ */
public ModuleDirective exportDirective()
{
if( null == m_directive )

Modified:
trunk/main/depot/library/src/main/dpml/library/impl/DefaultResource.java
===================================================================
--- trunk/main/depot/library/src/main/dpml/library/impl/DefaultResource.java
2007-04-23 16:29:19 UTC (rev 1986)
+++ trunk/main/depot/library/src/main/dpml/library/impl/DefaultResource.java
2007-04-23 17:37:55 UTC (rev 1987)
@@ -1,5 +1,5 @@
/*
- * Copyright 2005 Stephen J. McConnell
+ * Copyright 2005-2007 Stephen J. McConnell
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -18,6 +18,16 @@

package dpml.library.impl;

+import dpml.library.Info;
+import dpml.library.Filter;
+import dpml.library.Library;
+import dpml.library.Module;
+import dpml.library.Resource;
+import dpml.library.Type;
+import dpml.library.Classifier;
+import dpml.library.Scope;
+import dpml.library.ResourceNotFoundException;
+
import dpml.library.info.InfoDirective;
import dpml.library.info.TypeDirective;
import dpml.library.info.ResourceDirective;
@@ -27,11 +37,12 @@
import dpml.library.info.ValidationException;
import dpml.library.info.FilterDirective;

+import dpml.util.Category;
+
import java.io.File;
import java.io.IOException;
import java.net.URI;
import java.net.URISyntaxException;
-import java.net.URL;
import java.text.SimpleDateFormat;
import java.util.Arrays;
import java.util.ArrayList;
@@ -42,23 +53,8 @@
import java.util.Map;
import java.util.Hashtable;

-import dpml.util.Category;
import net.dpml.lang.Version;
-
-import dpml.library.Info;
-import dpml.library.Filter;
-import dpml.library.Library;
-import dpml.library.Module;
-import dpml.library.Resource;
-import dpml.library.Type;
-import dpml.library.Classifier;
-import dpml.library.Scope;
-import dpml.library.ResourceNotFoundException;
-
import net.dpml.transit.Artifact;
-import net.dpml.transit.Transit;
-import net.dpml.transit.Layout;
-
import net.dpml.util.Resolver;



Modified: trunk/main/depot/library/src/main/dpml/library/impl/DefaultType.java
===================================================================
--- trunk/main/depot/library/src/main/dpml/library/impl/DefaultType.java
2007-04-23 16:29:19 UTC (rev 1986)
+++ trunk/main/depot/library/src/main/dpml/library/impl/DefaultType.java
2007-04-23 17:37:55 UTC (rev 1987)
@@ -21,14 +21,8 @@
import dpml.library.info.TypeDirective;

import java.io.File;
-import java.io.FileNotFoundException;
import java.io.IOException;
-import java.net.URI;
-import java.net.URISyntaxException;
import java.net.URL;
-import java.util.ArrayList;
-import java.util.Properties;
-import java.util.Hashtable;

import dpml.library.Type;
import dpml.library.Resource;
@@ -37,8 +31,6 @@
import net.dpml.transit.Layout;
import net.dpml.transit.Transit;

-import net.dpml.util.Logger;
-
/**
* Utility class used for construction of a module model from an XML source.
*
@@ -93,7 +85,7 @@
{
return m_directive.getID();
}
-
+
/**
* Return the alias version.
* @return the alias version value (may be null)
@@ -111,6 +103,10 @@
}
}

+ /**
+ * Return the type name.
+ * @return the type name
+ */
public String getName()
{
String name = m_directive.getName();
@@ -124,6 +120,10 @@
}
}

+ /**
+ * Return the compound name.
+ * @return the compound name
+ */
public String getCompoundName()
{
String name = m_directive.getName();
@@ -137,16 +137,28 @@
}
}

+ /**
+ * Return the source for type (may be null).
+ * @return the type source attribute value
+ */
public String getSource()
{
return m_directive.getSource();
}

+ /**
+ * Return TRUE if the type is a test type.
+ * @return the test policy
+ */
public boolean getTest()
{
return m_directive.getTest();
}

+ /**
+ * Return TRUE if the type is exported.
+ * @return the export policy
+ */
public boolean getExport()
{
return m_directive.getExport();
@@ -222,6 +234,10 @@
}
}

+ /**
+ * Return the artifact for the type.
+ * @return the artifact
+ */
public Artifact getArtifact()
{
String id = getID();
@@ -232,6 +248,11 @@
return Artifact.createArtifact( scheme, group, name, version, id );
}

+ /**
+ * Return the artifact for the type ensuring that the artifact is fully
resolved.
+ * @return the resolved artifact
+ * @exception IOException if an IO error occurs
+ */
public Artifact getResolvedArtifact() throws IOException
{
try
@@ -255,6 +276,10 @@
}
}

+ /**
+ * Return the link artifact for the type.
+ * @return the link artifact
+ */
public Artifact getLinkArtifact()
{
String id = getID();

Modified:
trunk/main/depot/library/src/main/dpml/library/info/LibraryDecoder.java
===================================================================
--- trunk/main/depot/library/src/main/dpml/library/info/LibraryDecoder.java
2007-04-23 16:29:19 UTC (rev 1986)
+++ trunk/main/depot/library/src/main/dpml/library/info/LibraryDecoder.java
2007-04-23 17:37:55 UTC (rev 1987)
@@ -36,12 +36,10 @@
import java.util.ArrayList;
import java.util.Properties;

-import net.dpml.lang.Version;
import net.dpml.lang.DecodingException;

import org.w3c.dom.Element;
import org.w3c.dom.Document;
-import org.w3c.dom.TypeInfo;

/**
* Utility class used for construction of a module model from an XML source.

Modified:
trunk/main/depot/library/src/main/dpml/library/info/LibraryEncoder.java
===================================================================
--- trunk/main/depot/library/src/main/dpml/library/info/LibraryEncoder.java
2007-04-23 16:29:19 UTC (rev 1986)
+++ trunk/main/depot/library/src/main/dpml/library/info/LibraryEncoder.java
2007-04-23 17:37:55 UTC (rev 1987)
@@ -25,9 +25,7 @@
import java.util.Properties;

import dpml.util.Category;
-import net.dpml.lang.Version;

-import dpml.library.Classifier;
import dpml.library.Scope;

import dpml.library.info.IncludeDirective.Mode;

Modified:
trunk/main/depot/library/src/main/dpml/library/info/ModuleDirective.java
===================================================================
--- trunk/main/depot/library/src/main/dpml/library/info/ModuleDirective.java
2007-04-23 16:29:19 UTC (rev 1986)
+++ trunk/main/depot/library/src/main/dpml/library/info/ModuleDirective.java
2007-04-23 17:37:55 UTC (rev 1987)
@@ -22,7 +22,6 @@
import java.util.Properties;

import dpml.library.Classifier;
-import dpml.library.Scope;

/**
* The ModuleDirective class describes a module data-structure.
@@ -49,6 +48,7 @@
* @param properties suppliementary properties
* @param filters project filters
* @param resources subsidary resources
+ * @param export the export policy
* @return the immediate enclosing resource
*/
public static ModuleDirective createModuleDirective(
@@ -119,6 +119,7 @@
* @param resources resource included within the module
* @param properties suppliementary properties
* @param filters project filters
+ * @param export the export policy
*/
public ModuleDirective(
String name, String version, Classifier classifier, String basedir,

Modified:
trunk/main/depot/library/src/main/dpml/library/info/ResourceDirective.java
===================================================================
---
trunk/main/depot/library/src/main/dpml/library/info/ResourceDirective.java
2007-04-23 16:29:19 UTC (rev 1986)
+++
trunk/main/depot/library/src/main/dpml/library/info/ResourceDirective.java
2007-04-23 17:37:55 UTC (rev 1987)
@@ -19,7 +19,6 @@
package dpml.library.info;

import java.util.Arrays;
-import java.util.ArrayList;
import java.util.Properties;

import dpml.library.Classifier;
@@ -90,6 +89,7 @@
* @param dependencies resource dependencies
* @param properties suppliementary properties
* @param filters project filters
+ * @param export the export policy
* @return the immediate enclosing resource
*/
public static ResourceDirective createResourceDirective(

Modified:
trunk/main/depot/library/src/main/dpml/library/info/TypeDirective.java
===================================================================
--- trunk/main/depot/library/src/main/dpml/library/info/TypeDirective.java
2007-04-23 16:29:19 UTC (rev 1986)
+++ trunk/main/depot/library/src/main/dpml/library/info/TypeDirective.java
2007-04-23 17:37:55 UTC (rev 1987)
@@ -20,10 +20,6 @@

import java.util.Properties;

-import dpml.util.ObjectUtils;
-
-import dpml.library.Type;
-
/**
* The ModuleDirective class describes a module data-structure.
*

Modified: trunk/main/depot/library/src/test/dpml/library/XMLTestCase.java
===================================================================
--- trunk/main/depot/library/src/test/dpml/library/XMLTestCase.java
2007-04-23 16:29:19 UTC (rev 1986)
+++ trunk/main/depot/library/src/test/dpml/library/XMLTestCase.java
2007-04-23 17:37:55 UTC (rev 1987)
@@ -26,8 +26,6 @@
import dpml.library.info.TypeDirective;
import dpml.library.info.LibraryDecoder;

-import dpml.util.StandardClassLoader;
-
import junit.framework.TestCase;



Modified:
trunk/main/depot/library/src/test/dpml/library/impl/DefaultLibraryTestCase.java
===================================================================
---
trunk/main/depot/library/src/test/dpml/library/impl/DefaultLibraryTestCase.java
2007-04-23 16:29:19 UTC (rev 1986)
+++
trunk/main/depot/library/src/test/dpml/library/impl/DefaultLibraryTestCase.java
2007-04-23 17:37:55 UTC (rev 1987)
@@ -20,10 +20,7 @@

import dpml.library.Module;
import dpml.library.Resource;
-import dpml.library.Type;

-import org.w3c.dom.Element;
-
/**
* Test DefaultLibrary implementation.
*

Modified: trunk/main/depot/plugins/checkstyle/etc/prefs/formats/dpml.format
===================================================================
--- trunk/main/depot/plugins/checkstyle/etc/prefs/formats/dpml.format
2007-04-23 16:29:19 UTC (rev 1986)
+++ trunk/main/depot/plugins/checkstyle/etc/prefs/formats/dpml.format
2007-04-23 17:37:55 UTC (rev 1987)
@@ -202,9 +202,11 @@
<module
name="com.puppycrawl.tools.checkstyle.checks.whitespace.TabCharacterCheck">
<property name="severity" value="warning"/>
</module>
+ <!--
<module
name="com.puppycrawl.tools.checkstyle.checks.whitespace.WhitespaceAfterCheck">
<property name="severity" value="warning"/>
</module>
+ -->
<!--
<module
name="com.puppycrawl.tools.checkstyle.checks.whitespace.WhitespaceAroundCheck">
<property name="severity" value="warning"/>

Modified: trunk/main/depot/tools/src/main/dpml/tools/Context.java
===================================================================
--- trunk/main/depot/tools/src/main/dpml/tools/Context.java 2007-04-23
16:29:19 UTC (rev 1986)
+++ trunk/main/depot/tools/src/main/dpml/tools/Context.java 2007-04-23
17:37:55 UTC (rev 1987)
@@ -62,7 +62,8 @@
String getProperty( String key, String value );

/**
- *Initialize the context.
+ * Initialize the context.
+ * @exception IOException if an IO error occurs
*/
void init() throws IOException;

@@ -279,6 +280,7 @@
* Utility operation to construct a new classpath path instance.
* @param scope the build scope
* @return the path
+ * @exception IOException if an IO error occurs
*/
Path createPath( Scope scope ) throws IOException;

@@ -286,6 +288,7 @@
* Utility operation to construct a new path using a supplied array of
resources.
* @param resources the resource to use in path construction
* @return the path
+ * @exception IOException if an IO error occurs
*/
Path createPath( Resource[] resources ) throws IOException;

@@ -295,6 +298,7 @@
* @param resolve if true force local caching of the artifact
* @param filter if true restrict path entries to resources that produce
jars
* @return the path
+ * @exception IOException if an IO error occurs
*/
Path createPath( Resource[] resources, boolean resolve, boolean filter )
throws IOException;
}

Modified: trunk/main/depot/tools/src/main/dpml/tools/impl/DefaultContext.java
===================================================================
--- trunk/main/depot/tools/src/main/dpml/tools/impl/DefaultContext.java
2007-04-23 16:29:19 UTC (rev 1986)
+++ trunk/main/depot/tools/src/main/dpml/tools/impl/DefaultContext.java
2007-04-23 17:37:55 UTC (rev 1987)
@@ -32,7 +32,6 @@

import java.io.File;
import java.io.IOException;
-import java.net.URL;
import java.net.URI;
import java.util.Date;

@@ -48,14 +47,12 @@

import net.dpml.transit.Artifact;
import net.dpml.transit.Transit;
-import net.dpml.transit.LinkManager;
import net.dpml.transit.Layout;
import net.dpml.transit.layout.ClassicLayout;

import net.dpml.util.Logger;

import org.apache.tools.ant.Project;
-import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.BuildListener;
import org.apache.tools.ant.BuildEvent;
import org.apache.tools.ant.types.Path;
@@ -245,6 +242,7 @@
/**
* Initialize the context during which runtime and test path objects are
* established as project references.
+ * @exception IOException if an IO error occurs
*/
public void init() throws IOException
{
@@ -658,6 +656,7 @@
* Utility operation to construct a new classpath path instance.
* @param scope the build scope
* @return the path
+ * @exception IOException if an IO error occurs
*/
public Path createPath( Scope scope ) throws IOException
{
@@ -678,6 +677,7 @@
* Utility operation to construct a new path using a supplied array of
resources.
* @param resources the resource to use in path construction
* @return the path
+ * @exception IOException if an IO error occurs
*/
public Path createPath( Resource[] resources ) throws IOException
{
@@ -690,6 +690,7 @@
* @param resolve if true force local caching of the artifact
* @param filter if true restrict path entries to resources that produce
jars
* @return the path
+ * @exception IOException if an IO error occurs
*/
public Path createPath( Resource[] resources, boolean resolve, boolean
filter ) throws IOException
{

Modified: trunk/main/depot/tools/src/main/dpml/tools/impl/StandardBuilder.java
===================================================================
--- trunk/main/depot/tools/src/main/dpml/tools/impl/StandardBuilder.java
2007-04-23 16:29:19 UTC (rev 1986)
+++ trunk/main/depot/tools/src/main/dpml/tools/impl/StandardBuilder.java
2007-04-23 17:37:55 UTC (rev 1987)
@@ -19,10 +19,7 @@
package dpml.tools.impl;

import dpml.build.Builder;
-import dpml.build.BuildError;

-import dpml.library.impl.DefaultLibrary;
-
import dpml.tools.Context;
import dpml.tools.BuilderError;
import dpml.tools.info.BuilderDirective;
@@ -107,13 +104,19 @@
// constructors
//
------------------------------------------------------------------------

+ /**
+ * New standard builder.
+ * @param logger the assigned logging channel
+ * @param library the common library
+ * @param verbose the version policy
+ * @exception Exception if an error occurs
+ */
public StandardBuilder( Logger logger, Library library, Boolean verbose
) throws Exception
{
m_logger = logger;
m_verbose = verbose;
m_library = library;

- //Thread.currentThread().setContextClassLoader(
Builder.class.getClassLoader() );
Thread.currentThread().setContextClassLoader(
StandardBuilder.class.getClassLoader() );
}

@@ -126,6 +129,7 @@
* @param resource the project definition
* @param targets an array of build target names
* @return the build success status
+ * @exception Exception if an error occurs
*/
public boolean build( Resource resource, String[] targets ) throws
Exception
{

Modified: trunk/main/depot/tools/src/main/dpml/tools/tasks/GenericTask.java
===================================================================
--- trunk/main/depot/tools/src/main/dpml/tools/tasks/GenericTask.java
2007-04-23 16:29:19 UTC (rev 1986)
+++ trunk/main/depot/tools/src/main/dpml/tools/tasks/GenericTask.java
2007-04-23 17:37:55 UTC (rev 1987)
@@ -293,6 +293,12 @@
}
}

+ /**
+ * Return a property value.
+ * @param key the property key
+ * @param value tyhe default value
+ * @return the property value
+ */
protected String getProperty( String key, String value )
{
String v = getProject().getProperty( key );

Modified: trunk/main/depot/tools/src/main/dpml/tools/tasks/InstallTask.java
===================================================================
--- trunk/main/depot/tools/src/main/dpml/tools/tasks/InstallTask.java
2007-04-23 16:29:19 UTC (rev 1986)
+++ trunk/main/depot/tools/src/main/dpml/tools/tasks/InstallTask.java
2007-04-23 17:37:55 UTC (rev 1987)
@@ -29,9 +29,6 @@
import java.net.URI;
import java.net.URL;

-import net.dpml.lang.Version;
-
-import dpml.library.Module;
import dpml.library.Resource;
import dpml.library.Type;

@@ -41,9 +38,7 @@
import net.dpml.transit.LinkManager;
import net.dpml.transit.Layout;

-
import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Project;
import org.apache.tools.ant.types.FileSet;
import org.apache.tools.ant.taskdefs.Copy;
import org.apache.tools.ant.taskdefs.Checksum;

Modified: trunk/main/depot/tools/src/main/dpml/tools/tasks/JUnitTestTask.java
===================================================================
--- trunk/main/depot/tools/src/main/dpml/tools/tasks/JUnitTestTask.java
2007-04-23 16:29:19 UTC (rev 1986)
+++ trunk/main/depot/tools/src/main/dpml/tools/tasks/JUnitTestTask.java
2007-04-23 17:37:55 UTC (rev 1987)
@@ -282,7 +282,7 @@
final JUnitTask.SummaryAttribute summary = getSummaryAttribute();
junit.setPrintsummary( summary );

- junit.setShowOutput( true);
+ junit.setShowOutput( true );
junit.setTempdir( working );
junit.setReloading( true );
junit.setFiltertrace( true );
@@ -374,28 +374,8 @@
}

setupTestProperties( junit, project, working );
+ setupLoggingProperties( junit, project, working );

- final File logProperties = new File( working, "logging.properties" );
- if( logProperties.exists() )
- {
- final Environment.Variable log = new Environment.Variable();
- log.setKey( "dpml.logging.config" );
- try
- {
- URI logPropertiesURI = logProperties.toURI();
- String logPropertiesSpec = logPropertiesURI.toString();
- log.setValue( logPropertiesSpec );
- }
- catch( Exception e )
- {
- final String error =
- "Unexpected file to url error."
- + "\nFile: " + logProperties;
- throw new BuildException( error, e );
- }
- junit.addConfiguredSysproperty( log );
- }
-
String formatter = getResource().getProperty(
"java.util.logging.config.class" );
if( null != formatter )
{
@@ -424,6 +404,30 @@
junit.execute();
}

+ private void setupLoggingProperties( JUnitTask junit, Project project,
File working )
+ {
+ final File logProperties = new File( working, "logging.properties" );
+ if( logProperties.exists() )
+ {
+ final Environment.Variable log = new Environment.Variable();
+ log.setKey( "dpml.logging.config" );
+ try
+ {
+ URI logPropertiesURI = logProperties.toURI();
+ String logPropertiesSpec = logPropertiesURI.toString();
+ log.setValue( logPropertiesSpec );
+ }
+ catch( Exception e )
+ {
+ final String error =
+ "Unexpected file to url error."
+ + "\nFile: " + logProperties;
+ throw new BuildException( error, e );
+ }
+ junit.addConfiguredSysproperty( log );
+ }
+ }
+
private void setupTestProperties( JUnitTask junit, Project project, File
working )
{
File base = project.getBaseDir();

Modified: trunk/main/depot/tools/src/main/dpml/tools/tasks/JavadocTask.java
===================================================================
--- trunk/main/depot/tools/src/main/dpml/tools/tasks/JavadocTask.java
2007-04-23 16:29:19 UTC (rev 1986)
+++ trunk/main/depot/tools/src/main/dpml/tools/tasks/JavadocTask.java
2007-04-23 17:37:55 UTC (rev 1987)
@@ -29,7 +29,6 @@
import dpml.library.Resource;

import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Project;
import org.apache.tools.ant.taskdefs.Javadoc;
import org.apache.tools.ant.taskdefs.Javadoc.AccessType;
import org.apache.tools.ant.types.DirSet;
@@ -160,6 +159,10 @@
m_access = access;
}

+ /**
+ * Creation of a package name exclude.
+ * @return the package exclude
+ */
public Javadoc.PackageName createExclude()
{
Javadoc.PackageName packageName = new Javadoc.PackageName();

Modified: trunk/main/depot/tools/src/main/dpml/tools/tasks/ModuleTask.java
===================================================================
--- trunk/main/depot/tools/src/main/dpml/tools/tasks/ModuleTask.java
2007-04-23 16:29:19 UTC (rev 1986)
+++ trunk/main/depot/tools/src/main/dpml/tools/tasks/ModuleTask.java
2007-04-23 17:37:55 UTC (rev 1987)
@@ -25,7 +25,7 @@
import dpml.library.Module;
import dpml.library.Scope;
import dpml.library.Type;
-import dpml.library.info.ModuleDirective;
+
import dpml.library.info.LibraryEncoder;

import dpml.tools.Context;

Modified: trunk/main/depot/tools/src/main/dpml/tools/tasks/PackageTask.java
===================================================================
--- trunk/main/depot/tools/src/main/dpml/tools/tasks/PackageTask.java
2007-04-23 16:29:19 UTC (rev 1986)
+++ trunk/main/depot/tools/src/main/dpml/tools/tasks/PackageTask.java
2007-04-23 17:37:55 UTC (rev 1987)
@@ -47,9 +47,7 @@

import net.dpml.transit.Artifact;

-import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Project;
-import org.apache.tools.ant.taskdefs.Mkdir;
import org.apache.tools.ant.taskdefs.Copy;

import org.w3c.dom.Element;
@@ -334,6 +332,13 @@
return new Info( uri, title, description );
}

+ /**
+ * Return the resource classpath.
+ * @param resource the target resource
+ * @param test true if the classpathis a test classpath
+ * @return the classpath data structure
+ * @exception IOException of an IO error occurs
+ */
protected Classpath getClasspath( Resource resource, boolean test )
throws IOException
{
URI[] sysUris = getURIs( resource, Category.SYSTEM );

Modified: trunk/main/depot/tools/src/main/dpml/tools/tasks/PluginTask.java
===================================================================
--- trunk/main/depot/tools/src/main/dpml/tools/tasks/PluginTask.java
2007-04-23 16:29:19 UTC (rev 1986)
+++ trunk/main/depot/tools/src/main/dpml/tools/tasks/PluginTask.java
2007-04-23 17:37:55 UTC (rev 1987)
@@ -26,8 +26,6 @@
import dpml.library.Type;
import dpml.library.ResourceNotFoundException;

-import org.apache.tools.ant.BuildException;
-
/**
* The plugin task handles the establishment of ant tasks, listeners, and
antlibs derived
* from a classloader established by the tools sub-system.

Modified: trunk/main/depot/tools/src/main/dpml/tools/tasks/RMICTask.java
===================================================================
--- trunk/main/depot/tools/src/main/dpml/tools/tasks/RMICTask.java
2007-04-23 16:29:19 UTC (rev 1986)
+++ trunk/main/depot/tools/src/main/dpml/tools/tasks/RMICTask.java
2007-04-23 17:37:55 UTC (rev 1987)
@@ -26,7 +26,6 @@

import dpml.tools.Context;

-import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Project;
import org.apache.tools.ant.taskdefs.Rmic;
import org.apache.tools.ant.types.Path;
@@ -57,6 +56,9 @@
private String m_classPathRef;
private File m_base;

+ /**
+ * Creation of a new RMIC task instance.
+ */
public RMICTask()
{
super();
@@ -80,6 +82,10 @@
m_base = base;
}

+ /**
+ * Create and add a new include statement.
+ * @return the include
+ */
public Include createInclude()
{
Include include = new Include();
@@ -87,6 +93,10 @@
return include;
}

+ /**
+ * Create and add a new exclude statement.
+ * @return the exclude
+ */
public Include createExclude()
{
Include include = new Include();
@@ -94,6 +104,9 @@
return include;
}

+ /**
+ * Task initialization.
+ */
public void init()
{
setTaskName( "rmic" );
@@ -158,15 +171,26 @@
}
}

+ /**
+ * Include datatype.
+ */
public static class Include
{
private String m_name;

+ /**
+ * Set the include name.
+ * @param name the include name
+ */
public void setName( String name )
{
m_name = name;
}

+ /**
+ * Get the include name.
+ * @return the include name
+ */
public String getName()
{
return m_name;

Modified: trunk/main/depot/tools/src/main/dpml/tools/tasks/ReactorTask.java
===================================================================
--- trunk/main/depot/tools/src/main/dpml/tools/tasks/ReactorTask.java
2007-04-23 16:29:19 UTC (rev 1986)
+++ trunk/main/depot/tools/src/main/dpml/tools/tasks/ReactorTask.java
2007-04-23 17:37:55 UTC (rev 1987)
@@ -18,17 +18,13 @@

package dpml.tools.tasks;

-import net.dpml.lang.SimpleServiceRegistry;
+import dpml.library.Resource;
+import dpml.library.impl.DefaultLibrary;
+import dpml.tools.impl.StandardBuilder;
import dpml.util.DefaultLogger;

import java.io.File;

-import net.dpml.lang.Strategy;
-import net.dpml.lang.ServiceRegistry;
-import dpml.build.Builder;
-import dpml.library.Resource;
-import dpml.library.impl.DefaultLibrary;
-import dpml.tools.impl.StandardBuilder;
import net.dpml.util.Logger;

import org.apache.tools.ant.BuildException;

Modified:
trunk/main/depot/tools/src/main/dpml/tools/transit/ImportArtifactTask.java
===================================================================
---
trunk/main/depot/tools/src/main/dpml/tools/transit/ImportArtifactTask.java
2007-04-23 16:29:19 UTC (rev 1986)
+++
trunk/main/depot/tools/src/main/dpml/tools/transit/ImportArtifactTask.java
2007-04-23 17:37:55 UTC (rev 1987)
@@ -41,6 +41,8 @@
*/
public class ImportArtifactTask extends ImportTask
{
+ private static final File TRANSIT_DATA = DATA; // for static
initialization
+
/**
* A flag indicating that nested directives have been provided.
*/

Modified: trunk/main/depot/tools/src/main/dpml/tools/transit/PluginTask.java
===================================================================
--- trunk/main/depot/tools/src/main/dpml/tools/transit/PluginTask.java
2007-04-23 16:29:19 UTC (rev 1986)
+++ trunk/main/depot/tools/src/main/dpml/tools/transit/PluginTask.java
2007-04-23 17:37:55 UTC (rev 1987)
@@ -21,13 +21,8 @@
import dpml.lang.Part;
import dpml.util.ElementHelper;

-import java.io.IOException;
import java.io.InputStream;
-
import java.net.URI;
-import java.util.Map;
-import java.util.Hashtable;
-
import java.util.List;
import java.util.ArrayList;
import java.util.Hashtable;

Modified:
trunk/main/depot/tools/src/main/dpml/tools/transit/TransitComponentHelper.java
===================================================================
---
trunk/main/depot/tools/src/main/dpml/tools/transit/TransitComponentHelper.java
2007-04-23 16:29:19 UTC (rev 1986)
+++
trunk/main/depot/tools/src/main/dpml/tools/transit/TransitComponentHelper.java
2007-04-23 17:37:55 UTC (rev 1987)
@@ -18,8 +18,6 @@

package dpml.tools.transit;

-import dpml.tools.BuilderError;
-
import dpml.util.ElementHelper;

import java.io.InputStream;


Property changes on: trunk/main/metro/testing/plus
___________________________________________________________________
Name: svn:ignore
+ target




  • r1987 - in trunk: central/site main/depot/build/src/main/dpml/build main/depot/library/src/main/dpml/library main/depot/library/src/main/dpml/library/impl main/depot/library/src/main/dpml/library/info main/depot/library/src/test main/depot/library/src/test/dpml/library main/depot/library/src/test/dpml/library/impl main/depot/plugins/checkstyle/etc/prefs/formats main/depot/tools/src/main/dpml/tools main/depot/tools/src/main/dpml/tools/impl main/depot/tools/src/main/dpml/tools/tasks main/depot/tools/src/main/dpml/tools/transit main/metro/testing/plus, mcconnell at BerliOS, 04/23/2007

Archive powered by MHonArc 2.6.24.

Top of Page