Merge "Bug 535045 - Add some additional properties for RDFS etc"
diff --git a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateAdaptorManager.mtl b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateAdaptorManager.mtl
index d0fb085..c2cc06f 100644
--- a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateAdaptorManager.mtl
+++ b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateAdaptorManager.mtl
@@ -233,7 +233,7 @@
 
     [/for]
 
-    [for (aResource: Resource | servicedResources(anAdaptorInterface))]
+    [for (aResource: Resource | servicedResources(anAdaptorInterface)->sortedBy(name))]
     public static String [getResourceETagMethodName(aResource)/](final [javaClassName(aResource)/] aResource)
     {
         String eTag = null;
diff --git a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateAdaptorResourcesFactory.mtl b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateAdaptorResourcesFactory.mtl
index e69395c..0dc020c 100644
--- a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateAdaptorResourcesFactory.mtl
+++ b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateAdaptorResourcesFactory.mtl
@@ -34,7 +34,7 @@
 
 import org.eclipse.lyo.oslc4j.core.model.Link;
 import org.eclipse.lyo.oslc4j.core.OSLC4JUtils;
-[for (aResource: Resource | relevantResources(anAdaptorInterface))]
+[for (aResource: Resource | relevantResources(anAdaptorInterface)->sortedBy(name))]
 import [javaClassFullName(aResource, anAdaptorInterface, null) /];
 [/for]
 
@@ -116,7 +116,7 @@
     // [protected ('class_methods')]
     // [/protected]
 
-    [for (aResource: Resource | servicedResources(anAdaptorInterface))]
+    [for (aResource: Resource | servicedResources(anAdaptorInterface)->sortedBy(name))]
     //methods for [aResource.javaClassName()/] resource
     [aResource.generateFactoryMethods(anAdaptorInterface) /]