Author: davsclaus
Date: Fri Jan 6 06:41:59 2012
New Revision: 1227983
URL: http://svn.apache.org/viewvc?rev=1227983&view=rev
Log:
CAMEL-4779: Move ant path matching to camel-core. Work in pgoress. Moved some
files.
Added:
camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/AntPathMatcherFileFilter.java
- copied, changed from r1227952,
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/util/SpringAntPathMatcherFileFilter.java
camel/trunk/camel-core/src/main/java/org/apache/camel/util/AntPathMatcher.java
- copied, changed from r1227952,
camel/trunk/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/scan/AntPathMatcher.java
camel/trunk/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/PatternBasedPackageScanFilter.java
- copied, changed from r1227952,
camel/trunk/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/scan/PatternBasedPackageScanFilter.java
Removed:
camel/trunk/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/scan/AntPathMatcher.java
camel/trunk/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/scan/PatternBasedPackageScanFilter.java
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/util/SpringAntPathMatcherFileFilter.java
Modified:
camel/trunk/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/scan/PatternBasedPackageScanFilterTest.java
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/scan/ScanTestSupport.java
Copied:
camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/AntPathMatcherFileFilter.java
(from r1227952,
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/util/SpringAntPathMatcherFileFilter.java)
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/AntPathMatcherFileFilter.java?p2=camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/AntPathMatcherFileFilter.java&p1=camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/util/SpringAntPathMatcherFileFilter.java&r1=1227952&r2=1227983&rev=1227983&view=diff
==============================================================================
---
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/util/SpringAntPathMatcherFileFilter.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/AntPathMatcherFileFilter.java
Fri Jan 6 06:41:59 2012
@@ -14,23 +14,22 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.spring.util;
+package org.apache.camel.component.file;
import java.io.File;
import java.io.FileFilter;
+import org.apache.camel.util.AntPathMatcher;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.springframework.util.AntPathMatcher;
-import org.springframework.util.StringUtils;
/**
- * File filter using Spring's {@link AntPathMatcher}.
+ * File filter using {@link AntPathMatcher}.
* <p/>
* Exclude take precedence over includes. If a file match both exclude and
include it will be regarded as excluded.
*/
-public class SpringAntPathMatcherFileFilter implements FileFilter {
- private static final transient Logger LOG =
LoggerFactory.getLogger(SpringAntPathMatcherFileFilter.class);
+public class AntPathMatcherFileFilter implements FileFilter {
+ private static final transient Logger LOG =
LoggerFactory.getLogger(AntPathMatcherFileFilter.class);
private AntPathMatcher matcher = new AntPathMatcher();
private String[] excludes;
@@ -48,7 +47,7 @@ public class SpringAntPathMatcherFileFil
*/
public boolean acceptPathName(String path) {
// must use single / as path separators
- path = StringUtils.replace(path, File.separator, "/");
+ path = path.replace(File.separatorChar, '/');
LOG.trace("Filtering file: {}", path);
Copied:
camel/trunk/camel-core/src/main/java/org/apache/camel/util/AntPathMatcher.java
(from r1227952,
camel/trunk/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/scan/AntPathMatcher.java)
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/util/AntPathMatcher.java?p2=camel/trunk/camel-core/src/main/java/org/apache/camel/util/AntPathMatcher.java&p1=camel/trunk/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/scan/AntPathMatcher.java&r1=1227952&r2=1227983&rev=1227983&view=diff
==============================================================================
---
camel/trunk/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/scan/AntPathMatcher.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/util/AntPathMatcher.java
Fri Jan 6 06:41:59 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.core.xml.scan;
+package org.apache.camel.util;
import java.util.ArrayList;
import java.util.List;
Modified:
camel/trunk/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java?rev=1227983&r1=1227982&r2=1227983&view=diff
==============================================================================
---
camel/trunk/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java
(original)
+++
camel/trunk/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java
Fri Jan 6 06:41:59 2012
@@ -36,7 +36,6 @@ import org.apache.camel.builder.RouteBui
import org.apache.camel.component.properties.PropertiesComponent;
import org.apache.camel.component.properties.PropertiesParser;
import org.apache.camel.component.properties.PropertiesResolver;
-import org.apache.camel.core.xml.scan.PatternBasedPackageScanFilter;
import org.apache.camel.management.DefaultManagementAgent;
import org.apache.camel.management.DefaultManagementLifecycleStrategy;
import org.apache.camel.management.DefaultManagementStrategy;
Copied:
camel/trunk/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/PatternBasedPackageScanFilter.java
(from r1227952,
camel/trunk/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/scan/PatternBasedPackageScanFilter.java)
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/PatternBasedPackageScanFilter.java?p2=camel/trunk/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/PatternBasedPackageScanFilter.java&p1=camel/trunk/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/scan/PatternBasedPackageScanFilter.java&r1=1227952&r2=1227983&rev=1227983&view=diff
==============================================================================
---
camel/trunk/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/scan/PatternBasedPackageScanFilter.java
(original)
+++
camel/trunk/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/PatternBasedPackageScanFilter.java
Fri Jan 6 06:41:59 2012
@@ -14,12 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.core.xml.scan;
+package org.apache.camel.core.xml;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
+import org.apache.camel.util.AntPathMatcher;
import org.apache.camel.spi.PackageScanFilter;
/**
Modified:
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/scan/PatternBasedPackageScanFilterTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/scan/PatternBasedPackageScanFilterTest.java?rev=1227983&r1=1227982&r2=1227983&view=diff
==============================================================================
---
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/scan/PatternBasedPackageScanFilterTest.java
(original)
+++
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/scan/PatternBasedPackageScanFilterTest.java
Fri Jan 6 06:41:59 2012
@@ -26,7 +26,7 @@ import java.util.List;
import java.util.Set;
import java.util.jar.JarFile;
-import org.apache.camel.core.xml.scan.PatternBasedPackageScanFilter;
+import org.apache.camel.core.xml.PatternBasedPackageScanFilter;
import org.apache.camel.util.CollectionHelper;
public class PatternBasedPackageScanFilterTest extends
org.apache.camel.spring.scan.ScanTestSupport {
Modified:
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/scan/ScanTestSupport.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/scan/ScanTestSupport.java?rev=1227983&r1=1227982&r2=1227983&view=diff
==============================================================================
---
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/scan/ScanTestSupport.java
(original)
+++
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/scan/ScanTestSupport.java
Fri Jan 6 06:41:59 2012
@@ -20,7 +20,7 @@ import java.util.HashSet;
import java.util.Set;
import junit.framework.TestCase;
-import org.apache.camel.core.xml.scan.PatternBasedPackageScanFilter;
+import org.apache.camel.core.xml.PatternBasedPackageScanFilter;
public abstract class ScanTestSupport extends TestCase {