You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2010/04/30 11:28:50 UTC
svn commit: r939603 - in /camel/trunk:
camel-core/src/main/java/org/apache/camel/impl/ components/
components/camel-eclipse/ components/camel-eclipse/src/
components/camel-eclipse/src/main/ components/camel-eclipse/src/main/java/
components/camel-eclip...
Author: ningjiang
Date: Fri Apr 30 09:28:49 2010
New Revision: 939603
URL: http://svn.apache.org/viewvc?rev=939603&view=rev
Log:
CAMEL-2663 Implemented EclipsePackageScanClassResolver
Added:
camel/trunk/components/camel-eclipse/
camel/trunk/components/camel-eclipse/pom.xml (with props)
camel/trunk/components/camel-eclipse/src/
camel/trunk/components/camel-eclipse/src/main/
camel/trunk/components/camel-eclipse/src/main/java/
camel/trunk/components/camel-eclipse/src/main/java/org/
camel/trunk/components/camel-eclipse/src/main/java/org/apache/
camel/trunk/components/camel-eclipse/src/main/java/org/apache/camel/
camel/trunk/components/camel-eclipse/src/main/java/org/apache/camel/component/
camel/trunk/components/camel-eclipse/src/main/java/org/apache/camel/component/eclipse/
camel/trunk/components/camel-eclipse/src/main/java/org/apache/camel/component/eclipse/EclipsePackageScanClassResolver.java (with props)
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultPackageScanClassResolver.java
camel/trunk/components/pom.xml
camel/trunk/parent/pom.xml
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultPackageScanClassResolver.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultPackageScanClassResolver.java?rev=939603&r1=939602&r2=939603&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultPackageScanClassResolver.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultPackageScanClassResolver.java Fri Apr 30 09:28:49 2010
@@ -205,6 +205,8 @@ public class DefaultPackageScanClassReso
if (log.isTraceEnabled()) {
log.trace("URL from classloader: " + url);
}
+
+ url = customerResourceLocator(url);
String urlPath = url.getFile();
urlPath = URLDecoder.decode(urlPath, "UTF-8");
@@ -280,6 +282,12 @@ public class DefaultPackageScanClassReso
}
}
+ // We can override this method to support the customer ResourceLocator
+ protected URL customerResourceLocator(URL url) throws IOException {
+ // Do nothing here
+ return url;
+ }
+
/**
* Strategy to get the resources by the given classloader.
* <p/>
Added: camel/trunk/components/camel-eclipse/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-eclipse/pom.xml?rev=939603&view=auto
==============================================================================
--- camel/trunk/components/camel-eclipse/pom.xml (added)
+++ camel/trunk/components/camel-eclipse/pom.xml Fri Apr 30 09:28:49 2010
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-parent</artifactId>
+ <version>2.3-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>camel-eclipse</artifactId>
+ <packaging>bundle</packaging>
+ <name>Camel :: Eclipse</name>
+ <description>Camel Eclipse support</description>
+
+ <properties>
+ <camel.osgi.export.pkg>org.apache.camel.component.eclipse.*</camel.osgi.export.pkg>
+ <camel.osgi.import.pkg>
+ !org.apache.camel.component.eclipse.*,
+ org.apache.camel.*;${camel.osgi.import.camel.version},
+ org.eclipse.core.runtime;common=!
+ </camel.osgi.import.pkg>
+ </properties>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.equinox</groupId>
+ <artifactId>common</artifactId>
+ <version>3.3.0-v20070426</version>
+ </dependency>
+
+ <!-- testing -->
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-test</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>**/XXXTest.*</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Propchange: camel/trunk/components/camel-eclipse/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/trunk/components/camel-eclipse/pom.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: camel/trunk/components/camel-eclipse/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: camel/trunk/components/camel-eclipse/src/main/java/org/apache/camel/component/eclipse/EclipsePackageScanClassResolver.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-eclipse/src/main/java/org/apache/camel/component/eclipse/EclipsePackageScanClassResolver.java?rev=939603&view=auto
==============================================================================
--- camel/trunk/components/camel-eclipse/src/main/java/org/apache/camel/component/eclipse/EclipsePackageScanClassResolver.java (added)
+++ camel/trunk/components/camel-eclipse/src/main/java/org/apache/camel/component/eclipse/EclipsePackageScanClassResolver.java Fri Apr 30 09:28:49 2010
@@ -0,0 +1,34 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.eclipse;
+
+import java.io.IOException;
+import java.net.URL;
+
+import org.apache.camel.impl.DefaultPackageScanClassResolver;
+import org.eclipse.core.runtime.FileLocator;
+
+public class EclipsePackageScanClassResolver extends DefaultPackageScanClassResolver {
+
+ protected URL customerResourceLocator(URL url) throws IOException {
+ if (url.getProtocol().equalsIgnoreCase("bundleresource")) {
+ url = FileLocator.resolve(url);
+ }
+ return url;
+ }
+
+}
Propchange: camel/trunk/components/camel-eclipse/src/main/java/org/apache/camel/component/eclipse/EclipsePackageScanClassResolver.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/trunk/components/camel-eclipse/src/main/java/org/apache/camel/component/eclipse/EclipsePackageScanClassResolver.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: camel/trunk/components/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/pom.xml?rev=939603&r1=939602&r2=939603&view=diff
==============================================================================
--- camel/trunk/components/pom.xml (original)
+++ camel/trunk/components/pom.xml Fri Apr 30 09:28:49 2010
@@ -45,6 +45,7 @@
<module>camel-csv</module>
<module>camel-cxf</module>
<module>camel-dozer</module>
+ <module>camel-eclipse</module>
<module>camel-exec</module>
<module>camel-flatpack</module>
<module>camel-freemarker</module>
Modified: camel/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=939603&r1=939602&r2=939603&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Fri Apr 30 09:28:49 2010
@@ -258,6 +258,11 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-eclipse</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-exec</artifactId>
<version>${project.version}</version>
</dependency>