You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ge...@apache.org on 2008/08/29 14:28:36 UTC
svn commit: r690205 - in
/servicemix/smx3/trunk/core/servicemix-core/src/main/java/org/apache/servicemix:
components/util/ jbi/util/
Author: gertv
Date: Fri Aug 29 05:28:35 2008
New Revision: 690205
URL: http://svn.apache.org/viewvc?rev=690205&view=rev
Log:
SM-1455: Deprecating classes/interfaces that were moved to servicemix-utils
Modified:
servicemix/smx3/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/components/util/CopyTransformer.java
servicemix/smx3/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/components/util/MessageTransformer.java
servicemix/smx3/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/util/ByteArrayDataSource.java
servicemix/smx3/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/util/FileUtil.java
servicemix/smx3/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/util/MessageCopier.java
servicemix/smx3/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/util/MessageUtil.java
Modified: servicemix/smx3/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/components/util/CopyTransformer.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/components/util/CopyTransformer.java?rev=690205&r1=690204&r2=690205&view=diff
==============================================================================
--- servicemix/smx3/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/components/util/CopyTransformer.java (original)
+++ servicemix/smx3/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/components/util/CopyTransformer.java Fri Aug 29 05:28:35 2008
@@ -31,6 +31,7 @@
import org.xml.sax.SAXException;
+import org.apache.servicemix.jbi.helper.MessageUtil;
import org.apache.servicemix.jbi.jaxp.BytesSource;
import org.apache.servicemix.jbi.jaxp.ResourceSource;
import org.apache.servicemix.jbi.jaxp.SourceTransformer;
@@ -41,6 +42,7 @@
* A simple transformer which copies the properties and content from the source message to the destination message.
*
* @version $Revision$
+ * @deprecated
*/
public class CopyTransformer implements MessageTransformer {
@@ -141,6 +143,13 @@
return true;
}
+
+ public NormalizedMessage transform(MessageExchange exchange, NormalizedMessage in)
+ throws MessagingException {
+ NormalizedMessage out = new MessageUtil.NormalizedMessageImpl();
+ transform(exchange, in, out);
+ return out;
+ }
/**
* Copies all of the properties from one message to another
Modified: servicemix/smx3/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/components/util/MessageTransformer.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/components/util/MessageTransformer.java?rev=690205&r1=690204&r2=690205&view=diff
==============================================================================
--- servicemix/smx3/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/components/util/MessageTransformer.java (original)
+++ servicemix/smx3/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/components/util/MessageTransformer.java Fri Aug 29 05:28:35 2008
@@ -16,22 +16,12 @@
*/
package org.apache.servicemix.components.util;
-import javax.jbi.messaging.MessageExchange;
-import javax.jbi.messaging.MessagingException;
-import javax.jbi.messaging.NormalizedMessage;
-
/**
* Represents a transformer of an input message into an output message
*
* @version $Revision$
+ * @deprecated
*/
-public interface MessageTransformer {
+public interface MessageTransformer extends org.apache.servicemix.jbi.transformer.MessageTransformer {
- /**
- * Transfers the state in the input message into the output message
- * @param exchange the exchange on which the messages are flowing
- * @param in the input message
- * @param out an empty out message ready to contain the result of the transformation
- */
- boolean transform(MessageExchange exchange, NormalizedMessage in, NormalizedMessage out) throws MessagingException;
}
Modified: servicemix/smx3/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/util/ByteArrayDataSource.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/util/ByteArrayDataSource.java?rev=690205&r1=690204&r2=690205&view=diff
==============================================================================
--- servicemix/smx3/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/util/ByteArrayDataSource.java (original)
+++ servicemix/smx3/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/util/ByteArrayDataSource.java Fri Aug 29 05:28:35 2008
@@ -16,53 +16,16 @@
*/
package org.apache.servicemix.jbi.util;
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.Serializable;
-
-import javax.activation.DataSource;
-
/**
* Byte array DataSource for Mail and message attachments
*
* @author George Gastaldi
* @since 3.0
+ * @deprecated
*/
-public class ByteArrayDataSource implements DataSource, Serializable {
-
- private static final long serialVersionUID = 1L;
-
- private byte[] data;
- private String contentType;
- private String name = "unused";
+public class ByteArrayDataSource extends org.apache.servicemix.util.jaf.ByteArrayDataSource {
public ByteArrayDataSource(byte[] data, String contentType) {
- this.data = data;
- this.contentType = contentType;
- }
-
- public InputStream getInputStream() throws IOException {
- if (data == null) {
- throw new IOException("no data");
- }
- return new ByteArrayInputStream(data);
- }
-
- public OutputStream getOutputStream() throws IOException {
- throw new IOException("getOutputStream() not supported");
- }
-
- public String getContentType() {
- return contentType;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
+ super(data, contentType);
}
}
\ No newline at end of file
Modified: servicemix/smx3/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/util/FileUtil.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/util/FileUtil.java?rev=690205&r1=690204&r2=690205&view=diff
==============================================================================
--- servicemix/smx3/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/util/FileUtil.java (original)
+++ servicemix/smx3/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/util/FileUtil.java Fri Aug 29 05:28:35 2008
@@ -34,6 +34,7 @@
* File utilities
*
* @version $Revision$
+ * @deprecated use {@link FileUtil} instead
*/
public final class FileUtil {
Modified: servicemix/smx3/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/util/MessageCopier.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/util/MessageCopier.java?rev=690205&r1=690204&r2=690205&view=diff
==============================================================================
--- servicemix/smx3/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/util/MessageCopier.java (original)
+++ servicemix/smx3/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/util/MessageCopier.java Fri Aug 29 05:28:35 2008
@@ -31,6 +31,7 @@
* A thread-safe copier for NormalizedMessage onjects.
*
* @author Martin Krasser
+ * @deprecated use {@link org.apache.servicemix.jbi.transformer.CopyTransformer} instead
*/
public class MessageCopier {
Modified: servicemix/smx3/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/util/MessageUtil.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/util/MessageUtil.java?rev=690205&r1=690204&r2=690205&view=diff
==============================================================================
--- servicemix/smx3/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/util/MessageUtil.java (original)
+++ servicemix/smx3/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/util/MessageUtil.java Fri Aug 29 05:28:35 2008
@@ -44,6 +44,8 @@
/**
* @author gnodet
* @version $Revision: 376451 $
+ *
+ * @deprecated use {@link org.apache.servicemix.jbi.helper.MessageUtil} instead
*/
public final class MessageUtil {