Merge in rtc-setupv2.properties to resolve conflictrefs/changes/94/7694/1

3 files changed, 15 insertions, 11 deletions

diff --git a/org.eclipse.lyo.testsuite.server/config/rtc/rtc-json-template2.json b/org.eclipse.lyo.testsuite.server/config/rtc/rtc-json-template2.json
index 3cffe3d..fce970a 100644
--- a/org.eclipse.lyo.testsuite.server/config/rtc/rtc-json-template2.json
+++ b/org.eclipse.lyo.testsuite.server/config/rtc/rtc-json-template2.json
@@ -1,6 +1,6 @@
 {

 	"dcterms:title":"templatedDefect",

 	"dcterms:description":"templatedDefect",

-	"dcterms:type":{"rdf:resource":"https:\/\/quagmire.rtp.raleigh.ibm.com:14443\/ccm\/oslc\/types\/_YBdMgJhUEeGB3JzLyv0BEg\/defect"},

-	"rtc_cm:filedAgainst":{"rdf:resource":"https:\/\/quagmire.rtp.raleigh.ibm.com:14443\/ccm\/resource\/itemOid\/com.ibm.team.workitem.Category\/_YmXa8phVEeGB3JzLyv0BEg"}

+	"dcterms:type":{"rdf:resource":"https:\/\/quagmire.rtp.raleigh.ibm.com:14443\/ccm\/oslc\/types\/_D3PC4NIQEeG3VpOmzfgbRw\/defect"},

+	"rtc_cm:filedAgainst":{"rdf:resource":"https:\/\/quagmire.rtp.raleigh.ibm.com:14443\/ccm\/resource\/itemOid\/com.ibm.team.workitem.Category\/_FfVCEtIQEeG3VpOmzfgbRw"}

 }
\ No newline at end of file
diff --git a/org.eclipse.lyo.testsuite.server/config/rtc/rtc-setupv2.properties b/org.eclipse.lyo.testsuite.server/config/rtc/rtc-setupv2.properties
index 9aaf417..f1958e6 100644
--- a/org.eclipse.lyo.testsuite.server/config/rtc/rtc-setupv2.properties
+++ b/org.eclipse.lyo.testsuite.server/config/rtc/rtc-setupv2.properties
@@ -24,28 +24,32 @@ authMethod=FORM
 formUri=https://quagmire.rtp.raleigh.ibm.com:14443/ccm/authenticated/j_security_check
 #The authentication credentials
 userId=vince
-pw=<password>
+pw=vince
+
+fullTextSearch=true
 
 # Values: http://open-services.net/xmlns/cm/1.0/ | http://open-services.net/ns/cm# | both
 testVersions=http://open-services.net/ns/cm#
 
-# Specify a service provider to use if there are multiple
+# Specify a change request resource to test against
+# When this parameter has value, the "useThisServiceProvider" and "runOnlyOnce" will be ineffective
+useThisChangeRequest=https://quagmire.rtp.raleigh.ibm.com:14443/ccm/resource/itemName/com.ibm.team.workitem.WorkItem/198
 
-useThisServiceProvider = https://quagmire.rtp.raleigh.ibm.com:14443/ccm/oslc/contexts/_bO8skKt2EeGLf9T_-CPkrA/workitems/services.xml
+# Specify a service provider to use if there are multiple
+useThisServiceProvider=https://quagmire.rtp.raleigh.ibm.com:14443/ccm/oslc/contexts/_D3PC4NIQEeG3VpOmzfgbRw/workitems/services.xml
 # Determine if tests should follow all possible links: Service Catalogs, Service Providers, Query Capabilities, etc.
 # Default is runOnlyOnce=true, which will either use the 1st entry it encounters or use the services labeled as the defaults.
 runOnlyOnce=true
 
-
 ##QUERY PROPERTIES##
 # The query parameter that should be used to test equality
