Author: rfeng
Date: Thu Oct 19 12:30:40 2006
New Revision: 465746
URL: http://svn.apache.org/viewvc?view=rev&rev=465746
Log:
Fix jaxb-impl dependency to be runtime
Fix metadata lookup for jaxb context path
Added:
incubator/tuscany/java/sca/services/databinding/databinding-jaxb/src/main/resources/META-INF/sca/databinding.jaxb.scdl
Modified:
incubator/tuscany/java/sca/services/databinding/databinding-jaxb/pom.xml
incubator/tuscany/java/sca/services/databinding/databinding-jaxb/src/main/java/org/apache/tuscany/databinding/jaxb/JAXBContextHelper.java
incubator/tuscany/java/sca/services/databinding/databinding-jaxb/src/main/resources/META-INF/sca/default.scdl
Modified:
incubator/tuscany/java/sca/services/databinding/databinding-jaxb/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/databinding/databinding-jaxb/pom.xml?view=diff&rev=465746&r1=465745&r2=465746
==============================================================================
--- incubator/tuscany/java/sca/services/databinding/databinding-jaxb/pom.xml
(original)
+++ incubator/tuscany/java/sca/services/databinding/databinding-jaxb/pom.xml
Thu Oct 19 12:30:40 2006
@@ -64,7 +64,13 @@
<version>2.0</version>
<scope>compile</scope>
</dependency>
-
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <version>2.0.3</version>
+ <scope>runtime</scope>
+ </dependency>
+
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
@@ -73,12 +79,7 @@
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
</dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- <version>2.0.3</version>
- <scope>test</scope>
- </dependency>
+
</dependencies>
<build>
Modified:
incubator/tuscany/java/sca/services/databinding/databinding-jaxb/src/main/java/org/apache/tuscany/databinding/jaxb/JAXBContextHelper.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/databinding/databinding-jaxb/src/main/java/org/apache/tuscany/databinding/jaxb/JAXBContextHelper.java?view=diff&rev=465746&r1=465745&r2=465746
==============================================================================
---
incubator/tuscany/java/sca/services/databinding/databinding-jaxb/src/main/java/org/apache/tuscany/databinding/jaxb/JAXBContextHelper.java
(original)
+++
incubator/tuscany/java/sca/services/databinding/databinding-jaxb/src/main/java/org/apache/tuscany/databinding/jaxb/JAXBContextHelper.java
Thu Oct 19 12:30:40 2006
@@ -26,6 +26,7 @@
import org.apache.tuscany.spi.databinding.TransformationContext;
import org.apache.tuscany.spi.databinding.TransformationException;
import org.apache.tuscany.spi.model.DataType;
+import org.apache.tuscany.spi.model.Operation;
public class JAXBContextHelper {
// TODO: Do we need to set them for source and target?
@@ -45,6 +46,10 @@
// FIXME: What should we do if JAXB is an intermediate node?
DataType<?> bindingContext = source ? tContext.getSourceDataType() :
tContext.getTargetDataType();
String contextPath =
(String)bindingContext.getMetadata(JAXB_CONTEXT_PATH);
+ if (contextPath == null) {
+ Operation op =
(Operation)bindingContext.getMetadata(Operation.class.getName());
+ contextPath = op != null ?
(String)op.getMetaData().get(JAXB_CONTEXT_PATH) : null;
+ }
JAXBContext context = null;
if (contextPath != null) {
context = JAXBContext.newInstance(contextPath);
Added:
incubator/tuscany/java/sca/services/databinding/databinding-jaxb/src/main/resources/META-INF/sca/databinding.jaxb.scdl
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/databinding/databinding-jaxb/src/main/resources/META-INF/sca/databinding.jaxb.scdl?view=auto&rev=465746
==============================================================================
---
incubator/tuscany/java/sca/services/databinding/databinding-jaxb/src/main/resources/META-INF/sca/databinding.jaxb.scdl
(added)
+++
incubator/tuscany/java/sca/services/databinding/databinding-jaxb/src/main/resources/META-INF/sca/databinding.jaxb.scdl
Thu Oct 19 12:30:40 2006
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * 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.
+-->
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0";
xmlns:system="http://tuscany.apache.org/xmlns/system/1.0-SNAPSHOT";
+ name="org.apache.tuscany.databinding.jaxb.include">
+
+ <dependency xmlns="http://tuscany.apache.org/xmlns/1.0-SNAPSHOT";>
+ <group>org.apache.tuscany.sca.services.databinding</group>
+ <name>databinding-jaxb</name>
+ <version>1.0-incubator-M2-SNAPSHOT</version>
+ </dependency>
+
+ <component name="databinding.jaxb">
+ <system:implementation.system
class="org.apache.tuscany.databinding.jaxb.JAXBDataBinding" />
+ </component>
+
+ <component name="transformer.XMLStreamReader2JAXB">
+ <system:implementation.system
class="org.apache.tuscany.databinding.jaxb.XMLStreamReader2JAXB" />
+ </component>
+
+ <component name="transformer.Node2JAXB">
+ <system:implementation.system
class="org.apache.tuscany.databinding.jaxb.Node2JAXB" />
+ </component>
+
+ <component name="transformer.JAXB2Node">
+ <system:implementation.system
class="org.apache.tuscany.databinding.jaxb.JAXB2Node" />
+ </component>
+
+ <component name="transformer.Reader2JAXB">
+ <system:implementation.system
class="org.apache.tuscany.databinding.jaxb.Reader2JAXB" />
+ </component>
+
+</composite>
\ No newline at end of file
Modified:
incubator/tuscany/java/sca/services/databinding/databinding-jaxb/src/main/resources/META-INF/sca/default.scdl
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/databinding/databinding-jaxb/src/main/resources/META-INF/sca/default.scdl?view=diff&rev=465746&r1=465745&r2=465746
==============================================================================
---
incubator/tuscany/java/sca/services/databinding/databinding-jaxb/src/main/resources/META-INF/sca/default.scdl
(original)
+++
incubator/tuscany/java/sca/services/databinding/databinding-jaxb/src/main/resources/META-INF/sca/default.scdl
Thu Oct 19 12:30:40 2006
@@ -18,8 +18,14 @@
* under the License.
-->
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0";
xmlns:system="http://tuscany.apache.org/xmlns/system/1.0-SNAPSHOT";
- name="org.apache.tuscany.databinding.JAXB">
+ name="org.apache.tuscany.databinding.jaxb">
+ <dependency xmlns="http://tuscany.apache.org/xmlns/1.0-SNAPSHOT";>
+ <group>org.apache.tuscany.sca.services.databinding</group>
+ <name>databinding-jaxb</name>
+ <version>1.0-incubator-M2-SNAPSHOT</version>
+ </dependency>
+
<component name="databinding.jaxb">
<system:implementation.system
class="org.apache.tuscany.databinding.jaxb.JAXBDataBinding" />
</component>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
