[Yanel-commits] rev 29542 - in public/yanel/contributions/realms/foaf: . config src/resources/foaf/src/build src/resources/foaf/src/java/org/wyona/yanel/impl/map

[michi at wyona.com]

Author: michi
Date: 2007-12-04 16:43:54 +0100 (Tue, 04 Dec 2007)
New Revision: 29542

Modified:
   public/yanel/contributions/realms/foaf/config/ac-identities-repository.xml
   public/yanel/contributions/realms/foaf/realm.xml
   public/yanel/contributions/realms/foaf/src/resources/foaf/src/build/dependencies.xml
   public/yanel/contributions/realms/foaf/src/resources/foaf/src/java/org/wyona/yanel/impl/map/FOAFRealm.java
Log:
path fixed

Modified: public/yanel/contributions/realms/foaf/config/ac-identities-repository.xml
===================================================================
--- public/yanel/contributions/realms/foaf/config/ac-identities-repository.xml	2007-12-04 15:28:23 UTC (rev 29541)
+++ public/yanel/contributions/realms/foaf/config/ac-identities-repository.xml	2007-12-04 15:43:54 UTC (rev 29542)
@@ -3,9 +3,12 @@
 <repository class="org.wyona.yarep.impl.repo.vfs.VirtualFileSystemRepository">
   <name>FOAF Access Control Indentities</name>
 
+<!--
   <content src="../ac-identities"/>
+-->
   <meta src="../ac-identities-yarep-meta"/>
   <!--
   <content src="/home/michi/src/wyona-svn/wyona/misc/foaf/ac-identities"/>
   -->
+  <content src="/home/michi/src/wyona/wyona/misc/foaf/ac-identities"/>
 </repository>

Modified: public/yanel/contributions/realms/foaf/realm.xml
===================================================================
--- public/yanel/contributions/realms/foaf/realm.xml	2007-12-04 15:28:23 UTC (rev 29541)
+++ public/yanel/contributions/realms/foaf/realm.xml	2007-12-04 15:43:54 UTC (rev 29542)
@@ -8,7 +8,10 @@
   <data>config/data-repository.xml</data>
 
   <!-- TODO: Read by FOAFRealm -->
+  <foaf:profiles-data xmlns:foaf="http://www.wyona.org/foaf/1.0">/home/michi/src/wyona/wyona/misc/foaf/jcr-data-repository.xml</foaf:profiles-data>
+<!--
   <foaf:profiles-data xmlns:foaf="http://www.wyona.org/foaf/1.0">/home/michi/src/wyona-svn/wyona/misc/foaf/jcr-data-repository.xml</foaf:profiles-data>
+-->
 
   <ac-policies>config/ac-policies-repository.xml</ac-policies>
   <ac-identities>config/ac-identities-repository.xml</ac-identities>

Modified: public/yanel/contributions/realms/foaf/src/resources/foaf/src/build/dependencies.xml
===================================================================
--- public/yanel/contributions/realms/foaf/src/resources/foaf/src/build/dependencies.xml	2007-12-04 15:28:23 UTC (rev 29541)
+++ public/yanel/contributions/realms/foaf/src/resources/foaf/src/build/dependencies.xml	2007-12-04 15:43:54 UTC (rev 29542)
@@ -19,6 +19,8 @@
       <dependency groupId="javax.servlet" artifactId="servlet-api" version="2.3"/>
       <dependency groupId="xml-resolver" artifactId="xml-resolver" version="1.1"/>
       <dependency groupId="xalan" artifactId="xalan" version="2.7.0"/>
+      <dependency groupId="avalon-framework" artifactId="avalon-framework-api" version="4.3"/>
+      <dependency groupId="avalon-framework" artifactId="avalon-framework-impl" version="4.3"/>
     </artifact:dependencies>
 
     <artifact:dependencies pathId="maven2.resource.classpath" filesetId="maven2.resource.fileset">

Modified: public/yanel/contributions/realms/foaf/src/resources/foaf/src/java/org/wyona/yanel/impl/map/FOAFRealm.java
===================================================================
--- public/yanel/contributions/realms/foaf/src/resources/foaf/src/java/org/wyona/yanel/impl/map/FOAFRealm.java	2007-12-04 15:28:23 UTC (rev 29541)
+++ public/yanel/contributions/realms/foaf/src/resources/foaf/src/java/org/wyona/yanel/impl/map/FOAFRealm.java	2007-12-04 15:43:54 UTC (rev 29542)
@@ -21,6 +21,11 @@
 import org.wyona.yarep.core.Repository;
 import org.wyona.yarep.core.RepositoryFactory;
 
+import org.wyona.commons.io.FileUtil;
+
+import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.configuration.DefaultConfigurationBuilder;
+
 /**
  *
  */
@@ -37,9 +42,15 @@
         super(name, id, mountPoint, configFile);
         log.error("DEBUG: Custom FOAF Realm implementation!");
 
-	String repoConfig = "/home/michi/src/wyona/wyona/misc/foaf/jcr-data-repository.xml";
-	//String repoConfig = "/home/michi/src/wyona-svn/wyona/misc/foaf/jcr-data-repository.xml";
-        profilesRepo = new RepositoryFactory().newRepository("profiles", new java.io.File(repoConfig));
+        DefaultConfigurationBuilder builder =  new DefaultConfigurationBuilder(true);
+        Configuration config = builder.buildFromFile(configFile);
+        java.io.File profilesDataRepoConfigFile = new java.io.File(config.getChild("profiles-data").getValue());
+        log.error("DEBUG: Profiles Data repo path: " + profilesDataRepoConfigFile);
+
+        if (!profilesDataRepoConfigFile.isAbsolute()) {
+            profilesDataRepoConfigFile = FileUtil.file(configFile.getParentFile().getAbsolutePath(), profilesDataRepoConfigFile.toString());
+        }
+        profilesRepo = new RepositoryFactory().newRepository("profiles", profilesDataRepoConfigFile);
     }
 
     /**