[CVS spice] Remove remaining dependencies on oro
pdonald-yCVjj/[email protected] 11 Jul 2004 23:42:28 -0000
| Newsgroups | gmane.comp.java.spice.cvs |
|---|---|
| Message-ID | <[email protected]> |
<html>
<head>
<style><!--
body {background-color:#ffffff;}
.file {border:1px solid #eeeeee;margin-top:1em;margin-bottom:1em;}
.pathname {font-family:monospace; float:right;}
.fileheader {margin-bottom:.5em;}
.diff {margin:0;}
.tasklist {padding:4px;border:1px dashed #000000;margin-top:1em;}
.tasklist ul {margin-top:0;margin-bottom:0;}
tr.alt {background-color:#eeeeee}
#added {background-color:#ddffdd;}
#addedchars {background-color:#99ff99;font-weight:bolder;}
tr.alt #added {background-color:#ccf7cc;}
#removed {background-color:#ffdddd;}
#removedchars {background-color:#ff9999;font-weight:bolder;}
tr.alt #removed {background-color:#f7cccc;}
#info {color:#888888;}
#context {background-color:#eeeeee;}
td {padding-left:.3em;padding-right:.3em;}
tr.head {border-bottom-width:1px;border-bottom-style:solid;}
tr.head td {padding:0;padding-top:.2em;}
.task {background-color:#ffff00;}
.comment {padding:4px;border:1px dashed #000000;background-color:#ffffdd}
.error {color:red;}
hr {border-width:0px;height:2px;background:black;}
--></style>
</head>
<body>
<table cellspacing="0" cellpadding="0" border="0" rules="cols">
<tr class="head"><td colspan="4">Commit in <b><tt>spice/components/salt</tt></b><span id="info"> on MAIN</span></td></tr>
<tr><td><tt><a href="#file1">project.xml</a></tt></td><td></td><td align="right" id="removed">-8</td><td nowrap="nowrap" align="center">1.10 -> 1.11</td></tr>
<tr class="alt"><td><tt>src/java/org/codehaus/spice/salt/io/<a href="#file2">PathMatcher.java</a></tt></td><td align="right" id="added">+4</td><td align="right" id="removed">-19</td><td nowrap="nowrap" align="center">1.1 -> 1.2</td></tr>
<tr><td><tt>src/test/org/codehaus/spice/salt/io/<a href="#file3">PathMatcherTestCase.java</a></tt></td><td align="right" id="added">+3</td><td align="right" id="removed">-7</td><td nowrap="nowrap" align="center">1.1 -> 1.2</td></tr>
<tr><td></td><td align="right" id="added">+7</td><td align="right" id="removed">-34</td><td></td></tr>
</table>
<small id="info">3 modified files</small><br />
<pre class="comment">
Remove remaining dependencies on oro
</pre>
<hr /><a name="file1" /><div class="file">
<span class="pathname">spice/components/salt<br /></span>
<div class="fileheader"><big><b>project.xml</b></big> <small id="info">1.10 -> 1.11</small></div>
<pre class="diff"><small id="info">diff -u -r1.10 -r1.11
--- project.xml 25 Apr 2004 00:44:46 -0000 1.10
+++ project.xml 11 Jul 2004 23:42:28 -0000 1.11
@@ -30,7 +30,6 @@
</small></pre><pre class="diff" id="context"> <developer>
<name>Peter Donald</name>
<id>donaldp</id>
</pre><pre class="diff" id="removed">-
</pre><pre class="diff" id="context"> <roles>
<role>Developer</role>
</roles>
</pre><pre class="diff"><small id="info">@@ -40,12 +39,5 @@
</small></pre><pre class="diff" id="context"> <email>[email protected]</email>
</developer>
</developers>
</pre><pre class="diff" id="removed">-
- <dependencies>
- <dependency>
- <id>oro</id>
- <version>2.0.7</version>
- </dependency>
- </dependencies>
</pre><pre class="diff" id="context">
</project>
</pre></div>
<hr /><a name="file2" /><div class="file">
<span class="pathname">spice/components/salt/src/java/org/codehaus/spice/salt/io<br /></span>
<div class="fileheader"><big><b>PathMatcher.java</b></big> <small id="info">1.1 -> 1.2</small></div>
<pre class="diff"><small id="info">diff -u -r1.1 -r1.2
--- PathMatcher.java 2 Dec 2003 02:15:04 -0000 1.1
+++ PathMatcher.java 11 Jul 2004 23:42:28 -0000 1.2
@@ -7,17 +7,14 @@
</small></pre><pre class="diff" id="context"> */
package org.codehaus.spice.salt.io;
</pre><pre class="diff" id="removed">-import org.apache.oro.text.regex.MalformedPatternException;
-import org.apache.oro.text.regex.Pattern;
-import org.apache.oro.text.regex.Perl5Compiler;
-import org.apache.oro.text.regex.Perl5Matcher;
</pre><pre class="diff" id="added">+import java.util.regex.Pattern;
</pre><pre class="diff" id="context">
/**
* Utility class for scanning a filesystem and matching a particular set of
* include and exclude patterns ala ant.
*
* @author Peter Donald
</pre><pre class="diff" id="removed">- * @version $Revision: 1.1 $ $Date: 2003/12/02 02:15:04 $
</pre><pre class="diff" id="added">+ * @version $Revision: 1.2 $ $Date: 2004/07/11 23:42:28 $
</pre><pre class="diff" id="context"> */
public class PathMatcher
{
</pre><pre class="diff"><small id="info">@@ -30,9 +27,6 @@
</small></pre><pre class="diff" id="context"> */
private final Pattern[] m_excludes;
</pre><pre class="diff" id="removed">- /** The object that is capable of performing the matching. */
- private final Perl5Matcher m_matcher = new Perl5Matcher();
-
</pre><pre class="diff" id="context"> /** The character that separates elements in VPaths. */
private final char m_separator;
</pre><pre class="diff"><small id="info">@@ -130,7 +124,7 @@
</small></pre><pre class="diff" id="context"> {
for( int i = 0; i < patterns.length; i++ )
{
</pre><pre class="diff" id="removed">- if( m_matcher.matches( vPath, patterns[ i ] ) )
</pre><pre class="diff" id="added">+ if( patterns[ i ].matcher( vPath ).matches() )
</pre><pre class="diff" id="context"> {
return true;
}
</pre><pre class="diff"><small id="info">@@ -146,20 +140,11 @@
</small></pre><pre class="diff" id="context"> */
private Pattern[] toPatterns( final String[] strs )
{
</pre><pre class="diff" id="removed">- final Perl5Compiler compiler = new Perl5Compiler();
</pre><pre class="diff" id="context"> final Pattern[] patterns = new Pattern[ strs.length ];
for( int i = 0; i < patterns.length; i++ )
{
final String perlPatternStr = toPerlPatternStr( strs[ i ] );
</pre><pre class="diff" id="removed">- try
- {
- patterns[ i ] = compiler.compile( perlPatternStr );
- }
- catch( final MalformedPatternException mpe )
- {
- final String message = strs[ i ] + ":" + mpe.toString();
- throw new IllegalArgumentException( message );
- }
</pre><pre class="diff" id="added">+ patterns[ i ] = Pattern.compile( perlPatternStr );
</pre><pre class="diff" id="context"> }
return patterns;
}
</pre></div>
<hr /><a name="file3" /><div class="file">
<span class="pathname">spice/components/salt/src/test/org/codehaus/spice/salt/io<br /></span>
<div class="fileheader"><big><b>PathMatcherTestCase.java</b></big> <small id="info">1.1 -> 1.2</small></div>
<pre class="diff"><small id="info">diff -u -r1.1 -r1.2
--- PathMatcherTestCase.java 2 Dec 2003 02:15:05 -0000 1.1
+++ PathMatcherTestCase.java 11 Jul 2004 23:42:28 -0000 1.2
@@ -11,7 +11,7 @@
</small></pre><pre class="diff" id="context">
/**
* @author Peter Donald
</pre><pre class="diff" id="removed">- * @version $Revision: 1.1 $ $Date: 2003/12/02 02:15:05 $
</pre><pre class="diff" id="added">+ * @version $Revision: 1.2 $ $Date: 2004/07/11 23:42:28 $
</pre><pre class="diff" id="context"> */
public class PathMatcherTestCase
extends TestCase
</pre><pre class="diff"><small id="info">@@ -279,9 +279,7 @@
</small></pre><pre class="diff" id="context"> }
catch( IllegalArgumentException e )
{
</pre><pre class="diff" id="removed">- assertEquals( "InvalidArgument ",
- INVALID_PATTERN + ":" + INVALID_CAUSE,
- e.getMessage() );
</pre><pre class="diff" id="added">+ return;
</pre><pre class="diff" id="context"> }
}
</pre><pre class="diff"><small id="info">@@ -295,9 +293,7 @@
</small></pre><pre class="diff" id="context"> }
catch( IllegalArgumentException e )
{
</pre><pre class="diff" id="removed">- assertEquals( "InvalidArgument ",
- INVALID_PATTERN + ":" + INVALID_CAUSE,
- e.getMessage() );
</pre><pre class="diff" id="added">+ return;
</pre><pre class="diff" id="context"> }
}
</pre></div>
<center><small><a href="http://www.badgers-in-foil.co.uk/projects/cvsspam/" title="commit -> email">CVSspam</a> 0.2.8</small></center>
</body></html>