notify-dpml AT lists.ibiblio.org

Subject: DPML Notify

List archive

r1316 - in trunk/main: depot/library/src/main/net/dpml/library/impl depot/library/src/test/net/dpml/library/impl metro/tools/src/main/net/dpml/metro/tools

From: mcconnell at BerliOS <mcconnell AT mail.berlios.de>
To: notify-dpml AT lists.ibiblio.org
Subject: r1316 - in trunk/main: depot/library/src/main/net/dpml/library/impl depot/library/src/test/net/dpml/library/impl metro/tools/src/main/net/dpml/metro/tools
Date: Wed, 5 Apr 2006 19:14:00 +0200

Author: mcconnell
Date: 2006-04-05 19:13:46 +0200 (Wed, 05 Apr 2006)
New Revision: 1316

Modified:

trunk/main/depot/library/src/main/net/dpml/library/impl/DefaultResource.java

trunk/main/depot/library/src/test/net/dpml/library/impl/DefaultResourceTestCase.java
trunk/main/metro/tools/src/main/net/dpml/metro/tools/CatalogTask.java
Log:
resolve build issue

Modified:
trunk/main/depot/library/src/main/net/dpml/library/impl/DefaultResource.java
===================================================================
---
trunk/main/depot/library/src/main/net/dpml/library/impl/DefaultResource.java
2006-04-05 16:42:09 UTC (rev 1315)
+++
trunk/main/depot/library/src/main/net/dpml/library/impl/DefaultResource.java
2006-04-05 17:13:46 UTC (rev 1316)
@@ -73,7 +73,6 @@
private final String m_path;
private final File m_basedir;
private final Logger m_logger;
- private String m_version;

/**
* Creation of a new default resource.
@@ -213,19 +212,6 @@
*/
public String getVersion()
{
- if( null == m_version )
- {
- m_version = resolveVersion();
- }
- return m_version;
- }
-
- /**
- * Return the resource version.
- * @return the version
- */
- private String resolveVersion()
- {
if( null == m_directive )
{
return getStandardVersion();

Modified:
trunk/main/depot/library/src/test/net/dpml/library/impl/DefaultResourceTestCase.java
===================================================================
---
trunk/main/depot/library/src/test/net/dpml/library/impl/DefaultResourceTestCase.java
2006-04-05 16:42:09 UTC (rev 1315)
+++
trunk/main/depot/library/src/test/net/dpml/library/impl/DefaultResourceTestCase.java
2006-04-05 17:13:46 UTC (rev 1316)
@@ -61,27 +61,27 @@
* Test assigned build signature version.
* @exception Exception if a test error occurs
*/
- //public void testBuildSignatureVersion() throws Exception
- //{
- // System.setProperty( "build.signature", "project.timestamp" );
- // Resource resource = getLibrary().getResource(
"dpml/metro/dpml-composition-runtime" );
- // String version = resource.getVersion();
- // System.out.println( "# VERSION: " + version );
- // assertEquals( "version", "YYYYMMDD.HHMMSS".length(),
version.length() );
- // System.getProperties().remove( "build.signature" );
- //}
+ public void testBuildSignatureVersion() throws Exception
+ {
+ System.setProperty( "build.signature", "project.timestamp" );
+ Resource resource = getLibrary().getResource(
"dpml/metro/dpml-composition-runtime" );
+ String version = resource.getVersion();
+ System.out.println( "# VERSION: " + version );
+ assertEquals( "version", "YYYYMMDD.HHMMSS".length(),
version.length() );
+ System.getProperties().remove( "build.signature" );
+ }

/**
* Test resource version.
* @exception Exception if a test error occurs
*/
- //public void testSnapshotVersion() throws Exception
- //{
- // System.getProperties().remove( "build.signature" );
- // Resource resource = getLibrary().getResource(
"dpml/metro/dpml-composition-runtime" );
- // String version = resource.getVersion();
- // assertEquals( "version", "SNAPSHOT", version );
- //}
+ public void testSnapshotVersion() throws Exception
+ {
+ System.getProperties().remove( "build.signature" );
+ Resource resource = getLibrary().getResource(
"dpml/metro/dpml-composition-runtime" );
+ String version = resource.getVersion();
+ assertEquals( "version", "SNAPSHOT", version );
+ }

/**
* Test resource path.

Modified:
trunk/main/metro/tools/src/main/net/dpml/metro/tools/CatalogTask.java
===================================================================
--- trunk/main/metro/tools/src/main/net/dpml/metro/tools/CatalogTask.java
2006-04-05 16:42:09 UTC (rev 1315)
+++ trunk/main/metro/tools/src/main/net/dpml/metro/tools/CatalogTask.java
2006-04-05 17:13:46 UTC (rev 1316)
@@ -737,6 +737,7 @@

private void processType( File reports, File source )
{
+ log( source.toString() );
File htmls = reports;
try
{

r1316 - in trunk/main: depot/library/src/main/net/dpml/library/impl depot/library/src/test/net/dpml/library/impl metro/tools/src/main/net/dpml/metro/tools, mcconnell at BerliOS, 04/05/2006