Inheritance has been misspelled.....
--
dIon Gillard, Multitask Consulting
[EMAIL PROTECTED] wrote on 08/05/2004 08:59:24 AM:
> brett 2004/05/07 15:59:24
>
> Modified: xdocs Tag: MAVEN-1_0-BRANCH changes.xml
> src/java/org/apache/maven/jelly Tag: MAVEN-1_0-BRANCH
> JellyUtils.java
> src/conf Tag: MAVEN-1_0-BRANCH defaults.properties
> Log:
> PR: MAVEN-1255
> add maven.property.inheritence flag to disable inheritence
>
> Revision Changes Path
> No revision
> No revision
> 1.14.4.16 +1 -0 maven/xdocs/changes.xml
>
> Index: changes.xml
> ===================================================================
> RCS file: /home/cvs/maven/xdocs/changes.xml,v
> retrieving revision 1.14.4.15
> retrieving revision 1.14.4.16
> diff -u -r1.14.4.15 -r1.14.4.16
> --- changes.xml 5 May 2004 11:01:04 -0000 1.14.4.15
> +++ changes.xml 7 May 2004 22:59:23 -0000 1.14.4.16
> @@ -25,6 +25,7 @@
> </properties>
> <body>
> <release version="1.0RC3" date="in CVS">
> + <action dev="brett" type="add" issue="MAVEN-1255">Introduce
> a backwards compatibility option <code>maven.property.
> inheritence</code>, which disables the functionality when set to
> false.</action>
> <action dev="brett" type="fix" issue="MAVEN-1265">Setup
> dependency path for non-classpath dependencies</action>
> <action dev="brett" type="update" issue="MAVEN-1129" due-
> to="John Casey">Add a Base64 implementation to replace the sun.*
> internal version.</action>
> <action dev="brett" type="update" issue="MAVEN-1129">Remove
> tools.jar from startup classpath so it will run on non-Sun JVMs such
> as Kaffe.</action>
>
>
>
> No revision
> No revision
> 1.16.4.9 +6 -2 maven/src/java/org/apache/maven/jelly/JellyUtils.java
>
> Index: JellyUtils.java
> ===================================================================
> RCS file:
/home/cvs/maven/src/java/org/apache/maven/jelly/JellyUtils.java,v
> retrieving revision 1.16.4.8
> retrieving revision 1.16.4.9
> diff -u -r1.16.4.8 -r1.16.4.9
> --- JellyUtils.java 24 Apr 2004 23:11:23 -0000 1.16.4.8
> +++ JellyUtils.java 7 May 2004 22:59:23 -0000 1.16.4.9
> @@ -246,7 +246,11 @@
> {
> if ( sourceContext != null )
> {
> - populateVariables( destContext, sourceContext.
> isInherit() ? sourceContext.getParent() : null );
> + if ( !"false".equals( sourceContext.getVariable(
> "maven.property.inheritence" ) ) &&
> + ( !"false".equals( destContext.getVariable( "maven.
> property.inheritence" ) ) ) )
> + {
> + populateVariables( destContext, sourceContext.
> isInherit() ? sourceContext.getParent() : null );
> + }
> destContext.getVariables().putAll( sourceContext.
> getVariables() );
> }
> destContext.setVariable( "context", destContext );
>
>
>
> No revision
> No revision
> 1.8.4.3 +1 -0 maven/src/conf/defaults.properties
>
> Index: defaults.properties
> ===================================================================
> RCS file: /home/cvs/maven/src/conf/defaults.properties,v
> retrieving revision 1.8.4.2
> retrieving revision 1.8.4.3
> diff -u -r1.8.4.2 -r1.8.4.3
> --- defaults.properties 21 Apr 2004 00:30:10 -0000 1.8.4.2
> +++ defaults.properties 7 May 2004 22:59:24 -0000 1.8.4.3
> @@ -79,3 +79,4 @@
> maven.username=USERNAME_NOT_SET
> maven.remote.group=maven
>
> +maven.property.inheritence=true
>
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: [EMAIL PROTECTED]
> For additional commands, e-mail: [EMAIL PROTECTED]
>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
