Author: jboynes
Date: Mon Apr 10 14:31:36 2006
New Revision: 393071
URL: http://svn.apache.org/viewcvs?rev=393071&view=rev
Log:
remove some dependencies on SDO from model code
Modified:
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/ImportWSDLLoader.java
incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/AggregateImpl.java
incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/PropertyImpl.java
Modified:
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/ImportWSDLLoader.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/ImportWSDLLoader.java?rev=393071&r1=393070&r2=393071&view=diff
==============================================================================
---
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/ImportWSDLLoader.java
(original)
+++
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/ImportWSDLLoader.java
Mon Apr 10 14:31:36 2006
@@ -17,8 +17,10 @@
package org.apache.tuscany.core.loader.assembly;
import java.io.IOException;
+import java.io.InputStream;
import java.net.URL;
import javax.wsdl.WSDLException;
+import javax.wsdl.Definition;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
@@ -34,6 +36,10 @@
import static
org.apache.tuscany.core.loader.assembly.AssemblyConstants.IMPORT_WSDL;
import org.apache.tuscany.core.system.annotation.Autowire;
import org.apache.tuscany.model.assembly.ImportWSDL;
+import org.apache.tuscany.model.assembly.AssemblyModelContext;
+import org.apache.tuscany.sdo.util.SDOUtil;
+
+import commonj.sdo.helper.XSDHelper;
/**
* Loader that handles <import.wsdl> elements.
@@ -61,21 +67,24 @@
assert AssemblyConstants.IMPORT_WSDL.equals(reader.getName());
String namespace = reader.getAttributeValue(null, "namespace");
String location = reader.getAttributeValue(null, "location");
+ ImportWSDL importWSDL = factory.createImportWSDL(location, namespace);
- loadDefinition(namespace, location, resourceLoader);
+ Definition definition = loadDefinition(namespace, location,
resourceLoader);
+// importWSDL.setDefinition(definition);
StAXUtil.skipToEndElement(reader);
- return factory.createImportWSDL(location, namespace);
+ return importWSDL;
}
- protected void loadDefinition(String namespace, String location,
ResourceLoader resourceLoader) throws MissingResourceException,
SidefileLoadException {
+ protected Definition loadDefinition(String namespace, String location,
ResourceLoader resourceLoader) throws MissingResourceException,
SidefileLoadException {
+ Definition definition;
URL wsdlURL = resourceLoader.getResource(location);
if (wsdlURL == null) {
throw new MissingResourceException(location);
}
try {
- wsdlRegistry.loadDefinition(namespace, wsdlURL);
+ definition = wsdlRegistry.loadDefinition(namespace, wsdlURL);
} catch (IOException e) {
SidefileLoadException sfe = new
SidefileLoadException(e.getMessage());
sfe.setResourceURI(location);
@@ -85,5 +94,22 @@
sfe.setResourceURI(location);
throw sfe;
}
+
+ try {
+ InputStream xsdInputStream = wsdlURL.openStream();
+ try {
+ AssemblyModelContext context = registry.getContext();
+ XSDHelper xsdHelper =
SDOUtil.createXSDHelper(context.getTypeHelper());
+ xsdHelper.define(xsdInputStream, null);
+ } finally {
+ xsdInputStream.close();
+ }
+ } catch (IOException e) {
+ SidefileLoadException sfe = new
SidefileLoadException(e.getMessage());
+ sfe.setResourceURI(location);
+ throw sfe;
+ }
+
+ return definition;
}
}
Modified:
incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/AggregateImpl.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/AggregateImpl.java?rev=393071&r1=393070&r2=393071&view=diff
==============================================================================
---
incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/AggregateImpl.java
(original)
+++
incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/AggregateImpl.java
Mon Apr 10 14:31:36 2006
@@ -16,7 +16,6 @@
*/
package org.apache.tuscany.model.assembly.impl;
-import java.io.IOException;
import java.net.URL;
import java.util.ArrayList;
import java.util.Collections;
@@ -25,8 +24,6 @@
import java.util.Map;
import javax.wsdl.Definition;
-import commonj.sdo.helper.XSDHelper;
-
import org.apache.tuscany.common.resource.ResourceLoader;
import org.apache.tuscany.model.assembly.Aggregate;
import org.apache.tuscany.model.assembly.AggregatePart;
@@ -39,7 +36,6 @@
import org.apache.tuscany.model.assembly.ImportWSDL;
import org.apache.tuscany.model.assembly.ServiceURI;
import org.apache.tuscany.model.assembly.Wire;
-import org.apache.tuscany.sdo.util.SDOUtil;
/**
* An implementation of Aggregate.
@@ -228,13 +224,15 @@
// Load the WSDL definition if necessary
if (wsdlImport.getDefinition() == null) {
String location = wsdlImport.getLocation();
- Definition definition;
+ URL url = resourceLoader.getResource(location);
+ if (url == null)
+ throw new IllegalArgumentException("Cannot find " +
location);
+
+ Definition definition =
modelContext.getAssemblyLoader().loadDefinition(url.toString());
+ wsdlImport.setDefinition(definition);
+/*
ClassLoader ccl =
Thread.currentThread().getContextClassLoader();
try {
- URL url = resourceLoader.getResource(location);
- if (url == null)
- throw new IllegalArgumentException("Cannot find " +
location);
- definition =
modelContext.getAssemblyLoader().loadDefinition(url.toString());
Thread.currentThread().setContextClassLoader(modelContext.getApplicationResourceLoader().getClassLoader());
XSDHelper xsdHelper =
SDOUtil.createXSDHelper(modelContext.getTypeHelper());
xsdHelper.define(url.openStream(), null);
@@ -243,7 +241,7 @@
} finally {
Thread.currentThread().setContextClassLoader(ccl);
}
- wsdlImport.setDefinition(definition);
+*/
}
}
Modified:
incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/PropertyImpl.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/PropertyImpl.java?rev=393071&r1=393070&r2=393071&view=diff
==============================================================================
---
incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/PropertyImpl.java
(original)
+++
incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/PropertyImpl.java
Mon Apr 10 14:31:36 2006
@@ -16,30 +16,18 @@
*/
package org.apache.tuscany.model.assembly.impl;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.tuscany.model.assembly.AssemblyModelContext;
import org.apache.tuscany.model.assembly.Property;
-import org.apache.tuscany.sdo.util.SDOUtil;
-
-import commonj.sdo.Type;
/**
* An implementation of Property.
*/
public class PropertyImpl extends ExtensibleImpl implements Property {
-
- private Object defaultValue;
+
+ private Object defaultValue;
private String name;
private boolean many;
private boolean required;
private Class<?> type;
-
- private Type sdoType;
/**
* Constructor
@@ -86,7 +74,7 @@
* @see
org.apache.tuscany.model.assembly.Property#setDefaultValue(java.lang.Object)
*/
public void setDefaultValue(Object value) {
- defaultValue=value;
+ defaultValue = value;
}
/**
@@ -94,7 +82,7 @@
*/
public void setMany(boolean value) {
checkNotFrozen();
- many=value;
+ many = value;
}
/**
@@ -102,7 +90,7 @@
*/
public void setName(String value) {
checkNotFrozen();
- name=value;
+ name = value;
}
/**
@@ -110,7 +98,7 @@
*/
public void setRequired(boolean value) {
checkNotFrozen();
- required=value;
+ required = value;
}
/**
@@ -118,61 +106,6 @@
*/
public void setType(Class<?> value) {
checkNotFrozen();
- type=value;
- }
-
- /**
- * @param sdoType The sdoType to set.
- */
- public void setSDOType(Type sdoType) {
- checkNotFrozen();
- this.sdoType = sdoType;
- }
-
- /**
- * @return Returns the sdoType.
- */
- public Type getSDOType() {
- return sdoType;
- }
-
- private static final Map<Class, Type> typeMapping=new HashMap<Class,
Type>();
-
- static {
- typeMapping.put(BigDecimal.class, SDOUtil.getXSDSDOType("decimal"));
- typeMapping.put(BigInteger.class, SDOUtil.getXSDSDOType("integer"));
- typeMapping.put(boolean.class, SDOUtil.getXSDSDOType("boolean"));
- typeMapping.put(Boolean.class, SDOUtil.getXSDSDOType("boolean"));
- typeMapping.put(byte.class, SDOUtil.getXSDSDOType("byte"));
- typeMapping.put(Byte.class, SDOUtil.getXSDSDOType("Byte"));
- typeMapping.put(byte[].class, SDOUtil.getXSDSDOType("hexBinary"));
- typeMapping.put(char.class, SDOUtil.getXSDSDOType("string"));
- typeMapping.put(Character.class, SDOUtil.getXSDSDOType("string"));
- typeMapping.put(Date.class, SDOUtil.getXSDSDOType("dateTime"));
- typeMapping.put(double.class, SDOUtil.getXSDSDOType("double"));
- typeMapping.put(Double.class, SDOUtil.getXSDSDOType("double"));
- typeMapping.put(float.class, SDOUtil.getXSDSDOType("float"));
- typeMapping.put(Float.class, SDOUtil.getXSDSDOType("float"));
- typeMapping.put(int.class, SDOUtil.getXSDSDOType("int"));
- typeMapping.put(Integer.class, SDOUtil.getXSDSDOType("int"));
- typeMapping.put(long.class, SDOUtil.getXSDSDOType("long"));
- typeMapping.put(Long.class, SDOUtil.getXSDSDOType("long"));
- typeMapping.put(short.class, SDOUtil.getXSDSDOType("short"));
- typeMapping.put(Short.class, SDOUtil.getXSDSDOType("short"));
- typeMapping.put(String.class, SDOUtil.getXSDSDOType("string"));
- }
-
- /*
- * @see
org.apache.tuscany.model.assembly.impl.ExtensibleImpl#initialize(org.apache.tuscany.model.assembly.AssemblyModelContext)
- */
- public void initialize(AssemblyModelContext modelContext) {
- if (isInitialized())
- return;
- super.initialize(modelContext);
-
- // Get the SDO type corresponding to the property's Java type
- if (sdoType==null) {
- sdoType=typeMapping.get(type);
- }
+ type = value;
}
}
