You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@avalon.apache.org by Peter Donald <pe...@realityforge.org> on 2002/11/24 01:21:41 UTC
[patch] info schema separation
Cleaned up schema stuff so that the schemas for parameters and configuration
are in different variables.
--
Cheers,
Peter Donald
Sufficiently advanced science is
indistinguishable from magic"
-- Arthur C. Clarke
Re: [patch] info schema separation
Posted by Peter Donald <pe...@realityforge.org>.
On Sun, 24 Nov 2002 23:23, Jeff Turner wrote:
> 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.
tah.
> Some weirdness when applying though..
wierd.
--
Cheers,
Peter Donald
--------------------------------
My opinions may have changed,
but not the fact that I am right
--------------------------------
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>
Re: [patch] info schema separation
Posted by Jeff Turner <je...@apache.org>.
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: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>