You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by br...@apache.org on 2004/05/13 12:15:56 UTC
cvs commit: maven/xdocs/misc tasks.xml
brett 2004/05/13 03:15:56
Modified: maven-jelly-tags/src/java/main/org/apache/maven/jelly/tags/maven
Tag: MAVEN-1_0-BRANCH ReactorTag.java
src/conf Tag: MAVEN-1_0-BRANCH defaults.properties
src/java/org/apache/maven/jelly Tag: MAVEN-1_0-BRANCH
JellyUtils.java
src/java/org/apache/maven/project Tag: MAVEN-1_0-BRANCH
Build.java Project.java UnitTest.java
src/test/touchstone-build Tag: MAVEN-1_0-BRANCH maven.xml
xdocs Tag: MAVEN-1_0-BRANCH changes.xml faq.fml
xdocs/misc Tag: MAVEN-1_0-BRANCH tasks.xml
Log:
fix inheritance spelling mistakes
Revision Changes Path
No revision
No revision
1.36.4.11 +2 -2 maven/maven-jelly-tags/src/java/main/org/apache/maven/jelly/tags/maven/ReactorTag.java
Index: ReactorTag.java
===================================================================
RCS file: /home/cvs/maven/maven-jelly-tags/src/java/main/org/apache/maven/jelly/tags/maven/ReactorTag.java,v
retrieving revision 1.36.4.10
retrieving revision 1.36.4.11
diff -u -r1.36.4.10 -r1.36.4.11
--- ReactorTag.java 16 Apr 2004 09:35:51 -0000 1.36.4.10
+++ ReactorTag.java 13 May 2004 10:15:54 -0000 1.36.4.11
@@ -44,7 +44,7 @@
* @author <a href="mailto:evenisse@ifrance.com">Emmanuel Venisse</a>
* @version $Id$
* @todo We use the basedir for the glob, but we need to set the descriptor.
- * @todo better use of inheritence from MavenTag
+ * @todo better use of inheritance from MavenTag
*/
public class ReactorTag
extends MavenTag
No revision
No revision
1.8.4.4 +1 -1 maven/src/conf/defaults.properties
Index: defaults.properties
===================================================================
RCS file: /home/cvs/maven/src/conf/defaults.properties,v
retrieving revision 1.8.4.3
retrieving revision 1.8.4.4
diff -u -r1.8.4.3 -r1.8.4.4
--- defaults.properties 7 May 2004 22:59:24 -0000 1.8.4.3
+++ defaults.properties 13 May 2004 10:15:54 -0000 1.8.4.4
@@ -79,4 +79,4 @@
maven.username=USERNAME_NOT_SET
maven.remote.group=maven
-maven.property.inheritence=true
+maven.property.inheritance=true
No revision
No revision
1.16.4.11 +4 -4 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.10
retrieving revision 1.16.4.11
diff -u -r1.16.4.10 -r1.16.4.11
--- JellyUtils.java 11 May 2004 09:39:12 -0000 1.16.4.10
+++ JellyUtils.java 13 May 2004 10:15:54 -0000 1.16.4.11
@@ -286,7 +286,7 @@
}
/**
- * Populate a context with variables, including parent variables if inheritence is enabled.
+ * Populate a context with variables, including parent variables if inheritance is enabled.
*
* @param destContext the destination context
* @param srcContext the source context
@@ -295,8 +295,8 @@
{
if ( sourceContext != null )
{
- if ( !"false".equals( sourceContext.getVariable( "maven.property.inheritence" ) ) &&
- ( !"false".equals( destContext.getVariable( "maven.property.inheritence" ) ) ) )
+ if ( !"false".equals( sourceContext.getVariable( "maven.property.inheritance" ) ) &&
+ ( !"false".equals( destContext.getVariable( "maven.property.inheritance" ) ) ) )
{
populateVariables( destContext, sourceContext.isInherit() ? sourceContext.getParent() : null );
}
No revision
No revision
1.24.4.9 +2 -2 maven/src/java/org/apache/maven/project/Build.java
Index: Build.java
===================================================================
RCS file: /home/cvs/maven/src/java/org/apache/maven/project/Build.java,v
retrieving revision 1.24.4.8
retrieving revision 1.24.4.9
diff -u -r1.24.4.8 -r1.24.4.9
--- Build.java 28 Mar 2004 21:27:27 -0000 1.24.4.8
+++ Build.java 13 May 2004 10:15:54 -0000 1.24.4.9
@@ -315,7 +315,7 @@
}
/**
- * Setup inheritence from a parent project build element.
+ * Setup inheritance from a parent project build element.
* @param parent the parent build element
*/
void mergeParent(Build parent)
1.91.4.18 +2 -2 maven/src/java/org/apache/maven/project/Project.java
Index: Project.java
===================================================================
RCS file: /home/cvs/maven/src/java/org/apache/maven/project/Project.java,v
retrieving revision 1.91.4.17
retrieving revision 1.91.4.18
diff -u -r1.91.4.17 -r1.91.4.18
--- Project.java 26 Mar 2004 00:18:06 -0000 1.91.4.17
+++ Project.java 13 May 2004 10:15:55 -0000 1.91.4.18
@@ -1460,7 +1460,7 @@
}
/**
- * Setup inheritence from a parent project.
+ * Setup inheritance from a parent project.
*
* @param parent the parent project
*/
1.11.10.8 +1 -1 maven/src/java/org/apache/maven/project/UnitTest.java
Index: UnitTest.java
===================================================================
RCS file: /home/cvs/maven/src/java/org/apache/maven/project/UnitTest.java,v
retrieving revision 1.11.10.7
retrieving revision 1.11.10.8
diff -u -r1.11.10.7 -r1.11.10.8
--- UnitTest.java 1 Mar 2004 22:36:38 -0000 1.11.10.7
+++ UnitTest.java 13 May 2004 10:15:55 -0000 1.11.10.8
@@ -113,7 +113,7 @@
}
/**
- * Setup inheritence from a parent test element.
+ * Setup inheritance from a parent test element.
* @param parent the parent test element
*/
void mergeParent(UnitTest parent)
No revision
No revision
1.43.4.17 +2 -2 maven/src/test/touchstone-build/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/maven/src/test/touchstone-build/maven.xml,v
retrieving revision 1.43.4.16
retrieving revision 1.43.4.17
diff -u -r1.43.4.16 -r1.43.4.17
--- maven.xml 12 May 2004 12:44:09 -0000 1.43.4.16
+++ maven.xml 13 May 2004 10:15:55 -0000 1.43.4.17
@@ -213,7 +213,7 @@
<attainGoal name="test-reactor-run-twice" />
<attainGoal name="test-context-switch" />
<attainGoal name="test-defaults" />
- <attainGoal name="test-inheritence" />
+ <attainGoal name="test-inheritance" />
<attainGoal name="test-non-jar-dependency-path" />
<attainGoal name="test-entity-goal" />
<attainGoal name="test-plugin-getset" />
@@ -759,7 +759,7 @@
/>
</goal>
- <goal name="test-inheritence">
+ <goal name="test-inheritance">
<ant:echo>Testing 1 level</ant:echo>
<maven:maven
descriptor="${basedir}/src/reactor-build/inheritence/subproject/project.xml"
No revision
No revision
1.14.4.20 +1 -1 maven/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/maven/xdocs/changes.xml,v
retrieving revision 1.14.4.19
retrieving revision 1.14.4.20
diff -u -r1.14.4.19 -r1.14.4.20
--- changes.xml 13 May 2004 00:07:40 -0000 1.14.4.19
+++ changes.xml 13 May 2004 10:15:56 -0000 1.14.4.20
@@ -25,7 +25,7 @@
</properties>
<body>
<release version="1.0-rc3" date="2004-05-13">
- <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="add" issue="MAVEN-1255">Introduce a backwards compatibility option <code>maven.property.inheritance</code>, which disables the functionality when set to false.</action>
<action dev="brett" type="fix" issue="MAVEN-37">Parent project properties are now correctly loaded from extended project.xml files. This was implemented previously, but the properties were not being passed through to the final goal attainment context.</action>
<action dev="brett" type="fix" issue="MAVEN-1275" due-to="Henning Schmiedehausen">Evaluate context variables before inserting them into the ant properties</action>
<action dev="brett" type="fix" issue="MAVEN-1223" due-to="joseph benavidez">Have system entities with relative paths in maven.xml and plugin scripts resolve relative to the correct location.</action>
1.5.4.4 +3 -3 maven/xdocs/faq.fml
Index: faq.fml
===================================================================
RCS file: /home/cvs/maven/xdocs/faq.fml,v
retrieving revision 1.5.4.3
retrieving revision 1.5.4.4
diff -u -r1.5.4.3 -r1.5.4.4
--- faq.fml 7 May 2004 22:37:15 -0000 1.5.4.3
+++ faq.fml 13 May 2004 10:15:56 -0000 1.5.4.4
@@ -314,10 +314,10 @@
<part id="recent-changes">
<title>Recent Changes (Migrating from older versions of Maven)</title>
- <faq id="property-inheritence">
+ <faq id="property-inheritance">
<question>Why are strange property values appearing from other parts of my project?</question>
<answer>
- <p>Early in RC3, the bug that caused project.properties file inheritence to fail was fixed. This means
+ <p>Early in RC3, the bug that caused project.properties file inheritance to fail was fixed. This means
that if you extend another project.xml file, you also inherit the project.properties and build.properties
files from the same directory.</p>
<p>While this was a highly demanded fix, some builds may have come to depend on it not working (including
@@ -328,7 +328,7 @@
for extension (see the maven-plugins CVS tree for an example).</p>
<p>However, should you need to maintain your old structure, and you are encountering these problems, you can
add the following property to stop parents from being inherited:</p>
- <source>maven.property.inheritence=false</source>
+ <source>maven.property.inheritance=false</source>
</answer>
</faq>
No revision
No revision
1.1.10.2 +1 -1 maven/xdocs/misc/tasks.xml
Index: tasks.xml
===================================================================
RCS file: /home/cvs/maven/xdocs/misc/tasks.xml,v
retrieving revision 1.1.10.1
retrieving revision 1.1.10.2
diff -u -r1.1.10.1 -r1.1.10.2
--- tasks.xml 4 Mar 2004 17:45:57 -0000 1.1.10.1
+++ tasks.xml 13 May 2004 10:15:56 -0000 1.1.10.2
@@ -181,7 +181,7 @@
of deps and all that jazz.
</li>
<li>
- POM inheritence mechanism. Will wait for the switch to betwixt.
+ POM inheritance mechanism. Will wait for the switch to betwixt.
</li>
<li>
Generation of a standard build.xml file.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org