svn commit: r738115 - in /camel/trunk/camel-core/src: main/java/org/apache/camel/component/file/ main/java/org/apache/camel/component/file/strategy/ test/java/org/apache/camel/component/file/ test/jav
Author: davsclaus
Date: Tue Jan 27 15:53:52 2009
New Revision: 738115
URL: http://svn.apache.org/viewvc?rev=738115view=rev
Log:
Fixed failing unit tests reported by team city. Fixed checkstyle errors.
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileEndpoint.java
camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileExchange.java
camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/strategy/NewFileLockExclusiveReadLockStrategy.java
camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/strategy/NewMarkerFileExclusiveReadLockStrategy.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileNoOpLockFileTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/language/FileLanguageTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationUsingDefaultsTest.java
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileEndpoint.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileEndpoint.java?rev=738115r1=738114r2=738115view=diff
==
---
camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileEndpoint.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileEndpoint.java
Tue Jan 27 15:53:52 2009
@@ -16,14 +16,13 @@
*/
package org.apache.camel.component.file;
-import java.io.IOException;
import java.io.File;
+import java.io.IOException;
import java.lang.reflect.Method;
import java.util.Comparator;
import java.util.HashMap;
import java.util.Map;
-import org.apache.camel.CamelContext;
import org.apache.camel.Component;
import org.apache.camel.Expression;
import org.apache.camel.Message;
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileExchange.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileExchange.java?rev=738115r1=738114r2=738115view=diff
==
---
camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileExchange.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileExchange.java
Tue Jan 27 15:53:52 2009
@@ -17,7 +17,6 @@
package org.apache.camel.component.file;
import java.util.Date;
-import java.io.IOException;
import org.apache.camel.CamelContext;
import org.apache.camel.Endpoint;
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/strategy/NewFileLockExclusiveReadLockStrategy.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/strategy/NewFileLockExclusiveReadLockStrategy.java?rev=738115r1=738114r2=738115view=diff
==
---
camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/strategy/NewFileLockExclusiveReadLockStrategy.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/strategy/NewFileLockExclusiveReadLockStrategy.java
Tue Jan 27 15:53:52 2009
@@ -41,8 +41,7 @@
private static final transient Log LOG =
LogFactory.getLog(NewFileLockExclusiveReadLockStrategy.class);
private long timeout;
-public boolean acquireExclusiveReadLock(GenericFileOperationsFile
operations, GenericFileFile file, Exchange exchange)
-throws Exception {
+public boolean acquireExclusiveReadLock(GenericFileOperationsFile
operations, GenericFileFile file, Exchange exchange) throws Exception {
File target = new File(file.getAbsoluteFileName());
if (LOG.isTraceEnabled()) {
@@ -111,8 +110,7 @@
Channel channel = lock.channel();
try {
lock.release();
-}
-finally {
+} finally {
// must close channel
ObjectHelper.close(channel, while acquiring exclusive read lock
for file: + lockFileName, LOG);
}
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/strategy/NewMarkerFileExclusiveReadLockStrategy.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/strategy/NewMarkerFileExclusiveReadLockStrategy.java?rev=738115r1=738114r2=738115view=diff
==
---
camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/strategy/NewMarkerFileExclusiveReadLockStrategy.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/strategy/NewMarkerFileExclusiveReadLockStrategy.java
Tue Jan 27
svn commit: r738171 - in /camel/trunk/components/camel-quartz/src: main/java/org/apache/camel/component/quartz/ test/java/org/apache/camel/component/quartz/
Author: hadrian
Date: Tue Jan 27 17:58:08 2009
New Revision: 738171
URL: http://svn.apache.org/viewvc?rev=738171view=rev
Log:
CAMEL-1002. Patch applied with thanks.
Added:
camel/trunk/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/StatefulCamelJob.java
camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/StatefulQuartzRouteTest.java
Modified:
camel/trunk/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzComponent.java
camel/trunk/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzEndpoint.java
Modified:
camel/trunk/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzComponent.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzComponent.java?rev=738171r1=738170r2=738171view=diff
==
---
camel/trunk/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzComponent.java
(original)
+++
camel/trunk/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzComponent.java
Tue Jan 27 17:58:08 2009
@@ -46,12 +46,12 @@
public QuartzComponent() {
}
-public QuartzComponent(CamelContext context) {
+public QuartzComponent(final CamelContext context) {
super(context);
}
@Override
-protected QuartzEndpoint createEndpoint(String uri, String remaining, Map
parameters) throws Exception {
+protected QuartzEndpoint createEndpoint(final String uri, final String
remaining, final Map parameters) throws Exception {
QuartzEndpoint answer = new QuartzEndpoint(uri, this, getScheduler());
// lets split the remaining into a group/name
@@ -126,7 +126,7 @@
return factory;
}
-public void setFactory(SchedulerFactory factory) {
+public void setFactory(final SchedulerFactory factory) {
this.factory = factory;
}
@@ -137,7 +137,7 @@
return scheduler;
}
-public void setScheduler(Scheduler scheduler) {
+public void setScheduler(final Scheduler scheduler) {
this.scheduler = scheduler;
}
@@ -145,7 +145,7 @@
return triggers;
}
-public void setTriggers(Map triggers) {
+public void setTriggers(final Map triggers) {
this.triggers = triggers;
}
@@ -156,6 +156,8 @@
}
protected Scheduler createScheduler() throws SchedulerException {
-return getFactory().getScheduler();
+ Scheduler scheduler = getFactory().getScheduler();
+ scheduler.getContext().put(QuartzEndpoint.CONTEXT_KEY,
getCamelContext());
+return scheduler;
}
}
Modified:
camel/trunk/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzEndpoint.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzEndpoint.java?rev=738171r1=738170r2=738171view=diff
==
---
camel/trunk/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzEndpoint.java
(original)
+++
camel/trunk/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzEndpoint.java
Tue Jan 27 17:58:08 2009
@@ -45,25 +45,29 @@
* @version $Revision:520964 $
*/
public class QuartzEndpoint extends DefaultEndpoint {
-public static final String ENDPOINT_KEY = org.apache.camel.quartz;
private static final transient Log LOG =
LogFactory.getLog(QuartzEndpoint.class);
+
+public static final String ENDPOINT_KEY = org.apache.camel.quartz;
+public static final String CONTEXT_KEY = org.apache.camel.CamelContext;
+
private Scheduler scheduler;
private LoadBalancer loadBalancer;
private Trigger trigger;
private JobDetail jobDetail;
private boolean started;
+private boolean stateful;
-public QuartzEndpoint(String endpointUri, QuartzComponent component,
Scheduler scheduler) {
+public QuartzEndpoint(final String endpointUri, final QuartzComponent
component, final Scheduler scheduler) {
super(endpointUri, component);
this.scheduler = scheduler;
}
-public QuartzEndpoint(String endpointUri, Scheduler scheduler) {
+public QuartzEndpoint(final String endpointUri, final Scheduler scheduler)
{
super(endpointUri);
this.scheduler = scheduler;
}
-public void addTriggers(MapTrigger, JobDetail triggerMap) throws
SchedulerException {
+public void addTriggers(final MapTrigger, JobDetail triggerMap) throws
SchedulerException {
if (triggerMap != null) {
SetMap.EntryTrigger, JobDetail entries = triggerMap.entrySet();
for (Map.EntryTrigger, JobDetail entry : entries) {
@@ -77,7 +81,7 @@
}
}
-
[CONF] Apache Camel: POJO Messaging Example (page created)
Page Created : CAMEL : POJO Messaging Example POJO Messaging Example has been created by Jonathan Anstey (Jan 27, 2009). Content: POJO Messaging Example Introduction This example shows that you don't need to learn Camel's super cool DSLs if you don't want to. Camel has a set of annotations that allow you to produce, consume or route messages to endpoints. Requirements This requires Camel 2.0, the camel-jms component and Apache ActiveMQ. Of course, since we are using Maven these dependencies will be downloaded automatically. Running the example The README.txt states how to run the example from either Ant or Maven. Here's how to run it with Maven: mvn camel:run Whats happening? When you start the example up you'll see a whole bunch of logs that won't really mean anything to you The interesting stuff is happening in the background. Here's a diagram of whats going on. TODO See also Bean Integration Examples Tutorials User Guide Powered by Atlassian Confluence (Version: 2.2.9 Build:#527 Sep 07, 2006) - Bug/feature request Unsubscribe or edit your notifications preferences
svn commit: r738346 - in /camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf: CxfComponent.java CxfEndpoint.java CxfSpringEndpoint.java DefaultCxfBinding.java
Author: wtam
Date: Wed Jan 28 02:57:56 2009
New Revision: 738346
URL: http://svn.apache.org/viewvc?rev=738346view=rev
Log:
minor code cleanup to camel-cxf
Modified:
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfComponent.java
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfSpringEndpoint.java
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java
Modified:
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfComponent.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfComponent.java?rev=738346r1=738345r2=738346view=diff
==
---
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfComponent.java
(original)
+++
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfComponent.java
Wed Jan 28 02:57:56 2009
@@ -59,7 +59,7 @@
CxfEndpointBean bean =
CamelContextHelper.mandatoryLookup(getCamelContext(), beanId,
CxfEndpointBean.class);
-result = new CxfSpringEndpoint(this, beanId, bean);
+result = new CxfSpringEndpoint(this, bean);
} else {
// endpoint URI does not specify a bean
Modified:
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java?rev=738346r1=738345r2=738346view=diff
==
---
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
(original)
+++
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
Wed Jan 28 02:57:56 2009
@@ -52,6 +52,7 @@
import org.apache.cxf.headers.Header;
import org.apache.cxf.jaxws.JaxWsClientFactoryBean;
import org.apache.cxf.jaxws.JaxWsProxyFactoryBean;
+import org.apache.cxf.jaxws.JaxWsServerFactoryBean;
import org.apache.cxf.message.Message;
/**
@@ -76,8 +77,6 @@
private Bus bus;
private CxfBinding cxfBinding;
private HeaderFilterStrategy headerFilterStrategy;
-private boolean hasWSProviderAnnotation;
-private boolean hasWebServiceAnnotation;
private AtomicBoolean cxfBindingInitialized = new AtomicBoolean(false);
private AtomicBoolean getBusHasBeenCalled = new AtomicBoolean(false);
private boolean isSetDefaultBus;
@@ -111,8 +110,6 @@
* Populate server factory bean
*/
protected void setupServerFactoryBean(ServerFactoryBean sfb, Class? cls)
{
-hasWSProviderAnnotation = CxfEndpointUtils.hasAnnotation(cls,
-WebServiceProvider.class);
// address
sfb.setAddress(getEndpointUri());
@@ -136,7 +133,7 @@
}
// apply feature here
-if (!webServiceProviderAnnotated()) {
+if (!CxfEndpointUtils.hasAnnotation(cls, WebServiceProvider.class)) {
if (getDataFormat() == DataFormat.PAYLOAD) {
sfb.getFeatures().add(new PayLoadDataFormatFeature());
} else if (getDataFormat() == DataFormat.MESSAGE) {
@@ -162,8 +159,7 @@
// quick null point check for serviceClass
ObjectHelper.notNull(cls, Please provide endpoint service interface
class);
-hasWebServiceAnnotation =
CxfEndpointUtils.hasWebServiceAnnotation(cls);
-if (hasWebServiceAnnotation) {
+if (CxfEndpointUtils.hasWebServiceAnnotation(cls)) {
return new JaxWsProxyFactoryBean(new JaxWsClientFactoryBean() {
@Override
protected void createClient(Endpoint ep) {
@@ -256,21 +252,20 @@
Class? cls = ClassLoaderUtils.loadClass(getServiceClass(),
getClass());
// create server factory bean
-ServerFactoryBean answer = CxfEndpointUtils.getServerFactoryBean(cls);
+// Shouldn't use CxfEndpointUtils.getServerFactoryBean(cls) as it is
for
+// CxfSoapComponent
+ServerFactoryBean answer = null;
+if (CxfEndpointUtils.hasWebServiceAnnotation(cls)) {
+answer = new JaxWsServerFactoryBean();
+} else {
+answer = new ServerFactoryBean();
+}
// setup server factory bean
setupServerFactoryBean(answer, cls);
return answer;
}
-boolean webServiceProviderAnnotated() {
-return hasWSProviderAnnotation;
-}
-
-boolean webServiceAnnotated() {
-return hasWebServiceAnnotation;
-}
-
// Properties
//
svn commit: r738386 - in /camel/trunk: camel-core/src/main/java/org/apache/camel/component/file/ components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/
Author: davsclaus
Date: Wed Jan 28 07:30:02 2009
New Revision: 738386
URL: http://svn.apache.org/viewvc?rev=738386view=rev
Log:
CAMEL-1241: A little cleanup in the camel-ftp component.
Removed:
camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileExclusiveReadLockStrategy.java
camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileMessage.java
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileEndpoint.java
camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileExchange.java
camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileMessage.java
camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpConsumer.java
camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpRemoteFileComponent.java
camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpRemoteFileOperations.java
camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFile.java
camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileComponent.java
camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileConsumer.java
camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileEndpoint.java
camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileExchange.java
camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileOperations.java
camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileProducer.java
camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpConsumer.java
camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpRemoteFileComponent.java
camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpRemoteFileEndpoint.java
camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpRemoteFileOperations.java
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileEndpoint.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileEndpoint.java?rev=738386r1=738385r2=738386view=diff
==
---
camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileEndpoint.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileEndpoint.java
Wed Jan 28 07:30:02 2009
@@ -47,7 +47,7 @@
protected final transient Log log = LogFactory.getLog(getClass());
protected GenericFileProcessStrategy processStrategy;
-protected GenericFileOperations operations;
+protected GenericFileOperationsT operations;
protected GenericFileConfiguration configuration;
// TODO: Consider remove setNames
@@ -404,11 +404,11 @@
this.autoCreate = autoCreate;
}
-public GenericFileOperations getOperations() {
+public GenericFileOperationsT getOperations() {
return operations;
}
-public void setOperations(GenericFileOperations operations) {
+public void setOperations(GenericFileOperationsT operations) {
this.operations = operations;
}
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileExchange.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileExchange.java?rev=738386r1=738385r2=738386view=diff
==
---
camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileExchange.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileExchange.java
Wed Jan 28 07:30:02 2009
@@ -28,8 +28,6 @@
private GenericFileT genericFile;
-// TODO: Consider removing some of he constructors
-
public GenericFileExchange(CamelContext context) {
super(context);
}
@@ -92,7 +90,7 @@
}
public Exchange newInstance() {
-return new GenericFileExchange(this, genericFile);
+return new GenericFileExchangeT(this, genericFile);
}
}
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileMessage.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileMessage.java?rev=738386r1=738385r2=738386view=diff
