Skip to Content.
Sympa Menu

notify-dpml - r1723 - in trunk/main/depot: . library/src/main/net/dpml/library/impl

notify-dpml AT lists.ibiblio.org

Subject: DPML Notify

List archive

Chronological Thread  
  • From: mcconnell at BerliOS <mcconnell AT mail.berlios.de>
  • To: notify-dpml AT lists.ibiblio.org
  • Subject: r1723 - in trunk/main/depot: . library/src/main/net/dpml/library/impl
  • Date: Mon, 7 Aug 2006 20:00:39 +0200

Author: mcconnell
Date: 2006-08-07 20:00:22 +0200 (Mon, 07 Aug 2006)
New Revision: 1723

Modified:

trunk/main/depot/library/src/main/net/dpml/library/impl/DefaultResource.java
trunk/main/depot/module.xml
Log:
checkstyle forced reshuffle

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-08-07 07:38:04 UTC (rev 1722)
+++
trunk/main/depot/library/src/main/net/dpml/library/impl/DefaultResource.java
2006-08-07 18:00:22 UTC (rev 1723)
@@ -157,7 +157,6 @@

// setup produced types

- //m_types = buildTypes( directive.getTypeDirectives() );
m_types = directive.getTypeDirectives();
m_typeNames = new String[ m_types.length ];
for( int i=0; i<m_types.length; i++ )
@@ -1400,10 +1399,7 @@
return BOOTSTRAP;
}

- boolean isDecimal = Boolean.getBoolean( DECIMAL_VERSIONING_KEY );
- isDecimal = getBooleanProperty( DECIMAL_VERSIONING_KEY, isDecimal );
- isDecimal = getBooleanProperty( LEGACY_DECIMAL_PREFIX_KEY, isDecimal
);
- if( isDecimal )
+ if( isDecimal() )
{
Version decimal = getDecimalVersion();
String spec = decimal.toString();
@@ -1427,37 +1423,15 @@
return signature;
}
}
-
- /*
- String value = getBuildSignature();
- if( value.equals( SNAPSHOT ) || value.equals( BOOTSTRAP ) )
- {
- return value;
- }
- else
- {
-
- Version decimal = getDecimalVersion();
- if( null != decimal )
- {
- boolean flag = getBooleanProperty(
"project.version-postfix.enabled", true );
- if( flag )
- {
- return decimal.toString() + "-" + value;
- }
- else
- {
- return decimal.toString();
- }
- }
- else
- {
- return value;
- }
- }
- */
}

+ private boolean isDecimal()
+ {
+ boolean isDecimal = Boolean.getBoolean( DECIMAL_VERSIONING_KEY );
+ isDecimal = getBooleanProperty( DECIMAL_VERSIONING_KEY, isDecimal );
+ return getBooleanProperty( LEGACY_DECIMAL_PREFIX_KEY, isDecimal );
+ }
+
private String getBuildSignature()
{
String system = System.getProperty( "build.signature", null );

Modified: trunk/main/depot/module.xml
===================================================================
--- trunk/main/depot/module.xml 2006-08-07 07:38:04 UTC (rev 1722)
+++ trunk/main/depot/module.xml 2006-08-07 18:00:22 UTC (rev 1723)
@@ -12,6 +12,10 @@
<info title="DPML Project Management Library">
<description>Module, project and resource management
system.</description>
</info>
+ <properties>
+ <property name="project.minor.version" value="1"/>
+ <property name="project.micro.version" value="0"/>
+ </properties>
<types>
<type id="jar"/>
</types>
@@ -41,6 +45,9 @@
<part:plugin alias="true"
class="net.dpml.library.console.BuilderPlugin"/>
</types>
<dependencies>
+ <build>
+ <include key="dpml-tools-builder"/>
+ </build>
<runtime>
<include ref="dpml/depot/dpml-library"/>
<include ref="dpml/util/dpml-util-cli"/>




  • r1723 - in trunk/main/depot: . library/src/main/net/dpml/library/impl, mcconnell at BerliOS, 08/07/2006

Archive powered by MHonArc 2.6.24.

Top of Page