summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Terry2013-07-19 09:56:26 (EDT)
committer David Terry2013-07-19 09:56:26 (EDT)
commitcfab8990e92a19fdb167dd50aaa91a748a0da475 (patch)
tree33f162473b012bd673322d818c6547e8dfb8c859
parent21d9a990f8c5332d3cb813e180d25178d4367402 (diff)
downloadorg.eclipse.lyo.testsuite-cfab8990e92a19fdb167dd50aaa91a748a0da475.zip
org.eclipse.lyo.testsuite-cfab8990e92a19fdb167dd50aaa91a748a0da475.tar.gz
org.eclipse.lyo.testsuite-cfab8990e92a19fdb167dd50aaa91a748a0da475.tar.bz2
[413317] Update testsuite TRS implementation to react to ldp:Containerrefs/changes/11/14711/1
change (3 of 3) Updates to use the ldp:Container term over the ldp:AggregateContainer term Change-Id: I052400eadb5e89433db3d78d6191bbe5090f7359 Signed-off-by: David Terry <dgterry@us.ibm.com>
-rw-r--r--org.eclipse.lyo.testsuite.trs/src/main/java/org/eclipse/lyo/testsuite/oslcv2/trs/BaseTest.java2
-rw-r--r--org.eclipse.lyo.testsuite.trs/src/main/java/org/eclipse/lyo/testsuite/server/trsutils/ITRSVocabulary.java6
-rw-r--r--org.eclipse.lyo.testsuite.trs/src/main/java/org/eclipse/lyo/testsuite/server/trsutils/messages.properties2
3 files changed, 5 insertions, 5 deletions
diff --git a/org.eclipse.lyo.testsuite.trs/src/main/java/org/eclipse/lyo/testsuite/oslcv2/trs/BaseTest.java b/org.eclipse.lyo.testsuite.trs/src/main/java/org/eclipse/lyo/testsuite/oslcv2/trs/BaseTest.java
index 7724f15..0f4610d 100644
--- a/org.eclipse.lyo.testsuite.trs/src/main/java/org/eclipse/lyo/testsuite/oslcv2/trs/BaseTest.java
+++ b/org.eclipse.lyo.testsuite.trs/src/main/java/org/eclipse/lyo/testsuite/oslcv2/trs/BaseTest.java
@@ -188,7 +188,7 @@ public class BaseTest extends TestCore{
}
/**
- * Determine if the base resource contains the rdf:type ldp:AggregateContainer
+ * Determine if the base resource contains the rdf:type ldp:Container
* property.
*/
@Test
diff --git a/org.eclipse.lyo.testsuite.trs/src/main/java/org/eclipse/lyo/testsuite/server/trsutils/ITRSVocabulary.java b/org.eclipse.lyo.testsuite.trs/src/main/java/org/eclipse/lyo/testsuite/server/trsutils/ITRSVocabulary.java
index ff45399..31df2b6 100644
--- a/org.eclipse.lyo.testsuite.trs/src/main/java/org/eclipse/lyo/testsuite/server/trsutils/ITRSVocabulary.java
+++ b/org.eclipse.lyo.testsuite.trs/src/main/java/org/eclipse/lyo/testsuite/server/trsutils/ITRSVocabulary.java
@@ -43,7 +43,7 @@ public interface ITRSVocabulary {
public static final String CREATION_LOCALNAME = "Creation"; //$NON-NLS-1$
public static final String MODIFICATION_LOCALNAME = "Modification"; //$NON-NLS-1$
public static final String DELETION_LOCALNAME = "Deletion"; //$NON-NLS-1$
- public static final String AGGREGATE_CONTAINER_LOCALNAME = "AggregateContainer"; //$NON-NLS-1$
+ public static final String CONTAINER_LOCALNAME = "Container"; //$NON-NLS-1$
public static final String PAGE_LOCALNAME = "Page"; //$NON-NLS-1$
public static final String PAGE_OF_LOCALNAME = "pageOf"; //$NON-NLS-1$
@@ -139,10 +139,10 @@ public interface ITRSVocabulary {
public static final String LDP_NS = "http://www.w3.org/ns/ldp#"; //$NON-NLS-1$
/**
- * The AggregateContainer resource type used by the base resource
+ * The Container resource type used by the base resource
*/
public static final Resource CONTAINER_RESOURCE = ResourceFactory.createResource(LDP_NS
- + AGGREGATE_CONTAINER_LOCALNAME);
+ + CONTAINER_LOCALNAME);
/**
* The Page resource type used by the base resource to reference the next
diff --git a/org.eclipse.lyo.testsuite.trs/src/main/java/org/eclipse/lyo/testsuite/server/trsutils/messages.properties b/org.eclipse.lyo.testsuite.trs/src/main/java/org/eclipse/lyo/testsuite/server/trsutils/messages.properties
index b36d5df..c2046ab 100644
--- a/org.eclipse.lyo.testsuite.trs/src/main/java/org/eclipse/lyo/testsuite/server/trsutils/messages.properties
+++ b/org.eclipse.lyo.testsuite.trs/src/main/java/org/eclipse/lyo/testsuite/server/trsutils/messages.properties
@@ -55,7 +55,7 @@ validators.invalid.trs.order.property = Invalid trs:order property
validators.missing.ldp.next.page = Missing ldp:nextPage property
validators.missing.ldp.page.of = Missing or invalid ldp:pageOf property
validators.missing.rdf.type.oslc.trs = Missing rdf:type trs:TrackedResourceSet
-validators.missing.rdf.type.ldp.container = Missing rdf:type ldp:AggregateContainer
+validators.missing.rdf.type.ldp.container = Missing rdf:type ldp:Container
validators.missing.rdf.type.ldp.page = Missing rdf:type ldp:Page
validators.missing.trs.base.property = Missing trs:base property
validators.missing.trs.changed.property = Missing trs:changed property