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 2009/01/08 07:33:43 UTC
svn commit: r732623 - in /activemq/camel/branches/camel-1.x: ./
camel-core/src/test/java/org/apache/camel/processor/ components/camel-osgi/
components/camel-osgi/src/main/java/org/apache/camel/osgi/
components/camel-osgi/src/test/ components/camel-osgi...
Author: ningjiang
Date: Wed Jan 7 22:33:42 2009
New Revision: 732623
URL: http://svn.apache.org/viewvc?rev=732623&view=rev
Log:
Merged revisions 732589-732590 via svnmerge from
https://svn.apache.org/repos/asf/activemq/camel/trunk
........
r732589 | ningjiang | 2009-01-08 09:52:47 +0800 (Thu, 08 Jan 2009) | 1 line
CAMEL-1231 Added unit test for camel-osgi component
........
r732590 | ningjiang | 2009-01-08 09:54:30 +0800 (Thu, 08 Jan 2009) | 1 line
CAMEL-1231 Added unit tests for camel-osgi component
........
Added:
activemq/camel/branches/camel-1.x/components/camel-osgi/src/test/
- copied from r732590, activemq/camel/trunk/components/camel-osgi/src/test/
activemq/camel/branches/camel-1.x/components/camel-osgi/src/test/java/
- copied from r732590, activemq/camel/trunk/components/camel-osgi/src/test/java/
activemq/camel/branches/camel-1.x/components/camel-osgi/src/test/java/org/
- copied from r732590, activemq/camel/trunk/components/camel-osgi/src/test/java/org/
activemq/camel/branches/camel-1.x/components/camel-osgi/src/test/java/org/apache/
- copied from r732590, activemq/camel/trunk/components/camel-osgi/src/test/java/org/apache/
activemq/camel/branches/camel-1.x/components/camel-osgi/src/test/java/org/apache/camel/
- copied from r732590, activemq/camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/
activemq/camel/branches/camel-1.x/components/camel-osgi/src/test/java/org/apache/camel/osgi/
- copied from r732590, activemq/camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/
activemq/camel/branches/camel-1.x/components/camel-osgi/src/test/java/org/apache/camel/osgi/converter/
- copied from r732590, activemq/camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/converter/
activemq/camel/branches/camel-1.x/components/camel-osgi/src/test/resources/
- copied from r732590, activemq/camel/trunk/components/camel-osgi/src/test/resources/
activemq/camel/branches/camel-1.x/components/camel-osgi/src/test/resources/META-INF/
- copied from r732590, activemq/camel/trunk/components/camel-osgi/src/test/resources/META-INF/
activemq/camel/branches/camel-1.x/components/camel-osgi/src/test/resources/META-INF/services/
- copied from r732590, activemq/camel/trunk/components/camel-osgi/src/test/resources/META-INF/services/
activemq/camel/branches/camel-1.x/components/camel-osgi/src/test/resources/META-INF/services/org/
- copied from r732590, activemq/camel/trunk/components/camel-osgi/src/test/resources/META-INF/services/org/
activemq/camel/branches/camel-1.x/components/camel-osgi/src/test/resources/META-INF/services/org/apache/
- copied from r732590, activemq/camel/trunk/components/camel-osgi/src/test/resources/META-INF/services/org/apache/
activemq/camel/branches/camel-1.x/components/camel-osgi/src/test/resources/META-INF/services/org/apache/camel/
- copied from r732590, activemq/camel/trunk/components/camel-osgi/src/test/resources/META-INF/services/org/apache/camel/
activemq/camel/branches/camel-1.x/components/camel-osgi/src/test/resources/META-INF/services/org/apache/camel/component/
- copied from r732590, activemq/camel/trunk/components/camel-osgi/src/test/resources/META-INF/services/org/apache/camel/component/
activemq/camel/branches/camel-1.x/components/camel-osgi/src/test/resources/META-INF/services/org/apache/camel/language/
- copied from r732590, activemq/camel/trunk/components/camel-osgi/src/test/resources/META-INF/services/org/apache/camel/language/
Modified:
activemq/camel/branches/camel-1.x/ (props changed)
activemq/camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/processor/PipelineMEPTest.java (props changed)
activemq/camel/branches/camel-1.x/components/camel-osgi/pom.xml
activemq/camel/branches/camel-1.x/components/camel-osgi/src/main/java/org/apache/camel/osgi/Activator.java
activemq/camel/branches/camel-1.x/components/camel-osgi/src/main/java/org/apache/camel/osgi/OsgiFactoryFinder.java
activemq/camel/branches/camel-1.x/components/camel-osgi/src/test/java/org/apache/camel/osgi/ActivatorTest.java (contents, props changed)
activemq/camel/branches/camel-1.x/components/camel-osgi/src/test/java/org/apache/camel/osgi/CamelMockBundle.java (contents, props changed)
activemq/camel/branches/camel-1.x/components/camel-osgi/src/test/java/org/apache/camel/osgi/CamelOsgiTestSupport.java (contents, props changed)
activemq/camel/branches/camel-1.x/components/camel-osgi/src/test/java/org/apache/camel/osgi/OsgiFactoryFinderTest.java (contents, props changed)
activemq/camel/branches/camel-1.x/components/camel-osgi/src/test/java/org/apache/camel/osgi/converter/MyTypeConverter.java (contents, props changed)
activemq/camel/branches/camel-1.x/components/camel-osgi/src/test/resources/META-INF/services/org/apache/camel/TypeConverter
activemq/camel/branches/camel-1.x/components/camel-osgi/src/test/resources/META-INF/services/org/apache/camel/component/file_test
activemq/camel/branches/camel-1.x/components/camel-osgi/src/test/resources/META-INF/services/org/apache/camel/component/timer_test
activemq/camel/branches/camel-1.x/components/camel-osgi/src/test/resources/META-INF/services/org/apache/camel/language/bean_test
activemq/camel/branches/camel-1.x/components/camel-osgi/src/test/resources/META-INF/services/org/apache/camel/language/file_test
activemq/camel/branches/camel-1.x/components/camel-osgi/src/test/resources/log4j.properties (contents, props changed)
activemq/camel/branches/camel-1.x/pom.xml
Propchange: activemq/camel/branches/camel-1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 7 22:33:42 2009
@@ -1 +1 @@
-/activemq/camel/trunk:709850,711200,711206,711219-711220,711523,711531,711756,711784,711859,711874,711962,711971,712064,712119,712148,712662,712692,712925,713013,713107,713136,713273,713290,713292,713295,713314,713475,713625,713932,713944,714032,717965,717989,718242,718273,718312-718515,719163-719184,719334,719339,719524,719662,719848,719851,719855,719864,719978-719979,720207,720435-720437,720806,721272,721331,721333-721334,721360,721669,721764,721813,721985,722005,722070,722110,722415,722438,722726,722845,722878,723264,723314,723325-723327,723409,723835,723966,724122,724619,724681,725040,725309-725320,725340,725351,725569-725572,725612,725652-725660,725715,725883,726339,726640-726645,726932,727113,727375,727377,727624,727713,727946,729401,729892,730069,730132,730154,730157,730275,730299,730504-730505,730508,730571,730599,730759,730903,730916,730923,730936,730992,731126,731168-731169,731488,731492,731799,731824,731836,731844,731860,732207,732210,732237,732246-732247,732378
+/activemq/camel/trunk:709850,711200,711206,711219-711220,711523,711531,711756,711784,711859,711874,711962,711971,712064,712119,712148,712662,712692,712925,713013,713107,713136,713273,713290,713292,713295,713314,713475,713625,713932,713944,714032,717965,717989,718242,718273,718312-718515,719163-719184,719334,719339,719524,719662,719848,719851,719855,719864,719978-719979,720207,720435-720437,720806,721272,721331,721333-721334,721360,721669,721764,721813,721985,722005,722070,722110,722415,722438,722726,722845,722878,723264,723314,723325-723327,723409,723835,723966,724122,724619,724681,725040,725309-725320,725340,725351,725569-725572,725612,725652-725660,725715,725883,726339,726640-726645,726932,727113,727375,727377,727624,727713,727946,729401,729892,730069,730132,730154,730157,730275,730299,730504-730505,730508,730571,730599,730759,730903,730916,730923,730936,730992,731126,731168-731169,731488,731492,731799,731824,731836,731844,731860,732207,732210,732237,732246-732247,732378,7
32589-732590
Propchange: activemq/camel/branches/camel-1.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Propchange: activemq/camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/processor/PipelineMEPTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 7 22:33:42 2009
@@ -0,0 +1 @@
+/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/PipelineMEPTest.java:732589-732590
Modified: activemq/camel/branches/camel-1.x/components/camel-osgi/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/components/camel-osgi/pom.xml?rev=732623&r1=732622&r2=732623&view=diff
==============================================================================
--- activemq/camel/branches/camel-1.x/components/camel-osgi/pom.xml (original)
+++ activemq/camel/branches/camel-1.x/components/camel-osgi/pom.xml Wed Jan 7 22:33:42 2009
@@ -93,7 +93,7 @@
</dependency>
<dependency>
<groupId>org.springframework.osgi</groupId>
- <artifactId>spring-osgi-test</artifactId>
+ <artifactId>spring-osgi-mock</artifactId>
<scope>test</scope>
</dependency>
Modified: activemq/camel/branches/camel-1.x/components/camel-osgi/src/main/java/org/apache/camel/osgi/Activator.java
URL: http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/components/camel-osgi/src/main/java/org/apache/camel/osgi/Activator.java?rev=732623&r1=732622&r2=732623&view=diff
==============================================================================
--- activemq/camel/branches/camel-1.x/components/camel-osgi/src/main/java/org/apache/camel/osgi/Activator.java (original)
+++ activemq/camel/branches/camel-1.x/components/camel-osgi/src/main/java/org/apache/camel/osgi/Activator.java Wed Jan 7 22:33:42 2009
@@ -40,12 +40,12 @@
import org.springframework.osgi.util.BundleDelegatingClassLoader;
public class Activator implements BundleActivator, SynchronousBundleListener {
- public static final String META_INF_TYPE_CONVERTER = "/META-INF/services/org/apache/camel/TypeConverter";
- public static final String META_INF_COMPONENT = "/META-INF/services/org/apache/camel/component/";
- public static final String META_INF_LANGUAGE = "/META-INF/services/org/apache/camel/language/";
+ public static final String META_INF_TYPE_CONVERTER = "META-INF/services/org/apache/camel/TypeConverter";
+ public static final String META_INF_COMPONENT = "META-INF/services/org/apache/camel/component/";
+ public static final String META_INF_LANGUAGE = "META-INF/services/org/apache/camel/language/";
private static final transient Log LOG = LogFactory.getLog(Activator.class);
private static final Map<String, ComponentEntry> COMPONENTS = new HashMap<String, ComponentEntry>();
- private static final Map<Bundle, TypeConverterEntry> TYPE_CONVERTERS = new HashMap<Bundle, TypeConverterEntry>();
+ private static final Map<URL, TypeConverterEntry> TYPE_CONVERTERS = new HashMap<URL, TypeConverterEntry>();
private static final Map<String, ComponentEntry> LANGUAGES = new HashMap<String, ComponentEntry>();
private static Bundle bundle;
@@ -120,7 +120,7 @@
entry.bundle = bundle;
entry.resource = resource;
entry.converterPackages = getConverterPackages(resource);
- TYPE_CONVERTERS.put(bundle, entry);
+ TYPE_CONVERTERS.put(resource, entry);
}
}
} catch (IOException ignore) {
@@ -152,7 +152,7 @@
if (LOG.isDebugEnabled()) {
LOG.debug("Removing entry: " + entry.resource + " in bundle " + bundle.getSymbolicName());
}
- COMPONENTS.remove(bundle);
+ COMPONENTS.remove(entry.resource);
}
}
}
Modified: activemq/camel/branches/camel-1.x/components/camel-osgi/src/main/java/org/apache/camel/osgi/OsgiFactoryFinder.java
URL: http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/components/camel-osgi/src/main/java/org/apache/camel/osgi/OsgiFactoryFinder.java?rev=732623&r1=732622&r2=732623&view=diff
==============================================================================
--- activemq/camel/branches/camel-1.x/components/camel-osgi/src/main/java/org/apache/camel/osgi/OsgiFactoryFinder.java (original)
+++ activemq/camel/branches/camel-1.x/components/camel-osgi/src/main/java/org/apache/camel/osgi/OsgiFactoryFinder.java Wed Jan 7 22:33:42 2009
@@ -79,12 +79,12 @@
}
- public BundleEntry getResource(String path) {
+ public BundleEntry getResource(String name) {
URL url = null;
BundleEntry entry = null;
BundleContext bundleContext = Activator.getBundle().getBundleContext();
- for (Bundle bundle : bundleContext.getBundles()) {
- url = bundle.getEntry(path);
+ for (Bundle bundle : bundleContext.getBundles()) {
+ url = bundle.getEntry(getPath() + name);
if (url != null) {
entry = new BundleEntry();
entry.url = url;
Modified: activemq/camel/branches/camel-1.x/components/camel-osgi/src/test/java/org/apache/camel/osgi/ActivatorTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/components/camel-osgi/src/test/java/org/apache/camel/osgi/ActivatorTest.java?rev=732623&r1=732590&r2=732623&view=diff
==============================================================================
(empty)
Modified: activemq/camel/branches/camel-1.x/components/camel-osgi/src/test/java/org/apache/camel/osgi/CamelMockBundle.java
URL: http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/components/camel-osgi/src/test/java/org/apache/camel/osgi/CamelMockBundle.java?rev=732623&r1=732590&r2=732623&view=diff
==============================================================================
(empty)
Modified: activemq/camel/branches/camel-1.x/components/camel-osgi/src/test/java/org/apache/camel/osgi/CamelOsgiTestSupport.java
URL: http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/components/camel-osgi/src/test/java/org/apache/camel/osgi/CamelOsgiTestSupport.java?rev=732623&r1=732590&r2=732623&view=diff
==============================================================================
(empty)
Modified: activemq/camel/branches/camel-1.x/components/camel-osgi/src/test/java/org/apache/camel/osgi/OsgiFactoryFinderTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/components/camel-osgi/src/test/java/org/apache/camel/osgi/OsgiFactoryFinderTest.java?rev=732623&r1=732590&r2=732623&view=diff
==============================================================================
(empty)
Modified: activemq/camel/branches/camel-1.x/components/camel-osgi/src/test/java/org/apache/camel/osgi/converter/MyTypeConverter.java
URL: http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/components/camel-osgi/src/test/java/org/apache/camel/osgi/converter/MyTypeConverter.java?rev=732623&r1=732590&r2=732623&view=diff
==============================================================================
(empty)
Modified: activemq/camel/branches/camel-1.x/components/camel-osgi/src/test/resources/META-INF/services/org/apache/camel/TypeConverter
URL: http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/components/camel-osgi/src/test/resources/META-INF/services/org/apache/camel/TypeConverter?rev=732623&r1=732590&r2=732623&view=diff
==============================================================================
(empty)
Modified: activemq/camel/branches/camel-1.x/components/camel-osgi/src/test/resources/META-INF/services/org/apache/camel/component/file_test
URL: http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/components/camel-osgi/src/test/resources/META-INF/services/org/apache/camel/component/file_test?rev=732623&r1=732590&r2=732623&view=diff
==============================================================================
(empty)
Modified: activemq/camel/branches/camel-1.x/components/camel-osgi/src/test/resources/META-INF/services/org/apache/camel/component/timer_test
URL: http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/components/camel-osgi/src/test/resources/META-INF/services/org/apache/camel/component/timer_test?rev=732623&r1=732590&r2=732623&view=diff
==============================================================================
(empty)
Modified: activemq/camel/branches/camel-1.x/components/camel-osgi/src/test/resources/META-INF/services/org/apache/camel/language/bean_test
URL: http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/components/camel-osgi/src/test/resources/META-INF/services/org/apache/camel/language/bean_test?rev=732623&r1=732590&r2=732623&view=diff
==============================================================================
(empty)
Modified: activemq/camel/branches/camel-1.x/components/camel-osgi/src/test/resources/META-INF/services/org/apache/camel/language/file_test
URL: http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/components/camel-osgi/src/test/resources/META-INF/services/org/apache/camel/language/file_test?rev=732623&r1=732590&r2=732623&view=diff
==============================================================================
(empty)
Modified: activemq/camel/branches/camel-1.x/components/camel-osgi/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/components/camel-osgi/src/test/resources/log4j.properties?rev=732623&r1=732590&r2=732623&view=diff
==============================================================================
(empty)
Modified: activemq/camel/branches/camel-1.x/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/pom.xml?rev=732623&r1=732622&r2=732623&view=diff
==============================================================================
--- activemq/camel/branches/camel-1.x/pom.xml (original)
+++ activemq/camel/branches/camel-1.x/pom.xml Wed Jan 7 22:33:42 2009
@@ -753,7 +753,7 @@
<dependency>
<groupId>org.springframework.osgi</groupId>
- <artifactId>spring-osgi-test</artifactId>
+ <artifactId>spring-osgi-mock</artifactId>
<version>${spring-osgi-version}</version>
</dependency>