-queryEqualityProperty=dcterms:identifier
+queryEqualityProperty=dcterms:title
 # The parameter value used with the parameter to test equality (record with this value should exist in the system)
-queryEqualityValue=106
+queryEqualityValue=templatedDefect
 # The query parameter that should be used to test equality
 queryComparisonProperty=dcterms:modified
 # The parameter value used with the parameter to test comparisons (should split the results into two non-empty sets)
-queryComparisonValue=2010-12-19T20:16:03.578Z
+queryComparisonValue=2012-08-01T20:16:03.578Z
 # Additional non-OSLC parameters that need to be included to run queries
 queryAdditionalParameters=
 # A value to test full text search against (should return a non-empty record list)
@@ -78,4 +82,4 @@ OAuthAccessTokenUrl=https://quagmire.rtp.raleigh.ibm.com:14443/ccm/oauth-request
 # The consumer token and secret used to make the OAuth accesses
 # OAuthConsumerToken=445f507bd17d43b687d8b17b43edf9a6
 OAuthConsumerToken=f7c8cc58e60a4dc99c527fb90b8286fa
-OAuthConsumerSecret=secret
+OAuthConsumerSecret=secret
\ No newline at end of file
diff --git a/org.eclipse.lyo.testsuite.server/config/rtc/rtc-template2.xml b/org.eclipse.lyo.testsuite.server/config/rtc/rtc-template2.xml
index d392344..cc4aab8 100644
--- a/org.eclipse.lyo.testsuite.server/config/rtc/rtc-template2.xml
+++ b/org.eclipse.lyo.testsuite.server/config/rtc/rtc-template2.xml
@@ -13,4 +13,4 @@
    
        Steve Speicher - initial API and implementation
  -->
-
<rdf:RDF xmlns:dcterms="http://purl.org/dc/terms/" xmlns:oslc="http://open-services.net/ns/core#"
	xmlns:oslc_cm="http://open-services.net/ns/cm#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
	xmlns:rtc_cm="http://jazz.net/xmlns/prod/jazz/rtc/cm/1.0/">
  <oslc_cm:ChangeRequest>
	<dcterms:title>templatedDefect</dcterms:title>
	<dcterms:description>templatedDefect</dcterms:description>
    <rtc_cm:type rdf:resource="https://quagmire.rtp.raleigh.ibm.com:14443/ccm/oslc/types/_YBdMgJhUEeGB3JzLyv0BEg/defect"/>    
    <dcterms:type>Defect</dcterms:type>
   <rtc_cm:filedAgainst rdf:resource="https://quagmire.rtp.raleigh.ibm.com:14443/ccm/resource/itemOid/com.ibm.team.workitem.Category/_YmXa8phVEeGB3JzLyv0BEg"/>
  </oslc_cm:ChangeRequest>
</rdf:RDF>
\ No newline at end of file
+
<rdf:RDF xmlns:dcterms="http://purl.org/dc/terms/" xmlns:oslc="http://open-services.net/ns/core#"
	xmlns:oslc_cm="http://open-services.net/ns/cm#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
	xmlns:rtc_cm="http://jazz.net/xmlns/prod/jazz/rtc/cm/1.0/">
  <oslc_cm:ChangeRequest>
	<dcterms:title>templatedDefect</dcterms:title>
	<dcterms:description>templatedDefect</dcterms:description>
    <rtc_cm:type rdf:resource="https://quagmire.rtp.raleigh.ibm.com:14443/ccm/oslc/types/_D3PC4NIQEeG3VpOmzfgbRw/defect"/>    
    <dcterms:type>Defect</dcterms:type>
   <rtc_cm:filedAgainst rdf:resource="https://quagmire.rtp.raleigh.ibm.com:14443/ccm/resource/itemOid/com.ibm.team.workitem.Category/_FfVCEtIQEeG3VpOmzfgbRw"/>
  </oslc_cm:ChangeRequest>
</rdf:RDF>
\ No newline at end of file