Bug361870 - config file updates for test suites

3 files changed, 65 insertions, 73 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 5dfce5c..4f884af 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:9443\/ccm\/oslc\/types\/_gvEIUPJkEd-aL_39nkcG1w\/com.ibm.team.apt.workItemType.story"},

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

+	"dcterms:type":{"rdf:resource":"https:\/\/quagmire.rtp.raleigh.ibm.com:14444\/ccm\/oslc\/types\/_RQHaoPtbEeC-iIvPBDtJAA\/com.ibm.team.apt.workItemType.story"},

+	"rtc_cm:filedAgainst":{"rdf:resource":"https:\/\/quagmire.rtp.raleigh.ibm.com:14444\/ccm\/resource\/itemOid\/com.ibm.team.workitem.Category\/_SSWTsPtbEeC-iIvPBDtJAA"}

 }
\ 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 19f64a4..7553245 100644
--- a/org.eclipse.lyo.testsuite.server/config/rtc/rtc-setupv2.properties
+++ b/org.eclipse.lyo.testsuite.server/config/rtc/rtc-setupv2.properties
@@ -13,63 +13,66 @@
 #
 #    Steve Speicher - initial API and implementation
 ###############################################################################
-##GENERAL PROPERTIES##

-# The location of the top level ServiceProviderCatalog or Service Description Document

-baseUri=https://quagmire.rtp.raleigh.ibm.com:9443/ccm/oslc/workitems/catalog

-#baseUri=https://quagmire.rtp.raleigh.ibm.com:9443/ccm/oslc/contexts/_8sTnQPY-Ed-aL_39nkcG1w/workitems/services.xml

-# Implementation name (for identification purposes)

-implName=RTC

-# The authentication style (currently supports only BASIC and FORM)

-authMethod=FORM

-formUri=https://quagmire.rtp.raleigh.ibm.com:9443/ccm/authenticated/j_security_check

-#The authentication credentials

-userId=user

-pw=pw

-

-# Values: http://open-services.net/xmlns/cm/1.0/ | http://open-services.net/ns/cm# | both

-testVersions=http://open-services.net/ns/cm#

-

-# 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:title

-# The parameter value used with the parameter to test equality (record with this value should exist in the system)

-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

-# 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)

-fullTextSearchTerm=templatedDefect

-

-##CREATION AND UPDATION PROPERTIES##

-# Location of properly formatted xml which will be used to create a record.

-createTemplateXmlFile=config/rtc/rtc-template2.xml

-createTemplateRdfXmlFile=config/rtc/rtc-template2.xml

-# Location of properly formatted json which will be used to create a record.

-createTemplateJsonFile=config/rtc/rtc-json-template2.json

-# Location of properly formatted xml which will be used to update a record.

-updateTemplateXmlFile=config/rtc/rtc-update2.xml

-updateTemplateRdfXmlFile=config/rtc/rtc-update2.xml

-# Location of properly formatted json which will be used to update a record.

-updateTemplateJsonFile=config/rtc/rtc-json-update2.json

-# Update additional parameters (for supporting partial update)

-updateParams=?oslc.properties=dcterms:description

-

-##OAUTH PROPERTIES## only for CM 1.0 testing

-# The URL corresponding to issuing request tokens

-OAuthRequestTokenUrl=https://quagmire.rtp.raleigh.ibm.com:9443/ccm/oauth-request-token

-# The URL corresponding to OAuth user authorization

-OAuthAuthorizationUrl=https://quagmire.rtp.raleigh.ibm.com:9443/ccm/oauth-authorize

-# Parameters to be POSTed to the authorization URL along with the acquired request token

-OAuthAuthorizationParameters=oauth_callback=none&Authorize=Continue

-# The URL corresponding to issuing access tokens

-OAuthAccessTokenUrl=https://quagmire.rtp.raleigh.ibm.com:9443/ccm/oauth-request-token

-# The consumer token and secret used to make the OAuth accesses

-OAuthConsumerToken=445f507bd17d43b687d8b17b43edf9a6

