[Yanel-commits] rev 42462 - in public/yanel/trunk/src/build: java/org/wyona/yanel/ant targets

[michi at wyona.com]

Author: michi
Date: 2009-04-22 09:47:30 +0200 (Wed, 22 Apr 2009)
New Revision: 42462

Modified:
   public/yanel/trunk/src/build/java/org/wyona/yanel/ant/MergeResourceTypesConfigsTask.java
   public/yanel/trunk/src/build/targets/resources.xml
Log:
use realms and resource-types config within merge class

Modified: public/yanel/trunk/src/build/java/org/wyona/yanel/ant/MergeResourceTypesConfigsTask.java
===================================================================
--- public/yanel/trunk/src/build/java/org/wyona/yanel/ant/MergeResourceTypesConfigsTask.java	2009-04-22 07:18:56 UTC (rev 42461)
+++ public/yanel/trunk/src/build/java/org/wyona/yanel/ant/MergeResourceTypesConfigsTask.java	2009-04-22 07:47:30 UTC (rev 42462)
@@ -22,54 +22,47 @@
 
     private static Logger log = Logger.getLogger(MergeResourceTypesConfigsTask.class);
 
-    private Path defaultRealmsConfigDir;
-    private Path localRealmsConfigDir;
+    private Path realmsConfigFile;
+    private Path globalResourceTypesConfigFile;
 
     /**
      *
      */
     public void execute() throws BuildException {
         log.info("Merge ...");
-        log("INFO: Default realms config directory: " + defaultRealmsConfigDir);
-        log("INFO: Local realms config directory: " + localRealmsConfigDir);
-        File defaultRealmsConfig = new File(defaultRealmsConfigDir.toString(), "realms.xml");
-        File localRealmsConfig = new File(localRealmsConfigDir.toString(), "local.realms.xml");
+        log("INFO: Realms config file: " + realmsConfigFile);
+        log("INFO: Global resource-types config directory: " + globalResourceTypesConfigFile);
+        File realmsConfig = new File(realmsConfigFile.toString());
         RealmManagerConfig realmManagerConfig = new RealmManagerConfig();
-        RealmContextConfig[] realmContextConfigs;
         try {
-            if (localRealmsConfig.isFile()) {
-                log("INFO: Local realms config exists: " + localRealmsConfig.getAbsolutePath());
-                // TODO: Unfortunately the class RealmManager consumes at the moment a yanel configuration rather than a realms configuration ...
-                //realmManager = new RealmManager("yanel.xml");
-                realmContextConfigs = realmManagerConfig.getRealmContextConfigs(localRealmsConfig);
+            RealmContextConfig[] realmContextConfigs;
+            if (realmsConfig.isFile()) {
+                realmContextConfigs = realmManagerConfig.getRealmContextConfigs(realmsConfig);
+
+                log("Number of realms: " + realmContextConfigs.length);
+                for (int i = 0; i < realmContextConfigs.length; i++) {
+                    log("Realm context config: " + realmContextConfigs[i]);
+                }
             } else {
-                log("WARN: No local realms config '" + localRealmsConfig.getAbsolutePath() + "' exists, hence use default one '" + defaultRealmsConfig.getAbsolutePath() + "'");
-                // TODO: ...
-                //realmManager = new RealmManager("yanel.xml");
-                realmContextConfigs = realmManagerConfig.getRealmContextConfigs(defaultRealmsConfig);
+                log("ERROR: No such realms config '" + realmsConfig.getAbsolutePath() + "' exists!");
             }
         } catch (Exception e) {
             log("ERROR: " + e.getMessage());
             throw new BuildException(e.getMessage(), e);
         }
-
-        log("Number of realms: " + realmContextConfigs.length);
-        for (int i = 0; i < realmContextConfigs.length; i++) {
-            log("Realm context config: " + realmContextConfigs[i]);
-        }
     }
 
     /**
      *
      */
-    public void setDefaultRealmsConfigDir(Path defaultRealmsConfigDir) {
-        this.defaultRealmsConfigDir = defaultRealmsConfigDir;
+    public void setRealmsConfigFile(Path realmsConfigFile) {
+        this.realmsConfigFile = realmsConfigFile;
     }
 
     /**
      *
      */
-    public void setLocalRealmsConfigDir(Path localRealmsConfigDir) {
-        this.localRealmsConfigDir = localRealmsConfigDir;
+    public void setGlobalResourceTypesConfigFile(Path globalResourceTypesConfigFile) {
+        this.globalResourceTypesConfigFile = globalResourceTypesConfigFile;
     }
 }

Modified: public/yanel/trunk/src/build/targets/resources.xml
===================================================================
--- public/yanel/trunk/src/build/targets/resources.xml	2009-04-22 07:18:56 UTC (rev 42461)
+++ public/yanel/trunk/src/build/targets/resources.xml	2009-04-22 07:47:30 UTC (rev 42462)
@@ -37,7 +37,7 @@
 
     <antcall target="prepare-realms-config"/>
     <antcall target="prepare-global-resource-types-config"/>
-    <merge-resource-types-configs defaultrealmsconfigdir="${yanel.source.home}/conf/" localrealmsconfigdir="${local.config.home}/"/>
+    <merge-resource-types-configs realmsconfigfile="${classes.dir}/realms.xml" globalresourcetypesconfigfile="${classes.dir}/resource-types.xml"/>
     <antcall target="generate-resources-build-file"/>
   </target>