You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by me...@apache.org on 2007/02/06 21:55:55 UTC
svn commit: r504288 - in /incubator/tuscany/java/sca/kernel/core: ./
src/main/java/org/apache/tuscany/core/marshaller/
src/test/java/org/apache/tuscany/core/marshaller/
Author: meerajk
Date: Tue Feb 6 12:55:54 2007
New Revision: 504288
URL: http://svn.apache.org/viewvc?view=rev&rev=504288
Log:
Added commons codec for base64 encode/decode.
Modified:
incubator/tuscany/java/sca/kernel/core/pom.xml
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/JavaPhysicalComponentDefinitionMarshaller.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/marshaller/JavaPhysicalComponentDefinitionMarshallerTestCase.java
Modified: incubator/tuscany/java/sca/kernel/core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/pom.xml?view=diff&rev=504288&r1=504287&r2=504288
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/pom.xml (original)
+++ incubator/tuscany/java/sca/kernel/core/pom.xml Tue Feb 6 12:55:54 2007
@@ -64,6 +64,12 @@
</dependency>
<dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>1.3</version>
+ </dependency>
+
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/JavaPhysicalComponentDefinitionMarshaller.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/JavaPhysicalComponentDefinitionMarshaller.java?view=diff&rev=504288&r1=504287&r2=504288
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/JavaPhysicalComponentDefinitionMarshaller.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/JavaPhysicalComponentDefinitionMarshaller.java Tue Feb 6 12:55:54 2007
@@ -29,6 +29,7 @@
import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.XMLStreamWriter;
+import org.apache.commons.codec.binary.Base64;
import org.apache.tuscany.core.component.JavaPhysicalComponentDefinition;
import org.apache.tuscany.spi.marshaller.MarshalException;
import org.apache.tuscany.spi.marshaller.ModelMarshaller;
@@ -79,8 +80,7 @@
writer.writeStartElement(INSTANCE_FACTORY_BYTE_CODE.getLocalPart());
byte[] byteCode = modelObject.getInstanceFactoryByteCode();
- // TODO Change this with base64 encode
- String encodedByteCode = new String(byteCode);
+ String encodedByteCode = new String(Base64.encodeBase64(byteCode));
writer.writeCharacters(encodedByteCode);
writer.writeEndElement();
@@ -102,6 +102,7 @@
* @throws MarshalException In case of any unmarshalling error.
*/
public JavaPhysicalComponentDefinition unmarshall(XMLStreamReader reader) throws MarshalException {
+
try {
JavaPhysicalComponentDefinition definition = new JavaPhysicalComponentDefinition();
for(int i = reader.next(); i != END_DOCUMENT;i = reader.next()) {
@@ -127,6 +128,7 @@
} catch (URISyntaxException ex) {
throw new MarshalException(ex);
}
+
}
/*
@@ -134,8 +136,7 @@
*/
private void setInstanceFactoryByteCode(XMLStreamReader reader, JavaPhysicalComponentDefinition definition) throws XMLStreamException {
final String byteCode = reader.getElementText();
- // TODO change this to base 64 decode byte code
- final byte[] decodedByteCode = byteCode.getBytes();
+ final byte[] decodedByteCode = Base64.decodeBase64(byteCode.getBytes());
definition.setInstanceFactoryByteCode(decodedByteCode);
}
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/marshaller/JavaPhysicalComponentDefinitionMarshallerTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/marshaller/JavaPhysicalComponentDefinitionMarshallerTestCase.java?view=diff&rev=504288&r1=504287&r2=504288
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/marshaller/JavaPhysicalComponentDefinitionMarshallerTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/marshaller/JavaPhysicalComponentDefinitionMarshallerTestCase.java Tue Feb 6 12:55:54 2007
@@ -25,6 +25,7 @@
import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.XMLStreamWriter;
+import org.apache.commons.codec.binary.Base64;
import org.apache.tuscany.core.component.JavaPhysicalComponentDefinition;
import org.apache.tuscany.spi.marshaller.ModelMarshaller;
import org.apache.tuscany.spi.util.stax.StaxUtil;
@@ -47,9 +48,12 @@
public void testUnmarshall() throws Exception {
+ byte[] test = "TEST".getBytes();
+ String encodedBytes = new String(Base64.encodeBase64(test));
+
String xml =
"<componentJava componentId=\"uri\" xmlns=\"http://tuscany.apache.org/xmlns/1.0-SNAPSHOT\">" +
- " <instanceFactoryByteCode>Base 64 Encoded byte code</instanceFactoryByteCode>" +
+ " <instanceFactoryByteCode>" + encodedBytes + "</instanceFactoryByteCode>" +
"</componentJava>";
XMLStreamReader reader = StaxUtil.createReader(xml);
@@ -57,7 +61,7 @@
JavaPhysicalComponentDefinition definition = marshaller.unmarshall(reader);
assertEquals(new URI("uri"), definition.getComponentId());
- assertEquals("Base 64 Encoded byte code", new String(definition.getInstanceFactoryByteCode()));
+ assertEquals("TEST", new String(definition.getInstanceFactoryByteCode()));
}
@@ -67,7 +71,7 @@
JavaPhysicalComponentDefinition definition = new JavaPhysicalComponentDefinition();
definition.setComponentId(new URI("uri"));
- definition.setInstanceFactoryByteCode("Base 64 Encoded byte code".getBytes());
+ definition.setInstanceFactoryByteCode("TEST".getBytes());
XMLStreamWriter writer = XMLOutputFactory.newInstance().createXMLStreamWriter(out, "UTF-8");
@@ -80,7 +84,7 @@
definition = marshaller.unmarshall(reader);
assertEquals(new URI("uri"), definition.getComponentId());
- assertEquals("Base 64 Encoded byte code", new String(definition.getInstanceFactoryByteCode()));
+ assertEquals("TEST", new String(definition.getInstanceFactoryByteCode()));
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org