SCOUT-58 : set_publisherAssertions needs to set tModelKey to a valid tModelKey
git-svn-id: https://svn.apache.org/repos/asf/webservices/scout/trunk@659143 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/scout/src/main/java/org/apache/ws/scout/util/EnumerationHelper.java b/scout/src/main/java/org/apache/ws/scout/util/EnumerationHelper.java
index 5bff2ff..156f8bb 100644
--- a/scout/src/main/java/org/apache/ws/scout/util/EnumerationHelper.java
+++ b/scout/src/main/java/org/apache/ws/scout/util/EnumerationHelper.java
@@ -43,7 +43,9 @@
public class EnumerationHelper
{
private static Log log = LogFactory.getLog(EnumerationHelper.class);
-
+
+
+ private final static String UDDI_ORG_TYPES = "C1ACF26D-9672-4404-9D70-39B756E62AB4";
private final static String OBJECT_TYPE = "ObjectType";
private final static String ASSOCIATION_TYPE = "AssociationType";
private final static String URL_TYPE = "URLType";
@@ -117,7 +119,7 @@
private static Concept createConcept(String firstToken, String secondToken)
throws JAXRException, IllegalArgumentException
{
- if (!TYPES_LIST.contains(firstToken)) throw new IllegalArgumentException("Exspected the path to " +
+ if (!TYPES_LIST.contains(firstToken)) throw new IllegalArgumentException("Expected the path to " +
"start with one of " + TYPES);
//get the predefined classificationscheme
@@ -126,13 +128,13 @@
cs.setKey(new KeyImpl(firstToken));
ArrayList<String> conceptStrings = typesMap.get(firstToken);
- if (!conceptStrings.contains(secondToken)) throw new IllegalArgumentException("Exspected the path to " +
+ if (!conceptStrings.contains(secondToken)) throw new IllegalArgumentException("Expected the path to " +
"end with one of " + conceptStrings.toArray());
Concept concept = new ConceptImpl(null);
concept.setName(new InternationalStringImpl(secondToken.toLowerCase()));
concept.setValue(secondToken);
- concept.setKey(new KeyImpl(firstToken + "/" + secondToken));
+ concept.setKey(new KeyImpl(UDDI_ORG_TYPES));
((ConceptImpl)concept).setScheme(((ClassificationSchemeImpl)cs));
return concept;
}
diff --git a/scout/src/test/java/org/apache/ws/scout/registry/BusinessLifeCyleManagerlTest.java b/scout/src/test/java/org/apache/ws/scout/registry/BusinessLifeCyleManagerlTest.java
index 0491d29..6829a81 100644
--- a/scout/src/test/java/org/apache/ws/scout/registry/BusinessLifeCyleManagerlTest.java
+++ b/scout/src/test/java/org/apache/ws/scout/registry/BusinessLifeCyleManagerlTest.java
@@ -240,7 +240,7 @@
sOrg.setKey(iterator.next());
tOrg.setKey(iterator.next());
//creating the RelatedTo Association between these two organizations
- Concept type = bqm.findConceptByPath("AssociationType/RelatedTo");
+ Concept type = bqm.findConceptByPath("/AssociationType/RelatedTo");
Association association = blm.createAssociation(tOrg, type);
sOrg.addAssociation(association);
ArrayList<Association> associations = new ArrayList<Association>();
@@ -259,6 +259,7 @@
} catch (JAXRException je) {
fail(je.getMessage());
+ je.printStackTrace();
}
}
