avalon-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Jeff Turner <je...@apache.org>
Subject Re: [patch] info schema separation
Date Sun, 24 Nov 2002 12:23:48 GMT
On Sun, Nov 24, 2002 at 11:21:41AM +1100, Peter Donald wrote:
> Cleaned up schema stuff so that the schemas for parameters and configuration 
> are in different variables.

Applied.  Some weirdness when applying though..

jeff@expresso:~/apache/jakarta/jakarta-avalon-excalibur/info$ cvs up -dP
jeff@expresso:~/apache/jakarta/jakarta-avalon-excalibur/info$ patch -p0 < /tmp/info.txt

patching file src/java/org/apache/avalon/framework/info/ComponentInfo.java
patching file src/java/org/apache/avalon/framework/info/SchemaDescriptor.java
patching file src/java/org/apache/avalon/framework/tools/infobuilder/LegacyBlockInfoReader.java
patching file src/java/org/apache/avalon/framework/tools/infobuilder/XMLInfoReader.java
patching file src/java/org/apache/avalon/framework/tools/infobuilder/XMLInfoWriter.java
patching file src/java/org/apache/avalon/framework/tools/infobuilder/componentinfo.dtd
patching file src/java/org/apache/avalon/framework/tools/qdox/DefaultInfoBuilder.java
patching file src/java/org/apache/avalon/framework/tools/qdox/LegacyInfoBuilder.java
patching file src/java/org/apache/avalon/framework/tools/verifier/InfoVerifier.java
patching file src/test/org/apache/avalon/framework/tools/infobuilder/test/InfoAssert.java
patching file src/test/org/apache/avalon/framework/tools/infobuilder/test/InfoBuilderTestCase.java
patching file src/test/org/apache/avalon/framework/tools/infobuilder/test/data/QDoxComponent1-info.xml
Hunk #1 succeeded at 29 with fuzz 2.
patching file src/test/org/apache/avalon/framework/tools/infobuilder/test/data/QDoxLegacyComponent1-info.xml
Hunk #1 succeeded at 20 with fuzz 2.
patching file src/test/org/apache/avalon/framework/tools/infobuilder/test/data/component1-info.xml
Hunk #1 FAILED at 29.
1 out of 1 hunk FAILED -- saving rejects to file src/test/org/apache/avalon/framework/tools/infobuilder/test/data/component1-info.xml.rej
patching file src/test/org/apache/avalon/framework/tools/infobuilder/test/data/component3-info.xml
Hunk #1 succeeded at 27 with fuzz 2.


My copy of those files is up to date:

jeff@expresso:~/apache/jakarta/jakarta-avalon-excalibur/info$ cvs stat src/test/org/apache/avalon/framework/tools/infobuilder/test/data/component1-info.xml
===================================================================
File: component1-info.xml       Status: Up-to-date

   Working revision:    1.3
   Repository revision: 1.3     /home/cvs/jakarta-avalon-excalibur/info/src/test/org/apache/avalon/framework/tools/infobuilder/test/data/component1-info.xml,v
   Sticky Tag:          (none)
   Sticky Date:         (none)
   Sticky Options:      (none)


So for the component1-info.xml file that failed, I patched by hand.

--Jeff

--
To unsubscribe, e-mail:   <mailto:avalon-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:avalon-dev-help@jakarta.apache.org>


Mime
View raw message