+##GENERAL PROPERTIES##
+# The location of the top level ServiceProviderCatalog or Service Description Document
+baseUri=https://quagmire.rtp.raleigh.ibm.com:14444/ccm/oslc/workitems/catalog
+#baseUri=https://quagmire.rtp.raleigh.ibm.com:9443/ccm/oslc/workitems/catalog
+
+# Implementation name (for identification purposes)
+implName=RTC
+# The authentication style (currently supports only BASIC and FORM)
+authMethod=FORM
+formUri=https://quagmire.rtp.raleigh.ibm.com:14444/ccm/authenticated/j_security_check
+#The authentication credentials
+userId=oslctest
+pw=oslctest
+
+# Values: http://open-services.net/xmlns/cm/1.0/ | http://open-services.net/ns/cm# | both
+testVersions=http://open-services.net/ns/cm#
+
+# 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:title
+# The parameter value used with the parameter to test equality (record with this value should exist in the system)
+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
+# 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)
+fullTextSearchTerm=templatedDefect
+
+##CREATION AND UPDATION PROPERTIES##
+# Location of properly formatted xml which will be used to create a record.
+createTemplateXmlFile=config/rtc/rtc-template2.xml
+createTemplateRdfXmlFile=config/rtc/rtc-template2.xml
+# Location of properly formatted json which will be used to create a record.
+createTemplateJsonFile=config/rtc/rtc-json-template2.json
+# Location of properly formatted xml which will be used to update a record.
+updateTemplateXmlFile=config/rtc/rtc-update2.xml
+updateTemplateRdfXmlFile=config/rtc/rtc-update2.xml
+# Location of properly formatted json which will be used to update a record.
+updateTemplateJsonFile=config/rtc/rtc-json-update2.json
+# Update additional parameters (for supporting partial update)
+updateParams=?oslc.properties=dcterms:description
+
+##OAUTH PROPERTIES## only for CM 1.0 testing
+# The URL corresponding to issuing request tokens
+OAuthRequestTokenUrl=https://quagmire.rtp.raleigh.ibm.com:14444/ccm/oauth-request-token
+# The URL corresponding to OAuth user authorization
+OAuthAuthorizationUrl=https://quagmire.rtp.raleigh.ibm.com:14444/ccm/oauth-authorize
+# Parameters to be POSTed to the authorization URL along with the acquired request token
+OAuthAuthorizationParameters=oauth_callback=none&Authorize=Continue
+# The URL corresponding to issuing access tokens
+OAuthAccessTokenUrl=https://quagmire.rtp.raleigh.ibm.com:14444/ccm/oauth-request-token
+
+# The consumer token and secret used to make the OAuth accesses
+# OAuthConsumerToken=445f507bd17d43b687d8b17b43edf9a6
+OAuthConsumerToken=f7c8cc58e60a4dc99c527fb90b8286fa
 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 6ab429b..64e7987 100644
--- a/org.eclipse.lyo.testsuite.server/config/rtc/rtc-template2.xml
+++ b/org.eclipse.lyo.testsuite.server/config/rtc/rtc-template2.xml
@@ -13,15 +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:9443/ccm/oslc/types/_gvEIUPJkEd-aL_39nkcG1w/com.ibm.team.apt.workItemType.story"/>

-    <dcterms:type>Story</dcterms:type>

-   <rtc_cm:filedAgainst rdf:resource="https://quagmire.rtp.raleigh.ibm.com:9443/ccm/resource/itemOid/com.ibm.team.workitem.Category/_h1wDkPJkEd-aL_39nkcG1w"/>

-  </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:14444/ccm/oslc/types/_RQHaoPtbEeC-iIvPBDtJAA/com.ibm.team.apt.workItemType.story"/>    
    <dcterms:type>Story</dcterms:type>
   <rtc_cm:filedAgainst rdf:resource="https://quagmire.rtp.raleigh.ibm.com:14444/ccm/resource/itemOid/com.ibm.team.workitem.Category/_SSWTsPtbEeC-iIvPBDtJAA"/>
  </oslc_cm:ChangeRequest>
</rdf:RDF>
\ No newline at end of file