[Yanel-commits] rev 29408 - in public/yanel/contributions/realms/foaf/src/resources: findfriend/src/build findfriend/src/java/org/wyona/yanel/impl/resources/findfriend foaf foaf/src/build

[michi at wyona.com]

Author: michi
Date: 2007-11-30 23:59:16 +0100 (Fri, 30 Nov 2007)
New Revision: 29408

Added:
   public/yanel/contributions/realms/foaf/src/resources/foaf/src/build/pom.xml
Modified:
   public/yanel/contributions/realms/foaf/src/resources/findfriend/src/build/dependencies.xml
   public/yanel/contributions/realms/foaf/src/resources/findfriend/src/java/org/wyona/yanel/impl/resources/findfriend/FindFriendResource.java
   public/yanel/contributions/realms/foaf/src/resources/foaf/build.xml
Log:
dependencies fixed

Modified: public/yanel/contributions/realms/foaf/src/resources/findfriend/src/build/dependencies.xml
===================================================================
--- public/yanel/contributions/realms/foaf/src/resources/findfriend/src/build/dependencies.xml	2007-11-30 22:40:14 UTC (rev 29407)
+++ public/yanel/contributions/realms/foaf/src/resources/findfriend/src/build/dependencies.xml	2007-11-30 22:59:16 UTC (rev 29408)
@@ -11,6 +11,7 @@
                   version="${yanel.source.version}"/>
       <dependency groupId="wyona-org-meguni" artifactId="wyona-org-meguni" version="0.1-rREVISION"/>
       <dependency groupId="javax.servlet" artifactId="servlet-api" version="2.3"/>
+      <dependency groupId="foaf" artifactId="yanel-resource-foaf" version="0.0.1-dev-rXXX"/>
     </artifact:dependencies>
 
     <artifact:dependencies pathId="maven2.resource.classpath" filesetId="maven2.resource.fileset">

Modified: public/yanel/contributions/realms/foaf/src/resources/findfriend/src/java/org/wyona/yanel/impl/resources/findfriend/FindFriendResource.java
===================================================================
--- public/yanel/contributions/realms/foaf/src/resources/findfriend/src/java/org/wyona/yanel/impl/resources/findfriend/FindFriendResource.java	2007-11-30 22:40:14 UTC (rev 29407)
+++ public/yanel/contributions/realms/foaf/src/resources/findfriend/src/java/org/wyona/yanel/impl/resources/findfriend/FindFriendResource.java	2007-11-30 22:59:16 UTC (rev 29408)
@@ -179,12 +179,10 @@
      *
      */
     private Repository getProfilesRepository() throws Exception {
-        Repository repo = getRealm().getRepository();
-        String repoConfig = getResourceConfigProperty("repo-config");
-        if (repoConfig != null) {
-            repo = new RepositoryFactory().newRepository("profiles", new File(repoConfig));
-        }
-        return repo;
+        Repository repoProfiles = ((org.wyona.yanel.impl.map.FOAFRealm) getRealm()).getProfilesRepository();
+        if (repoProfiles != null) return repoProfiles;
+
+        return getRealm().getRepository();
     }
 
     /**

Modified: public/yanel/contributions/realms/foaf/src/resources/foaf/build.xml
===================================================================
--- public/yanel/contributions/realms/foaf/src/resources/foaf/build.xml	2007-11-30 22:40:14 UTC (rev 29407)
+++ public/yanel/contributions/realms/foaf/src/resources/foaf/build.xml	2007-11-30 22:59:16 UTC (rev 29408)
@@ -34,6 +34,7 @@
     <jar destfile="${resource.lib.dir}/yanel-resource-${resource.name}-${resource.version}.jar"
       basedir="${resource.classes.dir}"
     />
+    <antcall target="install-jar"/>
   </target>
 
   <target name="clean" depends="init">
@@ -46,4 +47,24 @@
       <mapper type="flatten"/>
     </copy>
   </target>
+
+  <target name="install-jar" description="Place jar file for this resource into local maven repository" xmlns:artifact="antlib:org.apache.maven.artifact.ant">
+<!--
+  <target name="install-jar" description="Place jar file for this resource into local maven repository" depends="init, clean, compile" xmlns:artifact="antlib:org.apache.maven.artifact.ant">
+-->
+    <copy file="src/build/pom.xml" tofile="build/lib/pom.xml"/>
+
+    <replace file="build/lib/pom.xml" value="${resource.version}">
+      <replacetoken>@VERSION@</replacetoken>
+    </replace>
+    <replace file="build/lib/pom.xml" value="${resource.name}">
+      <replacetoken>@NAME@</replacetoken>
+    </replace>
+
+    <artifact:pom id="maven.project.core" file="build/lib/pom.xml"/>
+    <artifact:install file="build/lib/yanel-resource-${resource.name}-${resource.version}.jar">
+      <pom refid="maven.project.core"/>
+    </artifact:install>
+  </target>
+
 </project>

Added: public/yanel/contributions/realms/foaf/src/resources/foaf/src/build/pom.xml
===================================================================
--- public/yanel/contributions/realms/foaf/src/resources/foaf/src/build/pom.xml	                        (rev 0)
+++ public/yanel/contributions/realms/foaf/src/resources/foaf/src/build/pom.xml	2007-11-30 22:59:16 UTC (rev 29408)
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>foaf</groupId>
+  <artifactId>yanel-resource- at NAME@</artifactId>
+  <version>@VERSION@</version>
+</project>