savara SVN: r323 - in trunk/tools: plugins and 1 other directories.
by do-not-reply＠jboss.org
Author: objectiser
Date: 2010-07-08 14:11:45 -0400 (Thu, 08 Jul 2010)
New Revision: 323
Added:
trunk/tools/features/org.scribble.conversation.feature/
trunk/tools/features/org.scribble.experimental.feature/
trunk/tools/features/org.scribble.feature/
trunk/tools/features/org.scribble.java.feature/
trunk/tools/plugins/org.scribble.conformance/
trunk/tools/plugins/org.scribble.conversation.comparator/
trunk/tools/plugins/org.scribble.conversation.eclipse/
trunk/tools/plugins/org.scribble.conversation.export.text/
trunk/tools/plugins/org.scribble.conversation.model/
trunk/tools/plugins/org.scribble.conversation.parser/
trunk/tools/plugins/org.scribble.conversation.projector/
trunk/tools/plugins/org.scribble.conversation.validation/
trunk/tools/plugins/org.scribble.core/
trunk/tools/plugins/org.scribble.core/src/java/org/scribble/model/Annotations.java
trunk/tools/plugins/org.scribble.core/src/java/org/scribble/model/ModelObject.java
trunk/tools/plugins/org.scribble.core/src/java/org/scribble/model/TypeReference.java
trunk/tools/plugins/org.scribble.eclipse/
trunk/tools/plugins/org.scribble.expression.xpath/
trunk/tools/plugins/org.scribble.lang.comparator/
trunk/tools/plugins/org.scribble.lang.model/
Removed:
trunk/tools/plugins/org.scribble.core/src/java/org/scribble/model/Annotations.java
trunk/tools/plugins/org.scribble.core/src/java/org/scribble/model/ModelObject.java
trunk/tools/plugins/org.scribble.core/src/java/org/scribble/model/TypeReference.java
Log:
Move the scribble plugins/features.
Copied: trunk/tools/features/org.scribble.conversation.feature (from rev 306, trunk/tools/eclipse/org.scribble.conversation.feature)
Copied: trunk/tools/features/org.scribble.experimental.feature (from rev 306, trunk/tools/eclipse/org.scribble.experimental.feature)
Copied: trunk/tools/features/org.scribble.feature (from rev 306, trunk/tools/eclipse/org.scribble.feature)
Copied: trunk/tools/features/org.scribble.java.feature (from rev 306, trunk/tools/eclipse/org.scribble.java.feature)
Copied: trunk/tools/plugins/org.scribble.conformance (from rev 306, trunk/tools/eclipse/org.scribble.conformance)
Copied: trunk/tools/plugins/org.scribble.conversation.comparator (from rev 306, trunk/tools/eclipse/org.scribble.conversation.comparator)
Copied: trunk/tools/plugins/org.scribble.conversation.eclipse (from rev 306, trunk/tools/eclipse/org.scribble.conversation.eclipse)
Copied: trunk/tools/plugins/org.scribble.conversation.export.text (from rev 306, trunk/tools/eclipse/org.scribble.conversation.export.text)
Copied: trunk/tools/plugins/org.scribble.conversation.model (from rev 306, trunk/tools/eclipse/org.scribble.conversation.model)
Copied: trunk/tools/plugins/org.scribble.conversation.parser (from rev 306, trunk/tools/eclipse/org.scribble.conversation.parser)
Copied: trunk/tools/plugins/org.scribble.conversation.projector (from rev 306, trunk/tools/eclipse/org.scribble.conversation.projector)
Copied: trunk/tools/plugins/org.scribble.conversation.validation (from rev 306, trunk/tools/eclipse/org.scribble.conversation.validation)
Copied: trunk/tools/plugins/org.scribble.core (from rev 306, trunk/tools/eclipse/org.scribble.core)
Deleted: trunk/tools/plugins/org.scribble.core/src/java/org/scribble/model/Annotations.java
===================================================================
--- trunk/tools/eclipse/org.scribble.core/src/java/org/scribble/model/Annotations.java 2010-07-06 21:48:27 UTC (rev 306)
+++ trunk/tools/plugins/org.scribble.core/src/java/org/scribble/model/Annotations.java 2010-07-08 18:11:45 UTC (rev 323)
@@ -1,45 +0,0 @@
-/*
- * Copyright 2005-9 Pi4 Technologies Ltd
- *
- * Licensed 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.
- *
- *
- * Change History:
- * 20 Apr 2009 : Initial version created by gary
- */
-package org.scribble.model;
-
-/**
- * This class represents a map of named serializable
- * information that can be used to provide additional
- * details about a model component.
- */
-public class Annotations extends java.util.HashMap<String,java.io.Serializable> {
-
- private static final long serialVersionUID = -4594153737794956180L;
-
- /**
- * The default constructor.
- */
- public Annotations() {
- }
-
- /**
- * This is the copy constructor.
- *
- * @param annotations The annotations to copy
- */
- public Annotations(Annotations annotations) {
- putAll(annotations);
- }
-}
Copied: trunk/tools/plugins/org.scribble.core/src/java/org/scribble/model/Annotations.java (from rev 314, trunk/tools/eclipse/org.scribble.core/src/java/org/scribble/model/Annotations.java)
===================================================================
--- trunk/tools/plugins/org.scribble.core/src/java/org/scribble/model/Annotations.java (rev 0)
+++ trunk/tools/plugins/org.scribble.core/src/java/org/scribble/model/Annotations.java 2010-07-08 18:11:45 UTC (rev 323)
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2005-9 Pi4 Technologies Ltd
+ *
+ * Licensed 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.
+ *
+ *
+ * Change History:
+ * 20 Apr 2009 : Initial version created by gary
+ */
+package org.scribble.model;
+
+/**
+ * This class represents a map of named serializable
+ * information that can be used to provide additional
+ * details about a model component.
+ */
+public class Annotations extends java.util.HashMap<String,Object> {
+
+ private static final long serialVersionUID = -4594153737794956180L;
+
+ /**
+ * The default constructor.
+ */
+ public Annotations() {
+ }
+
+ /**
+ * This is the copy constructor.
+ *
+ * @param annotations The annotations to copy
+ */
+ public Annotations(Annotations annotations) {
+ putAll(annotations);
+ }
+}
Deleted: trunk/tools/plugins/org.scribble.core/src/java/org/scribble/model/ModelObject.java
===================================================================
--- trunk/tools/eclipse/org.scribble.core/src/java/org/scribble/model/ModelObject.java 2010-07-06 21:48:27 UTC (rev 306)
+++ trunk/tools/plugins/org.scribble.core/src/java/org/scribble/model/ModelObject.java 2010-07-08 18:11:45 UTC (rev 323)
@@ -1,355 +0,0 @@
-/*
- * Copyright 2007 Pi4 Technologies Ltd
- *
- * Licensed 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.
- *
- *
- * Change History:
- * 20 Oct 2007 : Initial version created by gary
- */
-package org.scribble.model;
-
-import java.util.logging.Logger;
-
-/**
- * This is the generic object from which all Scribble model objects
- * are derived.
- */
-public abstract class ModelObject implements java.io.Serializable {
-
- private static final long serialVersionUID = -8915435247669402908L;
-
- /**
- * This is the default constructor for the model object.
- */
- public ModelObject() {
- }
-
- /**
- * This is the constructor initialized with the source
- * reference.
- *
- * @param source The source reference
- */
- public ModelObject(int start, int end) {
- m_sourceRef.setStartPosition(start);
- m_sourceRef.setEndPosition(end);
- }
-
- /**
- * This method returns the source reference.
- *
- * @return The source reference
- */
- public SourceRef getSource() {
- return(m_sourceRef);
- }
-
- /**
- * This method returns the parent of this
- * model object.
- *
- * @return The parent, or null if top model
- * object
- */
- public ModelObject getParent() {
- return(m_parent);
- }
-
- /**
- * This method sets the parent model object.
- *
- * @param parent The parent
- */
- public void setParent(ModelObject parent) {
- m_parent = parent;
- }
-
- /**
- * This method establishes the necessary information to
- * indicate that the current model object is derived
- * from the supplied source model object.
- *
- * @param modelObj The source model object
- */
- public void derivedFrom(ModelObject modelObj) {
- if (modelObj != null) {
- m_sourceRef = new SourceRef(modelObj.getSource());
-
- m_annotations = new Annotations(modelObj.getAnnotations());
- }
- }
-
- /**
- * This method returns the annotations associated
- * with this model object.
- *
- * @return The annotations
- */
- public Annotations getAnnotations() {
- return(m_annotations);
- }
-
- /**
- * This method visits the model object using the supplied
- * visitor.
- *
- * @param visitor The visitor
- */
- public void visit(Visitor visitor) {
- boolean visitContained=visitor.visit(this);
-
- if (visitContained) {
-
- // Iterate over references and contained model objects
- java.beans.BeanInfo bi=null;
-
- try {
- bi = java.beans.Introspector.getBeanInfo(getClass());
- } catch(Exception e) {
- logger.log(java.util.logging.Level.SEVERE,
- "Failed to get bean info for class '"+
- getClass()+"'", e);
- }
-
- if (bi != null) {
- java.beans.PropertyDescriptor[] pds=bi.getPropertyDescriptors();
-
- for (int i=0; i < pds.length; i++) {
- if (pds[i].getReadMethod() != null) {
- org.scribble.model.Reference ref=
- (org.scribble.model.Reference)
- pds[i].getReadMethod().getAnnotation(
- org.scribble.model.Reference.class);
-
- if (ref != null && ref.containment()) {
- try {
- Object refObject=pds[i].getReadMethod().invoke(this, (Object[])null);
-
- if (refObject instanceof java.util.List) {
- java.util.List<?> list=(java.util.List<?>)refObject;
-
- for (int j=0; j < list.size(); j++) {
- if (list.get(j) instanceof ModelObject) {
-
- ((ModelObject)list.get(j)).visit(visitor);
-
- } else {
- logger.severe("Property '"+
- pds[i].getName()+"' on class '"+
- getClass()+
- "': Object in list is not a ModelObject");
- }
- }
- } else if (refObject instanceof ModelObject) {
- ((ModelObject)refObject).visit(visitor);
-
- } else if (refObject != null) {
- logger.severe("Property '"+pds[i].getName()+"' on class '"+
- getClass()+
- "': Contained object is not a ModelObject or list: "+
- refObject.getClass());
- }
- } catch(Exception e) {
- logger.severe("Failed to obtain property '"+
- pds[i].getName()+"' on class '"+
- getClass()+"': "+e);
- e.printStackTrace();
- }
- }
- }
- }
- }
- }
- }
-
- /**
- * This method sets the URI on the current model object, and
- * iterates through all contained model objects to set the
- * relative URI on them.
- *
- * @param uriPart The model object's URI part, relative to
- * its parent
- */
- protected void initializeURIPart(String uriPart) {
- String uri="";
-
- if (getParent() != null) {
- uri = getParent().getSource().getModelObjectURI();
- }
-
- uri += "/" + (uriPart == null ? "":uriPart);
-
- // Initialize the URI on the source reference
- getSource().setModelObjectURI(uri);
-
- // Iterate over references and contained model objects
- java.beans.BeanInfo bi=null;
-
- try {
- bi = java.beans.Introspector.getBeanInfo(getClass());
- } catch(Exception e) {
- logger.log(java.util.logging.Level.SEVERE,
- "Failed to get bean info for class '"+
- getClass()+"'", e);
- }
-
- if (bi != null) {
- java.beans.PropertyDescriptor[] pds=bi.getPropertyDescriptors();
-
- for (int i=0; i < pds.length; i++) {
- if (pds[i].getReadMethod() != null) {
- org.scribble.model.Reference ref=
- (org.scribble.model.Reference)
- pds[i].getReadMethod().getAnnotation(
- org.scribble.model.Reference.class);
-
- if (ref != null && ref.containment()) {
- try {
- Object refObject=pds[i].getReadMethod().invoke(this, (Object[])null);
-
- if (refObject instanceof java.util.List) {
- java.util.List<?> list=(java.util.List<?>)refObject;
-
- for (int j=0; j < list.size(); j++) {
- if (list.get(j) instanceof ModelObject) {
-
- ((ModelObject)list.get(j)).initializeURIPart(pds[i].getName()+"."+(j+1));
-
- } else {
- logger.severe("Property '"+
- pds[i].getName()+"' on class '"+
- getClass()+
- "': Object in list is not a ModelObject");
- }
- }
- } else if (refObject instanceof ModelObject) {
- ((ModelObject)refObject).initializeURIPart(pds[i].getName());
-
- } else if (refObject != null) {
- logger.severe("Property '"+pds[i].getName()+"' on class '"+
- getClass()+
- "': Contained object is not a ModelObject or list: "+
- refObject.getClass());
- }
- } catch(Exception e) {
- logger.severe("Failed to obtain property '"+
- pds[i].getName()+"' on class '"+
- getClass()+"': "+e);
- e.printStackTrace();
- }
- }
- }
- }
- }
- }
-
- /**
- * This method returns the child model object associated with
- * the supplied URI part.
- *
- * @param uriPart The URI part
- * @return The model object, or null if not found
- */
- protected ModelObject findChild(String uriPart) {
- ModelObject ret=null;
- int index=-1;
- int pos=-1;
-
- // Check if has an index
- if ((index=uriPart.indexOf('.')) != -1) {
- String num=uriPart.substring(index+1);
-
- uriPart = uriPart.substring(0, index);
-
- try {
- pos = Integer.parseInt(num);
- } catch(Exception e) {
- e.printStackTrace();
- }
- }
-
- // Find property
- java.beans.BeanInfo bi=null;
- java.beans.PropertyDescriptor pd=null;
-
- try {
- bi = java.beans.Introspector.getBeanInfo(getClass());
- } catch(Exception e) {
- logger.log(java.util.logging.Level.SEVERE,
- "Failed to get bean info for class '"+
- getClass()+"'", e);
- }
-
- if (bi != null) {
- java.beans.PropertyDescriptor[] pds=bi.getPropertyDescriptors();
-
- for (int i=0; pd == null && i < pds.length; i++) {
- if (pds[i].getName().equals(uriPart)) {
- pd = pds[i];
- }
- }
- }
-
- if (pd != null && pd.getReadMethod() != null) {
- try {
- Object refObject=pd.getReadMethod().invoke(this, (Object[])null);
-
- if (refObject instanceof java.util.List &&
- pos != -1) {
- java.util.List<?> list=(java.util.List<?>)refObject;
-
- ret = (ModelObject)list.get(pos-1);
- } else if (refObject instanceof ModelObject) {
- ret = (ModelObject)refObject;
-
- } else if (refObject != null) {
- logger.severe("Property '"+pd.getName()+"' on class '"+
- getClass()+
- "': Contained object is not a ModelObject or list: "+
- refObject.getClass());
- }
- } catch(Exception e) {
- logger.severe("Failed to obtain property '"+
- pd.getName()+"' on class '"+
- getClass()+"': "+e);
- e.printStackTrace();
- }
- }
-
- return(ret);
- }
-
- /* DON'T PROVIDE AN EQUALS IMPL, as this causes a problem with comparator rules
- * when checking for multiple paths - but can use equality of the source refs
- public boolean equals(Object obj) {
- boolean ret=false;
-
- if (obj instanceof ModelObject) {
- ModelObject other=(ModelObject)obj;
-
- if (m_sourceRef != null &&
- other.m_sourceRef != null) {
- ret = m_sourceRef.equals(other.m_sourceRef);
- }
- }
- return(ret);
- }
- */
-
- private static Logger logger = Logger.getLogger("org.scribble.model");
-
- private SourceRef m_sourceRef=new SourceRef();
- private ModelObject m_parent=null;
- private Annotations m_annotations=new Annotations();
-}
Copied: trunk/tools/plugins/org.scribble.core/src/java/org/scribble/model/ModelObject.java (from rev 314, trunk/tools/eclipse/org.scribble.core/src/java/org/scribble/model/ModelObject.java)
===================================================================
--- trunk/tools/plugins/org.scribble.core/src/java/org/scribble/model/ModelObject.java (rev 0)
+++ trunk/tools/plugins/org.scribble.core/src/java/org/scribble/model/ModelObject.java 2010-07-08 18:11:45 UTC (rev 323)
@@ -0,0 +1,355 @@
+/*
+ * Copyright 2007 Pi4 Technologies Ltd
+ *
+ * Licensed 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.
+ *
+ *
+ * Change History:
+ * 20 Oct 2007 : Initial version created by gary
+ */
+package org.scribble.model;
+
+import java.util.logging.Logger;
+
+/**
+ * This is the generic object from which all Scribble model objects
+ * are derived.
+ */
+public abstract class ModelObject {
+
+ private static final long serialVersionUID = -8915435247669402908L;
+
+ /**
+ * This is the default constructor for the model object.
+ */
+ public ModelObject() {
+ }
+
+ /**
+ * This is the constructor initialized with the source
+ * reference.
+ *
+ * @param source The source reference
+ */
+ public ModelObject(int start, int end) {
+ m_sourceRef.setStartPosition(start);
+ m_sourceRef.setEndPosition(end);
+ }
+
+ /**
+ * This method returns the source reference.
+ *
+ * @return The source reference
+ */
+ public SourceRef getSource() {
+ return(m_sourceRef);
+ }
+
+ /**
+ * This method returns the parent of this
+ * model object.
+ *
+ * @return The parent, or null if top model
+ * object
+ */
+ public ModelObject getParent() {
+ return(m_parent);
+ }
+
+ /**
+ * This method sets the parent model object.
+ *
+ * @param parent The parent
+ */
+ public void setParent(ModelObject parent) {
+ m_parent = parent;
+ }
+
+ /**
+ * This method establishes the necessary information to
+ * indicate that the current model object is derived
+ * from the supplied source model object.
+ *
+ * @param modelObj The source model object
+ */
+ public void derivedFrom(ModelObject modelObj) {
+ if (modelObj != null) {
+ m_sourceRef = new SourceRef(modelObj.getSource());
+
+ m_annotations = new Annotations(modelObj.getAnnotations());
+ }
+ }
+
+ /**
+ * This method returns the annotations associated
+ * with this model object.
+ *
+ * @return The annotations
+ */
+ public Annotations getAnnotations() {
+ return(m_annotations);
+ }
+
+ /**
+ * This method visits the model object using the supplied
+ * visitor.
+ *
+ * @param visitor The visitor
+ */
+ public void visit(Visitor visitor) {
+ boolean visitContained=visitor.visit(this);
+
+ if (visitContained) {
+
+ // Iterate over references and contained model objects
+ java.beans.BeanInfo bi=null;
+
+ try {
+ bi = java.beans.Introspector.getBeanInfo(getClass());
+ } catch(Exception e) {
+ logger.log(java.util.logging.Level.SEVERE,
+ "Failed to get bean info for class '"+
+ getClass()+"'", e);
+ }
+
+ if (bi != null) {
+ java.beans.PropertyDescriptor[] pds=bi.getPropertyDescriptors();
+
+ for (int i=0; i < pds.length; i++) {
+ if (pds[i].getReadMethod() != null) {
+ org.scribble.model.Reference ref=
+ (org.scribble.model.Reference)
+ pds[i].getReadMethod().getAnnotation(
+ org.scribble.model.Reference.class);
+
+ if (ref != null && ref.containment()) {
+ try {
+ Object refObject=pds[i].getReadMethod().invoke(this, (Object[])null);
+
+ if (refObject instanceof java.util.List) {
+ java.util.List<?> list=(java.util.List<?>)refObject;
+
+ for (int j=0; j < list.size(); j++) {
+ if (list.get(j) instanceof ModelObject) {
+
+ ((ModelObject)list.get(j)).visit(visitor);
+
+ } else {
+ logger.severe("Property '"+
+ pds[i].getName()+"' on class '"+
+ getClass()+
+ "': Object in list is not a ModelObject");
+ }
+ }
+ } else if (refObject instanceof ModelObject) {
+ ((ModelObject)refObject).visit(visitor);
+
+ } else if (refObject != null) {
+ logger.severe("Property '"+pds[i].getName()+"' on class '"+
+ getClass()+
+ "': Contained object is not a ModelObject or list: "+
+ refObject.getClass());
+ }
+ } catch(Exception e) {
+ logger.severe("Failed to obtain property '"+
+ pds[i].getName()+"' on class '"+
+ getClass()+"': "+e);
+ e.printStackTrace();
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+
+ /**
+ * This method sets the URI on the current model object, and
+ * iterates through all contained model objects to set the
+ * relative URI on them.
+ *
+ * @param uriPart The model object's URI part, relative to
+ * its parent
+ */
+ protected void initializeURIPart(String uriPart) {
+ String uri="";
+
+ if (getParent() != null) {
+ uri = getParent().getSource().getModelObjectURI();
+ }
+
+ uri += "/" + (uriPart == null ? "":uriPart);
+
+ // Initialize the URI on the source reference
+ getSource().setModelObjectURI(uri);
+
+ // Iterate over references and contained model objects
+ java.beans.BeanInfo bi=null;
+
+ try {
+ bi = java.beans.Introspector.getBeanInfo(getClass());
+ } catch(Exception e) {
+ logger.log(java.util.logging.Level.SEVERE,
+ "Failed to get bean info for class '"+
+ getClass()+"'", e);
+ }
+
+ if (bi != null) {
+ java.beans.PropertyDescriptor[] pds=bi.getPropertyDescriptors();
+
+ for (int i=0; i < pds.length; i++) {
+ if (pds[i].getReadMethod() != null) {
+ org.scribble.model.Reference ref=
+ (org.scribble.model.Reference)
+ pds[i].getReadMethod().getAnnotation(
+ org.scribble.model.Reference.class);
+
+ if (ref != null && ref.containment()) {
+ try {
+ Object refObject=pds[i].getReadMethod().invoke(this, (Object[])null);
+
+ if (refObject instanceof java.util.List) {
+ java.util.List<?> list=(java.util.List<?>)refObject;
+
+ for (int j=0; j < list.size(); j++) {
+ if (list.get(j) instanceof ModelObject) {
+
+ ((ModelObject)list.get(j)).initializeURIPart(pds[i].getName()+"."+(j+1));
+
+ } else {
+ logger.severe("Property '"+
+ pds[i].getName()+"' on class '"+
+ getClass()+
+ "': Object in list is not a ModelObject");
+ }
+ }
+ } else if (refObject instanceof ModelObject) {
+ ((ModelObject)refObject).initializeURIPart(pds[i].getName());
+
+ } else if (refObject != null) {
+ logger.severe("Property '"+pds[i].getName()+"' on class '"+
+ getClass()+
+ "': Contained object is not a ModelObject or list: "+
+ refObject.getClass());
+ }
+ } catch(Exception e) {
+ logger.severe("Failed to obtain property '"+
+ pds[i].getName()+"' on class '"+
+ getClass()+"': "+e);
+ e.printStackTrace();
+ }
+ }
+ }
+ }
+ }
+ }
+
+ /**
+ * This method returns the child model object associated with
+ * the supplied URI part.
+ *
+ * @param uriPart The URI part
+ * @return The model object, or null if not found
+ */
+ protected ModelObject findChild(String uriPart) {
+ ModelObject ret=null;
+ int index=-1;
+ int pos=-1;
+
+ // Check if has an index
+ if ((index=uriPart.indexOf('.')) != -1) {
+ String num=uriPart.substring(index+1);
+
+ uriPart = uriPart.substring(0, index);
+
+ try {
+ pos = Integer.parseInt(num);
+ } catch(Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+ // Find property
+ java.beans.BeanInfo bi=null;
+ java.beans.PropertyDescriptor pd=null;
+
+ try {
+ bi = java.beans.Introspector.getBeanInfo(getClass());
+ } catch(Exception e) {
+ logger.log(java.util.logging.Level.SEVERE,
+ "Failed to get bean info for class '"+
+ getClass()+"'", e);
+ }
+
+ if (bi != null) {
+ java.beans.PropertyDescriptor[] pds=bi.getPropertyDescriptors();
+
+ for (int i=0; pd == null && i < pds.length; i++) {
+ if (pds[i].getName().equals(uriPart)) {
+ pd = pds[i];
+ }
+ }
+ }
+
+ if (pd != null && pd.getReadMethod() != null) {
+ try {
+ Object refObject=pd.getReadMethod().invoke(this, (Object[])null);
+
+ if (refObject instanceof java.util.List &&
+ pos != -1) {
+ java.util.List<?> list=(java.util.List<?>)refObject;
+
+ ret = (ModelObject)list.get(pos-1);
+ } else if (refObject instanceof ModelObject) {
+ ret = (ModelObject)refObject;
+
+ } else if (refObject != null) {
+ logger.severe("Property '"+pd.getName()+"' on class '"+
+ getClass()+
+ "': Contained object is not a ModelObject or list: "+
+ refObject.getClass());
+ }
+ } catch(Exception e) {
+ logger.severe("Failed to obtain property '"+
+ pd.getName()+"' on class '"+
+ getClass()+"': "+e);
+ e.printStackTrace();
+ }
+ }
+
+ return(ret);
+ }
+
+ /* DON'T PROVIDE AN EQUALS IMPL, as this causes a problem with comparator rules
+ * when checking for multiple paths - but can use equality of the source refs
+ public boolean equals(Object obj) {
+ boolean ret=false;
+
+ if (obj instanceof ModelObject) {
+ ModelObject other=(ModelObject)obj;
+
+ if (m_sourceRef != null &&
+ other.m_sourceRef != null) {
+ ret = m_sourceRef.equals(other.m_sourceRef);
+ }
+ }
+ return(ret);
+ }
+ */
+
+ private static Logger logger = Logger.getLogger("org.scribble.model");
+
+ private SourceRef m_sourceRef=new SourceRef();
+ private ModelObject m_parent=null;
+ private Annotations m_annotations=new Annotations();
+}
Deleted: trunk/tools/plugins/org.scribble.core/src/java/org/scribble/model/TypeReference.java
===================================================================
--- trunk/tools/eclipse/org.scribble.core/src/java/org/scribble/model/TypeReference.java 2010-07-06 21:48:27 UTC (rev 306)
+++ trunk/tools/plugins/org.scribble.core/src/java/org/scribble/model/TypeReference.java 2010-07-08 18:11:45 UTC (rev 323)
@@ -1,53 +0,0 @@
-/*
- * Copyright 2007 Pi4 Technologies Ltd
- *
- * Licensed 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.
- *
- *
- * Change History:
- * 24 Oct 2007 : Initial version created by gary
- */
-package org.scribble.model;
-
-/**
- * This class represents a type reference.
- */
-public class TypeReference extends ModelReference {
-
- private static final long serialVersionUID = 6492984753933254949L;
-
- public static final String TYPE_SYSTEM="TypeSystem";
-
- public static final String TS_XSD_TYPE="XSDType";
- public static final String TS_XSD_ELEMENT="XSDElement";
-
- /**
- * This is the default constructor for the type reference.
- */
- public TypeReference() {
- super(TypeModel.TYPE);
- }
-
- /**
- * This method determines whether another reference, that
- * implements (or conforms to) this reference, can be
- * used.
- *
- * @return Whether to use an implementation of this
- * referenced model
- */
- public boolean useImplementations() {
- return(true);
- }
-
-}
Copied: trunk/tools/plugins/org.scribble.core/src/java/org/scribble/model/TypeReference.java (from rev 317, trunk/tools/eclipse/org.scribble.core/src/java/org/scribble/model/TypeReference.java)
===================================================================
--- trunk/tools/plugins/org.scribble.core/src/java/org/scribble/model/TypeReference.java (rev 0)
+++ trunk/tools/plugins/org.scribble.core/src/java/org/scribble/model/TypeReference.java 2010-07-08 18:11:45 UTC (rev 323)
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2007 Pi4 Technologies Ltd
+ *
+ * Licensed 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.
+ *
+ *
+ * Change History:
+ * 24 Oct 2007 : Initial version created by gary
+ */
+package org.scribble.model;
+
+/**
+ * This class represents a type reference.
+ */
+public class TypeReference extends ModelReference {
+
+ private static final long serialVersionUID = 6492984753933254949L;
+
+ /**
+ * This is the default constructor for the type reference.
+ */
+ public TypeReference() {
+ super(TypeModel.TYPE);
+ }
+
+ /**
+ * This method determines whether another reference, that
+ * implements (or conforms to) this reference, can be
+ * used.
+ *
+ * @return Whether to use an implementation of this
+ * referenced model
+ */
+ public boolean useImplementations() {
+ return(true);
+ }
+
+}
Copied: trunk/tools/plugins/org.scribble.eclipse (from rev 306, trunk/tools/eclipse/org.scribble.eclipse)
Copied: trunk/tools/plugins/org.scribble.expression.xpath (from rev 306, trunk/tools/eclipse/org.scribble.expression.xpath)
Copied: trunk/tools/plugins/org.scribble.lang.comparator (from rev 306, trunk/tools/eclipse/org.scribble.lang.comparator)
Copied: trunk/tools/plugins/org.scribble.lang.model (from rev 306, trunk/tools/eclipse/org.scribble.lang.model)
13 years, 10 months
- 1
- 0
savara SVN: r322 - trunk/tools/eclipse.
by do-not-reply＠jboss.org
Author: objectiser
Date: 2010-07-08 14:09:58 -0400 (Thu, 08 Jul 2010)
New Revision: 322
Removed:
trunk/tools/eclipse/org.jboss.savara.tools.tests.feature/
trunk/tools/eclipse/org.scribble.conformance/
trunk/tools/eclipse/org.scribble.conversation.comparator/
trunk/tools/eclipse/org.scribble.conversation.eclipse/
trunk/tools/eclipse/org.scribble.conversation.export.text/
trunk/tools/eclipse/org.scribble.conversation.feature/
trunk/tools/eclipse/org.scribble.conversation.model/
trunk/tools/eclipse/org.scribble.conversation.parser/
trunk/tools/eclipse/org.scribble.conversation.projector/
trunk/tools/eclipse/org.scribble.conversation.validation/
Log:
Move the scribble plugins/features.
13 years, 10 months
- 1
- 0
savara SVN: r321 - in trunk/tools: features and 1 other directories.
by do-not-reply＠jboss.org
Author: objectiser
Date: 2010-07-08 13:51:38 -0400 (Thu, 08 Jul 2010)
New Revision: 321
Added:
trunk/tools/features/org.pi4soa.bpmn.feature/
trunk/tools/features/org.pi4soa.monitor.feature/
trunk/tools/plugins/org.pi4soa.bpmn/
trunk/tools/plugins/org.pi4soa.monitor/
Removed:
trunk/tools/eclipse/org.pi4soa.bpmn.feature/
trunk/tools/eclipse/org.pi4soa.bpmn/
trunk/tools/eclipse/org.pi4soa.monitor.feature/
trunk/tools/eclipse/org.pi4soa.monitor/
Log:
Move the pi4soa plugins.
Copied: trunk/tools/features/org.pi4soa.bpmn.feature (from rev 306, trunk/tools/eclipse/org.pi4soa.bpmn.feature)
Copied: trunk/tools/features/org.pi4soa.monitor.feature (from rev 306, trunk/tools/eclipse/org.pi4soa.monitor.feature)
Copied: trunk/tools/plugins/org.pi4soa.bpmn (from rev 306, trunk/tools/eclipse/org.pi4soa.bpmn)
Copied: trunk/tools/plugins/org.pi4soa.monitor (from rev 306, trunk/tools/eclipse/org.pi4soa.monitor)
13 years, 10 months
- 1
- 0
savara SVN: r320 - in trunk/tools: plugins/org.jboss.savara.protocol.contract/src/java/org/jboss/savara/protocol/contract/impl and 1 other directories.
by do-not-reply＠jboss.org
Author: objectiser
Date: 2010-07-08 12:56:24 -0400 (Thu, 08 Jul 2010)
New Revision: 320
Modified:
trunk/tools/plugins/org.jboss.savara.contract.model/src/java/org/jboss/savara/contract/model/Interface.java
trunk/tools/plugins/org.jboss.savara.protocol.contract/src/java/org/jboss/savara/protocol/contract/impl/ContractIntrospector.java
trunk/tools/tests/org.jboss.savara.protocol.contract.tests/src/java/org/jboss/savara/protocol/contract/impl/ContractIntrospectorTest.java
Log:
Added code and tests for creating a request.
Modified: trunk/tools/plugins/org.jboss.savara.contract.model/src/java/org/jboss/savara/contract/model/Interface.java
===================================================================
--- trunk/tools/plugins/org.jboss.savara.contract.model/src/java/org/jboss/savara/contract/model/Interface.java 2010-07-08 14:49:52 UTC (rev 319)
+++ trunk/tools/plugins/org.jboss.savara.contract.model/src/java/org/jboss/savara/contract/model/Interface.java 2010-07-08 16:56:24 UTC (rev 320)
@@ -80,4 +80,27 @@
public java.util.List<MessageExchangePattern> getMessageExchangePatterns() {
return(m_messageExchangePatterns);
}
+
+ /**
+ * This method retrieves an existing message exchange pattern,
+ * associated with the supplied operation name, if one exists.
+ *
+ * @param op The operation
+ * @return The message exchange pattern, or null if not found
+ */
+ public MessageExchangePattern getMessageExchangePatternForOperation(String op) {
+ MessageExchangePattern ret=null;
+
+ java.util.Iterator<MessageExchangePattern> iter=getMessageExchangePatterns().iterator();
+
+ while (ret == null && iter.hasNext()) {
+ ret = iter.next();
+
+ if (op.equals(ret.getOperation()) == false) {
+ ret = null;
+ }
+ }
+
+ return(ret);
+ }
}
Modified: trunk/tools/plugins/org.jboss.savara.protocol.contract/src/java/org/jboss/savara/protocol/contract/impl/ContractIntrospector.java
===================================================================
--- trunk/tools/plugins/org.jboss.savara.protocol.contract/src/java/org/jboss/savara/protocol/contract/impl/ContractIntrospector.java 2010-07-08 14:49:52 UTC (rev 319)
+++ trunk/tools/plugins/org.jboss.savara.protocol.contract/src/java/org/jboss/savara/protocol/contract/impl/ContractIntrospector.java 2010-07-08 16:56:24 UTC (rev 320)
@@ -26,11 +26,17 @@
import org.jboss.savara.contract.model.Contract;
import org.jboss.savara.contract.model.Interface;
+import org.jboss.savara.contract.model.MessageExchangePattern;
+import org.jboss.savara.contract.model.OneWayRequestMEP;
+import org.jboss.savara.contract.model.RequestResponseMEP;
+import org.jboss.savara.contract.model.Type;
+import org.jboss.savara.contract.model.TypeDefinition;
import org.scribble.conversation.model.Conversation;
import org.scribble.conversation.model.ConversationInteraction;
import org.scribble.conversation.model.Run;
import org.scribble.model.ModelObject;
import org.scribble.model.Role;
+import org.scribble.model.TypeReference;
/**
* This class examines a protocol to determine the contract that represents
@@ -189,12 +195,55 @@
interaction.getReplyToLabel().trim().length() == 0) {
// Receiving a request - so record this in the contract
- Interface intf=getContract().getInterface(m_role.getName());
+ Interface intf=getInterface();
-
+ if (interaction.getMessageSignature().getOperation() != null) {
+
+ // Check if message exchange pattern exists for operation
+ MessageExchangePattern mep=intf.getMessageExchangePatternForOperation(
+ interaction.getMessageSignature().getOperation());
+
+ if (mep == null) {
+ // Create new MEP
+ if (interaction.getRequestLabel() != null) {
+ mep = new RequestResponseMEP();
+ } else {
+ mep = new OneWayRequestMEP();
+ }
+
+ mep.setOperation(interaction.getMessageSignature().getOperation());
+
+ for (int i=0; i < interaction.getMessageSignature().getTypes().size(); i++) {
+ mep.getTypes().add(convertType(interaction.getMessageSignature().getTypes().get(i)));
+ }
+
+ intf.getMessageExchangePatterns().add(mep);
+ }
+ }
+
} else {
}
}
}
+
+ /**
+ * This method converts a protocol type reference into a contract model type.
+ *
+ * @param tref The protocol type reference
+ * @return The type
+ */
+ public Type convertType(TypeReference tref) {
+ Type ret=new Type();
+
+ TypeDefinition td=new TypeDefinition();
+ td.setName(tref.getLocalpart());
+ td.setNamespace(tref.getNamespace());
+ //td.setTypeSystem(typeSystem);
+
+ ret.getTypeDefinitions().add(td);
+ ret.setName(td.getName());
+
+ return(ret);
+ }
}
Modified: trunk/tools/tests/org.jboss.savara.protocol.contract.tests/src/java/org/jboss/savara/protocol/contract/impl/ContractIntrospectorTest.java
===================================================================
--- trunk/tools/tests/org.jboss.savara.protocol.contract.tests/src/java/org/jboss/savara/protocol/contract/impl/ContractIntrospectorTest.java 2010-07-08 14:49:52 UTC (rev 319)
+++ trunk/tools/tests/org.jboss.savara.protocol.contract.tests/src/java/org/jboss/savara/protocol/contract/impl/ContractIntrospectorTest.java 2010-07-08 16:56:24 UTC (rev 320)
@@ -21,7 +21,12 @@
*/
package org.jboss.savara.protocol.contract.impl;
+import org.jboss.savara.contract.model.Contract;
import org.jboss.savara.contract.model.Interface;
+import org.jboss.savara.contract.model.MessageExchangePattern;
+import org.jboss.savara.contract.model.OneWayRequestMEP;
+import org.jboss.savara.contract.model.RequestResponseMEP;
+import org.jboss.savara.contract.model.Type;
import org.scribble.conversation.model.Conversation;
import org.scribble.conversation.model.ConversationInteraction;
import org.scribble.conversation.model.ConversationReference;
@@ -35,6 +40,7 @@
public class ContractIntrospectorTest {
+ private static final String MY_ROLE = "myRole";
private static final String TYPE_NS = "typeNS";
private static final String TYPE_LP = "typeLP";
private static final String OP_NAME = "opName";
@@ -151,7 +157,7 @@
public void testCreateSingleInterface() {
Conversation protocol=new Conversation();
Role role=new Role();
- role.setName("myRole");
+ role.setName(MY_ROLE);
LocatedName ln=new LocatedName();
ln.setRole(role);
protocol.setLocatedName(ln);
@@ -184,9 +190,16 @@
}
@org.junit.Test
- public void testVisitInteractionRequestRPC() {
- ContractIntrospector introspector=new ContractIntrospector(null);
+ public void testVisitInteractionOneWayRequestRPC() {
+ Conversation protocol=new Conversation();
+ Role role=new Role();
+ role.setName(MY_ROLE);
+ LocatedName ln=new LocatedName();
+ ln.setRole(role);
+ protocol.setLocatedName(ln);
+ ContractIntrospector introspector=new ContractIntrospector(protocol);
+
ConversationInteraction interaction=new ConversationInteraction();
MessageSignature msig=new MessageSignature();
@@ -198,8 +211,93 @@
msig.getTypes().add(tref);
interaction.setMessageSignature(msig);
+ interaction.setFromRole(new Role());
introspector.visitInteraction(interaction);
+
+ Contract contract=introspector.getContract();
+
+ Interface intf=contract.getInterface(role.getName());
+
+ if (intf == null) {
+ fail("Interface '"+role.getName()+"' not found");
+ }
+
+ MessageExchangePattern mep=intf.getMessageExchangePatternForOperation(OP_NAME);
+
+ if (mep == null) {
+ fail("Operation '"+OP_NAME+"' not found");
+ }
+
+ if ((mep instanceof OneWayRequestMEP) == false) {
+ fail("Not a oneway request");
+ }
+
+ if (mep.getTypes().size() != 1) {
+ fail("One type expected, but got: "+mep.getTypes().size());
+ }
+
+ Type t=mep.getTypes().get(0);
+
+ if (t.getName().equals(TYPE_LP) == false) {
+ fail("Type name not correct: "+t.getName());
+ }
}
+
+ @org.junit.Test
+ public void testVisitInteractionRequestResponseRPCOnlyRequest() {
+ Conversation protocol=new Conversation();
+ Role role=new Role();
+ role.setName(MY_ROLE);
+ LocatedName ln=new LocatedName();
+ ln.setRole(role);
+ protocol.setLocatedName(ln);
+
+ ContractIntrospector introspector=new ContractIntrospector(protocol);
+
+ ConversationInteraction interaction=new ConversationInteraction();
+
+ MessageSignature msig=new MessageSignature();
+ msig.setOperation(OP_NAME);
+
+ TypeReference tref=new TypeReference();
+ tref.setLocalpart(TYPE_LP);
+ tref.setNamespace(TYPE_NS);
+ msig.getTypes().add(tref);
+
+ interaction.setMessageSignature(msig);
+ interaction.setFromRole(new Role());
+ interaction.setRequestLabel("label");
+
+ introspector.visitInteraction(interaction);
+
+ Contract contract=introspector.getContract();
+
+ Interface intf=contract.getInterface(role.getName());
+
+ if (intf == null) {
+ fail("Interface '"+role.getName()+"' not found");
+ }
+
+ MessageExchangePattern mep=intf.getMessageExchangePatternForOperation(OP_NAME);
+
+ if (mep == null) {
+ fail("Operation '"+OP_NAME+"' not found");
+ }
+
+ if ((mep instanceof RequestResponseMEP) == false) {
+ fail("Not a request/response MEP");
+ }
+
+ if (mep.getTypes().size() != 1) {
+ fail("One type expected, but got: "+mep.getTypes().size());
+ }
+
+ Type t=mep.getTypes().get(0);
+
+ if (t.getName().equals(TYPE_LP) == false) {
+ fail("Type name not correct: "+t.getName());
+ }
+ }
}
13 years, 10 months
- 1
- 0
savara SVN: r319 - in trunk/tools: plugins/org.jboss.savara.protocol.contract/src/java/org/jboss/savara/protocol/contract/impl and 1 other directories.
by do-not-reply＠jboss.org
Author: objectiser
Date: 2010-07-08 10:49:52 -0400 (Thu, 08 Jul 2010)
New Revision: 319
Modified:
trunk/tools/plugins/org.jboss.savara.protocol.contract/META-INF/MANIFEST.MF
trunk/tools/plugins/org.jboss.savara.protocol.contract/src/java/org/jboss/savara/protocol/contract/impl/ContractGeneratorImpl.java
trunk/tools/plugins/org.jboss.savara.protocol.contract/src/java/org/jboss/savara/protocol/contract/impl/ContractIntrospector.java
trunk/tools/tests/org.jboss.savara.protocol.contract.tests/src/java/org/jboss/savara/protocol/contract/impl/ContractIntrospectorTest.java
Log:
Added more tests, and changed way introspector is used slightly.
Modified: trunk/tools/plugins/org.jboss.savara.protocol.contract/META-INF/MANIFEST.MF
===================================================================
--- trunk/tools/plugins/org.jboss.savara.protocol.contract/META-INF/MANIFEST.MF 2010-07-08 13:22:47 UTC (rev 318)
+++ trunk/tools/plugins/org.jboss.savara.protocol.contract/META-INF/MANIFEST.MF 2010-07-08 14:49:52 UTC (rev 319)
@@ -11,4 +11,4 @@
org.scribble.conversation.model,
org.jboss.savara.contract.model
Export-Package: org.jboss.savara.protocol.contract,
- org.jboss.savara.protocol.contract.impl
+ org.jboss.savara.protocol.contract.impl;x-friends:="org.jboss.savara.protocol.contract.tests"
Modified: trunk/tools/plugins/org.jboss.savara.protocol.contract/src/java/org/jboss/savara/protocol/contract/impl/ContractGeneratorImpl.java
===================================================================
--- trunk/tools/plugins/org.jboss.savara.protocol.contract/src/java/org/jboss/savara/protocol/contract/impl/ContractGeneratorImpl.java 2010-07-08 13:22:47 UTC (rev 318)
+++ trunk/tools/plugins/org.jboss.savara.protocol.contract/src/java/org/jboss/savara/protocol/contract/impl/ContractGeneratorImpl.java 2010-07-08 14:49:52 UTC (rev 319)
@@ -22,7 +22,6 @@
import org.jboss.savara.contract.model.Contract;
import org.jboss.savara.protocol.contract.ContractGenerator;
import org.scribble.conversation.model.Conversation;
-import org.scribble.model.Role;
/**
* This class generates a contract from a protocol defining the behaviour of
@@ -54,10 +53,9 @@
getString("SAVARAPC-00002"), (Object)null));
}
- ContractIntrospector introspector=new ContractIntrospector(new Contract(),
- new java.util.HashSet<Conversation>());
+ ContractIntrospector introspector=new ContractIntrospector(cm);
- introspector.process(cm);
+ introspector.process();
return(introspector.getContract());
}
Modified: trunk/tools/plugins/org.jboss.savara.protocol.contract/src/java/org/jboss/savara/protocol/contract/impl/ContractIntrospector.java
===================================================================
--- trunk/tools/plugins/org.jboss.savara.protocol.contract/src/java/org/jboss/savara/protocol/contract/impl/ContractIntrospector.java 2010-07-08 13:22:47 UTC (rev 318)
+++ trunk/tools/plugins/org.jboss.savara.protocol.contract/src/java/org/jboss/savara/protocol/contract/impl/ContractIntrospector.java 2010-07-08 14:49:52 UTC (rev 319)
@@ -21,6 +21,7 @@
*/
package org.jboss.savara.protocol.contract.impl;
+import java.text.MessageFormat;
import java.util.logging.Logger;
import org.jboss.savara.contract.model.Contract;
@@ -39,18 +40,47 @@
public class ContractIntrospector implements org.scribble.model.Visitor {
private Contract m_contract=new Contract();
- private java.util.Set<Conversation> m_processedProtocols=new java.util.HashSet<Conversation>();
+ private java.util.Set<Conversation> m_processedProtocols=null;
private Role m_role=null;
private Conversation m_protocol=null;
private static Logger logger = Logger.getLogger(ContractIntrospector.class.getName());
/**
- * Default constructor for the contract introspector.
+ * Constructor for the contract introspector.
+ *
+ * @param protocol The protocol to introspect
*/
- protected ContractIntrospector(Contract contract, java.util.Set<Conversation> processed) {
+ public ContractIntrospector(Conversation protocol) {
+ this(protocol, null, null);
+ }
+
+ /**
+ * Constructor for the contract introspector.
+ *
+ * @param protocol The protocol being introspected
+ * @param contract The optional contract being derived
+ * @param processed The optional set of protocols currently processed
+ */
+ public ContractIntrospector(Conversation protocol, Contract contract,
+ java.util.Set<Conversation> processed) {
m_contract = contract;
- m_processedProtocols = processed;
+
+ if (m_contract == null) {
+ m_contract = new Contract();
+ }
+
+ if (processed != null) {
+ m_processedProtocols = processed;
+ } else {
+ m_processedProtocols = new java.util.HashSet<Conversation>();
+ }
+
+ m_protocol = protocol;
+
+ if (protocol != null) {
+ m_role = protocol.getLocatedName().getRole();
+ }
}
/**
@@ -63,11 +93,30 @@
}
/**
+ * This method returns the interface.
+ *
+ * @return The interface
+ */
+ public Interface getInterface() {
+ Interface ret=getContract().getInterface(m_role.getName());
+
+ if (ret == null) {
+ // Create interface for the role
+ ret = new Interface();
+ ret.setName(m_role.getName());
+
+ getContract().getInterfaces().add(ret);
+ }
+
+ return(ret);
+ }
+
+ /**
* This method returns the set of processed protocols.
*
* @return The processed protocols
*/
- protected java.util.Set<Conversation> getProcessedProtocols() {
+ public java.util.Set<Conversation> getProcessedProtocols() {
return(m_processedProtocols);
}
@@ -78,14 +127,16 @@
*
* @param conv The located protocol
*/
- public void process(Conversation conv) throws IllegalArgumentException {
- m_protocol = conv;
- m_role = conv.getLocatedName().getRole();
+ public void process() throws IllegalStateException {
- // Find or create an interface associated with the role
- Interface intf=getContract().getInterface(m_role.getName());
+ if (m_protocol == null) {
+ throw new IllegalStateException(MessageFormat.format(
+ java.util.PropertyResourceBundle.getBundle(
+ "org.jboss.savara.protocol.contract.Messages").
+ getString("SAVARAPC-00001"), (Object)null));
+ }
- conv.visit(this);
+ m_protocol.visit(this);
}
@Override
@@ -106,7 +157,12 @@
if (m_processedProtocols.contains(toProtocol) == false) {
m_processedProtocols.add(toProtocol);
- process(run.getDefinition());
+ ContractIntrospector ci=new ContractIntrospector(toProtocol,
+ getContract(), getProcessedProtocols());
+
+ ci.process();
+ } else {
+ logger.fine("Invoked definition not found for "+run.getReference());
}
} else if (obj.getClass() == ConversationInteraction.class) {
visitInteraction((ConversationInteraction)obj);
@@ -115,9 +171,15 @@
return(f_visitChildren);
}
- protected void visitInteraction(ConversationInteraction interaction) {
+ /**
+ * This method introspects the supplied interaction to generate Message Exchange
+ * Patterns on the contract interface.
+ *
+ * @param interaction The interaction
+ */
+ public void visitInteraction(ConversationInteraction interaction) {
- // Check if the interacton is a request or response
+ // Check if the interacton is being received
if (interaction.getFromRole() != null &&
interaction.getFromRole().equals(m_role) == false) {
@@ -127,7 +189,11 @@
interaction.getReplyToLabel().trim().length() == 0) {
// Receiving a request - so record this in the contract
+ Interface intf=getContract().getInterface(m_role.getName());
+
+ } else {
+
}
}
}
Modified: trunk/tools/tests/org.jboss.savara.protocol.contract.tests/src/java/org/jboss/savara/protocol/contract/impl/ContractIntrospectorTest.java
===================================================================
--- trunk/tools/tests/org.jboss.savara.protocol.contract.tests/src/java/org/jboss/savara/protocol/contract/impl/ContractIntrospectorTest.java 2010-07-08 13:22:47 UTC (rev 318)
+++ trunk/tools/tests/org.jboss.savara.protocol.contract.tests/src/java/org/jboss/savara/protocol/contract/impl/ContractIntrospectorTest.java 2010-07-08 14:49:52 UTC (rev 319)
@@ -21,17 +21,24 @@
*/
package org.jboss.savara.protocol.contract.impl;
-import org.jboss.savara.contract.model.Contract;
+import org.jboss.savara.contract.model.Interface;
import org.scribble.conversation.model.Conversation;
+import org.scribble.conversation.model.ConversationInteraction;
import org.scribble.conversation.model.ConversationReference;
import org.scribble.conversation.model.Run;
import org.scribble.model.LocatedName;
+import org.scribble.model.MessageSignature;
import org.scribble.model.Role;
+import org.scribble.model.TypeReference;
import static org.junit.Assert.*;
public class ContractIntrospectorTest {
+ private static final String TYPE_NS = "typeNS";
+ private static final String TYPE_LP = "typeLP";
+ private static final String OP_NAME = "opName";
+
@org.junit.Test
public void testNoSubProtocolWithoutRun() {
Role r=new Role();
@@ -68,15 +75,12 @@
mid.getBlock().getContents().add(run);
mid.getBlock().getContents().add(sub);
- Contract contract=new Contract();
- java.util.Set<Conversation> processed=new java.util.HashSet<Conversation>();
+ ContractIntrospector introspector=new ContractIntrospector(top);
- ContractIntrospector introspector=new ContractIntrospector(contract, processed);
+ introspector.process();
- introspector.process(top);
-
- if (processed.size() != 0) {
- fail("Expecting 0 processed protocol, but got: "+processed.size());
+ if (introspector.getProcessedProtocols().size() != 0) {
+ fail("Expecting 0 processed protocol, but got: "+introspector.getProcessedProtocols().size());
}
}
@@ -126,23 +130,76 @@
mid.getBlock().getContents().add(run2);
mid.getBlock().getContents().add(sub);
- Contract contract=new Contract();
- java.util.Set<Conversation> processed=new java.util.HashSet<Conversation>();
+ ContractIntrospector introspector=new ContractIntrospector(top);
- ContractIntrospector introspector=new ContractIntrospector(contract, processed);
+ introspector.process();
- introspector.process(top);
-
- if (processed.size() != 2) {
- fail("Expecting 2 processed protocol, but got: "+processed.size());
+ if (introspector.getProcessedProtocols().size() != 2) {
+ fail("Expecting 2 processed protocol, but got: "+introspector.getProcessedProtocols().size());
}
- if (processed.contains(mid) == false) {
+ if (introspector.getProcessedProtocols().contains(mid) == false) {
fail("Should contain mid");
}
- if (processed.contains(sub) == false) {
+ if (introspector.getProcessedProtocols().contains(sub) == false) {
fail("Should contain sub");
}
}
+
+ @org.junit.Test
+ public void testCreateSingleInterface() {
+ Conversation protocol=new Conversation();
+ Role role=new Role();
+ role.setName("myRole");
+ LocatedName ln=new LocatedName();
+ ln.setRole(role);
+ protocol.setLocatedName(ln);
+
+ ContractIntrospector introspector=new ContractIntrospector(protocol);
+
+ if (introspector.getContract().getInterfaces().size() != 0) {
+ fail("Should be 0 interfaces: "+introspector.getContract().getInterfaces().size());
+ }
+
+ Interface intf=introspector.getInterface();
+
+ if (intf == null) {
+ fail("Interface not created");
+ }
+
+ if (introspector.getContract().getInterfaces().size() != 1) {
+ fail("Should be 1 interface: "+introspector.getContract().getInterfaces().size());
+ }
+
+ Interface intf2=introspector.getInterface();
+
+ if (intf2 != intf) {
+ fail("Interfaces are different");
+ }
+
+ if (introspector.getContract().getInterfaces().size() != 1) {
+ fail("Should still only be 1 interface: "+introspector.getContract().getInterfaces().size());
+ }
+ }
+
+ @org.junit.Test
+ public void testVisitInteractionRequestRPC() {
+ ContractIntrospector introspector=new ContractIntrospector(null);
+
+ ConversationInteraction interaction=new ConversationInteraction();
+
+ MessageSignature msig=new MessageSignature();
+ msig.setOperation(OP_NAME);
+
+ TypeReference tref=new TypeReference();
+ tref.setLocalpart(TYPE_LP);
+ tref.setNamespace(TYPE_NS);
+ msig.getTypes().add(tref);
+
+ interaction.setMessageSignature(msig);
+
+ introspector.visitInteraction(interaction);
+ }
+
}
13 years, 10 months
- 1
- 0
savara SVN: r318 - in trunk/tools: plugins/org.jboss.savara.pi4soa.cdm/src/java/org/jboss/savara/pi4soa/cdm/parser/rules and 2 other directories.
by do-not-reply＠jboss.org
Author: objectiser
Date: 2010-07-08 09:22:47 -0400 (Thu, 08 Jul 2010)
New Revision: 318
Added:
trunk/tools/plugins/org.jboss.savara.contract.model/src/java/org/jboss/savara/contract/model/Type.java
trunk/tools/plugins/org.jboss.savara.contract.model/src/java/org/jboss/savara/contract/model/TypeDefinition.java
Modified:
trunk/tools/plugins/org.jboss.savara.contract.model/src/java/org/jboss/savara/contract/model/Contract.java
trunk/tools/plugins/org.jboss.savara.contract.model/src/java/org/jboss/savara/contract/model/FaultDetails.java
trunk/tools/plugins/org.jboss.savara.contract.model/src/java/org/jboss/savara/contract/model/Interface.java
trunk/tools/plugins/org.jboss.savara.contract.model/src/java/org/jboss/savara/contract/model/MessageExchangePattern.java
trunk/tools/plugins/org.jboss.savara.contract.model/src/java/org/jboss/savara/contract/model/Namespace.java
trunk/tools/plugins/org.jboss.savara.contract.model/src/java/org/jboss/savara/contract/model/RequestResponseMEP.java
trunk/tools/plugins/org.jboss.savara.pi4soa.cdm/src/java/org/jboss/savara/pi4soa/cdm/parser/rules/ConversationConverterRuleImpl.java
trunk/tools/plugins/org.jboss.savara.tools.wsdl/src/java/org/jboss/savara/tools/wsdl/generator/WSDLGenerator.java
trunk/tools/tests/org.jboss.savara.tools.wsdl.tests/src/java/org/jboss/savara/tools/wsdl/tests/WSDLGeneratorTest.java
Log:
Add Type and TypeDefinition components to contract model, to explicitly model the type information. Updated the CDM and WSDL generation plugins to make use of these new model components.
Modified: trunk/tools/plugins/org.jboss.savara.contract.model/src/java/org/jboss/savara/contract/model/Contract.java
===================================================================
--- trunk/tools/plugins/org.jboss.savara.contract.model/src/java/org/jboss/savara/contract/model/Contract.java 2010-07-08 13:20:56 UTC (rev 317)
+++ trunk/tools/plugins/org.jboss.savara.contract.model/src/java/org/jboss/savara/contract/model/Contract.java 2010-07-08 13:22:47 UTC (rev 318)
@@ -22,6 +22,13 @@
*/
public class Contract {
+ private String m_name=null;
+ private String m_namespace=null;
+ private java.util.Set<Interface> m_interfaces=
+ new java.util.HashSet<Interface>();
+ private java.util.Set<Namespace> m_namespaces=
+ new java.util.HashSet<Namespace>();
+
/**
* The default constructor.
*/
@@ -108,11 +115,4 @@
public java.util.Set<Namespace> getNamespaces() {
return(m_namespaces);
}
-
- private String m_name=null;
- private String m_namespace=null;
- private java.util.Set<Interface> m_interfaces=
- new java.util.HashSet<Interface>();
- private java.util.Set<Namespace> m_namespaces=
- new java.util.HashSet<Namespace>();
}
Modified: trunk/tools/plugins/org.jboss.savara.contract.model/src/java/org/jboss/savara/contract/model/FaultDetails.java
===================================================================
--- trunk/tools/plugins/org.jboss.savara.contract.model/src/java/org/jboss/savara/contract/model/FaultDetails.java 2010-07-08 13:20:56 UTC (rev 317)
+++ trunk/tools/plugins/org.jboss.savara.contract.model/src/java/org/jboss/savara/contract/model/FaultDetails.java 2010-07-08 13:22:47 UTC (rev 318)
@@ -17,13 +17,16 @@
*/
package org.jboss.savara.contract.model;
-import org.scribble.model.TypeReference;
-
/**
* This class represents the fault details.
*/
public class FaultDetails {
+ private String m_name=null;
+ private String m_namespace=null;
+ private java.util.List<Type> m_types=
+ new java.util.Vector<Type>();
+
/**
* The default constructor.
*/
@@ -69,16 +72,11 @@
}
/**
- * This method returns the list of type references.
+ * This method returns the list of types.
*
- * @return The list of type references
+ * @return The list of types
*/
- public java.util.List<TypeReference> getTypes() {
+ public java.util.List<Type> getTypes() {
return(m_types);
}
-
- private String m_name=null;
- private String m_namespace=null;
- private java.util.List<TypeReference> m_types=
- new java.util.Vector<TypeReference>();
}
Modified: trunk/tools/plugins/org.jboss.savara.contract.model/src/java/org/jboss/savara/contract/model/Interface.java
===================================================================
--- trunk/tools/plugins/org.jboss.savara.contract.model/src/java/org/jboss/savara/contract/model/Interface.java 2010-07-08 13:20:56 UTC (rev 317)
+++ trunk/tools/plugins/org.jboss.savara.contract.model/src/java/org/jboss/savara/contract/model/Interface.java 2010-07-08 13:22:47 UTC (rev 318)
@@ -22,6 +22,11 @@
*
*/
public class Interface {
+
+ private String m_name=null;
+ private String m_namespace=null;
+ private java.util.List<MessageExchangePattern> m_messageExchangePatterns=
+ new java.util.Vector<MessageExchangePattern>();
/**
* The default constructor.
@@ -75,9 +80,4 @@
public java.util.List<MessageExchangePattern> getMessageExchangePatterns() {
return(m_messageExchangePatterns);
}
-
- private String m_name=null;
- private String m_namespace=null;
- private java.util.List<MessageExchangePattern> m_messageExchangePatterns=
- new java.util.Vector<MessageExchangePattern>();
}
Modified: trunk/tools/plugins/org.jboss.savara.contract.model/src/java/org/jboss/savara/contract/model/MessageExchangePattern.java
===================================================================
--- trunk/tools/plugins/org.jboss.savara.contract.model/src/java/org/jboss/savara/contract/model/MessageExchangePattern.java 2010-07-08 13:20:56 UTC (rev 317)
+++ trunk/tools/plugins/org.jboss.savara.contract.model/src/java/org/jboss/savara/contract/model/MessageExchangePattern.java 2010-07-08 13:22:47 UTC (rev 318)
@@ -17,13 +17,15 @@
*/
package org.jboss.savara.contract.model;
-import org.scribble.model.TypeReference;
-
/**
* This class represents the message exchange pattern.
*/
public abstract class MessageExchangePattern {
+ private String m_operation=null;
+ private java.util.List<Type> m_types=
+ new java.util.Vector<Type>();
+
/**
* The default constructor.
*/
@@ -49,17 +51,13 @@
}
/**
- * This method returns the list of type references. If
- * no operation is defined, then only one type reference
+ * This method returns the list of types. If
+ * no operation name is defined, then only one type
* should be defined.
*
- * @return The list of type references
+ * @return The list of types
*/
- public java.util.List<TypeReference> getTypes() {
+ public java.util.List<Type> getTypes() {
return(m_types);
}
-
- private String m_operation=null;
- private java.util.List<TypeReference> m_types=
- new java.util.Vector<TypeReference>();
}
Modified: trunk/tools/plugins/org.jboss.savara.contract.model/src/java/org/jboss/savara/contract/model/Namespace.java
===================================================================
--- trunk/tools/plugins/org.jboss.savara.contract.model/src/java/org/jboss/savara/contract/model/Namespace.java 2010-07-08 13:20:56 UTC (rev 317)
+++ trunk/tools/plugins/org.jboss.savara.contract.model/src/java/org/jboss/savara/contract/model/Namespace.java 2010-07-08 13:22:47 UTC (rev 318)
@@ -22,6 +22,10 @@
*/
public class Namespace {
+ private String m_prefix=null;
+ private String m_uri=null;
+ private String m_schemaLocation=null;
+
/**
* The default constructor.
*/
@@ -84,8 +88,4 @@
public void setSchemaLocation(String schemaLocation) {
m_schemaLocation = schemaLocation;
}
-
- private String m_prefix=null;
- private String m_uri=null;
- private String m_schemaLocation=null;
}
Modified: trunk/tools/plugins/org.jboss.savara.contract.model/src/java/org/jboss/savara/contract/model/RequestResponseMEP.java
===================================================================
--- trunk/tools/plugins/org.jboss.savara.contract.model/src/java/org/jboss/savara/contract/model/RequestResponseMEP.java 2010-07-08 13:20:56 UTC (rev 317)
+++ trunk/tools/plugins/org.jboss.savara.contract.model/src/java/org/jboss/savara/contract/model/RequestResponseMEP.java 2010-07-08 13:22:47 UTC (rev 318)
@@ -17,13 +17,16 @@
*/
package org.jboss.savara.contract.model;
-import org.scribble.model.TypeReference;
-
/**
* This class represents the request response message exchange pattern.
*/
public class RequestResponseMEP extends MessageExchangePattern {
+ private java.util.List<Type> m_responseTypes=
+ new java.util.Vector<Type>();
+ private java.util.List<FaultDetails> m_faultDetails=
+ new java.util.Vector<FaultDetails>();
+
/**
* The default constructor.
*/
@@ -31,11 +34,11 @@
}
/**
- * This method returns the list of response type references.
+ * This method returns the list of response types.
*
- * @return The list of response type references
+ * @return The list of response types
*/
- public java.util.List<TypeReference> getResponseTypes() {
+ public java.util.List<Type> getResponseTypes() {
return(m_responseTypes);
}
@@ -47,9 +50,4 @@
public java.util.List<FaultDetails> getFaultDetails() {
return(m_faultDetails);
}
-
- private java.util.List<TypeReference> m_responseTypes=
- new java.util.Vector<TypeReference>();
- private java.util.List<FaultDetails> m_faultDetails=
- new java.util.Vector<FaultDetails>();
}
Added: trunk/tools/plugins/org.jboss.savara.contract.model/src/java/org/jboss/savara/contract/model/Type.java
===================================================================
--- trunk/tools/plugins/org.jboss.savara.contract.model/src/java/org/jboss/savara/contract/model/Type.java (rev 0)
+++ trunk/tools/plugins/org.jboss.savara.contract.model/src/java/org/jboss/savara/contract/model/Type.java 2010-07-08 13:22:47 UTC (rev 318)
@@ -0,0 +1,62 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+package org.jboss.savara.contract.model;
+
+/**
+ * This class represents a type associated with information passed by the contract.
+ */
+public class Type {
+
+ private String m_name=null;
+ private java.util.Set<TypeDefinition> m_typeDefinitions=
+ new java.util.HashSet<TypeDefinition>();
+
+ /**
+ * The default constructor.
+ */
+ public Type() {
+ }
+
+ /**
+ * This method returns the name associated with the
+ * type.
+ *
+ * @return The name
+ */
+ public String getName() {
+ return(m_name);
+ }
+
+ /**
+ * This method sets the name of the type.
+ *
+ * @param name The name
+ */
+ public void setName(String name) {
+ m_name = name;
+ }
+
+ /**
+ * This method returns the list of type definitions.
+ *
+ * @return The list of type definitions
+ */
+ public java.util.Set<TypeDefinition> getTypeDefinitions() {
+ return(m_typeDefinitions);
+ }
+}
Added: trunk/tools/plugins/org.jboss.savara.contract.model/src/java/org/jboss/savara/contract/model/TypeDefinition.java
===================================================================
--- trunk/tools/plugins/org.jboss.savara.contract.model/src/java/org/jboss/savara/contract/model/TypeDefinition.java (rev 0)
+++ trunk/tools/plugins/org.jboss.savara.contract.model/src/java/org/jboss/savara/contract/model/TypeDefinition.java 2010-07-08 13:22:47 UTC (rev 318)
@@ -0,0 +1,95 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+package org.jboss.savara.contract.model;
+
+/**
+ * This class represents a type definition within
+ */
+public class TypeDefinition {
+
+ public static final String XSD_ELEMENT="##XSDElement";
+ public static final String XSD_TYPE="##XSDType";
+
+ private String m_name=null;
+ private String m_namespace=null;
+ private String m_typeSystem=null;
+
+ /**
+ * The default constructor.
+ */
+ public TypeDefinition() {
+ }
+
+ /**
+ * This method returns the name associated with the
+ * type.
+ *
+ * @return The name
+ */
+ public String getName() {
+ return(m_name);
+ }
+
+ /**
+ * This method returns the namespace associated with the
+ * type definition.
+ *
+ * @return The namespace
+ */
+ public String getNamespace() {
+ return(m_namespace);
+ }
+
+ /**
+ * This method sets the namespace of the type definition.
+ *
+ * @param namespace The namespace
+ */
+ public void setNamespace(String namespace) {
+ m_namespace = namespace;
+ }
+
+ /**
+ * This method sets the name of the type.
+ *
+ * @param name The name
+ */
+ public void setName(String name) {
+ m_name = name;
+ }
+
+ /**
+ * This method returns the type system associated with the
+ * type definition.
+ *
+ * @return The type system
+ */
+ public String getTypeSystem() {
+ return(m_typeSystem);
+ }
+
+ /**
+ * This method sets the type system associated with the
+ * type definition.
+ *
+ * @param typeSystem The type system
+ */
+ public void setTypeSystem(String typeSystem) {
+ m_typeSystem = typeSystem;
+ }
+}
Modified: trunk/tools/plugins/org.jboss.savara.pi4soa.cdm/src/java/org/jboss/savara/pi4soa/cdm/parser/rules/ConversationConverterRuleImpl.java
===================================================================
--- trunk/tools/plugins/org.jboss.savara.pi4soa.cdm/src/java/org/jboss/savara/pi4soa/cdm/parser/rules/ConversationConverterRuleImpl.java 2010-07-08 13:20:56 UTC (rev 317)
+++ trunk/tools/plugins/org.jboss.savara.pi4soa.cdm/src/java/org/jboss/savara/pi4soa/cdm/parser/rules/ConversationConverterRuleImpl.java 2010-07-08 13:22:47 UTC (rev 318)
@@ -691,13 +691,13 @@
public void message(MessageDefinition defn) {
if (defn.getClassification() == MessageDefinition.INPUT) {
- m_currentMEP.getTypes().add(createTypeReference(defn));
+ m_currentMEP.getTypes().add(createType(defn));
} else if (m_currentMEP instanceof RequestResponseMEP) {
RequestResponseMEP mep=(RequestResponseMEP)m_currentMEP;
if (defn.getClassification() == MessageDefinition.OUTPUT) {
- mep.getResponseTypes().add(createTypeReference(defn));
+ mep.getResponseTypes().add(createType(defn));
} else if (defn.getClassification() == MessageDefinition.OUTFAULT) {
FaultDetails fault=new FaultDetails();
@@ -705,35 +705,39 @@
fault.setName(defn.getFaultName());
fault.setNamespace(defn.getFaultNamespace());
- fault.getTypes().add(createTypeReference(defn));
+ fault.getTypes().add(createType(defn));
mep.getFaultDetails().add(fault);
}
}
}
- protected TypeReference createTypeReference(MessageDefinition defn) {
- TypeReference ret=new TypeReference();
+ protected Type createType(MessageDefinition defn) {
+ Type ret=new Type();
+ TypeDefinition td=new TypeDefinition();
+ ret.getTypeDefinitions().add(td);
if (defn.getElement() != null && defn.getElement().trim().length() > 0) {
- ret.setLocalpart(defn.getElement());
+ td.setName(defn.getElement());
if (defn.getElementNamespace() != null) {
- ret.setNamespace(defn.getElementNamespace());
+ td.setNamespace(defn.getElementNamespace());
}
- ret.setProperty(TypeReference.TYPE_SYSTEM, TypeReference.TS_XSD_ELEMENT);
+ td.setTypeSystem(TypeDefinition.XSD_ELEMENT);
} else if (defn.getType() != null && defn.getType().trim().length() > 0) {
- ret.setLocalpart(defn.getType());
+ td.setName(defn.getType());
if (defn.getTypeNamespace() != null) {
- ret.setNamespace(defn.getTypeNamespace());
+ td.setNamespace(defn.getTypeNamespace());
}
- ret.setProperty(TypeReference.TYPE_SYSTEM, TypeReference.TS_XSD_TYPE);
+ td.setTypeSystem(TypeDefinition.XSD_TYPE);
}
+ ret.setName(td.getName());
+
return(ret);
}
Modified: trunk/tools/plugins/org.jboss.savara.tools.wsdl/src/java/org/jboss/savara/tools/wsdl/generator/WSDLGenerator.java
===================================================================
--- trunk/tools/plugins/org.jboss.savara.tools.wsdl/src/java/org/jboss/savara/tools/wsdl/generator/WSDLGenerator.java 2010-07-08 13:20:56 UTC (rev 317)
+++ trunk/tools/plugins/org.jboss.savara.tools.wsdl/src/java/org/jboss/savara/tools/wsdl/generator/WSDLGenerator.java 2010-07-08 13:22:47 UTC (rev 318)
@@ -26,6 +26,8 @@
import org.jboss.savara.contract.model.Interface;
import org.jboss.savara.contract.model.Namespace;
import org.jboss.savara.contract.model.RequestResponseMEP;
+import org.jboss.savara.contract.model.Type;
+import org.jboss.savara.contract.model.TypeDefinition;
import org.scribble.model.TypeReference;
/**
@@ -477,7 +479,7 @@
public javax.wsdl.Message getMessage(java.util.List<javax.wsdl.Definition> wsdls,
org.jboss.savara.contract.model.Contract contract,
javax.xml.namespace.QName msgname,
- java.util.List<TypeReference> types,
+ java.util.List<org.jboss.savara.contract.model.Type> types,
WSDLBinding wsdlBinding) {
javax.wsdl.Message ret=null;
@@ -486,32 +488,45 @@
} else if (types.size() > 1) {
throw new UnsupportedOperationException("Currently only supports single type reference");
} else {
- TypeReference ref=types.get(0);
- javax.xml.namespace.QName qname=
- new javax.xml.namespace.QName(ref.getNamespace(),ref.getLocalpart());
- javax.wsdl.Definition defn=
- getDefinition(wsdls, contract, msgname.getNamespaceURI(), wsdlBinding);
-
- if (defn != null && qname != null &&
- (ret = defn.getMessage(msgname)) == null) {
- ret = defn.createMessage();
- ret.setUndefined(false);
+ Type ref=types.get(0);
+
+ java.util.Iterator<TypeDefinition> iter=ref.getTypeDefinitions().iterator();
+ boolean f_done=false;
+
+ while (f_done == false && iter.hasNext()) {
+ TypeDefinition td=iter.next();
- ret.setQName(msgname);
-
- // Create single part for type or element
- Part part=defn.createPart();
- part.setName("content");
-
- if (TypeReference.TS_XSD_ELEMENT.equals(ref.getProperty(TypeReference.TYPE_SYSTEM))) {
- part.setElementName(qname);
- } else {
- part.setTypeName(qname);
+ if (TypeDefinition.XSD_ELEMENT.equals(td.getTypeSystem()) ||
+ TypeDefinition.XSD_TYPE.equals(td.getTypeSystem())) {
+ javax.xml.namespace.QName qname=
+ new javax.xml.namespace.QName(td.getNamespace(),td.getName());
+ javax.wsdl.Definition defn=
+ getDefinition(wsdls, contract, msgname.getNamespaceURI(), wsdlBinding);
+
+ if (defn != null && qname != null &&
+ (ret = defn.getMessage(msgname)) == null) {
+ ret = defn.createMessage();
+ ret.setUndefined(false);
+
+ ret.setQName(msgname);
+
+ // Create single part for type or element
+ Part part=defn.createPart();
+ part.setName("content");
+
+ if (TypeDefinition.XSD_ELEMENT.equals(td.getTypeSystem())) {
+ part.setElementName(qname);
+ } else {
+ part.setTypeName(qname);
+ }
+
+ ret.addPart(part);
+
+ defn.addMessage(ret);
+
+ f_done = true;
+ }
}
-
- ret.addPart(part);
-
- defn.addMessage(ret);
}
}
Modified: trunk/tools/tests/org.jboss.savara.tools.wsdl.tests/src/java/org/jboss/savara/tools/wsdl/tests/WSDLGeneratorTest.java
===================================================================
--- trunk/tools/tests/org.jboss.savara.tools.wsdl.tests/src/java/org/jboss/savara/tools/wsdl/tests/WSDLGeneratorTest.java 2010-07-08 13:20:56 UTC (rev 317)
+++ trunk/tools/tests/org.jboss.savara.tools.wsdl.tests/src/java/org/jboss/savara/tools/wsdl/tests/WSDLGeneratorTest.java 2010-07-08 13:22:47 UTC (rev 318)
@@ -22,7 +22,6 @@
import org.jboss.savara.tools.wsdl.generator.WSDLGenerator;
import org.jboss.savara.contract.model.*;
-import org.scribble.model.TypeReference;
import junit.framework.TestCase;
@@ -164,10 +163,13 @@
m1.setOperation(TEST_NAME);
- TypeReference ref1=new TypeReference();
- ref1.setLocalpart(TEST_TYPE_LP);
+ Type tref1=new Type();
+ TypeDefinition ref1=new TypeDefinition();
+ tref1.getTypeDefinitions().add(ref1);
+ ref1.setName(TEST_TYPE_LP);
ref1.setNamespace(TEST_NAME_SPACE);
- m1.getTypes().add(ref1);
+ ref1.setTypeSystem(TypeDefinition.XSD_TYPE);
+ m1.getTypes().add(tref1);
i1.getMessageExchangePatterns().add(m1);
@@ -179,10 +181,13 @@
m2.setOperation(TEST_NAME);
- TypeReference ref2=new TypeReference();
- ref2.setLocalpart(TEST_TYPE_LP);
+ Type tref2=new Type();
+ TypeDefinition ref2=new TypeDefinition();
+ tref2.getTypeDefinitions().add(ref1);
+ ref2.setName(TEST_TYPE_LP);
ref2.setNamespace(TEST_NAME_SPACE);
- m2.getTypes().add(ref2);
+ ref2.setTypeSystem(TypeDefinition.XSD_TYPE);
+ m2.getTypes().add(tref2);
i2.getMessageExchangePatterns().add(m2);
@@ -194,10 +199,13 @@
m3.setOperation(TEST_NAME);
- TypeReference ref3=new TypeReference();
- ref3.setLocalpart(TEST_TYPE_LP);
+ Type tref3=new Type();
+ TypeDefinition ref3=new TypeDefinition();
+ tref3.getTypeDefinitions().add(ref1);
+ ref3.setName(TEST_TYPE_LP);
ref3.setNamespace(TEST_NAME_SPACE);
- m3.getTypes().add(ref3);
+ ref3.setTypeSystem(TypeDefinition.XSD_TYPE);
+ m3.getTypes().add(tref3);
i3.getMessageExchangePatterns().add(m3);
@@ -244,10 +252,14 @@
src.setOperation(TEST_NAME);
- TypeReference ref=new TypeReference();
- ref.setLocalpart(TEST_TYPE_LP);
+ Type tref=new Type();
+ TypeDefinition ref=new TypeDefinition();
+ tref.getTypeDefinitions().add(ref);
+ ref.setName(TEST_TYPE_LP);
ref.setNamespace(TEST_TYPE_NS);
- src.getTypes().add(ref);
+ ref.setTypeSystem(TypeDefinition.XSD_TYPE);
+ tref.setName(ref.getName());
+ src.getTypes().add(tref);
WSDLGenerator gen=new WSDLGenerator();
@@ -298,33 +310,45 @@
src.setOperation(TEST_NAME);
- TypeReference ref1=new TypeReference();
- ref1.setLocalpart(TEST_TYPE_LP);
+ Type tref1=new Type();
+ TypeDefinition ref1=new TypeDefinition();
+ tref1.getTypeDefinitions().add(ref1);
+ ref1.setName(TEST_TYPE_LP);
ref1.setNamespace(TEST_TYPE_NS);
- src.getTypes().add(ref1);
+ ref1.setTypeSystem(TypeDefinition.XSD_TYPE);
+ src.getTypes().add(tref1);
- TypeReference ref2=new TypeReference();
- ref2.setLocalpart(TEST_TYPE_LP);
+ Type tref2=new Type();
+ TypeDefinition ref2=new TypeDefinition();
+ tref2.getTypeDefinitions().add(ref2);
+ ref2.setName(TEST_TYPE_LP);
ref2.setNamespace(TEST_TYPE_NS);
- src.getResponseTypes().add(ref2);
+ ref2.setTypeSystem(TypeDefinition.XSD_TYPE);
+ src.getResponseTypes().add(tref2);
FaultDetails fd1=new FaultDetails();
fd1.setName("faultName1");
- TypeReference ref3=new TypeReference();
- ref3.setLocalpart(TEST_TYPE_LP);
+ Type tref3=new Type();
+ TypeDefinition ref3=new TypeDefinition();
+ tref3.getTypeDefinitions().add(ref3);
+ ref3.setName(TEST_TYPE_LP);
ref3.setNamespace(TEST_TYPE_NS);
- fd1.getTypes().add(ref3);
+ ref3.setTypeSystem(TypeDefinition.XSD_TYPE);
+ fd1.getTypes().add(tref3);
src.getFaultDetails().add(fd1);
FaultDetails fd2=new FaultDetails();
fd2.setName("faultName2");
- TypeReference ref4=new TypeReference();
- ref4.setLocalpart(TEST_TYPE_LP);
+ Type tref4=new Type();
+ TypeDefinition ref4=new TypeDefinition();
+ tref4.getTypeDefinitions().add(ref4);
+ ref4.setName(TEST_TYPE_LP);
ref4.setNamespace(TEST_TYPE_NS);
- fd2.getTypes().add(ref4);
+ ref4.setTypeSystem(TypeDefinition.XSD_TYPE);
+ fd2.getTypes().add(tref4);
src.getFaultDetails().add(fd2);
@@ -374,13 +398,17 @@
fail("Failed to get definition");
}
- TypeReference src=new TypeReference();
- src.setLocalpart(TEST_TYPE_LP);
+ TypeDefinition src=new TypeDefinition();
+ src.setName(TEST_TYPE_LP);
src.setNamespace(TEST_TYPE_NS);
+ src.setTypeSystem(TypeDefinition.XSD_TYPE);
- java.util.List<TypeReference> refs=new java.util.Vector<TypeReference>();
- refs.add(src);
+ Type t=new Type();
+ t.getTypeDefinitions().add(src);
+ java.util.List<Type> refs=new java.util.Vector<Type>();
+ refs.add(t);
+
WSDLGenerator gen=new WSDLGenerator();
java.util.List<javax.wsdl.Definition> defns=new java.util.Vector<javax.wsdl.Definition>();
@@ -451,10 +479,13 @@
m1.setOperation(TEST_NAME);
- TypeReference ref1=new TypeReference();
- ref1.setLocalpart(TEST_TYPE_LP);
+ Type tref1=new Type();
+ TypeDefinition ref1=new TypeDefinition();
+ tref1.getTypeDefinitions().add(ref1);
+ ref1.setName(TEST_TYPE_LP);
ref1.setNamespace(TEST_NAME_SPACE);
- m1.getTypes().add(ref1);
+ ref1.setTypeSystem(TypeDefinition.XSD_TYPE);
+ m1.getTypes().add(tref1);
i1.getMessageExchangePatterns().add(m1);
@@ -466,10 +497,13 @@
m2.setOperation(TEST_NAME);
- TypeReference ref2=new TypeReference();
- ref2.setLocalpart(TEST_TYPE_LP);
+ Type tref2=new Type();
+ TypeDefinition ref2=new TypeDefinition();
+ tref2.getTypeDefinitions().add(ref2);
+ ref2.setName(TEST_TYPE_LP);
ref2.setNamespace(TEST_NAME_SPACE2);
- m2.getTypes().add(ref2);
+ ref2.setTypeSystem(TypeDefinition.XSD_TYPE);
+ m2.getTypes().add(tref2);
i2.getMessageExchangePatterns().add(m2);
@@ -481,10 +515,13 @@
m3.setOperation(TEST_NAME);
- TypeReference ref3=new TypeReference();
- ref3.setLocalpart(TEST_TYPE_LP);
+ Type tref3=new Type();
+ TypeDefinition ref3=new TypeDefinition();
+ tref3.getTypeDefinitions().add(ref3);
+ ref3.setName(TEST_TYPE_LP);
ref3.setNamespace(TEST_NAME_SPACE3);
- m3.getTypes().add(ref3);
+ ref3.setTypeSystem(TypeDefinition.XSD_TYPE);
+ m3.getTypes().add(tref3);
i3.getMessageExchangePatterns().add(m3);
13 years, 10 months
- 1
- 0
savara SVN: r317 - trunk/tools/eclipse/org.scribble.core/src/java/org/scribble/model.
by do-not-reply＠jboss.org
Author: objectiser
Date: 2010-07-08 09:20:56 -0400 (Thu, 08 Jul 2010)
New Revision: 317
Modified:
trunk/tools/eclipse/org.scribble.core/src/java/org/scribble/model/TypeReference.java
Log:
Removed type system details, as now explicitly stored in savara contract model.
Modified: trunk/tools/eclipse/org.scribble.core/src/java/org/scribble/model/TypeReference.java
===================================================================
--- trunk/tools/eclipse/org.scribble.core/src/java/org/scribble/model/TypeReference.java 2010-07-07 21:30:30 UTC (rev 316)
+++ trunk/tools/eclipse/org.scribble.core/src/java/org/scribble/model/TypeReference.java 2010-07-08 13:20:56 UTC (rev 317)
@@ -26,11 +26,6 @@
private static final long serialVersionUID = 6492984753933254949L;
- public static final String TYPE_SYSTEM="TypeSystem";
-
- public static final String TS_XSD_TYPE="XSDType";
- public static final String TS_XSD_ELEMENT="XSDElement";
-
/**
* This is the default constructor for the type reference.
*/
13 years, 10 months
- 1
- 0
Build failed in Hudson: savara-eclipse #26
by jboss-qa-internal＠redhat.com
See <http://hudson.qa.jboss.com/hudson/job/savara-eclipse/26/changes>
Changes:
[objectiser]
[objectiser] SAVARA-112 - fixed message type.
[objectiser] SAVARA-111 - now deals with xsd includes.
[objectiser] SAVARA-109 and SAVARA-110.
------------------------------------------
[...truncated 2579 lines...]
++ [[ -n '' ]]
++ projRelengBranch=
++ [[ -n -projRelengName org.jboss.savara.tools.releng ]]
++ projRelengName='-projRelengName org.jboss.savara.tools.releng'
++ [[ 0 -gt 0 ]]
++ signingDir=<http://hudson.qa.jboss.com/hudson/job/savara-eclipse/ws/build/signing>
++ mkdir -p <http://hudson.qa.jboss.com/hudson/job/savara-eclipse/ws/build/signing>
++ [[ -n true ]]
++ buildDir=<http://hudson.qa.jboss.com/hudson/job/savara-eclipse/ws/build/N-SNAPSHOT>
++ EXTRAFLAGS='-buildAlias N-SNAPSHOT -forceContextQualifier'
++ mkdir -p <http://hudson.qa.jboss.com/hudson/job/savara-eclipse/ws/downloads> <http://hudson.qa.jboss.com/hudson/job/savara-eclipse/ws/build/signing> <http://hudson.qa.jboss.com/hudson/job/savara-eclipse/ws/build/N-SNAPSHOT>
++ touch <http://hudson.qa.jboss.com/hudson/job/savara-eclipse/ws/build/.cvspass>
++ relengBaseBuilderDir=<http://hudson.qa.jboss.com/hudson/job/savara-eclipse/ws/build/org.eclipse...>
++ relengCommonBuilderDir=<http://hudson.qa.jboss.com/hudson/job/savara-eclipse/ws/build/org.eclipse...>
++ ln -s <http://hudson.qa.jboss.com/hudson/job/savara-eclipse/ws/org.eclipse.relen...> <http://hudson.qa.jboss.com/hudson/job/savara-eclipse/ws/build/>
++ ln -s <http://hudson.qa.jboss.com/hudson/job/savara-eclipse/ws/org.eclipse.dash....> <http://hudson.qa.jboss.com/hudson/job/savara-eclipse/ws/build/>
++ ln -s <http://hudson.qa.jboss.com/hudson/job/savara-eclipse/ws/3rdPartyJars> <http://hudson.qa.jboss.com/hudson/job/savara-eclipse/ws/build/>
++ thirdPartyJarsDir=<http://hudson.qa.jboss.com/hudson/job/savara-eclipse/ws/build/3rdPartyJars>
++ find <http://hudson.qa.jboss.com/hudson/job/savara-eclipse/ws/downloads> -maxdepth 1 -type f -name '*-SNAPSHOT.zip' -exec rm -f '{}' ';'
++ cd <http://hudson.qa.jboss.com/hudson/job/savara-eclipse/ws/build/org.eclipse...>
++ ./start.sh -projectid savara.eclipse.tools -version 1.0.0 -buildType N -buildTimestamp 201006291836 -writableBuildRoot <http://hudson.qa.jboss.com/hudson/job/savara-eclipse/ws/build> -thirdPartyJarsDir <http://hudson.qa.jboss.com/hudson/job/savara-eclipse/ws/build/3rdPartyJars> -downloadsDir <http://hudson.qa.jboss.com/hudson/job/savara-eclipse/ws/downloads> -buildDir <http://hudson.qa.jboss.com/hudson/job/savara-eclipse/ws/build/N-SNAPSHOT> -projRelengName org.jboss.savara.tools.releng -projRelengRoot http://anonsvn.jboss.org/repos/savara/trunk -projRelengPath tools/eclipse/releng -thirdPartyDownloadLicenseAcceptance -javaHome /qa/tools/opt/amd64/jdk1.5.0_last -buildAlias N-SNAPSHOT -forceContextQualifier
Found cvs: /usr/bin/cvs /usr/share/cvs /usr/share/man/man1/cvs.1.gz /usr/share/man/man5/cvs.5.gz
Found svn in PATH=
/bin:/usr/bin/:/usr/local/bin
Found javac: /usr/bin/javac /usr/share/man/man1/javac.1.gz
Found wget: /usr/bin/wget /usr/share/man/man1/wget.1.gz
Found vncserver in PATH=
/bin:/usr/bin/:/usr/local/bin
Found Xvfb in PATH=
/bin:/usr/bin/:/usr/local/bin
Found Xvnc in PATH=
/bin:/usr/bin/:/usr/local/bin
[start] [18:36:57] Started on 20100629 with these options:
-projectid savara.eclipse.tools
-version 1.0.0
-buildType N
-buildTimestamp 201006291836
-writableBuildRoot <http://hudson.qa.jboss.com/hudson/job/savara-eclipse/ws/build>
-thirdPartyJarsDir <http://hudson.qa.jboss.com/hudson/job/savara-eclipse/ws/build/3rdPartyJars>
-downloadsDir <http://hudson.qa.jboss.com/hudson/job/savara-eclipse/ws/downloads>
-buildDir <http://hudson.qa.jboss.com/hudson/job/savara-eclipse/ws/build/N-SNAPSHOT>
-projRelengName org.jboss.savara.tools.releng
-projRelengRoot http://anonsvn.jboss.org/repos/savara/trunk
-projRelengPath tools/eclipse/releng
-thirdPartyDownloadLicenseAcceptance
-javaHome /qa/tools/opt/amd64/jdk1.5.0_last
-buildAlias N-SNAPSHOT
-forceContextQualifier
[start] Create build directory <http://hudson.qa.jboss.com/hudson/job/savara-eclipse/ws/build/N-SNAPSHOT>
svn -q export -r HEAD http://anonsvn.jboss.org/repos/savara/trunk/tools/eclipse/releng org.jboss.savara.tools.releng
[start] [18:37:00] Export done.
[start] Export skipped: org.eclipse.dash.common.releng already exists.
[start] Export skipped: org.eclipse.releng.basebuilder already exists.
Environment variables:
HOME = <http://hudson.qa.jboss.com/hudson/job/savara-eclipse/ws/build>
JAVA_HOME = /qa/tools/opt/amd64/jdk1.5.0_last
ANT_HOME = /opt/public/common/apache-ant-1.7.1
ANT = /opt/public/common/apache-ant-1.7.1/bin/ant
[start] mapVersionTag: HEAD
[start] [18:37:00] Invoke Eclipse build
[18:37:00]
/qa/tools/opt/amd64/jdk1.5.0_last/bin/java
-enableassertions
-cp <http://hudson.qa.jboss.com/hudson/job/savara-eclipse/ws/build/org.eclipse...> org.eclipse.equinox.launcher.Main
-application org.eclipse.ant.core.antRunner
-f <http://hudson.qa.jboss.com/hudson/job/savara-eclipse/ws/build/org.eclipse...> run
-DthirdPartyDownloadLicenseAcceptance=Y
-Dprojectid=savara.eclipse.tools
-DbuildTimestamp=201006291836
-DbuildType=N
-DbuildAlias=N-SNAPSHOT
-Dversion=1.0.0
-DwritableBuildRoot=<http://hudson.qa.jboss.com/hudson/job/savara-eclipse/ws/build>
-DdownloadsDir=<http://hudson.qa.jboss.com/hudson/job/savara-eclipse/ws/downloads>
-DthirdPartyJarsDir=<http://hudson.qa.jboss.com/hudson/job/savara-eclipse/ws/build/3rdPartyJars>
-DbuildDir=<http://hudson.qa.jboss.com/hudson/job/savara-eclipse/ws/build/N-SNAPSHOT>
-DrelengBuilderDir=<http://hudson.qa.jboss.com/hudson/job/savara-eclipse/ws/build/org.jboss.s...>
-DrelengCommonBuilderDir=<http://hudson.qa.jboss.com/hudson/job/savara-eclipse/ws/build/org.eclipse...>
-DrelengBaseBuilderDir=<http://hudson.qa.jboss.com/hudson/job/savara-eclipse/ws/build/org.eclipse...>
-DJAVA_HOME=/qa/tools/opt/amd64/jdk1.5.0_last
-DmapVersionTag=HEAD
-DforceContextQualifier=v201006291836
Buildfile: <http://hudson.qa.jboss.com/hudson/job/savara-eclipse/ws/build/org.eclipse...>
init:
check.ant-contrib:
get.ant-contrib:
[get] Getting: http://downloads.sourceforge.net/ant-contrib/ant-contrib-1.0b2-bin.zip
[get] To: <http://hudson.qa.jboss.com/hudson/job/savara-eclipse/ws/downloads/ant-con...>
[mkdir] Created dir: /tmp/ant-contrib-1.0b2-bin.zip_
[unzip] Expanding: <http://hudson.qa.jboss.com/hudson/job/savara-eclipse/ws/downloads/ant-con...> into /tmp/ant-contrib-1.0b2-bin.zip_
[mkdir] Created dir: <http://hudson.qa.jboss.com/hudson/job/savara-eclipse/ws/build/org.jboss.s...>
[copy] Copying 1 file to <http://hudson.qa.jboss.com/hudson/job/savara-eclipse/ws/build/org.jboss.s...>
[delete] Deleting directory /tmp/ant-contrib-1.0b2-bin.zip_
resolvepaths:
init:
genBuildCfgInit:
Trying to override old definition of task resolvepath
projectid2names:
genBuildCfg:
Trying to override old definition of task resolvepath
createBuildConfigFile:
Trying to override old definition of task resolvepath
initCommandlineArgsList:
Trying to override old definition of task resolvepath
load.properties:
[echo] Load properties from <http://hudson.qa.jboss.com/hudson/job/savara-eclipse/ws/build/org.jboss.s...>
[echo]
[echo] Loaded JAVA*_HOME and bootclasspath values:
[echo] JAVA_HOME = /qa/tools/opt/amd64/jdk1.5.0_last
[echo] JAVA14_HOME = /qa/tools/opt/amd64/jdk1.5.0_last, J2SE-1.4 = /qa/tools/opt/amd64/jdk1.5.0_last/lib/vm.jar:/qa/tools/opt/amd64/jdk1.5.0_last/jre/lib/vm.jar:/qa/tools/opt/amd64/jdk1.5.0_last/lib/dt.jar:/qa/tools/opt/amd64/jdk1.5.0_last/jre/lib/dt.jar:/qa/tools/opt/amd64/jdk1.5.0_last/lib/rt.jar:/qa/tools/opt/amd64/jdk1.5.0_last/jre/lib/rt.jar:/qa/tools/opt/amd64/jdk1.5.0_last/lib/core.jar:/qa/tools/opt/amd64/jdk1.5.0_last/jre/lib/core.jar:/qa/tools/opt/amd64/jdk1.5.0_last/lib/xml.jar:/qa/tools/opt/amd64/jdk1.5.0_last/jre/lib/xml.jar:/qa/tools/opt/amd64/jdk1.5.0_last/lib/graphics.jar:/qa/tools/opt/amd64/jdk1.5.0_last/jre/lib/graphics.jar:/qa/tools/opt/amd64/jdk1.5.0_last/lib/server.jar:/qa/tools/opt/amd64/jdk1.5.0_last/jre/lib/server.jar:/qa/tools/opt/amd64/jdk1.5.0_last/lib/ibmorbapi.jar:/qa/tools/opt/amd64/jdk1.5.0_last/jre/lib/ibmorbapi.jar:/qa/tools/opt/amd64/jdk1.5.0_last/lib/security.jar:/qa/tools/opt/amd64/jdk1.5.0_last/jre/lib/security.jar:/qa/tools/opt/amd64/jdk1.5.0_last/lib/classes.jar:/qa/tools/opt/amd64/jdk1.5.0_last/jre/lib/classes.jar:/qa/tools/opt/amd64/jdk1.5.0_last/jre/lib/jce.jar:/qa/tools/opt/amd64/jdk1.5.0_last/lib/jsse.jar:/qa/tools/opt/amd64/jdk1.5.0_last/jre/lib/jsse.jar:/qa/tools/opt/amd64/jdk1.5.0_last/../Classes/dt.jar:/qa/tools/opt/amd64/jdk1.5.0_last/../Classes/classes.jar:/qa/tools/opt/amd64/jdk1.5.0_last/../Classes/jsse.jar:/qa/tools/opt/amd64/jdk1.5.0_last/../Classes/jce.jar
[echo] JAVA50_HOME = /qa/tools/opt/amd64/jdk1.5.0_last, J2SE-1.5 = /qa/tools/opt/amd64/jdk1.5.0_last/jre/lib/rt.jar:/qa/tools/opt/amd64/jdk1.5.0_last/jre/lib/vm.jar:/qa/tools/opt/amd64/jdk1.5.0_last/jre/lib/core.jar:/qa/tools/opt/amd64/jdk1.5.0_last/jre/lib/xml.jar:/qa/tools/opt/amd64/jdk1.5.0_last/jre/lib/graphics.jar:/qa/tools/opt/amd64/jdk1.5.0_last/jre/lib/server.jar:/qa/tools/opt/amd64/jdk1.5.0_last/jre/lib/ibmorbapi.jar:/qa/tools/opt/amd64/jdk1.5.0_last/jre/lib/security.jar:/qa/tools/opt/amd64/jdk1.5.0_last/jre/lib/classes.jar:/qa/tools/opt/amd64/jdk1.5.0_last/jre/lib/jsse.jar:/qa/tools/opt/amd64/jdk1.5.0_last/jre/lib/jce.jar:/qa/tools/opt/amd64/jdk1.5.0_last/jre/lib/ibmjcefw.jar:/qa/tools/opt/amd64/jdk1.5.0_last/../Classes/dt.jar:/qa/tools/opt/amd64/jdk1.5.0_last/../Classes/classes.jar:/qa/tools/opt/amd64/jdk1.5.0_last/../Classes/jsse.jar:/qa/tools/opt/amd64/jdk1.5.0_last/../Classes/jce.jar
[echo] JAVA60_HOME = /qa/tools/opt/amd64/jdk1.5.0_last, JavaSE-1.6 = /qa/tools/opt/amd64/jdk1.5.0_last/jre/lib/rt.jar:/qa/tools/opt/amd64/jdk1.5.0_last/jre/lib/core.jar:/qa/tools/opt/amd64/jdk1.5.0_last/jre/lib/annotation.jar:/qa/tools/opt/amd64/jdk1.5.0_last/jre/lib/beans.jar:/qa/tools/opt/amd64/jdk1.5.0_last/jre/lib/ibmorbapi.jar:/qa/tools/opt/amd64/jdk1.5.0_last/jre/lib/java.util.jar:/qa/tools/opt/amd64/jdk1.5.0_last/jre/lib/jlm.jar:/qa/tools/opt/amd64/jdk1.5.0_last/jre/lib/logging.jar:/qa/tools/opt/amd64/jdk1.5.0_last/jre/lib/resources.jar:/qa/tools/opt/amd64/jdk1.5.0_last/jre/lib/security.jar:/qa/tools/opt/amd64/jdk1.5.0_last/jre/lib/sql.jar:/qa/tools/opt/amd64/jdk1.5.0_last/jre/lib/vm.jar:/qa/tools/opt/amd64/jdk1.5.0_last/jre/lib/xmldsigfw.jar:/qa/tools/opt/amd64/jdk1.5.0_last/jre/lib/xml.jar:/qa/tools/opt/amd64/jdk1.5.0_last/jre/lib/graphics.jar:/qa/tools/opt/amd64/jdk1.5.0_last/jre/lib/server.jar:/qa/tools/opt/amd64/jdk1.5.0_last/jre/lib/jce.jar:/qa/tools/opt/amd64/jdk1.5.0_last/jre/lib/jsse.jar:/qa/tools/opt/amd64/jdk1.5.0_last/jre/lib/ibmjcefw.jar:/qa/tools/opt/amd64/jdk1.5.0_last/lib/dt.jar:/qa/tools/opt/amd64/jdk1.5.0_last/../Classes/dt.jar:/qa/tools/opt/amd64/jdk1.5.0_last/../Classes/classes.jar:/qa/tools/opt/amd64/jdk1.5.0_last/../Classes/jsse.jar:/qa/tools/opt/amd64/jdk1.5.0_last/../Classes/jce.jar
[echo] Created <http://hudson.qa.jboss.com/hudson/job/savara-eclipse/ws/build/N-SNAPSHOT/...>
Trying to override old definition of task resolvepath
collectMapTypes:
[echo] Found these map entry types: SVN,CVS
Trying to override old definition of task resolvepath
collectURLs:
[echo] Found 0 dependency URLs
[echo] Load properties from <http://hudson.qa.jboss.com/hudson/job/savara-eclipse/ws/build/N-SNAPSHOT/...>
[echo] Got incubation =
create.label.properties:
[echo] subprojectName = tools
[echo] Base OS: linux; Base Window System: gtk
collectMaps:
run:
get.pde.build.svn:
get.ant4eclipse:
[echo] Third Party Download License Agreement: Y
[get] Getting: http://downloads.sourceforge.net/sourceforge/ant4eclipse/ant4eclipse-0.5....
[get] To: <http://hudson.qa.jboss.com/hudson/job/savara-eclipse/ws/downloads/ant4ecl...>
[mkdir] Created dir: /tmp/net.sf.ant4eclipse
[unzip] Expanding: <http://hudson.qa.jboss.com/hudson/job/savara-eclipse/ws/downloads/ant4ecl...> into /tmp/net.sf.ant4eclipse
[move] Moving 1 file to <http://hudson.qa.jboss.com/hudson/job/savara-eclipse/ws/build/org.eclipse...>
[delete] Deleting directory /tmp/net.sf.ant4eclipse
get.SWTBot.junit4:
[echo] buildAll.xml#run :: build.step :: buildUpdate
buildUpdate:
buildMasterZip:
-timestamp:
[echo] 06:37:15
main-init:
main:
main:
preBuild:
preSetup:
[mkdir] Created dir: <http://hudson.qa.jboss.com/hudson/job/savara-eclipse/ws/build/N-SNAPSHOT/...>
getMapFiles:
[copy] Copying 2 files to <http://hudson.qa.jboss.com/hudson/job/savara-eclipse/ws/build/N-SNAPSHOT/...>
init:
postSetup:
provision.eclipse.build.base:
provision.eclipse.base:
[echo] Install org.eclipse.sdk.feature.group+org.eclipse.sdk.ide+org.eclipse.emf.feature.group+org.eclipse.xsd.feature.group+org.eclipse.gef.feature.group+org.apache.xml.resolver+javax.xml+org.apache.xml.serializer+org.apache.xerces+org.apache.xalan+org.pi4soa.common+org.pi4soa.cdl+org.pi4soa.service+org.pi4soa.designer+javax.wsdl+org.eclipse.stp.bpmn+org.eclipse.gmf.runtime.notation to <http://hudson.qa.jboss.com/hudson/job/savara-eclipse/ws/build/N-SNAPSHOT/...>
run.director:
-timestamp:
[echo] 06:37:16
[mkdir] Created dir: <http://hudson.qa.jboss.com/hudson/job/savara-eclipse/ws/build/N-SNAPSHOT/...>
init:
getDep:
getBundle:
downloadFile:
[get] Getting: http://download.jboss.org/jbosstools/builds/nightly/trunk/201006210931/al...
[get] To: <http://hudson.qa.jboss.com/hudson/job/savara-eclipse/ws/downloads/JBossTo...>
[get] Error opening connection java.io.FileNotFoundException: http://download.jboss.org/jbosstools/builds/nightly/trunk/201006210931/al...
[get] Error opening connection java.io.FileNotFoundException: http://download.jboss.org/jbosstools/builds/nightly/trunk/201006210931/al...
[get] Error opening connection java.io.FileNotFoundException: http://download.jboss.org/jbosstools/builds/nightly/trunk/201006210931/al...
[get] Can't get http://download.jboss.org/jbosstools/builds/nightly/trunk/201006210931/al... to <http://hudson.qa.jboss.com/hudson/job/savara-eclipse/ws/downloads/JBossTo...>
[for] org.eclipse.sdk.feature.group+org.eclipse.sdk.ide+org.eclipse.emf.feature.group+org.eclipse.xsd.feature.group+org.eclipse.gef.feature.group+org.apache.xml.resolver+javax.xml+org.apache.xml.serializer+org.apache.xerces+org.apache.xalan+org.pi4soa.common+org.pi4soa.cdl+org.pi4soa.service+org.pi4soa.designer+javax.wsdl+org.eclipse.stp.bpmn+org.eclipse.gmf.runtime.notation: The following error occurred while executing this line:
[for] <http://hudson.qa.jboss.com/hudson/job/savara-eclipse/ws/build/org.eclipse...>:257: The following error occurred while executing this line:
[for] <http://hudson.qa.jboss.com/hudson/job/savara-eclipse/ws/build/org.eclipse...>:1377: The following error occurred while executing this line:
[for] <http://hudson.qa.jboss.com/hudson/job/savara-eclipse/ws/build/org.eclipse...>:1398: The following error occurred while executing this line:
[for] <http://hudson.qa.jboss.com/hudson/job/savara-eclipse/ws/build/org.eclipse...>:41: The following error occurred while executing this line:
[for] <http://hudson.qa.jboss.com/hudson/job/savara-eclipse/ws/build/org.eclipse...>:13: The following error occurred while executing this line:
[for] <http://hudson.qa.jboss.com/hudson/job/savara-eclipse/ws/build/org.eclipse...>:78: Can't get http://download.jboss.org/jbosstools/builds/nightly/trunk/201006210931/al... to <http://hudson.qa.jboss.com/hudson/job/savara-eclipse/ws/downloads/JBossTo...>
[for] IUsToInstall: The following error occurred while executing this line:
[for] <http://hudson.qa.jboss.com/hudson/job/savara-eclipse/ws/build/org.eclipse...>:230: Keepgoing execution: 1 of 1 iterations failed.
BUILD FAILED
<http://hudson.qa.jboss.com/hudson/job/savara-eclipse/ws/build/org.eclipse...>:378: The following error occurred while executing this line:
<http://hudson.qa.jboss.com/hudson/job/savara-eclipse/ws/build/org.eclipse...>:419: The following error occurred while executing this line:
<http://hudson.qa.jboss.com/hudson/job/savara-eclipse/ws/build/org.eclipse...>:833: The following error occurred while executing this line:
<http://hudson.qa.jboss.com/hudson/job/savara-eclipse/ws/build/org.eclipse...>:1242: The following error occurred while executing this line:
<http://hudson.qa.jboss.com/hudson/job/savara-eclipse/ws/build/org.eclipse...>:199: The following error occurred while executing this line:
<http://hudson.qa.jboss.com/hudson/job/savara-eclipse/ws/org.eclipse.relen...>:32: The following error occurred while executing this line:
<http://hudson.qa.jboss.com/hudson/job/savara-eclipse/ws/org.eclipse.relen...>:53: The following error occurred while executing this line:
<http://hudson.qa.jboss.com/hudson/job/savara-eclipse/ws/build/org.eclipse...>:208: Keepgoing execution: 1 of 3 iterations failed.
Total time: 11 seconds
[start] [18:37:17] start.sh finished.
++ rm -f <http://hudson.qa.jboss.com/hudson/job/savara-eclipse/ws/build/.cvspass>
++ echo ''
++ echo Linux hudson1.qa.atl2.redhat.com 2.6.18-128.1.10.el5 '#1' SMP Wed Apr 29 13:53:08 EDT 2009 x86_64 x86_64 x86_64 GNU/Linux
Linux hudson1.qa.atl2.redhat.com 2.6.18-128.1.10.el5 #1 SMP Wed Apr 29 13:53:08 EDT 2009 x86_64 x86_64 x86_64 GNU/Linux
++ echo ''
+++ date '+%Y/%m/%d %H:%M'
++ echo '[2010/06/29 18:37] Hudson job build #26 (2010-06-29_18-33-55) done.'
[2010/06/29 18:37] Hudson job build #26 (2010-06-29_18-33-55) done.
Archiving artifacts
ERROR: No artifacts found that match the file pattern "build/**/savara-Update*.zip, build/**/savara-Update*.zip.md5". Configuration error?
ERROR: 'build/**/savara-Update*.zip' doesn't match anything: 'build' exists but not 'build/**/savara-Update*.zip'
13 years, 10 months
- 1
- 5
savara SVN: r316 - in trunk/tools: plugins/org.jboss.savara.protocol.contract/src/java/org/jboss/savara/protocol/contract/impl and 8 other directories.
by do-not-reply＠jboss.org
Author: objectiser
Date: 2010-07-07 17:30:30 -0400 (Wed, 07 Jul 2010)
New Revision: 316
Added:
trunk/tools/plugins/org.jboss.savara.protocol.contract/src/java/org/jboss/savara/protocol/contract/impl/ContractIntrospector.java
trunk/tools/tests/org.jboss.savara.protocol.contract.tests/src/java/org/jboss/savara/protocol/contract/ContractGeneratorTest.java
trunk/tools/tests/org.jboss.savara.protocol.contract.tests/src/java/org/jboss/savara/protocol/contract/impl/
trunk/tools/tests/org.jboss.savara.protocol.contract.tests/src/java/org/jboss/savara/protocol/contract/impl/ContractIntrospectorTest.java
Removed:
trunk/tools/tests/org.jboss.savara.protocol.contract.tests/src/java/org/jboss/savara/protocol/contract/tests/ContractGeneratorTest.java
Modified:
trunk/tools/plugins/org.jboss.savara.protocol.contract/META-INF/MANIFEST.MF
trunk/tools/plugins/org.jboss.savara.protocol.contract/src/java/org/jboss/savara/protocol/contract/impl/ContractGeneratorImpl.java
trunk/tools/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/generator/Generator.java
trunk/tools/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/ConversationChangeRule.java
trunk/tools/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/ConversationInteractionModelChangeRule.java
trunk/tools/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/IfModelChangeRule.java
trunk/tools/plugins/org.jboss.savara.tools.wsdl/src/java/org/jboss/savara/tools/wsdl/actions/GenerateAction.java
trunk/tools/plugins/org.jboss.savara.tools.wsdl/src/java/org/jboss/savara/tools/wsdl/generator/WSDLGenerator.java
trunk/tools/tests/org.jboss.savara.protocol.contract.tests/META-INF/MANIFEST.MF
Log:
Update uses of the contract model based on changes from list to set, and implemented abit more of contract generator.
Modified: trunk/tools/plugins/org.jboss.savara.protocol.contract/META-INF/MANIFEST.MF
===================================================================
--- trunk/tools/plugins/org.jboss.savara.protocol.contract/META-INF/MANIFEST.MF 2010-07-07 21:27:59 UTC (rev 315)
+++ trunk/tools/plugins/org.jboss.savara.protocol.contract/META-INF/MANIFEST.MF 2010-07-07 21:30:30 UTC (rev 316)
@@ -10,4 +10,5 @@
Require-Bundle: org.scribble.core,
org.scribble.conversation.model,
org.jboss.savara.contract.model
-Export-Package: org.jboss.savara.protocol.contract
+Export-Package: org.jboss.savara.protocol.contract,
+ org.jboss.savara.protocol.contract.impl
Modified: trunk/tools/plugins/org.jboss.savara.protocol.contract/src/java/org/jboss/savara/protocol/contract/impl/ContractGeneratorImpl.java
===================================================================
--- trunk/tools/plugins/org.jboss.savara.protocol.contract/src/java/org/jboss/savara/protocol/contract/impl/ContractGeneratorImpl.java 2010-07-07 21:27:59 UTC (rev 315)
+++ trunk/tools/plugins/org.jboss.savara.protocol.contract/src/java/org/jboss/savara/protocol/contract/impl/ContractGeneratorImpl.java 2010-07-07 21:30:30 UTC (rev 316)
@@ -54,7 +54,12 @@
getString("SAVARAPC-00002"), (Object)null));
}
- return(null);
+ ContractIntrospector introspector=new ContractIntrospector(new Contract(),
+ new java.util.HashSet<Conversation>());
+
+ introspector.process(cm);
+
+ return(introspector.getContract());
}
}
Added: trunk/tools/plugins/org.jboss.savara.protocol.contract/src/java/org/jboss/savara/protocol/contract/impl/ContractIntrospector.java
===================================================================
--- trunk/tools/plugins/org.jboss.savara.protocol.contract/src/java/org/jboss/savara/protocol/contract/impl/ContractIntrospector.java (rev 0)
+++ trunk/tools/plugins/org.jboss.savara.protocol.contract/src/java/org/jboss/savara/protocol/contract/impl/ContractIntrospector.java 2010-07-07 21:30:30 UTC (rev 316)
@@ -0,0 +1,134 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.savara.protocol.contract.impl;
+
+import java.util.logging.Logger;
+
+import org.jboss.savara.contract.model.Contract;
+import org.jboss.savara.contract.model.Interface;
+import org.scribble.conversation.model.Conversation;
+import org.scribble.conversation.model.ConversationInteraction;
+import org.scribble.conversation.model.Run;
+import org.scribble.model.ModelObject;
+import org.scribble.model.Role;
+
+/**
+ * This class examines a protocol to determine the contract that represents
+ * the static functional interface to the role's behaviour.
+ *
+ */
+public class ContractIntrospector implements org.scribble.model.Visitor {
+
+ private Contract m_contract=new Contract();
+ private java.util.Set<Conversation> m_processedProtocols=new java.util.HashSet<Conversation>();
+ private Role m_role=null;
+ private Conversation m_protocol=null;
+
+ private static Logger logger = Logger.getLogger(ContractIntrospector.class.getName());
+
+ /**
+ * Default constructor for the contract introspector.
+ */
+ protected ContractIntrospector(Contract contract, java.util.Set<Conversation> processed) {
+ m_contract = contract;
+ m_processedProtocols = processed;
+ }
+
+ /**
+ * This method returns the contract being derived.
+ *
+ * @return The contract
+ */
+ public Contract getContract() {
+ return(m_contract);
+ }
+
+ /**
+ * This method returns the set of processed protocols.
+ *
+ * @return The processed protocols
+ */
+ protected java.util.Set<Conversation> getProcessedProtocols() {
+ return(m_processedProtocols);
+ }
+
+ /**
+ * This method introspects the supplied protocol to derive information
+ * that can be used to define the functional contract for the role
+ * associated with the protocol.
+ *
+ * @param conv The located protocol
+ */
+ public void process(Conversation conv) throws IllegalArgumentException {
+ m_protocol = conv;
+ m_role = conv.getLocatedName().getRole();
+
+ // Find or create an interface associated with the role
+ Interface intf=getContract().getInterface(m_role.getName());
+
+ conv.visit(this);
+ }
+
+ @Override
+ public boolean visit(ModelObject obj) {
+ boolean f_visitChildren=true;
+
+ if (obj.getClass() == Conversation.class) {
+
+ // Only visit children if same protocol that is being visited
+ f_visitChildren = (obj == m_protocol);
+
+ } else if (obj.getClass() == Run.class) {
+ Run run=(Run)obj;
+
+ Conversation toProtocol=run.getDefinition();
+
+ // Check if protocol already processed to avoid stack overflow
+ if (m_processedProtocols.contains(toProtocol) == false) {
+ m_processedProtocols.add(toProtocol);
+
+ process(run.getDefinition());
+ }
+ } else if (obj.getClass() == ConversationInteraction.class) {
+ visitInteraction((ConversationInteraction)obj);
+ }
+
+ return(f_visitChildren);
+ }
+
+ protected void visitInteraction(ConversationInteraction interaction) {
+
+ // Check if the interacton is a request or response
+ if (interaction.getFromRole() != null &&
+ interaction.getFromRole().equals(m_role) == false) {
+
+ // Received by the role, but need to check if its replyTo
+ // has been set, indicating it is receiving a response
+ if (interaction.getReplyToLabel() == null ||
+ interaction.getReplyToLabel().trim().length() == 0) {
+
+ // Receiving a request - so record this in the contract
+
+ }
+ }
+ }
+}
Modified: trunk/tools/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/generator/Generator.java
===================================================================
--- trunk/tools/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/generator/Generator.java 2010-07-07 21:27:59 UTC (rev 315)
+++ trunk/tools/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/generator/Generator.java 2010-07-07 21:30:30 UTC (rev 316)
@@ -304,8 +304,10 @@
// Check if contract has atleast one message exchange pattern
boolean f_hasMEP=false;
- for (int i=0; f_hasMEP == false && i < contract.getInterfaces().size(); i++) {
- Interface intf=contract.getInterfaces().get(i);
+ java.util.Iterator<Interface> iter=contract.getInterfaces().iterator();
+
+ while (f_hasMEP == false && iter.hasNext()) {
+ Interface intf=iter.next();
f_hasMEP = (intf.getMessageExchangePatterns().size() > 0);
}
@@ -475,8 +477,12 @@
boolean gen=false;
- for (int i=0; gen == false && i < contract.getInterfaces().size(); i++) {
- if (contract.getInterfaces().get(i).getMessageExchangePatterns().size() > 0) {
+ java.util.Iterator<Interface> iter=contract.getInterfaces().iterator();
+
+ while (gen == false && iter.hasNext()) {
+ Interface intf=iter.next();
+
+ if (intf.getMessageExchangePatterns().size() > 0) {
gen = true;
}
}
@@ -522,7 +528,7 @@
Contract contract=(Contract)useRole.getAnnotations().get(Contract.class.getName());
if (contract.getInterfaces().size() > 0) {
- Interface intf=contract.getInterfaces().get(0);
+ Interface intf=contract.getInterfaces().iterator().next();
String prefix=null;
String portType=intf.getName();
@@ -549,7 +555,7 @@
Contract contract=(Contract)role.getAnnotations().get(Contract.class.getName());
if (contract.getInterfaces().size() > 0) {
- Interface intf=contract.getInterfaces().get(0);
+ Interface intf=contract.getInterfaces().iterator().next();
String prefix=null;
String portType=intf.getName();
Modified: trunk/tools/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/ConversationChangeRule.java
===================================================================
--- trunk/tools/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/ConversationChangeRule.java 2010-07-07 21:27:59 UTC (rev 315)
+++ trunk/tools/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/ConversationChangeRule.java 2010-07-07 21:30:30 UTC (rev 316)
@@ -24,6 +24,7 @@
import org.scribble.model.*;
import org.scribble.model.change.*;
import org.jboss.savara.contract.model.Contract;
+import org.jboss.savara.contract.model.Interface;
import org.scribble.conversation.model.*;
import org.scribble.extensions.RegistryInfo;
@@ -219,8 +220,12 @@
boolean gen=false;
- for (int i=0; gen == false && i < contract.getInterfaces().size(); i++) {
- if (contract.getInterfaces().get(i).getMessageExchangePatterns().size() > 0) {
+ java.util.Iterator<Interface> iter=contract.getInterfaces().iterator();
+
+ while (gen == false && iter.hasNext()) {
+ Interface intf=iter.next();
+
+ if (intf.getMessageExchangePatterns().size() > 0) {
gen = true;
}
}
Modified: trunk/tools/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/ConversationInteractionModelChangeRule.java
===================================================================
--- trunk/tools/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/ConversationInteractionModelChangeRule.java 2010-07-07 21:27:59 UTC (rev 315)
+++ trunk/tools/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/ConversationInteractionModelChangeRule.java 2010-07-07 21:30:30 UTC (rev 316)
@@ -135,7 +135,7 @@
// Assume that contract only has one interface for now
if (contract != null && contract.getInterfaces().size() > 0) {
- intf = contract.getInterfaces().get(0);
+ intf = contract.getInterfaces().iterator().next();
}
}
Modified: trunk/tools/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/IfModelChangeRule.java
===================================================================
--- trunk/tools/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/IfModelChangeRule.java 2010-07-07 21:27:59 UTC (rev 315)
+++ trunk/tools/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/IfModelChangeRule.java 2010-07-07 21:30:30 UTC (rev 316)
@@ -260,7 +260,7 @@
contract = ModelChangeUtils.getContract(context, role.getName());
if (contract != null && contract.getInterfaces().size() > 0) {
- Interface intf = contract.getInterfaces().get(0);
+ Interface intf = contract.getInterfaces().iterator().next();
portType = intf.getName();
@@ -288,7 +288,7 @@
contract = ModelChangeUtils.getContract(context, recv.getFromRole().getName());
if (contract != null && contract.getInterfaces().size() > 0) {
- Interface intf = contract.getInterfaces().get(0);
+ Interface intf = contract.getInterfaces().iterator().next();
portType = intf.getName();
Modified: trunk/tools/plugins/org.jboss.savara.tools.wsdl/src/java/org/jboss/savara/tools/wsdl/actions/GenerateAction.java
===================================================================
--- trunk/tools/plugins/org.jboss.savara.tools.wsdl/src/java/org/jboss/savara/tools/wsdl/actions/GenerateAction.java 2010-07-07 21:27:59 UTC (rev 315)
+++ trunk/tools/plugins/org.jboss.savara.tools.wsdl/src/java/org/jboss/savara/tools/wsdl/actions/GenerateAction.java 2010-07-07 21:30:30 UTC (rev 316)
@@ -150,8 +150,10 @@
// Check if contract has atleast one message exchange pattern
boolean f_hasMEP=false;
- for (int i=0; f_hasMEP == false && i < contract.getInterfaces().size(); i++) {
- Interface intf=contract.getInterfaces().get(i);
+ java.util.Iterator<Interface> iter=contract.getInterfaces().iterator();
+
+ while (f_hasMEP == false && iter.hasNext()) {
+ Interface intf=iter.next();
f_hasMEP = (intf.getMessageExchangePatterns().size() > 0);
}
Modified: trunk/tools/plugins/org.jboss.savara.tools.wsdl/src/java/org/jboss/savara/tools/wsdl/generator/WSDLGenerator.java
===================================================================
--- trunk/tools/plugins/org.jboss.savara.tools.wsdl/src/java/org/jboss/savara/tools/wsdl/generator/WSDLGenerator.java 2010-07-07 21:27:59 UTC (rev 315)
+++ trunk/tools/plugins/org.jboss.savara.tools.wsdl/src/java/org/jboss/savara/tools/wsdl/generator/WSDLGenerator.java 2010-07-07 21:30:30 UTC (rev 316)
@@ -23,6 +23,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.jboss.savara.contract.model.FaultDetails;
+import org.jboss.savara.contract.model.Interface;
import org.jboss.savara.contract.model.Namespace;
import org.jboss.savara.contract.model.RequestResponseMEP;
import org.scribble.model.TypeReference;
@@ -68,19 +69,21 @@
main.addService(service);
// Define a port type per interface
- for (int i=0; i < contract.getInterfaces().size(); i++) {
+ java.util.Iterator<Interface> iter=contract.getInterfaces().iterator();
+
+ while (iter.hasNext()) {
+ Interface intf=iter.next();
+
javax.wsdl.PortType portType=
- createPortType(ret, contract, contract.getInterfaces().get(i),
- wsdlBinding);
+ createPortType(ret, contract, intf, wsdlBinding);
javax.wsdl.Binding binding=
- createBinding(ret, contract, contract.getInterfaces().get(i),
- portType, wsdlBinding);
+ createBinding(ret, contract, intf, portType, wsdlBinding);
// Create service port for interface
javax.wsdl.Port port=main.createPort();
- port.setName(contract.getInterfaces().get(i).getName()+"Port");
+ port.setName(intf.getName()+"Port");
port.setBinding(binding);
service.addPort(port);
@@ -164,8 +167,10 @@
ret.setTargetNamespace(targetNamespace);
// Set up namespace mappings
- for (int i=0; i < contract.getNamespaces().size(); i++) {
- Namespace ns=contract.getNamespaces().get(i);
+ java.util.Iterator<Namespace> iter=contract.getNamespaces().iterator();
+
+ while (iter.hasNext()) {
+ Namespace ns=iter.next();
ret.addNamespace(ns.getPrefix(), ns.getURI());
}
Modified: trunk/tools/tests/org.jboss.savara.protocol.contract.tests/META-INF/MANIFEST.MF
===================================================================
--- trunk/tools/tests/org.jboss.savara.protocol.contract.tests/META-INF/MANIFEST.MF 2010-07-07 21:27:59 UTC (rev 315)
+++ trunk/tools/tests/org.jboss.savara.protocol.contract.tests/META-INF/MANIFEST.MF 2010-07-07 21:30:30 UTC (rev 316)
@@ -12,4 +12,4 @@
org.jboss.savara.contract.model,
org.jboss.savara.protocol.contract,
org.junit
-Export-Package: org.jboss.savara.protocol.contract.tests
+Export-Package: org.jboss.savara.protocol.contract
Added: trunk/tools/tests/org.jboss.savara.protocol.contract.tests/src/java/org/jboss/savara/protocol/contract/ContractGeneratorTest.java
===================================================================
--- trunk/tools/tests/org.jboss.savara.protocol.contract.tests/src/java/org/jboss/savara/protocol/contract/ContractGeneratorTest.java (rev 0)
+++ trunk/tools/tests/org.jboss.savara.protocol.contract.tests/src/java/org/jboss/savara/protocol/contract/ContractGeneratorTest.java 2010-07-07 21:30:30 UTC (rev 316)
@@ -0,0 +1,66 @@
+package org.jboss.savara.protocol.contract;
+
+import static org.junit.Assert.*;
+
+import org.jboss.savara.protocol.contract.ContractGenerator;
+import org.jboss.savara.protocol.contract.ContractGeneratorFactory;
+import org.scribble.conversation.model.Conversation;
+import org.scribble.model.LocatedName;
+import org.scribble.model.Role;
+
+public class ContractGeneratorTest {
+
+ @org.junit.Test
+ public void testGenerateProtocolNull() {
+
+ ContractGenerator generator=ContractGeneratorFactory.getContractGenerator();
+
+ try {
+ Conversation conv=null;
+
+ generator.generate(conv);
+
+ fail("Should have thrown IllegalArgumentException");
+
+ } catch(IllegalArgumentException iae) {
+ // Test worked
+ }
+ }
+
+ @org.junit.Test
+ public void testGenerateProtocolNotLocated() {
+
+ ContractGenerator generator=ContractGeneratorFactory.getContractGenerator();
+
+ try {
+ Conversation conv=new Conversation();
+ LocatedName ln=new LocatedName();
+ conv.setLocatedName(ln);
+
+ generator.generate(conv);
+
+ fail("Should have thrown IllegalArgumentException");
+
+ } catch(IllegalArgumentException iae) {
+ // Test worked
+ }
+ }
+
+ @org.junit.Test
+ public void testGenerateConversationAndRoleNotNull2() {
+
+ ContractGenerator generator=ContractGeneratorFactory.getContractGenerator();
+
+ try {
+ Conversation conv=new Conversation();
+ LocatedName ln=new LocatedName();
+ ln.setRole(new Role());
+ conv.setLocatedName(ln);
+
+ generator.generate(conv);
+
+ } catch(IllegalArgumentException iae) {
+ fail("Should NOT have thrown IllegalArgumentException");
+ }
+ }
+}
Added: trunk/tools/tests/org.jboss.savara.protocol.contract.tests/src/java/org/jboss/savara/protocol/contract/impl/ContractIntrospectorTest.java
===================================================================
--- trunk/tools/tests/org.jboss.savara.protocol.contract.tests/src/java/org/jboss/savara/protocol/contract/impl/ContractIntrospectorTest.java (rev 0)
+++ trunk/tools/tests/org.jboss.savara.protocol.contract.tests/src/java/org/jboss/savara/protocol/contract/impl/ContractIntrospectorTest.java 2010-07-07 21:30:30 UTC (rev 316)
@@ -0,0 +1,148 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.savara.protocol.contract.impl;
+
+import org.jboss.savara.contract.model.Contract;
+import org.scribble.conversation.model.Conversation;
+import org.scribble.conversation.model.ConversationReference;
+import org.scribble.conversation.model.Run;
+import org.scribble.model.LocatedName;
+import org.scribble.model.Role;
+
+import static org.junit.Assert.*;
+
+public class ContractIntrospectorTest {
+
+ @org.junit.Test
+ public void testNoSubProtocolWithoutRun() {
+ Role r=new Role();
+ r.setName("role");
+
+ LocatedName ln1=new LocatedName();
+ ln1.setName("top");
+ ln1.setRole(r);
+ LocatedName ln2=new LocatedName();
+ ln2.setName("mid");
+ ln2.setRole(r);
+ LocatedName ln3=new LocatedName();
+ ln3.setName("sub");
+ ln3.setRole(r);
+
+ Conversation top=new Conversation();
+ top.setLocatedName(ln1);
+
+ Conversation mid=new Conversation();
+ mid.setLocatedName(ln2);
+
+ Conversation sub=new Conversation();
+ sub.setLocatedName(ln3);
+
+ ConversationReference ref=new ConversationReference();
+ ref.setLocalpart("sub");
+ ref.setLocatedRole(r.getName());
+
+ Run run=new Run();
+ run.setReference(ref);
+
+ top.getBlock().getContents().add(mid);
+
+ mid.getBlock().getContents().add(run);
+ mid.getBlock().getContents().add(sub);
+
+ Contract contract=new Contract();
+ java.util.Set<Conversation> processed=new java.util.HashSet<Conversation>();
+
+ ContractIntrospector introspector=new ContractIntrospector(contract, processed);
+
+ introspector.process(top);
+
+ if (processed.size() != 0) {
+ fail("Expecting 0 processed protocol, but got: "+processed.size());
+ }
+ }
+
+ @org.junit.Test
+ public void testSubProtocolWithRun() {
+ Role r=new Role();
+ r.setName("role");
+
+ LocatedName ln1=new LocatedName();
+ ln1.setName("top");
+ ln1.setRole(r);
+ LocatedName ln2=new LocatedName();
+ ln2.setName("mid");
+ ln2.setRole(r);
+ LocatedName ln3=new LocatedName();
+ ln3.setName("sub");
+ ln3.setRole(r);
+
+ Conversation top=new Conversation();
+ top.setLocatedName(ln1);
+
+ Conversation mid=new Conversation();
+ mid.setLocatedName(ln2);
+
+ Conversation sub=new Conversation();
+ sub.setLocatedName(ln3);
+
+ ConversationReference ref1=new ConversationReference();
+ ref1.setLocalpart("mid");
+ ref1.setLocatedRole(r.getName());
+ ref1.setInner(true);
+
+ Run run1=new Run();
+ run1.setReference(ref1);
+
+ top.getBlock().getContents().add(run1);
+ top.getBlock().getContents().add(mid);
+
+ ConversationReference ref2=new ConversationReference();
+ ref2.setLocalpart("sub");
+ ref2.setLocatedRole(r.getName());
+ ref2.setInner(true);
+
+ Run run2=new Run();
+ run2.setReference(ref2);
+
+ mid.getBlock().getContents().add(run2);
+ mid.getBlock().getContents().add(sub);
+
+ Contract contract=new Contract();
+ java.util.Set<Conversation> processed=new java.util.HashSet<Conversation>();
+
+ ContractIntrospector introspector=new ContractIntrospector(contract, processed);
+
+ introspector.process(top);
+
+ if (processed.size() != 2) {
+ fail("Expecting 2 processed protocol, but got: "+processed.size());
+ }
+
+ if (processed.contains(mid) == false) {
+ fail("Should contain mid");
+ }
+
+ if (processed.contains(sub) == false) {
+ fail("Should contain sub");
+ }
+ }
+}
Deleted: trunk/tools/tests/org.jboss.savara.protocol.contract.tests/src/java/org/jboss/savara/protocol/contract/tests/ContractGeneratorTest.java
===================================================================
--- trunk/tools/tests/org.jboss.savara.protocol.contract.tests/src/java/org/jboss/savara/protocol/contract/tests/ContractGeneratorTest.java 2010-07-07 21:27:59 UTC (rev 315)
+++ trunk/tools/tests/org.jboss.savara.protocol.contract.tests/src/java/org/jboss/savara/protocol/contract/tests/ContractGeneratorTest.java 2010-07-07 21:30:30 UTC (rev 316)
@@ -1,66 +0,0 @@
-package org.jboss.savara.protocol.contract.tests;
-
-import static org.junit.Assert.*;
-
-import org.jboss.savara.protocol.contract.ContractGenerator;
-import org.jboss.savara.protocol.contract.ContractGeneratorFactory;
-import org.scribble.conversation.model.Conversation;
-import org.scribble.model.LocatedName;
-import org.scribble.model.Role;
-
-public class ContractGeneratorTest {
-
- @org.junit.Test
- public void testGenerateProtocolNull() {
-
- ContractGenerator generator=ContractGeneratorFactory.getContractGenerator();
-
- try {
- Conversation conv=null;
-
- generator.generate(conv);
-
- fail("Should have thrown IllegalArgumentException");
-
- } catch(IllegalArgumentException iae) {
- // Test worked
- }
- }
-
- @org.junit.Test
- public void testGenerateProtocolNotLocated() {
-
- ContractGenerator generator=ContractGeneratorFactory.getContractGenerator();
-
- try {
- Conversation conv=new Conversation();
- LocatedName ln=new LocatedName();
- conv.setLocatedName(ln);
-
- generator.generate(conv);
-
- fail("Should have thrown IllegalArgumentException");
-
- } catch(IllegalArgumentException iae) {
- // Test worked
- }
- }
-
- @org.junit.Test
- public void testGenerateConversationAndRoleNotNull2() {
-
- ContractGenerator generator=ContractGeneratorFactory.getContractGenerator();
-
- try {
- Conversation conv=new Conversation();
- LocatedName ln=new LocatedName();
- ln.setRole(new Role());
- conv.setLocatedName(ln);
-
- generator.generate(conv);
-
- } catch(IllegalArgumentException iae) {
- fail("Should NOT have thrown IllegalArgumentException");
- }
- }
-}
13 years, 10 months
- 1
- 0
savara SVN: r315 - trunk/tools/plugins/org.jboss.savara.contract.model/src/java/org/jboss/savara/contract/model.
by do-not-reply＠jboss.org
Author: objectiser
Date: 2010-07-07 17:27:59 -0400 (Wed, 07 Jul 2010)
New Revision: 315
Modified:
trunk/tools/plugins/org.jboss.savara.contract.model/src/java/org/jboss/savara/contract/model/Contract.java
trunk/tools/plugins/org.jboss.savara.contract.model/src/java/org/jboss/savara/contract/model/FaultDetails.java
trunk/tools/plugins/org.jboss.savara.contract.model/src/java/org/jboss/savara/contract/model/Interface.java
trunk/tools/plugins/org.jboss.savara.contract.model/src/java/org/jboss/savara/contract/model/MessageExchangePattern.java
trunk/tools/plugins/org.jboss.savara.contract.model/src/java/org/jboss/savara/contract/model/Namespace.java
trunk/tools/plugins/org.jboss.savara.contract.model/src/java/org/jboss/savara/contract/model/OneWayRequestMEP.java
trunk/tools/plugins/org.jboss.savara.contract.model/src/java/org/jboss/savara/contract/model/RequestResponseMEP.java
Log:
Change contract model to remove scribble specific aspects. The only scribble aspect left is the use of the type references.
Modified: trunk/tools/plugins/org.jboss.savara.contract.model/src/java/org/jboss/savara/contract/model/Contract.java
===================================================================
--- trunk/tools/plugins/org.jboss.savara.contract.model/src/java/org/jboss/savara/contract/model/Contract.java 2010-07-07 21:26:33 UTC (rev 314)
+++ trunk/tools/plugins/org.jboss.savara.contract.model/src/java/org/jboss/savara/contract/model/Contract.java 2010-07-07 21:27:59 UTC (rev 315)
@@ -17,17 +17,11 @@
*/
package org.jboss.savara.contract.model;
-import org.scribble.model.ContainmentList;
-import org.scribble.model.ModelObject;
-import org.scribble.model.Reference;
-
/**
* This class represents the contract.
*/
-public class Contract extends ModelObject {
+public class Contract {
- private static final long serialVersionUID = 1826808390992159186L;
-
/**
* The default constructor.
*/
@@ -77,12 +71,33 @@
*
* @return The list of interfaces
*/
- @Reference(containment=true)
- public java.util.List<Interface> getInterfaces() {
+ public java.util.Set<Interface> getInterfaces() {
return(m_interfaces);
}
/**
+ * This method returns the interface associated
+ * with the supplied name.
+ *
+ * @param name The interface name
+ * @return The interface, or null if not found.
+ */
+ public Interface getInterface(String name) {
+ Interface ret=null;
+
+ java.util.Iterator<Interface> iter=getInterfaces().iterator();
+ while (ret == null && iter.hasNext()) {
+ ret = iter.next();
+
+ if (ret.getName().equals(name) == false) {
+ ret = null;
+ }
+ }
+
+ return(ret);
+ }
+
+ /**
* This method returns the list of namespaces.
* If a namespace is used in the contract that does
* not exist in this list, then a dynamic prefix should
@@ -90,15 +105,14 @@
*
* @return The list of namespaces
*/
- @Reference(containment=true)
- public java.util.List<Namespace> getNamespaces() {
+ public java.util.Set<Namespace> getNamespaces() {
return(m_namespaces);
}
private String m_name=null;
private String m_namespace=null;
- private java.util.List<Interface> m_interfaces=
- new ContainmentList<Interface>(this, Interface.class);
- private java.util.List<Namespace> m_namespaces=
- new java.util.Vector<Namespace>();
+ private java.util.Set<Interface> m_interfaces=
+ new java.util.HashSet<Interface>();
+ private java.util.Set<Namespace> m_namespaces=
+ new java.util.HashSet<Namespace>();
}
Modified: trunk/tools/plugins/org.jboss.savara.contract.model/src/java/org/jboss/savara/contract/model/FaultDetails.java
===================================================================
--- trunk/tools/plugins/org.jboss.savara.contract.model/src/java/org/jboss/savara/contract/model/FaultDetails.java 2010-07-07 21:26:33 UTC (rev 314)
+++ trunk/tools/plugins/org.jboss.savara.contract.model/src/java/org/jboss/savara/contract/model/FaultDetails.java 2010-07-07 21:27:59 UTC (rev 315)
@@ -17,18 +17,13 @@
*/
package org.jboss.savara.contract.model;
-import org.scribble.model.ContainmentList;
-import org.scribble.model.ModelObject;
-import org.scribble.model.Reference;
import org.scribble.model.TypeReference;
/**
* This class represents the fault details.
*/
-public class FaultDetails extends ModelObject {
+public class FaultDetails {
- private static final long serialVersionUID = 3197411493758826511L;
-
/**
* The default constructor.
*/
@@ -78,7 +73,6 @@
*
* @return The list of type references
*/
- @Reference(containment=true)
public java.util.List<TypeReference> getTypes() {
return(m_types);
}
@@ -86,5 +80,5 @@
private String m_name=null;
private String m_namespace=null;
private java.util.List<TypeReference> m_types=
- new ContainmentList<TypeReference>(this, TypeReference.class);
+ new java.util.Vector<TypeReference>();
}
Modified: trunk/tools/plugins/org.jboss.savara.contract.model/src/java/org/jboss/savara/contract/model/Interface.java
===================================================================
--- trunk/tools/plugins/org.jboss.savara.contract.model/src/java/org/jboss/savara/contract/model/Interface.java 2010-07-07 21:26:33 UTC (rev 314)
+++ trunk/tools/plugins/org.jboss.savara.contract.model/src/java/org/jboss/savara/contract/model/Interface.java 2010-07-07 21:27:59 UTC (rev 315)
@@ -17,18 +17,12 @@
*/
package org.jboss.savara.contract.model;
-import org.scribble.model.ContainmentList;
-import org.scribble.model.ModelObject;
-import org.scribble.model.Reference;
-
/**
* This class represents an interface, as part of a contract.
*
*/
-public class Interface extends ModelObject {
+public class Interface {
- private static final long serialVersionUID = -5867002445215817481L;
-
/**
* The default constructor.
*/
@@ -78,7 +72,6 @@
*
* @return The list of message exchange patterns
*/
- @Reference(containment=true)
public java.util.List<MessageExchangePattern> getMessageExchangePatterns() {
return(m_messageExchangePatterns);
}
@@ -86,5 +79,5 @@
private String m_name=null;
private String m_namespace=null;
private java.util.List<MessageExchangePattern> m_messageExchangePatterns=
- new ContainmentList<MessageExchangePattern>(this, MessageExchangePattern.class);
+ new java.util.Vector<MessageExchangePattern>();
}
Modified: trunk/tools/plugins/org.jboss.savara.contract.model/src/java/org/jboss/savara/contract/model/MessageExchangePattern.java
===================================================================
--- trunk/tools/plugins/org.jboss.savara.contract.model/src/java/org/jboss/savara/contract/model/MessageExchangePattern.java 2010-07-07 21:26:33 UTC (rev 314)
+++ trunk/tools/plugins/org.jboss.savara.contract.model/src/java/org/jboss/savara/contract/model/MessageExchangePattern.java 2010-07-07 21:27:59 UTC (rev 315)
@@ -17,18 +17,13 @@
*/
package org.jboss.savara.contract.model;
-import org.scribble.model.ContainmentList;
-import org.scribble.model.ModelObject;
-import org.scribble.model.Reference;
import org.scribble.model.TypeReference;
/**
* This class represents the message exchange pattern.
*/
-public abstract class MessageExchangePattern extends ModelObject {
+public abstract class MessageExchangePattern {
- private static final long serialVersionUID = 6024134205644784735L;
-
/**
* The default constructor.
*/
@@ -60,12 +55,11 @@
*
* @return The list of type references
*/
- @Reference(containment=true)
public java.util.List<TypeReference> getTypes() {
return(m_types);
}
private String m_operation=null;
private java.util.List<TypeReference> m_types=
- new ContainmentList<TypeReference>(this, TypeReference.class);
+ new java.util.Vector<TypeReference>();
}
Modified: trunk/tools/plugins/org.jboss.savara.contract.model/src/java/org/jboss/savara/contract/model/Namespace.java
===================================================================
--- trunk/tools/plugins/org.jboss.savara.contract.model/src/java/org/jboss/savara/contract/model/Namespace.java 2010-07-07 21:26:33 UTC (rev 314)
+++ trunk/tools/plugins/org.jboss.savara.contract.model/src/java/org/jboss/savara/contract/model/Namespace.java 2010-07-07 21:27:59 UTC (rev 315)
@@ -17,15 +17,11 @@
*/
package org.jboss.savara.contract.model;
-import org.scribble.model.ModelObject;
-
/**
* This class represents the namespace.
*/
-public class Namespace extends ModelObject {
+public class Namespace {
- private static final long serialVersionUID = -2756456243428682166L;
-
/**
* The default constructor.
*/
Modified: trunk/tools/plugins/org.jboss.savara.contract.model/src/java/org/jboss/savara/contract/model/OneWayRequestMEP.java
===================================================================
--- trunk/tools/plugins/org.jboss.savara.contract.model/src/java/org/jboss/savara/contract/model/OneWayRequestMEP.java 2010-07-07 21:26:33 UTC (rev 314)
+++ trunk/tools/plugins/org.jboss.savara.contract.model/src/java/org/jboss/savara/contract/model/OneWayRequestMEP.java 2010-07-07 21:27:59 UTC (rev 315)
@@ -22,8 +22,6 @@
*/
public class OneWayRequestMEP extends MessageExchangePattern {
- private static final long serialVersionUID = 1798545946621135972L;
-
/**
* The default constructor.
*/
Modified: trunk/tools/plugins/org.jboss.savara.contract.model/src/java/org/jboss/savara/contract/model/RequestResponseMEP.java
===================================================================
--- trunk/tools/plugins/org.jboss.savara.contract.model/src/java/org/jboss/savara/contract/model/RequestResponseMEP.java 2010-07-07 21:26:33 UTC (rev 314)
+++ trunk/tools/plugins/org.jboss.savara.contract.model/src/java/org/jboss/savara/contract/model/RequestResponseMEP.java 2010-07-07 21:27:59 UTC (rev 315)
@@ -17,8 +17,6 @@
*/
package org.jboss.savara.contract.model;
-import org.scribble.model.ContainmentList;
-import org.scribble.model.Reference;
import org.scribble.model.TypeReference;
/**
@@ -26,8 +24,6 @@
*/
public class RequestResponseMEP extends MessageExchangePattern {
- private static final long serialVersionUID = -2468151434616043577L;
-
/**
* The default constructor.
*/
@@ -39,7 +35,6 @@
*
* @return The list of response type references
*/
- @Reference(containment=true)
public java.util.List<TypeReference> getResponseTypes() {
return(m_responseTypes);
}
@@ -49,13 +44,12 @@
*
* @return The list of fault details
*/
- @Reference(containment=true)
public java.util.List<FaultDetails> getFaultDetails() {
return(m_faultDetails);
}
private java.util.List<TypeReference> m_responseTypes=
- new ContainmentList<TypeReference>(this, TypeReference.class);
+ new java.util.Vector<TypeReference>();
private java.util.List<FaultDetails> m_faultDetails=
- new ContainmentList<FaultDetails>(this, FaultDetails.class);
+ new java.util.Vector<FaultDetails>();
}
13 years, 10 months
- 1
- 0