You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by js...@apache.org on 2008/06/07 09:15:40 UTC
svn commit: r664294 [8/10] - in
/incubator/tuscany/sandbox/sebastien/java/sca-test2: ./ demos/
demos/bigbank/ demos/bigbank/src/main/java/bigbank/account/feed/
demos/secure-bigbank/ demos/secure-bigbank/secure-bigbank-account/
demos/secure-bigbank/secu...
Modified: incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/XMLTypeHelper.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/XMLTypeHelper.java?rev=664294&r1=664293&r2=664294&view=diff
==============================================================================
--- incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/XMLTypeHelper.java (original)
+++ incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/XMLTypeHelper.java Sat Jun 7 00:15:29 2008
@@ -22,15 +22,18 @@
import java.util.List;
import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
+import org.apache.tuscany.sca.interfacedef.DataType;
+import org.apache.tuscany.sca.interfacedef.Interface;
import org.apache.tuscany.sca.interfacedef.util.TypeInfo;
-import org.apache.tuscany.sca.xsd.XSDefinition;
import org.apache.tuscany.sca.xsd.XSDFactory;
+import org.apache.tuscany.sca.xsd.XSDefinition;
/**
* XML and schema helper for Java types
*/
public interface XMLTypeHelper {
+ // FIXME: This method seems to require the XMLHelper instance to be stateful
/**
* Convert a Java type into XML type information
* @param javaType the physical Java class
@@ -43,6 +46,23 @@
* Get schema definitions for the Java types known to this helper
* @return A list of schema definitions
*/
- List<XSDefinition> getSchemaDefinitions(XSDFactory factory, ModelResolver resolver);
+ // List<XSDefinition> getSchemaDefinitions(XSDFactory factory, ModelResolver resolver);
+
+ /**
+ * Get a list of XML schemas for the given data types
+ * @param factory
+ * @param resolver
+ * @param dataTypes
+ * @return
+ */
+ List<XSDefinition> getSchemaDefinitions(XSDFactory factory, ModelResolver resolver, List<DataType> dataTypes);
+ /**
+ * Get a list of XML schemas for the given interface
+ * @param factory
+ * @param resolver
+ * @param intf
+ * @return
+ */
+ List<XSDefinition> getSchemaDefinitions(XSDFactory factory, ModelResolver resolver, Interface intf);
}
Modified: incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/BaseDataBinding.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/BaseDataBinding.java?rev=664294&r1=664293&r2=664294&view=diff
==============================================================================
--- incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/BaseDataBinding.java (original)
+++ incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/BaseDataBinding.java Sat Jun 7 00:15:29 2008
@@ -18,13 +18,13 @@
*/
package org.apache.tuscany.sca.databinding.impl;
-import java.lang.annotation.Annotation;
import org.apache.tuscany.sca.databinding.DataBinding;
import org.apache.tuscany.sca.databinding.SimpleTypeMapper;
import org.apache.tuscany.sca.databinding.WrapperHandler;
import org.apache.tuscany.sca.databinding.XMLTypeHelper;
import org.apache.tuscany.sca.interfacedef.DataType;
+import org.apache.tuscany.sca.interfacedef.Operation;
import org.apache.tuscany.sca.interfacedef.impl.DataTypeImpl;
import org.apache.tuscany.sca.interfacedef.util.XMLType;
@@ -77,7 +77,7 @@
}
@SuppressWarnings("unchecked")
- public boolean introspect(DataType type, Annotation[] annotations) {
+ public boolean introspect(DataType type, Operation operation) {
assert type != null;
Class cls = type.getPhysical();
if (baseType != null && baseType.isAssignableFrom(cls)) {
@@ -95,7 +95,7 @@
return null;
} else {
DataType<Class> dataType = new DataTypeImpl<Class>(value.getClass(), value.getClass());
- if (introspect(dataType, null)) {
+ if (introspect(dataType, (Operation) null)) {
return dataType;
} else {
return null;
Modified: incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/GroupDataBinding.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/GroupDataBinding.java?rev=664294&r1=664293&r2=664294&view=diff
==============================================================================
--- incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/GroupDataBinding.java (original)
+++ incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/GroupDataBinding.java Sat Jun 7 00:15:29 2008
@@ -19,11 +19,11 @@
package org.apache.tuscany.sca.databinding.impl;
-import java.lang.annotation.Annotation;
import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Type;
import org.apache.tuscany.sca.interfacedef.DataType;
+import org.apache.tuscany.sca.interfacedef.Operation;
import org.apache.tuscany.sca.interfacedef.util.XMLType;
/**
@@ -46,7 +46,7 @@
@SuppressWarnings("unchecked")
@Override
- public boolean introspect(DataType type, Annotation[] annotations) {
+ public boolean introspect(DataType type, Operation operation) {
if (markerTypes == null) {
return false;
}
@@ -61,9 +61,9 @@
for (Class<?> c : markerTypes) {
if (isTypeOf(c, cls)) {
type.setDataBinding(getDataBinding(c));
- Object logical = getLogical(cls, annotations);
+ Object logical = getLogical(cls, null);
if (logical != null) {
- type.setLogical(getLogical(cls, annotations));
+ type.setLogical(getLogical(cls, null));
} else {
type.setLogical(XMLType.UNKNOWN);
}
@@ -95,9 +95,9 @@
/**
* Get the logical type
* @param type The java type
- * @param annotations
+ * @param operation TODO
* @return
*/
- protected abstract Object getLogical(Class<?> type, Annotation[] annotations);
+ protected abstract Object getLogical(Class<?> type, Operation operation);
}
Modified: incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/MediatorImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/MediatorImpl.java?rev=664294&r1=664293&r2=664294&view=diff
==============================================================================
--- incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/MediatorImpl.java (original)
+++ incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/MediatorImpl.java Sat Jun 7 00:15:29 2008
@@ -34,6 +34,7 @@
import org.apache.tuscany.sca.databinding.Transformer;
import org.apache.tuscany.sca.databinding.TransformerExtensionPoint;
import org.apache.tuscany.sca.interfacedef.DataType;
+import org.apache.tuscany.sca.interfacedef.Operation;
import org.apache.tuscany.sca.interfacedef.impl.DataTypeImpl;
/**
@@ -55,7 +56,8 @@
public Object mediate(Object source, DataType sourceDataType, DataType targetDataType, Map<String, Object> metadata) {
if (sourceDataType == null || sourceDataType.getDataBinding() == null) {
if (source != null) {
- sourceDataType = dataBindings.introspectType(source);
+ Operation operation = (Operation) metadata.get("source.operation");
+ sourceDataType = dataBindings.introspectType(source, operation);
}
}
if (sourceDataType == null || targetDataType == null) {
@@ -126,7 +128,8 @@
return;
}
if (sourceDataType == null || sourceDataType.getDataBinding() == null) {
- sourceDataType = dataBindings.introspectType(source);
+ Operation operation = (Operation) metadata.get("source.operation");
+ sourceDataType = dataBindings.introspectType(source, operation);
}
if (sourceDataType == null) {
return;
Modified: incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/SimpleJavaDataBinding.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/SimpleJavaDataBinding.java?rev=664294&r1=664293&r2=664294&view=diff
==============================================================================
--- incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/SimpleJavaDataBinding.java (original)
+++ incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/SimpleJavaDataBinding.java Sat Jun 7 00:15:29 2008
@@ -19,7 +19,6 @@
package org.apache.tuscany.sca.databinding.javabeans;
-import java.lang.annotation.Annotation;
import javax.xml.namespace.QName;
@@ -27,6 +26,7 @@
import org.apache.tuscany.sca.databinding.impl.SimpleTypeMapperImpl;
import org.apache.tuscany.sca.databinding.xml.XMLStringDataBinding;
import org.apache.tuscany.sca.interfacedef.DataType;
+import org.apache.tuscany.sca.interfacedef.Operation;
import org.apache.tuscany.sca.interfacedef.util.TypeInfo;
import org.apache.tuscany.sca.interfacedef.util.XMLType;
@@ -48,7 +48,7 @@
}
@Override
- public boolean introspect(DataType type, Annotation[] annotations) {
+ public boolean introspect(DataType type, Operation operation) {
Class<?> cls = type.getPhysical();
if (cls == Object.class) {
return false;
Modified: incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMDataBinding.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMDataBinding.java?rev=664294&r1=664293&r2=664294&view=diff
==============================================================================
--- incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMDataBinding.java (original)
+++ incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMDataBinding.java Sat Jun 7 00:15:29 2008
@@ -18,13 +18,13 @@
*/
package org.apache.tuscany.sca.databinding.xml;
-import java.lang.annotation.Annotation;
import javax.xml.namespace.QName;
import org.apache.tuscany.sca.databinding.WrapperHandler;
import org.apache.tuscany.sca.databinding.impl.BaseDataBinding;
import org.apache.tuscany.sca.interfacedef.DataType;
+import org.apache.tuscany.sca.interfacedef.Operation;
import org.apache.tuscany.sca.interfacedef.util.XMLType;
import org.w3c.dom.Node;
@@ -59,7 +59,7 @@
}
@Override
- public boolean introspect(DataType type, Annotation[] annotations) {
+ public boolean introspect(DataType type, Operation operation) {
if (Node.class.isAssignableFrom(type.getPhysical())) {
if (type.getLogical() == null) {
type.setLogical(new XMLType(ROOT_ELEMENT, null));
Modified: incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMWrapperHandler.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMWrapperHandler.java?rev=664294&r1=664293&r2=664294&view=diff
==============================================================================
--- incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMWrapperHandler.java (original)
+++ incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMWrapperHandler.java Sat Jun 7 00:15:29 2008
@@ -32,8 +32,10 @@
import org.apache.tuscany.sca.databinding.WrapperHandler;
import org.apache.tuscany.sca.databinding.impl.DOMHelper;
import org.apache.tuscany.sca.interfacedef.DataType;
+import org.apache.tuscany.sca.interfacedef.Operation;
import org.apache.tuscany.sca.interfacedef.impl.DataTypeImpl;
import org.apache.tuscany.sca.interfacedef.util.ElementInfo;
+import org.apache.tuscany.sca.interfacedef.util.WrapperInfo;
import org.apache.tuscany.sca.interfacedef.util.XMLType;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
@@ -89,9 +91,11 @@
}
/**
- * @see org.apache.tuscany.sca.databinding.WrapperHandler#getWrapperType(org.apache.tuscany.sca.interfacedef.util.ElementInfo, Class, org.apache.tuscany.sca.databinding.TransformationContext)
+ * @see org.apache.tuscany.sca.databinding.WrapperHandler#getWrapperType(Operation, boolean)
*/
- public DataType getWrapperType(ElementInfo element, Class<? extends Node> wrapperClass, TransformationContext context) {
+ public DataType getWrapperType(Operation operation, boolean input) {
+ WrapperInfo wrapper = operation.getWrapper();
+ ElementInfo element = input? wrapper.getInputWrapperElement(): wrapper.getOutputWrapperElement();
DataType<XMLType> wrapperType =
new DataTypeImpl<XMLType>(DOMDataBinding.NAME, Node.class, new XMLType(element));
return wrapperType;
Added: incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2SourceTransformer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2SourceTransformer.java?rev=664294&view=auto
==============================================================================
--- incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2SourceTransformer.java (added)
+++ incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2SourceTransformer.java Sat Jun 7 00:15:29 2008
@@ -0,0 +1,61 @@
+/*
+ * 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.tuscany.sca.databinding.xml;
+
+import javax.xml.transform.Source;
+import javax.xml.transform.dom.DOMSource;
+
+import org.apache.tuscany.sca.databinding.PullTransformer;
+import org.apache.tuscany.sca.databinding.TransformationContext;
+import org.apache.tuscany.sca.databinding.TransformationException;
+import org.apache.tuscany.sca.databinding.impl.BaseTransformer;
+import org.w3c.dom.Node;
+
+/**
+ * Transform TrAX Node to Source
+ *
+ * @version $Rev$ $Date$
+ */
+public class Node2SourceTransformer extends BaseTransformer<Node, Source> implements
+ PullTransformer<Node, Source> {
+
+ public Source transform(Node source, TransformationContext context) {
+ try {
+ return new DOMSource(source);
+ } catch (Exception e) {
+ throw new TransformationException(e);
+ }
+ }
+
+ @Override
+ protected Class<Node> getSourceType() {
+ return Node.class;
+ }
+
+ @Override
+ protected Class<Source> getTargetType() {
+ return Source.class;
+ }
+
+ @Override
+ public int getWeight() {
+ return 40;
+ }
+
+}
Added: incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Source2NodeTransformer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Source2NodeTransformer.java?rev=664294&view=auto
==============================================================================
--- incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Source2NodeTransformer.java (added)
+++ incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Source2NodeTransformer.java Sat Jun 7 00:15:29 2008
@@ -0,0 +1,69 @@
+/*
+ * 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.tuscany.sca.databinding.xml;
+
+import javax.xml.transform.Source;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMResult;
+
+import org.apache.tuscany.sca.databinding.PullTransformer;
+import org.apache.tuscany.sca.databinding.TransformationContext;
+import org.apache.tuscany.sca.databinding.TransformationException;
+import org.apache.tuscany.sca.databinding.impl.BaseTransformer;
+import org.apache.tuscany.sca.databinding.impl.DOMHelper;
+import org.w3c.dom.Document;
+import org.w3c.dom.Node;
+
+/**
+ * Transform TrAX Source to Node
+ *
+ * @version $Rev$ $Date$
+ */
+public class Source2NodeTransformer extends BaseTransformer<Source, Node> implements
+ PullTransformer<Source, Node> {
+ private static final TransformerFactory FACTORY = TransformerFactory.newInstance();
+
+ public Node transform(Source source, TransformationContext context) {
+ try {
+ javax.xml.transform.Transformer transformer = FACTORY.newTransformer();
+ DOMResult result = new DOMResult();
+ transformer.transform(source, result);
+ Document doc = (Document) result.getNode();
+ return DOMHelper.adjustElementName(context, doc.getDocumentElement());
+ } catch (Exception e) {
+ throw new TransformationException(e);
+ }
+ }
+
+ @Override
+ protected Class<Source> getSourceType() {
+ return Source.class;
+ }
+
+ @Override
+ protected Class<Node> getTargetType() {
+ return Node.class;
+ }
+
+ @Override
+ public int getWeight() {
+ return 40;
+ }
+
+}
Added: incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Source2StringTransformer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Source2StringTransformer.java?rev=664294&view=auto
==============================================================================
--- incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Source2StringTransformer.java (added)
+++ incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Source2StringTransformer.java Sat Jun 7 00:15:29 2008
@@ -0,0 +1,68 @@
+/*
+ * 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.tuscany.sca.databinding.xml;
+
+import java.io.StringWriter;
+
+import javax.xml.transform.Source;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.stream.StreamResult;
+
+import org.apache.tuscany.sca.databinding.PullTransformer;
+import org.apache.tuscany.sca.databinding.TransformationContext;
+import org.apache.tuscany.sca.databinding.TransformationException;
+import org.apache.tuscany.sca.databinding.impl.BaseTransformer;
+
+/**
+ * Transform TrAX Source to String
+ *
+ * @version $Rev$ $Date$
+ */
+public class Source2StringTransformer extends BaseTransformer<Source, String> implements
+ PullTransformer<Source, String> {
+ private static final TransformerFactory FACTORY = TransformerFactory.newInstance();
+
+ public String transform(Source source, TransformationContext context) {
+ try {
+ javax.xml.transform.Transformer transformer = FACTORY.newTransformer();
+ StringWriter sw = new StringWriter();
+ StreamResult result = new StreamResult(sw);
+ transformer.transform(source, result);
+ return sw.toString();
+ } catch (Exception e) {
+ throw new TransformationException(e);
+ }
+ }
+
+ @Override
+ protected Class<Source> getSourceType() {
+ return Source.class;
+ }
+
+ @Override
+ protected Class<String> getTargetType() {
+ return String.class;
+ }
+
+ @Override
+ public int getWeight() {
+ return 40;
+ }
+
+}
Modified: incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAXDataBinding.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAXDataBinding.java?rev=664294&r1=664293&r2=664294&view=diff
==============================================================================
--- incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAXDataBinding.java (original)
+++ incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAXDataBinding.java Sat Jun 7 00:15:29 2008
@@ -19,12 +19,12 @@
package org.apache.tuscany.sca.databinding.xml;
-import java.lang.annotation.Annotation;
import javax.xml.stream.XMLStreamReader;
import org.apache.tuscany.sca.databinding.impl.BaseDataBinding;
import org.apache.tuscany.sca.interfacedef.DataType;
+import org.apache.tuscany.sca.interfacedef.Operation;
import org.apache.tuscany.sca.interfacedef.util.XMLType;
/**
@@ -41,8 +41,8 @@
}
@Override
- public boolean introspect(DataType type, Annotation[] annotations) {
- if (super.introspect(type, annotations)) {
+ public boolean introspect(DataType type, Operation operation) {
+ if (super.introspect(type, operation)) {
type.setLogical(XMLType.UNKNOWN);
type.setDataBinding(NAME);
return true;
Added: incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2SourceTransformer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2SourceTransformer.java?rev=664294&view=auto
==============================================================================
--- incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2SourceTransformer.java (added)
+++ incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2SourceTransformer.java Sat Jun 7 00:15:29 2008
@@ -0,0 +1,62 @@
+/*
+ * 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.tuscany.sca.databinding.xml;
+
+import java.io.StringReader;
+
+import javax.xml.transform.Source;
+import javax.xml.transform.stream.StreamSource;
+
+import org.apache.tuscany.sca.databinding.PullTransformer;
+import org.apache.tuscany.sca.databinding.TransformationContext;
+import org.apache.tuscany.sca.databinding.TransformationException;
+import org.apache.tuscany.sca.databinding.impl.BaseTransformer;
+
+/**
+ * Transform XML String to Source
+ *
+ * @version $Rev$ $Date$
+ */
+public class String2SourceTransformer extends BaseTransformer<String, Source> implements
+ PullTransformer<String, Source> {
+
+ public Source transform(String source, TransformationContext context) {
+ try {
+ return new StreamSource(new StringReader(source));
+ } catch (Exception e) {
+ throw new TransformationException(e);
+ }
+ }
+
+ @Override
+ protected Class<String> getSourceType() {
+ return String.class;
+ }
+
+ @Override
+ protected Class<Source> getTargetType() {
+ return Source.class;
+ }
+
+ @Override
+ public int getWeight() {
+ return 40;
+ }
+
+}
Modified: incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLGroupDataBinding.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLGroupDataBinding.java?rev=664294&r1=664293&r2=664294&view=diff
==============================================================================
--- incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLGroupDataBinding.java (original)
+++ incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLGroupDataBinding.java Sat Jun 7 00:15:29 2008
@@ -23,7 +23,6 @@
import java.io.OutputStream;
import java.io.Reader;
import java.io.Writer;
-import java.lang.annotation.Annotation;
import javax.xml.stream.XMLEventReader;
import javax.xml.stream.XMLEventWriter;
@@ -33,6 +32,7 @@
import javax.xml.transform.Source;
import org.apache.tuscany.sca.databinding.impl.GroupDataBinding;
+import org.apache.tuscany.sca.interfacedef.Operation;
import org.xml.sax.ContentHandler;
import org.xml.sax.InputSource;
@@ -50,7 +50,7 @@
}
@Override
- protected Object getLogical(Class<?> markerType, Annotation[] annotations) {
+ protected Object getLogical(Class<?> markerType, Operation operation) {
return null;
}
Modified: incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStringDataBinding.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStringDataBinding.java?rev=664294&r1=664293&r2=664294&view=diff
==============================================================================
--- incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStringDataBinding.java (original)
+++ incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStringDataBinding.java Sat Jun 7 00:15:29 2008
@@ -19,10 +19,10 @@
package org.apache.tuscany.sca.databinding.xml;
-import java.lang.annotation.Annotation;
import org.apache.tuscany.sca.databinding.impl.BaseDataBinding;
import org.apache.tuscany.sca.interfacedef.DataType;
+import org.apache.tuscany.sca.interfacedef.Operation;
import org.apache.tuscany.sca.interfacedef.util.XMLType;
/**
@@ -39,7 +39,7 @@
}
@Override
- public boolean introspect(DataType type, Annotation[] annotations) {
+ public boolean introspect(DataType type, Operation operation) {
if (type.getPhysical() == String.class && NAME.equals(type.getDataBinding()) || ALIASES[0].equals(type.getDataBinding())) {
type.setDataBinding(NAME);
type.setLogical(XMLType.UNKNOWN);
Modified: incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer?rev=664294&r1=664293&r2=664294&view=diff
==============================================================================
--- incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer (original)
+++ incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer Sat Jun 7 00:15:29 2008
@@ -33,4 +33,8 @@
org.apache.tuscany.sca.databinding.xml.XMLStreamReader2String;source=javax.xml.stream.XMLStreamReader,target=java.lang.String,weight=80
# org.apache.tuscany.sca.databinding.xml.Node2SimpleJavaType;source=org.w3c.dom.Node,target=java:simpleType,weight=80000
# org.apache.tuscany.sca.databinding.xml.SimpleJavaType2Node;source=java:simpleType,target=org.w3c.dom.Node,weight=80000
+org.apache.tuscany.sca.databinding.xml.Source2NodeTransformer;source=javax.xml.transform.Source,target=org.w3c.dom.Node,weight=80
+org.apache.tuscany.sca.databinding.xml.Source2StringTransformer;source=javax.xml.transform.Source,target=java.lang.String,weight=80
+org.apache.tuscany.sca.databinding.xml.Node2SourceTransformer;source=org.w3c.dom.Node,target=javax.xml.transform.Source,weight=80
+org.apache.tuscany.sca.databinding.xml.String2SourceTransformer;source=java.lang.String,target=javax.xml.transform.Source,weight=80
Modified: incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DataBindingRegistryImplTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DataBindingRegistryImplTestCase.java?rev=664294&r1=664293&r2=664294&view=diff
==============================================================================
--- incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DataBindingRegistryImplTestCase.java (original)
+++ incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DataBindingRegistryImplTestCase.java Sat Jun 7 00:15:29 2008
@@ -22,8 +22,6 @@
import static org.easymock.EasyMock.expect;
import static org.easymock.EasyMock.replay;
-import java.lang.annotation.Annotation;
-
import javax.xml.stream.XMLStreamReader;
import junit.framework.TestCase;
@@ -32,6 +30,7 @@
import org.apache.tuscany.sca.databinding.DataBindingExtensionPoint;
import org.apache.tuscany.sca.databinding.DefaultDataBindingExtensionPoint;
import org.apache.tuscany.sca.interfacedef.DataType;
+import org.apache.tuscany.sca.interfacedef.Operation;
import org.apache.tuscany.sca.interfacedef.impl.DataTypeImpl;
import org.easymock.EasyMock;
import org.xml.sax.ContentHandler;
@@ -59,7 +58,7 @@
expect(db1.getName()).andReturn(ContentHandler.class.getName()).anyTimes();
DataType<Class> dataType1 = new DataTypeImpl<Class>(ContentHandler.class, ContentHandler.class);
expect(db1.introspect(dataType1, null)).andReturn(true);
- expect(db1.introspect(EasyMock.not(EasyMock.same(dataType1)), (Annotation[])EasyMock.isNull()))
+ expect(db1.introspect(EasyMock.not(EasyMock.same(dataType1)), (Operation) EasyMock.isNull()))
.andReturn(false).anyTimes();
replay(db1);
@@ -70,7 +69,7 @@
expect(db2.getName()).andReturn(XMLStreamReader.class.getName()).anyTimes();
DataType<Class> dataType2 = new DataTypeImpl<Class>(XMLStreamReader.class, XMLStreamReader.class);
expect(db2.introspect(dataType2, null)).andReturn(true);
- expect(db2.introspect(EasyMock.not(EasyMock.same(dataType2)), (Annotation[])EasyMock.isNull()))
+ expect(db2.introspect(EasyMock.not(EasyMock.same(dataType2)), (Operation) EasyMock.isNull()))
.andReturn(false).anyTimes();
replay(db2);
Modified: incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/domain-manager/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/domain-manager/pom.xml?rev=664294&r1=664293&r2=664294&view=diff
==============================================================================
--- incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/domain-manager/pom.xml (original)
+++ incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/domain-manager/pom.xml Sat Jun 7 00:15:29 2008
@@ -79,7 +79,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-data-api</artifactId>
+ <artifactId>tuscany-data-api</artifactId>
<version>2.0-incubating-SNAPSHOT</version>
</dependency>
Modified: incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeConfigurationCollectionImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeConfigurationCollectionImpl.java?rev=664294&r1=664293&r2=664294&view=diff
==============================================================================
--- incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeConfigurationCollectionImpl.java (original)
+++ incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeConfigurationCollectionImpl.java Sat Jun 7 00:15:29 2008
@@ -29,11 +29,11 @@
import javax.xml.namespace.QName;
-import org.apache.tuscany.sca.implementation.data.collection.Entry;
-import org.apache.tuscany.sca.implementation.data.collection.Item;
-import org.apache.tuscany.sca.implementation.data.collection.ItemCollection;
-import org.apache.tuscany.sca.implementation.data.collection.LocalItemCollection;
-import org.apache.tuscany.sca.implementation.data.collection.NotFoundException;
+import org.apache.tuscany.sca.data.collection.Entry;
+import org.apache.tuscany.sca.data.collection.Item;
+import org.apache.tuscany.sca.data.collection.ItemCollection;
+import org.apache.tuscany.sca.data.collection.LocalItemCollection;
+import org.apache.tuscany.sca.data.collection.NotFoundException;
import org.osoa.sca.annotations.Init;
import org.osoa.sca.annotations.Reference;
import org.osoa.sca.annotations.Scope;
Modified: incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeConfigurationServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeConfigurationServiceImpl.java?rev=664294&r1=664293&r2=664294&view=diff
==============================================================================
--- incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeConfigurationServiceImpl.java (original)
+++ incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeConfigurationServiceImpl.java Sat Jun 7 00:15:29 2008
@@ -69,10 +69,10 @@
import org.apache.tuscany.sca.contribution.service.ContributionResolveException;
import org.apache.tuscany.sca.core.ExtensionPointRegistry;
import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.implementation.data.collection.Entry;
-import org.apache.tuscany.sca.implementation.data.collection.Item;
-import org.apache.tuscany.sca.implementation.data.collection.LocalItemCollection;
-import org.apache.tuscany.sca.implementation.data.collection.NotFoundException;
+import org.apache.tuscany.sca.data.collection.Entry;
+import org.apache.tuscany.sca.data.collection.Item;
+import org.apache.tuscany.sca.data.collection.LocalItemCollection;
+import org.apache.tuscany.sca.data.collection.NotFoundException;
import org.apache.tuscany.sca.implementation.node.NodeImplementation;
import org.apache.tuscany.sca.implementation.node.builder.impl.NodeCompositeBuilderImpl;
import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper;
Modified: incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeGeneratorServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeGeneratorServiceImpl.java?rev=664294&r1=664293&r2=664294&view=diff
==============================================================================
--- incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeGeneratorServiceImpl.java (original)
+++ incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeGeneratorServiceImpl.java Sat Jun 7 00:15:29 2008
@@ -61,10 +61,10 @@
import org.apache.tuscany.sca.contribution.service.ContributionWriteException;
import org.apache.tuscany.sca.core.ExtensionPointRegistry;
import org.apache.tuscany.sca.core.UtilityExtensionPoint;
+import org.apache.tuscany.sca.data.collection.Item;
+import org.apache.tuscany.sca.data.collection.LocalItemCollection;
+import org.apache.tuscany.sca.data.collection.NotFoundException;
import org.apache.tuscany.sca.domain.manager.impl.CompositeGeneratorServiceImpl.Cache.ContributionCache;
-import org.apache.tuscany.sca.implementation.data.collection.Item;
-import org.apache.tuscany.sca.implementation.data.collection.LocalItemCollection;
-import org.apache.tuscany.sca.implementation.data.collection.NotFoundException;
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.MonitorFactory;
import org.apache.tuscany.sca.workspace.processor.impl.ContributionContentProcessor;
Modified: incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/ContributionCollectionImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/ContributionCollectionImpl.java?rev=664294&r1=664293&r2=664294&view=diff
==============================================================================
--- incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/ContributionCollectionImpl.java (original)
+++ incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/ContributionCollectionImpl.java Sat Jun 7 00:15:29 2008
@@ -68,12 +68,12 @@
import org.apache.tuscany.sca.contribution.service.ContributionReadException;
import org.apache.tuscany.sca.core.ExtensionPointRegistry;
import org.apache.tuscany.sca.core.UtilityExtensionPoint;
+import org.apache.tuscany.sca.data.collection.Entry;
+import org.apache.tuscany.sca.data.collection.Item;
+import org.apache.tuscany.sca.data.collection.ItemCollection;
+import org.apache.tuscany.sca.data.collection.LocalItemCollection;
+import org.apache.tuscany.sca.data.collection.NotFoundException;
import org.apache.tuscany.sca.domain.manager.impl.ContributionCollectionImpl.Cache.ContributionCache;
-import org.apache.tuscany.sca.implementation.data.collection.Entry;
-import org.apache.tuscany.sca.implementation.data.collection.Item;
-import org.apache.tuscany.sca.implementation.data.collection.ItemCollection;
-import org.apache.tuscany.sca.implementation.data.collection.LocalItemCollection;
-import org.apache.tuscany.sca.implementation.data.collection.NotFoundException;
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.MonitorFactory;
import org.apache.tuscany.sca.monitor.Problem;
Modified: incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/ContributionServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/ContributionServiceImpl.java?rev=664294&r1=664293&r2=664294&view=diff
==============================================================================
--- incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/ContributionServiceImpl.java (original)
+++ incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/ContributionServiceImpl.java Sat Jun 7 00:15:29 2008
@@ -29,9 +29,9 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.tuscany.sca.implementation.data.collection.Item;
-import org.apache.tuscany.sca.implementation.data.collection.LocalItemCollection;
-import org.apache.tuscany.sca.implementation.data.collection.NotFoundException;
+import org.apache.tuscany.sca.data.collection.Item;
+import org.apache.tuscany.sca.data.collection.LocalItemCollection;
+import org.apache.tuscany.sca.data.collection.NotFoundException;
import org.osoa.sca.annotations.Reference;
import org.osoa.sca.annotations.Scope;
import org.osoa.sca.annotations.Service;
Modified: incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployableCompositeCollectionImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployableCompositeCollectionImpl.java?rev=664294&r1=664293&r2=664294&view=diff
==============================================================================
--- incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployableCompositeCollectionImpl.java (original)
+++ incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployableCompositeCollectionImpl.java Sat Jun 7 00:15:29 2008
@@ -60,12 +60,12 @@
import org.apache.tuscany.sca.contribution.service.ContributionResolveException;
import org.apache.tuscany.sca.core.ExtensionPointRegistry;
import org.apache.tuscany.sca.core.UtilityExtensionPoint;
+import org.apache.tuscany.sca.data.collection.Entry;
+import org.apache.tuscany.sca.data.collection.Item;
+import org.apache.tuscany.sca.data.collection.ItemCollection;
+import org.apache.tuscany.sca.data.collection.LocalItemCollection;
+import org.apache.tuscany.sca.data.collection.NotFoundException;
import org.apache.tuscany.sca.domain.manager.impl.DeployableCompositeCollectionImpl.Cache.ContributionCache;
-import org.apache.tuscany.sca.implementation.data.collection.Entry;
-import org.apache.tuscany.sca.implementation.data.collection.Item;
-import org.apache.tuscany.sca.implementation.data.collection.ItemCollection;
-import org.apache.tuscany.sca.implementation.data.collection.LocalItemCollection;
-import org.apache.tuscany.sca.implementation.data.collection.NotFoundException;
import org.apache.tuscany.sca.implementation.node.NodeImplementation;
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.MonitorFactory;
Modified: incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployableCompositeServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployableCompositeServiceImpl.java?rev=664294&r1=664293&r2=664294&view=diff
==============================================================================
--- incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployableCompositeServiceImpl.java (original)
+++ incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployableCompositeServiceImpl.java Sat Jun 7 00:15:29 2008
@@ -36,9 +36,9 @@
import javax.xml.parsers.ParserConfigurationException;
import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.implementation.data.collection.Item;
-import org.apache.tuscany.sca.implementation.data.collection.LocalItemCollection;
-import org.apache.tuscany.sca.implementation.data.collection.NotFoundException;
+import org.apache.tuscany.sca.data.collection.Item;
+import org.apache.tuscany.sca.data.collection.LocalItemCollection;
+import org.apache.tuscany.sca.data.collection.NotFoundException;
import org.osoa.sca.annotations.Init;
import org.osoa.sca.annotations.Reference;
import org.osoa.sca.annotations.Scope;
Modified: incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployedCompositeCollectionImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployedCompositeCollectionImpl.java?rev=664294&r1=664293&r2=664294&view=diff
==============================================================================
--- incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployedCompositeCollectionImpl.java (original)
+++ incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployedCompositeCollectionImpl.java Sat Jun 7 00:15:29 2008
@@ -65,11 +65,11 @@
import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint;
import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.implementation.data.collection.Entry;
-import org.apache.tuscany.sca.implementation.data.collection.Item;
-import org.apache.tuscany.sca.implementation.data.collection.ItemCollection;
-import org.apache.tuscany.sca.implementation.data.collection.LocalItemCollection;
-import org.apache.tuscany.sca.implementation.data.collection.NotFoundException;
+import org.apache.tuscany.sca.data.collection.Entry;
+import org.apache.tuscany.sca.data.collection.Item;
+import org.apache.tuscany.sca.data.collection.ItemCollection;
+import org.apache.tuscany.sca.data.collection.LocalItemCollection;
+import org.apache.tuscany.sca.data.collection.NotFoundException;
import org.apache.xml.serialize.OutputFormat;
import org.apache.xml.serialize.XMLSerializer;
import org.osoa.sca.ServiceRuntimeException;
Modified: incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/FileCollectionImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/FileCollectionImpl.java?rev=664294&r1=664293&r2=664294&view=diff
==============================================================================
--- incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/FileCollectionImpl.java (original)
+++ incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/FileCollectionImpl.java Sat Jun 7 00:15:29 2008
@@ -25,10 +25,10 @@
import java.util.List;
import java.util.logging.Logger;
-import org.apache.tuscany.sca.implementation.data.collection.Entry;
-import org.apache.tuscany.sca.implementation.data.collection.Item;
-import org.apache.tuscany.sca.implementation.data.collection.ItemCollection;
-import org.apache.tuscany.sca.implementation.data.collection.NotFoundException;
+import org.apache.tuscany.sca.data.collection.Entry;
+import org.apache.tuscany.sca.data.collection.Item;
+import org.apache.tuscany.sca.data.collection.ItemCollection;
+import org.apache.tuscany.sca.data.collection.NotFoundException;
import org.osoa.sca.annotations.Init;
import org.osoa.sca.annotations.Property;
import org.osoa.sca.annotations.Reference;
Modified: incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/NodeConfigurationServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/NodeConfigurationServiceImpl.java?rev=664294&r1=664293&r2=664294&view=diff
==============================================================================
--- incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/NodeConfigurationServiceImpl.java (original)
+++ incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/NodeConfigurationServiceImpl.java Sat Jun 7 00:15:29 2008
@@ -32,9 +32,9 @@
import javax.servlet.http.HttpServletResponse;
import javax.xml.namespace.QName;
-import org.apache.tuscany.sca.implementation.data.collection.Entry;
-import org.apache.tuscany.sca.implementation.data.collection.Item;
-import org.apache.tuscany.sca.implementation.data.collection.LocalItemCollection;
+import org.apache.tuscany.sca.data.collection.Entry;
+import org.apache.tuscany.sca.data.collection.Item;
+import org.apache.tuscany.sca.data.collection.LocalItemCollection;
import org.osoa.sca.annotations.Reference;
import org.osoa.sca.annotations.Scope;
import org.osoa.sca.annotations.Service;
Modified: incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/NodeProcessCollectionFacadeImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/NodeProcessCollectionFacadeImpl.java?rev=664294&r1=664293&r2=664294&view=diff
==============================================================================
--- incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/NodeProcessCollectionFacadeImpl.java (original)
+++ incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/NodeProcessCollectionFacadeImpl.java Sat Jun 7 00:15:29 2008
@@ -34,11 +34,11 @@
import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
import org.apache.tuscany.sca.core.ExtensionPointRegistry;
import org.apache.tuscany.sca.core.assembly.CompositeActivator;
-import org.apache.tuscany.sca.implementation.data.collection.Entry;
-import org.apache.tuscany.sca.implementation.data.collection.Item;
-import org.apache.tuscany.sca.implementation.data.collection.ItemCollection;
-import org.apache.tuscany.sca.implementation.data.collection.LocalItemCollection;
-import org.apache.tuscany.sca.implementation.data.collection.NotFoundException;
+import org.apache.tuscany.sca.data.collection.Entry;
+import org.apache.tuscany.sca.data.collection.Item;
+import org.apache.tuscany.sca.data.collection.ItemCollection;
+import org.apache.tuscany.sca.data.collection.LocalItemCollection;
+import org.apache.tuscany.sca.data.collection.NotFoundException;
import org.osoa.sca.ServiceRuntimeException;
import org.osoa.sca.annotations.Init;
import org.osoa.sca.annotations.Reference;
Modified: incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/QuickStartServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/QuickStartServiceImpl.java?rev=664294&r1=664293&r2=664294&view=diff
==============================================================================
--- incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/QuickStartServiceImpl.java (original)
+++ incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/QuickStartServiceImpl.java Sat Jun 7 00:15:29 2008
@@ -40,10 +40,10 @@
import javax.xml.namespace.QName;
import javax.xml.parsers.ParserConfigurationException;
-import org.apache.tuscany.sca.implementation.data.collection.Entry;
-import org.apache.tuscany.sca.implementation.data.collection.Item;
-import org.apache.tuscany.sca.implementation.data.collection.LocalItemCollection;
-import org.apache.tuscany.sca.implementation.data.collection.NotFoundException;
+import org.apache.tuscany.sca.data.collection.Entry;
+import org.apache.tuscany.sca.data.collection.Item;
+import org.apache.tuscany.sca.data.collection.LocalItemCollection;
+import org.apache.tuscany.sca.data.collection.NotFoundException;
import org.osoa.sca.annotations.Init;
import org.osoa.sca.annotations.Reference;
import org.osoa.sca.annotations.Scope;
Modified: incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/domain-manager/src/test/java/org/apache/tuscany/sca/domain/manager/impl/DomainManagerTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/domain-manager/src/test/java/org/apache/tuscany/sca/domain/manager/impl/DomainManagerTestCase.java?rev=664294&r1=664293&r2=664294&view=diff
==============================================================================
--- incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/domain-manager/src/test/java/org/apache/tuscany/sca/domain/manager/impl/DomainManagerTestCase.java (original)
+++ incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/domain-manager/src/test/java/org/apache/tuscany/sca/domain/manager/impl/DomainManagerTestCase.java Sat Jun 7 00:15:29 2008
@@ -27,9 +27,9 @@
import junit.framework.TestCase;
-import org.apache.tuscany.sca.implementation.data.collection.Entry;
-import org.apache.tuscany.sca.implementation.data.collection.Item;
-import org.apache.tuscany.sca.implementation.data.collection.NotFoundException;
+import org.apache.tuscany.sca.data.collection.Entry;
+import org.apache.tuscany.sca.data.collection.Item;
+import org.apache.tuscany.sca.data.collection.NotFoundException;
/**
* Test case for the workspace admin services.
Modified: incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/domain-manager/src/test/resources/contributions/assets/META-INF/sca-contribution.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/domain-manager/src/test/resources/contributions/assets/META-INF/sca-contribution.xml?rev=664294&r1=664293&r2=664294&view=diff
==============================================================================
--- incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/domain-manager/src/test/resources/contributions/assets/META-INF/sca-contribution.xml (original)
+++ incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/domain-manager/src/test/resources/contributions/assets/META-INF/sca-contribution.xml Sat Jun 7 00:15:29 2008
@@ -22,6 +22,6 @@
<export.java package="services"/>
<export.java package="services.merger"/>
<export.java package="services.db"/>
- <import.java package="org.apache.tuscany.sca.implementation.data.collection"/>
+ <import.java package="org.apache.tuscany.sca.data.collection"/>
<import.java package="org.apache.derby.*"/>
</contribution>
\ No newline at end of file
Modified: incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomain.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomain.java?rev=664294&r1=664293&r2=664294&view=diff
==============================================================================
--- incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomain.java (original)
+++ incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomain.java Sat Jun 7 00:15:29 2008
@@ -298,7 +298,7 @@
}
});
} catch (PrivilegedActionException e) {
- throw (ServiceRuntimeException)e.getException();
+ throw new ServiceRuntimeException(e.getException());
}
}
Modified: incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServer.java?rev=664294&r1=664293&r2=664294&view=diff
==============================================================================
--- incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServer.java (original)
+++ incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServer.java Sat Jun 7 00:15:29 2008
@@ -76,8 +76,6 @@
private BpelServerImpl _bpelServer;
- protected ProcessStore store;
-
private Scheduler _scheduler;
protected ExecutorService _executorService;
@@ -91,8 +89,10 @@
public void init() throws ODEInitializationException {
Properties p = System.getProperties();
p.put("derby.system.home", "target");
-
- _config = new OdeConfigProperties(new Properties(), "ode-sca");
+
+ Properties confProps = new Properties();
+ confProps.put("openjpa.jdbc.SynchronizeMappings", "buildSchema(ForeignKeys=false)");
+ _config = new OdeConfigProperties(confProps, "ode-sca");
// Setting work root as the directory containing our database (wherever in the classpath)
URL dbLocation = getClass().getClassLoader().getResource("jpadb");
@@ -166,21 +166,6 @@
_bpelServer.setDehydrationPolicy(dehy);
}
- store = new ProcessStoreImpl(_db.getDataSource(), "jpa", true);
- store.registerListener(new ProcessStoreListener() {
- public void onProcessStoreEvent(ProcessStoreEvent event) {
- // bounce the process
- _bpelServer.unregister(event.pid);
- if (event.type != ProcessStoreEvent.Type.UNDEPLOYED) {
- ProcessConf conf = (ProcessConf) store.getProcessConfiguration(event.pid);
- // Test processes always run with in-mem DAOs
- // conf.setTransient(true); //FIXME: what should we use for ProcessConfImpl
- _bpelServer.register(conf);
-
- } // end if
- } // end onProcessStoreEvent
- });
-
_bpelServer.init();
} // end InitBpelServer
@@ -205,16 +190,6 @@
}
}
- if(store != null) {
- try {
- __log.debug("Stopping store");
- ((ProcessStoreImpl)store).shutdown();
- store = null;
- } catch (Exception ex) {
- __log.debug("Error stopping store");
- }
- }
-
if(_daoCF != null) {
try {
__log.debug("Stopping DAO");
@@ -270,28 +245,16 @@
// Updated by Mike Edwards, 23/05/2008
public void deploy(ODEDeployment d, BPELImplementation implementation) {
-
try {
- // old code - using the ODE store
- // Generate the required ODE deploy.xml file "on the fly" - it is required by the ODE
- // store - this code avoids the need for the programmer to create this file manually.
- BPELODEDeployFile deployFile = new BPELODEDeployFile( implementation );
- deployFile.writeDeployfile();
- store.deploy(d.deployDir);
- //System.out.println("Completed calling old Process deployment code...");
-
- // Code for doing deployment directly from Tuscany without using the ODE store
- // - disabled for the present due to issues with the ODE engine when used in this
- // mode - Mike Edwards 29/05/2008
- //TuscanyProcessConfImpl processConf = new TuscanyProcessConfImpl( implementation );
- //_bpelServer.register(processConf);
- //System.out.println("Completed calling new Process deployment code...");
+ TuscanyProcessConfImpl processConf = new TuscanyProcessConfImpl( implementation );
+ _bpelServer.register(processConf);
+ System.out.println("Completed calling new Process deployment code...");
} catch (Exception ex) {
String errMsg = ">>> DEPLOY: Unexpected exception: " + ex.getMessage();
__log.debug(errMsg, ex);
throw new ODEDeploymentException(errMsg,ex);
- } // end try
- } // end deploy
+ }
+ }
public void undeploy(ODEDeployment d) {
//TODO
Modified: incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/TuscanyProcessConfImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/TuscanyProcessConfImpl.java?rev=664294&r1=664293&r2=664294&view=diff
==============================================================================
--- incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/TuscanyProcessConfImpl.java (original)
+++ incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/TuscanyProcessConfImpl.java Sat Jun 7 00:15:29 2008
@@ -338,7 +338,7 @@
*/
public boolean isTransient() {
//System.out.println("isTransient called");
- return true;
+ return false;
} // end isTransient
/**
Modified: incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/provider/BPELInvoker.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/provider/BPELInvoker.java?rev=664294&r1=664293&r2=664294&view=diff
==============================================================================
--- incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/provider/BPELInvoker.java (original)
+++ incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/provider/BPELInvoker.java Sat Jun 7 00:15:29 2008
@@ -82,7 +82,7 @@
private void initializeInvocation() {
- if(__log.isDebugEnabled()){
+ if(true){
__log.debug("Initializing BPELInvoker");
}
Interface interfaze = operation.getInterface();
@@ -121,8 +121,8 @@
throw new InvocationTargetException(null,"Unsupported service contract");
}
- if(__log.isDebugEnabled()) {
- __log.debug("Invoking bpel component : " + bpelServiceName + "#" + bpelOperationName);
+ if(true) {
+ System.out.println("Invoking bpel component : " + bpelServiceName + "#" + bpelOperationName);
}
org.apache.ode.bpel.iapi.MyRoleMessageExchange mex = null;
@@ -134,12 +134,6 @@
mex = odeServer.getBpelServer().getEngine().createMessageExchange(new GUID().toString(),
bpelServiceName,
bpelOperationName);
- /*
- if(__log.isDebugEnabled()) {
- Element invocationRequest = mex.getRequest().getMessage();
- __log.debug(">>>Request:\n" + DOMUtils.domToString(invocationRequest));
-
- }*/
onhold = mex.invoke(createInvocationMessage(mex, args));
@@ -170,12 +164,13 @@
// be sure we have the "freshest" one.
mex = (MyRoleMessageExchange)odeServer.getBpelServer().getEngine().getMessageExchange(mex.getMessageExchangeId());
- if(__log.isDebugEnabled()) {
+ if(true) {
Status status = mex.getStatus();
Element invocationResponse = mex.getResponse().getMessage();
- __log.debug(">>>Invocation status:" + status.name());
- __log.debug(">>>Response:\n" + DOMUtils.domToString(invocationResponse));
+ System.out.println(">>>Invocation status:" + status.name());
+ System.out.println(">>>Response:\n" + DOMUtils.domToString(invocationResponse));
+ System.out.println(">>>Response:\n" + DOMUtils.domToString(invocationResponse));
}
//process the method invocation result
response = processResponse(mex.getResponse().getMessage());
@@ -225,10 +220,10 @@
contentMessage.appendChild(contentPart);
dom.appendChild(contentMessage);
- if(__log.isDebugEnabled()) {
- __log.debug("Creating invocation message:");
- __log.debug(">> args.....: " + DOMUtils.domToString(payload));
- __log.debug(">> message..:" + DOMUtils.domToString(dom.getDocumentElement()));
+ if(true) {
+ System.out.println("Creating invocation message:");
+ System.out.println(">> args.....: " + DOMUtils.domToString(payload));
+ System.out.println(">> message..:" + DOMUtils.domToString(dom.getDocumentElement()));
}
org.apache.ode.bpel.iapi.Message request = mex.createMessage(new QName("", ""));
@@ -250,6 +245,7 @@
* @return
*/
private Element processResponse(Element response) {
+ // return (Element) DOMUtils.findChildByName(response, new QName("",bpelOperationOutputPart.getName())).getFirstChild();
return (Element) DOMUtils.findChildByName(response, new QName("",bpelOperationOutputPart.getName()));
}
}
Modified: incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/implementation-data-xml/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/implementation-data-xml/pom.xml?rev=664294&r1=664293&r2=664294&view=diff
==============================================================================
--- incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/implementation-data-xml/pom.xml (original)
+++ incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/implementation-data-xml/pom.xml Sat Jun 7 00:15:29 2008
@@ -130,7 +130,7 @@
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-data-api</artifactId>
+ <artifactId>tuscany-data-api</artifactId>
<version>2.0-incubating-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
Modified: incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/implementation-data-xml/src/main/java/org/apache/tuscany/sca/implementation/data/DATACollection.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/implementation-data-xml/src/main/java/org/apache/tuscany/sca/implementation/data/DATACollection.java?rev=664294&r1=664293&r2=664294&view=diff
==============================================================================
--- incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/implementation-data-xml/src/main/java/org/apache/tuscany/sca/implementation/data/DATACollection.java (original)
+++ incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/implementation-data-xml/src/main/java/org/apache/tuscany/sca/implementation/data/DATACollection.java Sat Jun 7 00:15:29 2008
@@ -20,7 +20,8 @@
package org.apache.tuscany.sca.implementation.data;
import javax.xml.stream.XMLStreamReader;
-import org.apache.tuscany.sca.implementation.data.collection.Collection;
+
+import org.apache.tuscany.sca.data.collection.Collection;
public interface DATACollection extends Collection<String, XMLStreamReader> {
Modified: incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/implementation-data-xml/src/test/java/org/apache/tuscany/sca/implementation/data/companyFeed/CompanyFeed.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/implementation-data-xml/src/test/java/org/apache/tuscany/sca/implementation/data/companyFeed/CompanyFeed.java?rev=664294&r1=664293&r2=664294&view=diff
==============================================================================
--- incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/implementation-data-xml/src/test/java/org/apache/tuscany/sca/implementation/data/companyFeed/CompanyFeed.java (original)
+++ incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/implementation-data-xml/src/test/java/org/apache/tuscany/sca/implementation/data/companyFeed/CompanyFeed.java Sat Jun 7 00:15:29 2008
@@ -19,10 +19,10 @@
package org.apache.tuscany.sca.implementation.data.companyFeed;
+import org.apache.tuscany.sca.data.collection.Collection;
+import org.apache.tuscany.sca.data.collection.Entry;
+import org.apache.tuscany.sca.data.collection.NotFoundException;
import org.apache.tuscany.sca.implementation.data.DATA;
-import org.apache.tuscany.sca.implementation.data.collection.Collection;
-import org.apache.tuscany.sca.implementation.data.collection.Entry;
-import org.apache.tuscany.sca.implementation.data.collection.NotFoundException;
import org.osoa.sca.annotations.Reference;
import commonj.sdo.DataObject;
Modified: incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/implementation-node-runtime/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/implementation-node-runtime/pom.xml?rev=664294&r1=664293&r2=664294&view=diff
==============================================================================
--- incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/implementation-node-runtime/pom.xml (original)
+++ incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/implementation-node-runtime/pom.xml Sat Jun 7 00:15:29 2008
@@ -62,7 +62,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-data-api</artifactId>
+ <artifactId>tuscany-data-api</artifactId>
<version>2.0-incubating-SNAPSHOT</version>
</dependency>
Modified: incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeProcessCollectionImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeProcessCollectionImpl.java?rev=664294&r1=664293&r2=664294&view=diff
==============================================================================
--- incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeProcessCollectionImpl.java (original)
+++ incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeProcessCollectionImpl.java Sat Jun 7 00:15:29 2008
@@ -27,11 +27,11 @@
import java.util.Properties;
import java.util.logging.Logger;
-import org.apache.tuscany.sca.implementation.data.collection.Entry;
-import org.apache.tuscany.sca.implementation.data.collection.Item;
-import org.apache.tuscany.sca.implementation.data.collection.ItemCollection;
-import org.apache.tuscany.sca.implementation.data.collection.LocalItemCollection;
-import org.apache.tuscany.sca.implementation.data.collection.NotFoundException;
+import org.apache.tuscany.sca.data.collection.Entry;
+import org.apache.tuscany.sca.data.collection.Item;
+import org.apache.tuscany.sca.data.collection.ItemCollection;
+import org.apache.tuscany.sca.data.collection.LocalItemCollection;
+import org.apache.tuscany.sca.data.collection.NotFoundException;
import org.apache.tuscany.sca.node.launcher.NodeLauncher;
import org.osoa.sca.ServiceRuntimeException;
import org.osoa.sca.annotations.Init;
Modified: incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiRemotableInvoker.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiRemotableInvoker.java?rev=664294&r1=664293&r2=664294&view=diff
==============================================================================
--- incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiRemotableInvoker.java (original)
+++ incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiRemotableInvoker.java Sat Jun 7 00:15:29 2008
@@ -118,7 +118,7 @@
copiedArg = argDataBinding.copy(arg);
} else {
copiedArg = arg;
- DataType<?> dataType = registry.introspectType(arg);
+ DataType<?> dataType = registry.introspectType(arg, operation);
if (dataType != null) {
DataBinding binding = registry.getDataBinding(dataType.getDataBinding());
if (binding != null) {
Modified: incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/implementation-resource/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/implementation-resource/pom.xml?rev=664294&r1=664293&r2=664294&view=diff
==============================================================================
--- incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/implementation-resource/pom.xml (original)
+++ incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/implementation-resource/pom.xml Sat Jun 7 00:15:29 2008
@@ -50,7 +50,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-data-api</artifactId>
+ <artifactId>tuscany-data-api</artifactId>
<version>2.0-incubating-SNAPSHOT</version>
</dependency>
Modified: incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/Resource.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/Resource.java?rev=664294&r1=664293&r2=664294&view=diff
==============================================================================
--- incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/Resource.java (original)
+++ incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/Resource.java Sat Jun 7 00:15:29 2008
@@ -21,7 +21,7 @@
import java.io.InputStream;
-import org.apache.tuscany.sca.implementation.data.collection.Collection;
+import org.apache.tuscany.sca.data.collection.Collection;
/**
* The service interface of resource implementations. This is not an API for application
Modified: incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/impl/ResourceImplementationProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/impl/ResourceImplementationProcessor.java?rev=664294&r1=664293&r2=664294&view=diff
==============================================================================
--- incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/impl/ResourceImplementationProcessor.java (original)
+++ incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/impl/ResourceImplementationProcessor.java Sat Jun 7 00:15:29 2008
@@ -6,15 +6,15 @@
* 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.
+ * under the License.
*/
package org.apache.tuscany.sca.implementation.resource.impl;
@@ -53,20 +53,20 @@
public class ResourceImplementationProcessor implements StAXArtifactProcessor<ResourceImplementation> {
private static final QName IMPLEMENTATION_RESOURCE = new QName(Constants.SCA10_TUSCANY_NS, "implementation.resource");
private static final String MSG_LOCATION_MISSING = "Reading implementation.resource - location attribute missing";
-
+
private ContributionFactory contributionFactory;
private ResourceImplementationFactory implementationFactory;
private Monitor monitor;
-
+
public ResourceImplementationProcessor(ModelFactoryExtensionPoint modelFactories, Monitor monitor) {
contributionFactory = modelFactories.getFactory(ContributionFactory.class);
implementationFactory = modelFactories.getFactory(ResourceImplementationFactory.class);
this.monitor = monitor;
}
-
+
/**
* Report a exception.
- *
+ *
* @param problems
* @param message
* @param model
@@ -80,7 +80,7 @@
/**
* Report a error.
- *
+ *
* @param problems
* @param message
* @param model
@@ -90,7 +90,7 @@
Problem problem = new ProblemImpl(this.getClass().getName(), "impl-resource-validation-messages", Severity.ERROR, model, message, (Object[])messageParameters);
monitor.problem(problem);
}
- }
+ }
public QName getArtifactType() {
// Returns the QName of the XML element processed by this processor
@@ -103,11 +103,11 @@
}
public ResourceImplementation read(XMLStreamReader reader) throws ContributionReadException, XMLStreamException {
-
+
// Read an <implementation.resource> element
-
+
// Create and initialize the resource implementation model
- ResourceImplementation implementation = null;
+ ResourceImplementation implementation = null;
// Read the location attribute specifying the location of the resources
String location = reader.getAttributeValue(null, "location");
@@ -127,12 +127,12 @@
break;
}
}
-
+
return implementation;
}
public void resolve(ResourceImplementation implementation, ModelResolver resolver) throws ContributionResolveException {
-
+
// Resolve the resource directory location
Artifact artifact = contributionFactory.createArtifact();
artifact.setURI(implementation.getLocation());
@@ -146,18 +146,21 @@
error("ContributionResolveException", resolver, ce);
throw ce;
}
+ } else {
+ error("CouldNotResolveLocation", resolver, implementation.getLocation());
+ throw new ContributionResolveException("Could not resolve implementation.resource location: " + implementation.getLocation());
}
}
public void write(ResourceImplementation implementation, XMLStreamWriter writer) throws ContributionWriteException, XMLStreamException {
-
+
// Write <implementation.resource>
writer.writeStartElement(IMPLEMENTATION_RESOURCE.getNamespaceURI(), IMPLEMENTATION_RESOURCE.getLocalPart());
-
+
if (implementation.getLocation() != null) {
writer.writeAttribute("location", implementation.getLocation());
}
-
+
writer.writeEndElement();
}
}
Modified: incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/implementation-widget/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/implementation-widget/pom.xml?rev=664294&r1=664293&r2=664294&view=diff
==============================================================================
--- incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/implementation-widget/pom.xml (original)
+++ incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/implementation-widget/pom.xml Sat Jun 7 00:15:29 2008
@@ -44,7 +44,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-data-api</artifactId>
+ <artifactId>tuscany-data-api</artifactId>
<version>2.0-incubating-SNAPSHOT</version>
</dependency>
Modified: incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/Widget.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/Widget.java?rev=664294&r1=664293&r2=664294&view=diff
==============================================================================
--- incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/Widget.java (original)
+++ incubator/tuscany/sandbox/sebastien/java/sca-test2/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/Widget.java Sat Jun 7 00:15:29 2008
@@ -21,7 +21,7 @@
import java.io.InputStream;
-import org.apache.tuscany.sca.implementation.data.collection.Collection;
+import org.apache.tuscany.sca.data.collection.Collection;
/**
* The service interface of widget implementations. This is not an API for application