You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2008/09/11 18:35:57 UTC
svn commit: r694342 - in /activemq/camel/trunk/components/camel-rmi: pom.xml
src/main/java/org/apache/camel/component/rmi/RmiEndpoint.java
src/test/resources/log4j.properties
Author: davsclaus
Date: Thu Sep 11 09:35:49 2008
New Revision: 694342
URL: http://svn.apache.org/viewvc?rev=694342&view=rev
Log:
CAMEL-890: Skip leading slashes for lookup name.
Modified:
activemq/camel/trunk/components/camel-rmi/pom.xml
activemq/camel/trunk/components/camel-rmi/src/main/java/org/apache/camel/component/rmi/RmiEndpoint.java
activemq/camel/trunk/components/camel-rmi/src/test/resources/log4j.properties
Modified: activemq/camel/trunk/components/camel-rmi/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-rmi/pom.xml?rev=694342&r1=694341&r2=694342&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-rmi/pom.xml (original)
+++ activemq/camel/trunk/components/camel-rmi/pom.xml Thu Sep 11 09:35:49 2008
@@ -70,6 +70,11 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
Modified: activemq/camel/trunk/components/camel-rmi/src/main/java/org/apache/camel/component/rmi/RmiEndpoint.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-rmi/src/main/java/org/apache/camel/component/rmi/RmiEndpoint.java?rev=694342&r1=694341&r2=694342&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-rmi/src/main/java/org/apache/camel/component/rmi/RmiEndpoint.java (original)
+++ activemq/camel/trunk/components/camel-rmi/src/main/java/org/apache/camel/component/rmi/RmiEndpoint.java Thu Sep 11 09:35:49 2008
@@ -64,7 +64,7 @@
public Consumer<BeanExchange> createConsumer(Processor processor) throws Exception {
if (remoteInterfaces == null || remoteInterfaces.size() == 0) {
- throw new RuntimeCamelException("To create an RMI consumer, the RMI endpoint's remoteInterfaces property must be be configured.");
+ throw new RuntimeCamelException("To create a RMI consumer, the RMI endpoint's remoteInterfaces property must be be configured.");
}
return new RmiConsumer(this, processor);
}
@@ -78,6 +78,10 @@
if (path == null) {
path = uri.getSchemeSpecificPart();
}
+ // skip leading slash
+ if (path.startsWith("/")) {
+ return path.substring(1);
+ }
return path;
}
Modified: activemq/camel/trunk/components/camel-rmi/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-rmi/src/test/resources/log4j.properties?rev=694342&r1=694341&r2=694342&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-rmi/src/test/resources/log4j.properties (original)
+++ activemq/camel/trunk/components/camel-rmi/src/test/resources/log4j.properties Thu Sep 11 09:35:49 2008
@@ -18,13 +18,19 @@
#
# The logging properties used for eclipse testing, We want to see debug output on the console.
#
-log4j.rootLogger=INFO, out
+log4j.rootLogger=INFO, file
#log4j.logger.org.apache.activemq=DEBUG
-#log4j.logger.org.apache.camel=DEBUG
+log4j.logger.org.apache.camel=DEBUG
# CONSOLE appender not used by default
log4j.appender.out=org.apache.log4j.ConsoleAppender
log4j.appender.out.layout=org.apache.log4j.PatternLayout
log4j.appender.out.layout.ConversionPattern=[%30.30t] %-30.30c{1} %-5p %m%n
#log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n
+
+# File appender
+log4j.appender.file=org.apache.log4j.FileAppender
+log4j.appender.file.layout=org.apache.log4j.PatternLayout
+log4j.appender.file.layout.ConversionPattern=%d %-5p %c{1} - %m %n
+log4j.appender.file.file=target/camel-rmi-test.log