Author: ningjiang
Date: Sat Aug 9 03:06:23 2008
New Revision: 684214
URL: http://svn.apache.org/viewvc?rev=684214&view=rev
Log:
Fixed the CS errors
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileEndpoint.java
activemq/camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailBinding.java
activemq/camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProcessOnlyUnseenMessagesTest.java
activemq/camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailUsingHeadersTest.java
activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaConsumerTest.java
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/handler/ModelFileGenerator.java
activemq/camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppBinding.java
activemq/camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppPrivateChatProducer.java
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileEndpoint.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileEndpoint.java?rev=684214&r1=684213&r2=684214&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileEndpoint.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileEndpoint.java
Sat Aug 9 03:06:23 2008
@@ -40,10 +40,11 @@
* @version $Revision$
*/
public class FileEndpoint extends ScheduledPollEndpoint<FileExchange> {
+ public static final transient String DEFAULT_LOCK_FILE_POSTFIX =
".camelLock";
private static final transient Log LOG =
LogFactory.getLog(FileEndpoint.class);
private static final transient String DEFAULT_STRATEGYFACTORY_CLASS =
"org.apache.camel.component.file.strategy.FileProcessStrategyFactory";
- public static final transient String DEFAULT_LOCK_FILE_POSTFIX =
".camelLock";
+
private File file;
private FileProcessStrategy fileProcessStrategy;
@@ -362,7 +363,7 @@
protected String createEndpointUri() {
return "file://" + getFile().getAbsolutePath();
}
-
+
protected String getFileFriendlyMessageId(String id) {
return UuidGenerator.generateSanitizedId(id);
}
Modified:
activemq/camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailBinding.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailBinding.java?rev=684214&r1=684213&r2=684214&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailBinding.java
(original)
+++
activemq/camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailBinding.java
Sat Aug 9 03:06:23 2008
@@ -55,9 +55,9 @@
public MailBinding() {
headerFilterStrategy = new DefaultHeaderFilterStrategy();
}
-
+
public MailBinding(HeaderFilterStrategy headerFilterStrategy) {
- this.headerFilterStrategy = headerFilterStrategy;
+ this.headerFilterStrategy = headerFilterStrategy;
}
public void populateMailMessage(MailEndpoint endpoint, MimeMessage
mimeMessage, Exchange exchange)
@@ -130,8 +130,8 @@
String headerName = entry.getKey();
Object headerValue = entry.getValue();
if (headerValue != null) {
- if (headerFilterStrategy != null &&
-
!headerFilterStrategy.applyFilterToCamelHeaders(headerName, headerValue)) {
+ if (headerFilterStrategy != null
+ &&
!headerFilterStrategy.applyFilterToCamelHeaders(headerName, headerValue)) {
// Mail messages can repeat the same header...
if (ObjectConverter.isCollection(headerValue)) {
Iterator iter = ObjectConverter.iterator(headerValue);
@@ -201,7 +201,7 @@
// Put parts in message
mimeMessage.setContent(multipart);
}
-
+
/**
* Strategy to allow filtering of attachments which are put on the Mail
message
*/
@@ -220,12 +220,12 @@
public Map<String, Object> extractHeadersFromMail(Message mailMessage)
throws MessagingException {
Map<String, Object> answer = new HashMap<String, Object>();
Enumeration names = mailMessage.getAllHeaders();
-
+
while (names.hasMoreElements()) {
Header header = (Header)names.nextElement();
String[] value = mailMessage.getHeader(header.getName());
- if (headerFilterStrategy != null &&
-
!headerFilterStrategy.applyFilterToExternalHeaders(header.getName(), value)) {
+ if (headerFilterStrategy != null
+ &&
!headerFilterStrategy.applyFilterToExternalHeaders(header.getName(), value)) {
// toLowerCase() for doing case insensitive search
if (value.length == 1) {
CollectionHelper.appendValue(answer,
header.getName().toLowerCase(), value[0]);
@@ -234,7 +234,7 @@
}
}
}
-
+
return answer;
}
Modified:
activemq/camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProcessOnlyUnseenMessagesTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProcessOnlyUnseenMessagesTest.java?rev=684214&r1=684213&r2=684214&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProcessOnlyUnseenMessagesTest.java
(original)
+++
activemq/camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProcessOnlyUnseenMessagesTest.java
Sat Aug 9 03:06:23 2008
@@ -25,8 +25,8 @@
import org.apache.camel.ContextTestSupport;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.springframework.mail.javamail.JavaMailSenderImpl;
import org.jvnet.mock_javamail.Mailbox;
+import org.springframework.mail.javamail.JavaMailSenderImpl;
/**
* Unit test for processOnlyUnseenMessages option.
Modified:
activemq/camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailUsingHeadersTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailUsingHeadersTest.java?rev=684214&r1=684213&r2=684214&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailUsingHeadersTest.java
(original)
+++
activemq/camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailUsingHeadersTest.java
Sat Aug 9 03:06:23 2008
@@ -16,8 +16,9 @@
*/
package org.apache.camel.component.mail;
-import java.util.Map;
import java.util.HashMap;
+import java.util.Map;
+
import javax.mail.Message;
import org.apache.camel.ContextTestSupport;
Modified:
activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaConsumerTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaConsumerTest.java?rev=684214&r1=684213&r2=684214&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaConsumerTest.java
(original)
+++
activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaConsumerTest.java
Sat Aug 9 03:06:23 2008
@@ -1,8 +1,25 @@
+/**
+ * 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.mina;
import org.apache.camel.ContextTestSupport;
-import org.apache.camel.Processor;
import org.apache.camel.Exchange;
+import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
Modified:
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java?rev=684214&r1=684213&r2=684214&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java
(original)
+++
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java
Sat Aug 9 03:06:23 2008
@@ -64,9 +64,10 @@
protected BeanDefinitionParser endpointParser = new
BeanDefinitionParser(EndpointFactoryBean.class);
protected BeanDefinitionParser beanPostProcessorParser = new
BeanDefinitionParser(CamelBeanPostProcessor.class);
protected Set<String> parserElementNames = new HashSet<String>();
+ protected Binder<Node> binder;
private JAXBContext jaxbContext;
private Map<String, BeanDefinitionParser> parserMap = new HashMap<String,
BeanDefinitionParser>();
- protected Binder<Node> binder;
+
public void init() {
// remoting
Modified:
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/handler/ModelFileGenerator.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/handler/ModelFileGenerator.java?rev=684214&r1=684213&r2=684214&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/handler/ModelFileGenerator.java
(original)
+++
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/handler/ModelFileGenerator.java
Sat Aug 9 03:06:23 2008
@@ -1,3 +1,19 @@
+/**
+ * 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.spring.handler;
import java.io.File;
@@ -18,45 +34,47 @@
import javax.xml.transform.TransformerFactory;
import javax.xml.transform.stream.StreamResult;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+
+
+import org.apache.camel.RuntimeCamelException;
+import org.apache.camel.RuntimeTransformException;
import org.apache.camel.builder.xml.Namespaces;
import org.apache.camel.converter.jaxp.XmlConverter;
import org.apache.camel.model.RouteType;
import org.apache.camel.model.RoutesType;
-import org.apache.camel.spring.handler.CamelNamespaceHandler;
import org.apache.camel.util.ObjectHelper;
-import org.apache.camel.RuntimeCamelException;
-import org.apache.camel.RuntimeTransformException;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
+
public class ModelFileGenerator extends CamelNamespaceHandler {
-
+
private static final String DEFAULT_ROOT_ELEMENT_NAME = "routes";
/**
* Write the specified 'routeTypes' to 'fileName' as XML using JAXB.
*/
- public void marshalRoutesUsingJaxb(String fileName, List<RouteType>
routeTypes) throws IOException {
+ public void marshalRoutesUsingJaxb(String fileName, List<RouteType>
routeTypes) throws IOException {
OutputStream outputStream = outputStream(fileName);
-
+
try {
XmlConverter converter = converter();
Document doc = converter.createDocument();
-
+
Element root = doc.createElement(rootElementName());
- root.setAttribute("xmlns", Namespaces.DEFAULT_NAMESPACE);
+ root.setAttribute("xmlns", Namespaces.DEFAULT_NAMESPACE);
doc.appendChild(root);
-
+
for (RouteType routeType : routeTypes) {
- addJaxbElementToNode(root, routeType);
- }
-
+ addJaxbElementToNode(root, routeType);
+ }
+
Result result = new StreamResult(new
OutputStreamWriter(outputStream, XmlConverter.defaultCharset));
-
+
copyToResult(converter, doc, result);
} catch (ParserConfigurationException e) {
- throw new RuntimeTransformException(e);
+ throw new RuntimeTransformException(e);
} catch (TransformerException e) {
throw new RuntimeTransformException(e);
} finally {
@@ -72,26 +90,26 @@
TransformerFactory transformerFactory =
converter.getTransformerFactory();
transformerFactory.setAttribute("indent-number", new Integer(2));
return converter;
- }
-
+ }
+
/**
* Copies the given input Document into the required result using the
provided converter.
*/
- private void copyToResult(XmlConverter converter, Document doc, Result
result) throws TransformerException {
+ private void copyToResult(XmlConverter converter, Document doc, Result
result) throws TransformerException {
Properties outputProperties = converter.defaultOutputProperties();
outputProperties.put(OutputKeys.OMIT_XML_DECLARATION, "no");
outputProperties.put(OutputKeys.INDENT, "yes");
-
- converter.toResult(converter.toSource(doc), result, outputProperties);
+
+ converter.toResult(converter.toSource(doc), result, outputProperties);
}
/**
* Convert the specified object into XML and add it as a child of 'node'
using JAXB.
*/
private void addJaxbElementToNode(Node node, Object jaxbElement) {
- try {
+ try {
binder = getJaxbContext().createBinder();
- binder.marshal(jaxbElement, node);
+ binder.marshal(jaxbElement, node);
} catch (JAXBException e) {
throw new RuntimeCamelException(e);
}
@@ -106,10 +124,10 @@
String elementName = annotation.name();
if (ObjectHelper.isNotNullAndNonEmpty(elementName)) {
return elementName;
- }
+ }
}
return DEFAULT_ROOT_ELEMENT_NAME;
- }
+ }
/**
* returns an output stream for the filename specified.
@@ -119,7 +137,7 @@
if (!file.exists()) {
File parentFile = file.getParentFile();
if (parentFile != null) {
- parentFile.mkdirs();
+ parentFile.mkdirs();
}
}
return new FileOutputStream(file);
Modified:
activemq/camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppBinding.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppBinding.java?rev=684214&r1=684213&r2=684214&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppBinding.java
(original)
+++
activemq/camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppBinding.java
Sat Aug 9 03:06:23 2008
@@ -38,7 +38,7 @@
public XmppBinding() {
this.headerFilterStrategy = new DefaultHeaderFilterStrategy();
}
-
+
public XmppBinding(HeaderFilterStrategy headerFilterStrategy) {
this.headerFilterStrategy = headerFilterStrategy;
}
@@ -54,7 +54,7 @@
String name = entry.getKey();
Object value = entry.getValue();
// BUG?
- if (headerFilterStrategy != null
+ if (headerFilterStrategy != null
&& !headerFilterStrategy.applyFilterToCamelHeaders(name,
value)) {
message.setProperty(name, value);
}
@@ -74,12 +74,12 @@
public Map<String, Object> extractHeadersFromXmpp(Message xmppMessage) {
Map<String, Object> answer = new HashMap<String, Object>();
-
+
for (String name : xmppMessage.getPropertyNames()) {
Object value = xmppMessage.getProperty(name);
-
- if (headerFilterStrategy != null &&
- !headerFilterStrategy.applyFilterToExternalHeaders(name,
value)) {
+
+ if (headerFilterStrategy != null
+ &&
!headerFilterStrategy.applyFilterToExternalHeaders(name, value)) {
answer.put(name, value);
}
}
Modified:
activemq/camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppPrivateChatProducer.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppPrivateChatProducer.java?rev=684214&r1=684213&r2=684214&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppPrivateChatProducer.java
(original)
+++
activemq/camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppPrivateChatProducer.java
Sat Aug 9 03:06:23 2008
@@ -49,20 +49,20 @@
try {
Chat chat =
endpoint.getConnection().getChatManager().getThreadChat(threadId);
- if(chat == null) {
- chat =
endpoint.getConnection().getChatManager().createChat(getParticipant(),
threadId, new MessageListener() {
- public void processMessage(Chat chat, Message message) {
- // not here to do conversation
- }
- });
+ if (chat == null) {
+ chat =
endpoint.getConnection().getChatManager().createChat(getParticipant(),
threadId, new MessageListener() {
+ public void processMessage(Chat chat, Message message) {
+ // not here to do conversation
+ }
+ });
}
// TODO it would be nice if we could reuse the message from the
exchange
Message message = new Message();
message.setTo(participant);
- //message.setFrom(endpoint.getUser());
+ message.setFrom(endpoint.getUser());
message.setThread(threadId);
- //message.setType(Message.Type.normal);
+ message.setType(Message.Type.normal);
endpoint.getBinding().populateXmppMessage(message, exchange);
if (LOG.isDebugEnabled()) {
