--- a/src/de/mpiwg/itgroup/triplestoremanager/owl/MetaDataHandler.java	Tue Dec 13 17:45:30 2011 +0100
+++ b/src/de/mpiwg/itgroup/triplestoremanager/owl/MetaDataHandler.java	Thu Jun 21 12:24:29 2012 +0200
@@ -28,9 +28,12 @@
 
 public class MetaDataHandler {
 
-	String ontologieUriString = "file:///Users/dwinter/Documents/Projekte/ECHO-eSciDoc-MPDL/escidocMPIWG/NamedIdentityManager/ontologies/namedIdentities.owl";
+	//String ontologieUriString = "file:///Users/dwinter/Documents/Projekte/ECHO-eSciDoc-MPDL/escidocMPIWG/NamedIdentityManager/ontologies/namedIdentities.owl";
+	String ontologieUriString = "file:///Users/dwinter/Documents/Projekte/ECHO-eSciDoc-MPDL/escidocMPIWG/MPIWG-ontologies/namedIdentities.owl";
+	//String ontologieUriString = "http://ontologies.mpiwg-berlin.mpg.de/owl/authorities/namedIdentities";
 	//String rdfUriString = "file:///Users/dwinter/Documents/Projekte/ECHO-eSciDoc-MPDL/escidocMPIWG/NamedIdentityManager/ontologies/rdf-schema";
-	String owlFolder = "/Users/dwinter/Documents/Projekte/ECHO-eSciDoc-MPDL/escidocMPIWG/NamedIdentityManager/ontologies";
+	//String owlFolder = "/Users/dwinter/Documents/Projekte/ECHO-eSciDoc-MPDL/escidocMPIWG/NamedIdentityManager/ontologies";
+	String owlFolder = "/Users/dwinter/Documents/Projekte/ECHO-eSciDoc-MPDL/escidocMPIWG/MPIWG-ontologies/";
 
 	static MetaDataHandler instance=null;
 	
@@ -98,7 +101,7 @@
 	 * @param string
 	 * @return
 	 */
-	public Set getAssociatedPropsForClass(String string) {
+	public Collection getAssociatedPropsForClass(String string) {
 
 	
 
@@ -114,13 +117,23 @@
 		}
 
 		if (owlclass != null) {
-			return owlclass.getAssociatedProperties();
+			Collection props2 = owlclass.getPossibleRDFProperties();
+			Collection props1 = owlclass.getAssociatedProperties();
+			props1.addAll(props2);
+			return props1;
+			
 		} else {
 			logger.debug("Cannot find OWLClass:" + string);
 			logger.debug("Trying RDFSClass");
 			RDFSNamedClass rdfsclass=(RDFSNamedClass)owlModel.getRDFSNamedClass(string);
 			if (rdfsclass != null) {
-				return rdfsclass.getAssociatedProperties();
+				Collection props2 = rdfsclass.getPossibleRDFProperties();
+				//System.out.println(props2);
+				
+				Collection props1 = rdfsclass.getAssociatedProperties();
+				props1.addAll(props2);
+				return props1;
+				
 			} else {
 				logger.debug("Cannot find RDFSClass:" + string);
 				return null;