Changeset 1057


Ignore:
Timestamp:
2009-02-11 13:18:42 (3 years ago)
Author:
bruno
Message:

module-source-locations: remove support for the property ${kauri.config.basedir}, as the kauri.xml does not exist anymore. Furthermore, it seems that interpreting the paths relative to the location of the module-source-locations.properties is enough and even more appropriate.

Location:
branches/BRANCH_CONFIG
Files:
15 edited

Legend:

Unmodified
Added
Removed

  • branches/BRANCH_CONFIG/core/kauri-runtime-cli/src/main/java/org/kauriproject/runtime/cli/KauriRuntimeCli.java

    r1031 r1057  
    234234            try { 
    235235                is = new FileInputStream(file); 
    236                 sourceLocations = new SourceLocations(is, confDirs.get(0).getAbsoluteFile().getParent(), file.getParent()); 
     236                sourceLocations = new SourceLocations(is, file.getParent()); 
    237237            } catch (Throwable t) { 
    238238                throw new KauriRTException("Problem reading source locations property file.", t); 

  • branches/BRANCH_CONFIG/core/kauri-runtime/src/main/java/org/kauriproject/runtime/model/SourceLocations.java

    r967 r1057  
    2828 */ 
    2929public class SourceLocations { 
    30     private static final String KAURI_CONFIG_BASEDIR = "kauri.config.basedir"; 
    3130    private Properties locations; 
    3231    private File baseDir; 
    … …  
    3736    } 
    3837 
    39     public SourceLocations(InputStream is, String kauriConfigDir, String moduleSourceLocationsDir) throws IOException { 
     38    public SourceLocations(InputStream is, String moduleSourceLocationsDir) throws IOException { 
    4039        baseDir = new File(moduleSourceLocationsDir); 
    41         load(is, kauriConfigDir); 
     40        load(is); 
    4241    } 
    4342 
    … …  
    5655    } 
    5756 
    58     private void load(InputStream is, String kauriConfigDir) throws IOException { 
     57    private void load(InputStream is) throws IOException { 
    5958        locations = new Properties(); 
    6059        locations.load(is); 
    6160 
    62         Properties properties = getProperties(kauriConfigDir); 
     61        Properties properties = System.getProperties(); 
    6362 
    6463        for (Map.Entry entry : locations.entrySet()) { 
    … …  
    6867        } 
    6968    } 
    70  
    71     private static Properties getProperties(String kauriConfigDir) { 
    72         Properties properties = new Properties(System.getProperties()); 
    73         properties.put(KAURI_CONFIG_BASEDIR, kauriConfigDir); 
    74         return properties; 
    75     } 
    7669} 

  • branches/BRANCH_CONFIG/modules/kauri-blueprintcss/module-source-locations.properties

    r869 r1057  
    44# Specify this file with -s argument to the Kauri Runtime CLI 
    55# 
    6 org.kauriproject!kauri-blueprintcss=${kauri.config.basedir} 
     6org.kauriproject!kauri-blueprintcss= 

  • branches/BRANCH_CONFIG/modules/kauri-jquery/module-source-locations.properties

    r870 r1057  
    44# Specify this file with -s argument to the Kauri Runtime CLI 
    55# 
    6 org.kauriproject!kauri-jquery=${kauri.config.basedir} 
     6org.kauriproject!kauri-jquery= 

  • branches/BRANCH_CONFIG/samples/kauri-dbforms-sample/module-source-locations.properties

    r898 r1057  
    44# Specify this file with -s argument to the Kauri Runtime CLI 
    55# 
    6 org.kauriproject!kauri-jquery=${kauri.config.basedir}/../../modules/kauri-jquery 
    7 org.kauriproject!kauri-blueprintcss=${kauri.config.basedir}/../../modules/kauri-blueprintcss 
    8 org.kauriproject!kauri-samples-common=${kauri.config.basedir}/../kauri-samples-common 
    9 org.kauriproject!kauri-dbforms-sample=${kauri.config.basedir} 
     6org.kauriproject!kauri-jquery=../../modules/kauri-jquery 
     7org.kauriproject!kauri-blueprintcss=../../modules/kauri-blueprintcss 
     8org.kauriproject!kauri-samples-common=../kauri-samples-common 
     9org.kauriproject!kauri-dbforms-sample= 
    1010 

  • branches/BRANCH_CONFIG/samples/kauri-dbresources-sample/module-source-locations.properties

    r883 r1057  
    44# Specify this file with -s argument to the Kauri Runtime CLI 
    55# 
    6 #org.kauriproject!kauri-dbresources-impl=${kauri.config.basedir}/../../modules/kauri-dbresources/kauri-dbresources-impl 
    7 #org.kauriproject!kauri-blueprintcss=${kauri.config.basedir}/../../modules/kauri-blueprintcss 
    8 org.kauriproject!kauri-samples-common=${kauri.config.basedir}/../kauri-samples-common 
    9 org.kauriproject!kauri-dbresources-sample=${kauri.config.basedir} 
     6#org.kauriproject!kauri-dbresources-impl=../../modules/kauri-dbresources/kauri-dbresources-impl 
     7#org.kauriproject!kauri-blueprintcss=../../modules/kauri-blueprintcss 
     8org.kauriproject!kauri-samples-common=../kauri-samples-common 
     9org.kauriproject!kauri-dbresources-sample= 

  • branches/BRANCH_CONFIG/samples/kauri-forms-sample/module-source-locations.properties

    r106 r1057  
    44# Specify this file with -s argument to the Kauri Runtime CLI 
    55# 
    6 org.kauriproject!kauri-forms-sample=${kauri.config.basedir} 
     6org.kauriproject!kauri-forms-sample= 

  • branches/BRANCH_CONFIG/samples/kauri-i18n-sample/module-source-locations.properties

    r999 r1057  
    44# Specify this file with -s argument to the Kauri Runtime CLI 
    55# 
    6 org.kauriproject!kauri-i18n-sample=${kauri.config.basedir} 
    7 org.kauriproject!kauri-samples-common=${kauri.config.basedir}/../kauri-samples-common 
     6org.kauriproject!kauri-i18n-sample= 
     7org.kauriproject!kauri-samples-common=../kauri-samples-common 

  • branches/BRANCH_CONFIG/samples/kauri-representationbuilder-sample/module-source-locations.properties

    r469 r1057  
    44# Specify this file with -s argument to the Kauri Runtime CLI 
    55# 
    6 org.kauriproject!kauri-representationbuilder-sample=${kauri.config.basedir} 
     6org.kauriproject!kauri-representationbuilder-sample= 

  • branches/BRANCH_CONFIG/samples/kauri-routing-sample/module-source-locations.properties

    r284 r1057  
    44# Specify this file with -s argument to the Kauri Runtime CLI 
    55# 
    6 org.kauriproject!kauri-routing-sample=${kauri.config.basedir} 
     6org.kauriproject!kauri-routing-sample= 

  • branches/BRANCH_CONFIG/samples/kauri-runtime-sample/module-source-locations.properties

    r279 r1057  
    44# Specify this file with -s argument to the Kauri Runtime CLI 
    55# 
    6 org.kauriproject!kauri-runtime-sample-module1=${kauri.config.basedir}/kauri-runtime-sample-module1 
    7 org.kauriproject!kauri-runtime-sample-module2=${kauri.config.basedir}/kauri-runtime-sample-module2 
    8 org.kauriproject!kauri-runtime-sample-index=${kauri.config.basedir}/kauri-runtime-sample-index 
    9 org.kauriproject!kauri-routing-impl=${kauri.config.basedir}/../../modules/kauri-routing/kauri-routing-impl 
     6org.kauriproject!kauri-runtime-sample-module1=kauri-runtime-sample-module1 
     7org.kauriproject!kauri-runtime-sample-module2=kauri-runtime-sample-module2 
     8org.kauriproject!kauri-runtime-sample-index=kauri-runtime-sample-index 
     9org.kauriproject!kauri-routing-impl=../../modules/kauri-routing/kauri-routing-impl 

  • branches/BRANCH_CONFIG/samples/kauri-samples-common/module-source-locations.properties

    r827 r1057  
    44# Specify this file with -s argument to the Kauri Runtime CLI 
    55# 
    6 org.kauriproject!kauri-samples-common=${kauri.config.basedir} 
    7 org.kauriproject!kauri-blueprintcss=${kauri.config.basedir}/../../modules/kauri-blueprintcss 
     6org.kauriproject!kauri-samples-common= 
     7org.kauriproject!kauri-blueprintcss=../../modules/kauri-blueprintcss 

  • branches/BRANCH_CONFIG/samples/kauri-template-sample/module-source-locations.properties

    r850 r1057  
    44# Specify this file with -s argument to the Kauri Runtime CLI 
    55# 
    6 #org.kauriproject!kauri-template-service-impl=${kauri.config.basedir}/../../modules/kauri-template/kauri-template-service-impl 
    7 org.kauriproject!kauri-template-sample=${kauri.config.basedir} 
    8 org.kauriproject!kauri-samples-common=${kauri.config.basedir}/../kauri-samples-common 
     6#org.kauriproject!kauri-template-service-impl=../../modules/kauri-template/kauri-template-service-impl 
     7org.kauriproject!kauri-template-sample= 
     8org.kauriproject!kauri-samples-common=../kauri-samples-common 

  • branches/BRANCH_CONFIG/tools/kauri-archetype/kauri-archetype-basic/src/main/resources/archetype-resources/module-source-locations.properties

    r304 r1057  
    44# Specify this file with -s argument to the Kauri Runtime CLI 
    55# 
    6 ${groupId}!module1=${kauri.config.basedir}/module1 
     6${groupId}!module1=module1 

  • branches/BRANCH_CONFIG/tools/kauri-archetype/kauri-archetype-prototyping/src/main/resources/archetype-resources/module-source-locations.properties

    r689 r1057  
    44# Specify this file with -s argument to the Kauri Runtime CLI 
    55# 
    6 ${groupId}!module1=${kauri.config.basedir}/module1 
     6${groupId}!module1=module1 
Note: See TracChangeset for help on using the changeset viewer.