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 2007/04/11 06:43:00 UTC
svn commit: r527384 - in /incubator/tuscany/java/sca/modules:
assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/
assembly/src/main/java/org/apache/tuscany/assembly/
assembly/src/main/java/org/apache/tuscany/assembly/impl/
core-spring/src/main/...
Author: jsdelfino
Date: Tue Apr 10 21:42:57 2007
New Revision: 527384
URL: http://svn.apache.org/viewvc?view=rev&rev=527384
Log:
Added a URI to ComponentType to allow it to be resolved by URI.
Modified:
incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/ComponentTypeDocumentProcessor.java
incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/ComponentType.java
incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/impl/ComponentTypeImpl.java
incubator/tuscany/java/sca/modules/core-spring/src/main/java/org/apache/tuscany/implementation/java/bean/impl/BeanJavaImplementationImpl.java
Modified: incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/ComponentTypeDocumentProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/ComponentTypeDocumentProcessor.java?view=diff&rev=527384&r1=527383&r2=527384
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/ComponentTypeDocumentProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/ComponentTypeDocumentProcessor.java Tue Apr 10 21:42:57 2007
@@ -74,6 +74,7 @@
XMLStreamReader reader = inputFactory.createXMLStreamReader(urlStream);
reader.nextTag();
ComponentType componentType = (ComponentType)extensionProcessor.read(reader);
+ componentType.setURI(url.toString());
return componentType;
} catch (XMLStreamException e) {
Modified: incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/ComponentType.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/ComponentType.java?view=diff&rev=527384&r1=527383&r2=527384
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/ComponentType.java (original)
+++ incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/ComponentType.java Tue Apr 10 21:42:57 2007
@@ -29,6 +29,18 @@
* @version $Rev$ $Date$
*/
public interface ComponentType extends Base, IntentAttachPoint, PolicySetAttachPoint {
+
+ /**
+ * Returns the URI of this component type.
+ * @return the URI of the component type
+ */
+ String getURI();
+
+ /**
+ * Sets the URI of this component type.
+ * @param uri the URI of the component type
+ */
+ void setURI(String uri);
/**
* Returns a list of services that are offered.
Modified: incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/impl/ComponentTypeImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/impl/ComponentTypeImpl.java?view=diff&rev=527384&r1=527383&r2=527384
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/impl/ComponentTypeImpl.java (original)
+++ incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/impl/ComponentTypeImpl.java Tue Apr 10 21:42:57 2007
@@ -36,6 +36,7 @@
* @version $Rev$ $Date$
*/
public class ComponentTypeImpl extends BaseImpl implements ComponentType {
+ private String uri;
private ConstrainingType constrainingType;
private List<Property> properties = new ArrayList<Property>();
private List<Reference> references = new ArrayList<Reference>();
@@ -55,6 +56,7 @@
*/
public ComponentTypeImpl(ComponentType other) {
super(other);
+ uri = other.getURI();
constrainingType = other.getConstrainingType();
getServices().clear();
for (Service service: other.getServices()) {
@@ -70,6 +72,14 @@
requiredIntents.addAll(other.getRequiredIntents());
policySets.addAll(other.getPolicySets());
}
+
+ public String getURI() {
+ return uri;
+ }
+
+ public void setURI(String uri) {
+ this.uri = uri;
+ }
public ConstrainingType getConstrainingType() {
return constrainingType;
@@ -119,5 +129,27 @@
}
}
return true;
+ }
+
+ @Override
+ public int hashCode() {
+ return String.valueOf(getURI()).hashCode();
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (obj == this) {
+ return true;
+ } else {
+ if (obj instanceof ComponentType) {
+ if (getURI() != null) {
+ return getURI().equals(((ComponentType)obj).getURI());
+ } else {
+ return ((ComponentType)obj).getURI() == null;
+ }
+ } else {
+ return false;
+ }
+ }
}
}
Modified: incubator/tuscany/java/sca/modules/core-spring/src/main/java/org/apache/tuscany/implementation/java/bean/impl/BeanJavaImplementationImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spring/src/main/java/org/apache/tuscany/implementation/java/bean/impl/BeanJavaImplementationImpl.java?view=diff&rev=527384&r1=527383&r2=527384
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spring/src/main/java/org/apache/tuscany/implementation/java/bean/impl/BeanJavaImplementationImpl.java (original)
+++ incubator/tuscany/java/sca/modules/core-spring/src/main/java/org/apache/tuscany/implementation/java/bean/impl/BeanJavaImplementationImpl.java Tue Apr 10 21:42:57 2007
@@ -47,6 +47,7 @@
private List<Object> extensions = new ArrayList<Object>();
private boolean unresolved;
private BeanDefinitionRegistry beanRegistry;
+ private String uri;
public BeanJavaImplementationImpl(BeanDefinitionRegistry beanRegistry) {
this.beanRegistry = beanRegistry;
@@ -72,6 +73,14 @@
public void setName(String className) {
super.setBeanClassName(className);
}
+
+ public String getURI() {
+ return uri;
+ }
+
+ public void setURI(String uri) {
+ this.uri = uri;
+ }
public ConstrainingType getConstrainingType() {
return constrainingType;
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org