Menu
▾
▴
[Equanda-svn-commit] SF.net SVN: equanda: [229] trunk
|
From: <tri...@us...> - 2007-12-30 11:22:31
|
Revision: 229
http://equanda.svn.sourceforge.net/equanda/?rev=229&view=rev
Author: triathlon98
Date: 2007-12-30 03:22:27 -0800 (Sun, 30 Dec 2007)
Log Message:
-----------
EQ-120 rename INIFile to IniFile
Modified Paths:
--------------
trunk/equanda-client/src/main/java/org/equanda/export/Export.java
trunk/equanda-generate/src/main/java/org/equanda/domain/db/CodebaseConvert.java
trunk/equanda-generate/src/main/java/org/equanda/generate/AntTask.java
trunk/equanda-generate/src/main/java/org/equanda/generate/Generator.java
trunk/equanda-generate/src/main/java/org/equanda/persistence/xml/CodebaseConvert.java
trunk/equanda-generate/src/test/java/org/equanda/generate/CaseConversionTest.java
trunk/equanda-generate/src/test/java/org/equanda/generate/ChoicesTest.java
trunk/equanda-generate/src/test/java/org/equanda/generate/CompareTest.java
trunk/equanda-generate/src/test/java/org/equanda/generate/DefaultTest.java
trunk/equanda-generate/src/test/java/org/equanda/generate/DisplayTest.java
trunk/equanda-generate/src/test/java/org/equanda/generate/FailOnInvalidDefinitionTest.java
trunk/equanda-generate/src/test/java/org/equanda/generate/ImmutableAndMutableTest.java
trunk/equanda-generate/src/test/java/org/equanda/generate/LinksTest.java
trunk/equanda-generate/src/test/java/org/equanda/generate/LobTest.java
trunk/equanda-generate/src/test/java/org/equanda/generate/MultipleTest.java
trunk/equanda-generate/src/test/java/org/equanda/generate/NamesTest.java
trunk/equanda-generate/src/test/java/org/equanda/generate/SelectTest.java
trunk/equanda-generate/src/test/java/org/equanda/generate/TableIncludeAndTypeTest.java
trunk/equanda-generate/src/test/java/org/equanda/generate/UniqueNameTest.java
trunk/equanda-generate/src/test/java/org/equanda/generate/UniqueTest.java
trunk/equanda-generate/src/test/java/org/equanda/generate/ValueWhenNullTest.java
trunk/equanda-maven-plugin/src/main/java/org/equanda/plugin/DmReportPlugin.java
trunk/equanda-maven-plugin/src/main/java/org/equanda/plugin/GeneratePlugin.java
trunk/equanda-test/test-test/src/test/java/org/equanda/test/export/ExportTest.java
trunk/equanda-tool/src/main/java/org/equanda/tool/export/configuration/ExportSectionObject.java
trunk/equanda-tool/src/main/java/org/equanda/tool/export/configuration/ExportSectionSettings.java
trunk/equanda-tool/src/main/java/org/equanda/tool/export/object/ExportHelper.java
trunk/equanda-tool/src/main/java/org/equanda/tool/print/configuration/PrintSectionScan.java
trunk/equanda-tool/src/main/java/org/equanda/tool/print/configuration/PrintSectionSettings.java
trunk/equanda-tool/src/main/java/org/equanda/tool/shared/configuration/ConfigurationExtraImpl.java
trunk/equanda-tool/src/main/java/org/equanda/tool/shared/configuration/ConfigurationMain.java
trunk/equanda-tool/src/main/java/org/equanda/tool/shared/configuration/Section.java
trunk/equanda-tool/src/main/java/org/equanda/tool/shared/configuration/SectionConfig.java
trunk/equanda-tool/src/main/java/org/equanda/tool/shared/configuration/SectionDataBase.java
trunk/equanda-tool/src/main/java/org/equanda/tool/shared/configuration/SectionGeneral.java
trunk/equanda-tool/src/main/java/org/equanda/tool/shared/configuration/SectionOM.java
trunk/equanda-tool/src/main/java/org/equanda/tool/translationsEditor/Configuration.java
trunk/equanda-tool/src/main/java/org/equanda/tool/translationsEditor/IniConfiguration.java
trunk/equanda-tool/src/main/java/org/equanda/tool/translationsEditor/TranslationsEditor.java
trunk/equanda-tool/src/main/java/org/equanda/tool/ymport/configuration/ImportSectionMail.java
trunk/equanda-tool/src/main/java/org/equanda/tool/ymport/configuration/ImportSectionScan.java
trunk/equanda-tool/src/main/java/org/equanda/tool/ymport/configuration/ImportSectionScript.java
trunk/equanda-tool/src/main/java/org/equanda/tool/ymport/configuration/ImportSectionSettings.java
trunk/equanda-util/src/main/java/org/equanda/util/script/DMExtension.java
Added Paths:
-----------
trunk/equanda-util/src/main/java/org/equanda/util/IniFile.java
Removed Paths:
-------------
trunk/equanda-generate/src/main/velocity/docs/om.mm.vm
trunk/equanda-util/src/main/java/org/equanda/util/INIFile.java
trunk/equanda-util/src/main/java/org/equanda/util/script/OMExtension.java
Modified: trunk/equanda-client/src/main/java/org/equanda/export/Export.java
===================================================================
--- trunk/equanda-client/src/main/java/org/equanda/export/Export.java 2007-12-29 01:18:51 UTC (rev 228)
+++ trunk/equanda-client/src/main/java/org/equanda/export/Export.java 2007-12-30 11:22:27 UTC (rev 229)
@@ -27,7 +27,7 @@
import org.equanda.persistence.UOID;
import org.equanda.persistence.EquandaProxy;
import org.equanda.util.Base64;
-import org.equanda.util.INIFile;
+import org.equanda.util.IniFile;
import org.equanda.util.StringSplitter;
import org.equanda.util.StringUtil;
import javolution.lang.TextBuilder;
@@ -69,7 +69,7 @@
*/
private String dir = "";
- public void export( Collection col, org.equanda.util.INIFile ini )
+ public void export( Collection col, IniFile ini )
throws ExportException
{
for ( Object obj : col )
@@ -78,7 +78,7 @@
}
}
- public void export( Collection col, INIFile ini, Map tableMap )
+ public void export( Collection col, IniFile ini, Map tableMap )
throws ExportException
{
Class previous = null;
@@ -94,25 +94,25 @@
}
}
- public void export( Object refForName, Collection col, INIFile ini )
+ public void export( Object refForName, Collection col, IniFile ini )
throws ExportException
{
export( refForName, col, ini, null, true, null );
}
- public void export( Object refForName, Object objectToExport, INIFile ini )
+ public void export( Object refForName, Object objectToExport, IniFile ini )
throws ExportException
{
export( refForName, objectToExport, ini, null, true, null );
}
- public void export( Object refForName, Collection col, INIFile ini, Map tableMap )
+ public void export( Object refForName, Collection col, IniFile ini, Map tableMap )
throws ExportException
{
export( refForName, col, ini, tableMap, true, null );
}
- public boolean export( Object refForName, Collection col, INIFile ini, Map tableMap, boolean writeDirective,
+ public boolean export( Object refForName, Collection col, IniFile ini, Map tableMap, boolean writeDirective,
Map<String, String> fileMoveMap )
throws ExportException
{
@@ -131,7 +131,7 @@
return ( previous == null ) && writeDirective;
}
- public boolean export( Object refForName, Object objectToExport, INIFile ini, Map tableMap, boolean writeDirective,
+ public boolean export( Object refForName, Object objectToExport, IniFile ini, Map tableMap, boolean writeDirective,
Map<String, String> fileMoveMap )
throws ExportException
{
@@ -146,7 +146,7 @@
}
}
- private void exportInternal( Object refForName, Object objectToExport, INIFile ini, Map tableMap,
+ private void exportInternal( Object refForName, Object objectToExport, IniFile ini, Map tableMap,
boolean writeDirective, Map<String, String> fileMoveMap )
throws ExportException
{
Modified: trunk/equanda-generate/src/main/java/org/equanda/domain/db/CodebaseConvert.java
===================================================================
--- trunk/equanda-generate/src/main/java/org/equanda/domain/db/CodebaseConvert.java 2007-12-29 01:18:51 UTC (rev 228)
+++ trunk/equanda-generate/src/main/java/org/equanda/domain/db/CodebaseConvert.java 2007-12-30 11:22:27 UTC (rev 229)
@@ -24,7 +24,7 @@
package org.equanda.domain.db;
-import org.equanda.util.INIFile;
+import org.equanda.util.IniFile;
import org.equanda.util.SaveException;
import java.io.IOException;
@@ -39,17 +39,17 @@
extends Convert
{
public static final String FILE = "CodebaseConversion.txt";
- INIFile convert;
+ IniFile convert;
public void init()
{
try
{
- convert = new INIFile( FILE, true );
+ convert = new IniFile( FILE, true );
}
catch ( IOException e )
{
- convert = new INIFile( true );
+ convert = new IniFile( true );
}
}
Modified: trunk/equanda-generate/src/main/java/org/equanda/generate/AntTask.java
===================================================================
--- trunk/equanda-generate/src/main/java/org/equanda/generate/AntTask.java 2007-12-29 01:18:51 UTC (rev 228)
+++ trunk/equanda-generate/src/main/java/org/equanda/generate/AntTask.java 2007-12-30 11:22:27 UTC (rev 229)
@@ -26,7 +26,7 @@
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Task;
-import org.equanda.util.INIFile;
+import org.equanda.util.IniFile;
import org.equanda.util.SaveException;
@@ -40,7 +40,7 @@
{
private String appDir;
- private INIFile ini = new INIFile();
+ private IniFile ini = new IniFile();
private boolean generateAll;
// The method executing the task
Modified: trunk/equanda-generate/src/main/java/org/equanda/generate/Generator.java
===================================================================
--- trunk/equanda-generate/src/main/java/org/equanda/generate/Generator.java 2007-12-29 01:18:51 UTC (rev 228)
+++ trunk/equanda-generate/src/main/java/org/equanda/generate/Generator.java 2007-12-30 11:22:27 UTC (rev 229)
@@ -33,7 +33,7 @@
import org.apache.xml.serialize.OutputFormat;
import org.apache.xml.serialize.XMLSerializer;
import org.equanda.persistence.xml.*;
-import org.equanda.util.INIFile;
+import org.equanda.util.IniFile;
import org.equanda.util.SaveException;
import org.equanda.util.StringSplitter;
import org.equanda.util.xml.XMLParser;
@@ -58,8 +58,8 @@
*/
public class Generator
{
- INIFile ini; // how to parse
- INIFile templateDefinition; // definition of what to generate
+ IniFile ini; // how to parse
+ IniFile templateDefinition; // definition of what to generate
long lastModified; // most recent last modification date
boolean failed; // has generation failed?
String appDir = ""; // directory where input files can be found
@@ -86,7 +86,7 @@
{
try
{
- Generator gen = new Generator( new INIFile( args[ 0 ] ), "" );
+ Generator gen = new Generator( new IniFile( args[ 0 ] ), "" );
gen.generate();
System.exit( gen.getFailed() ? 1 : 0 );
}
@@ -105,7 +105,7 @@
* @param ini project parameters
* @param defDir directory wehere definition is stored
*/
- public Generator( INIFile ini, String defDir )
+ public Generator( IniFile ini, String defDir )
{
this.ini = ini;
@@ -267,7 +267,7 @@
{
templateDefinitionFile = templateDefinitionFile.substring( "classpath://".length() );
}
- templateDefinition = new INIFile();
+ templateDefinition = new IniFile();
try
{
InputStream is = new EquandaResourceLoader().getResourceStream( templateDefinitionFile + ".ini" );
@@ -277,7 +277,7 @@
failed = true;
return;
}
- templateDefinition = new INIFile( is );
+ templateDefinition = new IniFile( is );
}
catch ( Exception e )
{
Modified: trunk/equanda-generate/src/main/java/org/equanda/persistence/xml/CodebaseConvert.java
===================================================================
--- trunk/equanda-generate/src/main/java/org/equanda/persistence/xml/CodebaseConvert.java 2007-12-29 01:18:51 UTC (rev 228)
+++ trunk/equanda-generate/src/main/java/org/equanda/persistence/xml/CodebaseConvert.java 2007-12-30 11:22:27 UTC (rev 229)
@@ -24,7 +24,7 @@
package org.equanda.persistence.xml;
-import org.equanda.util.INIFile;
+import org.equanda.util.IniFile;
import org.equanda.util.SaveException;
import java.io.IOException;
@@ -39,17 +39,17 @@
extends Convert
{
public static final String FILE = "CodebaseConversion.txt";
- INIFile convert;
+ IniFile convert;
public void init()
{
try
{
- convert = new INIFile( FILE, true );
+ convert = new IniFile( FILE, true );
}
catch ( IOException e )
{
- convert = new INIFile( true );
+ convert = new IniFile( true );
}
}
Deleted: trunk/equanda-generate/src/main/velocity/docs/om.mm.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/docs/om.mm.vm 2007-12-29 01:18:51 UTC (rev 228)
+++ trunk/equanda-generate/src/main/velocity/docs/om.mm.vm 2007-12-30 11:22:27 UTC (rev 229)
@@ -1,90 +0,0 @@
-#**
- * This file is part of the equanda project.
- *
- * The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at http://www.mozilla.org/MPL/
- *
- * Code generated by applying this template can be freely used.
- *
- * Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF
- * ANY KIND, either express or implied. See the License for the specific language governing rights and
- * limitations under the License.
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * @author Joachim Van der Auwera
- *
- *#<map version="0.9.0_Beta_8">
-<attribute_registry>
- <attribute_name NAME="multiple">
- <attribute_value VALUE=""/>
- </attribute_name>
- <attribute_name NAME="other-side-multiple">
- <attribute_value VALUE=""/>
- </attribute_name>
- <attribute_name NAME="required">
- <attribute_value VALUE=""/>
- </attribute_name>
- <attribute_name NAME="auto">
- <attribute_value VALUE=""/>
- </attribute_name>
- <attribute_name NAME="dibirectional">
- <attribute_value VALUE=""/>
- </attribute_name>
- <attribute_name NAME="calculated">
- <attribute_value VALUE=""/>
- </attribute_name>
- <attribute_name NAME="cascade-keep">
- <attribute_value VALUE=""/>
- </attribute_name>
- <attribute_name NAME="cascade-delete">
- <attribute_value VALUE=""/>
- </attribute_name>
- <attribute_name NAME="type">
- </attribute_name>
- <attribute_name NAME="renderer">
- </attribute_name>
- <attribute_name NAME="length">
- </attribute_name>
- <attribute_name NAME="displayed">
- <attribute_value VALUE=""/>
- </attribute_name>
- <attribute_name NAME="hidden">
- <attribute_value VALUE=""/>
- </attribute_name>
- <attribute_name NAME="reference">
- <attribute_value VALUE=""/>
- </attribute_name>
- <attribute_name NAME="description">
- <attribute_value VALUE=""/>
- </attribute_name>
- <attribute_name NAME="embedded">
- <attribute_value VALUE=""/>
- </attribute_name>
- <attribute_name NAME="immutable">
- <attribute_value VALUE=""/>
- </attribute_name>
- <attribute_name NAME="indexed">
- <attribute_value VALUE=""/>
- </attribute_name>
- <attribute_name NAME="unique">
- <attribute_value VALUE=""/>
- </attribute_name>
-</attribute_registry>
-<node ID="root" TEXT="object model">
-#foreach( $table in $tables )
-#parse( "mm_table.vm" )
-#end
-</node>
-</map>
\ No newline at end of file
Modified: trunk/equanda-generate/src/test/java/org/equanda/generate/CaseConversionTest.java
===================================================================
--- trunk/equanda-generate/src/test/java/org/equanda/generate/CaseConversionTest.java 2007-12-29 01:18:51 UTC (rev 228)
+++ trunk/equanda-generate/src/test/java/org/equanda/generate/CaseConversionTest.java 2007-12-30 11:22:27 UTC (rev 229)
@@ -24,7 +24,7 @@
package org.equanda.generate;
-import org.equanda.util.INIFile;
+import org.equanda.util.IniFile;
import junit.framework.TestCase;
/**
@@ -35,7 +35,7 @@
public class CaseConversionTest
extends TestCase
{
- private INIFile ini = new INIFile();
+ private IniFile ini = new IniFile();
protected void setUp()
throws Exception
Modified: trunk/equanda-generate/src/test/java/org/equanda/generate/ChoicesTest.java
===================================================================
--- trunk/equanda-generate/src/test/java/org/equanda/generate/ChoicesTest.java 2007-12-29 01:18:51 UTC (rev 228)
+++ trunk/equanda-generate/src/test/java/org/equanda/generate/ChoicesTest.java 2007-12-30 11:22:27 UTC (rev 229)
@@ -24,7 +24,7 @@
package org.equanda.generate;
-import org.equanda.util.INIFile;
+import org.equanda.util.IniFile;
import org.equanda.generate.Generator;
import junit.framework.TestCase;
@@ -37,7 +37,7 @@
extends TestCase
{
- private INIFile ini = new INIFile();
+ private IniFile ini = new IniFile();
protected void setUp()
throws Exception
Modified: trunk/equanda-generate/src/test/java/org/equanda/generate/CompareTest.java
===================================================================
--- trunk/equanda-generate/src/test/java/org/equanda/generate/CompareTest.java 2007-12-29 01:18:51 UTC (rev 228)
+++ trunk/equanda-generate/src/test/java/org/equanda/generate/CompareTest.java 2007-12-30 11:22:27 UTC (rev 229)
@@ -24,7 +24,7 @@
package org.equanda.generate;
-import org.equanda.util.INIFile;
+import org.equanda.util.IniFile;
import org.equanda.generate.Generator;
import junit.framework.TestCase;
@@ -37,7 +37,7 @@
public class CompareTest
extends TestCase
{
- private INIFile ini = new INIFile();
+ private IniFile ini = new IniFile();
protected void setUp()
throws Exception
Modified: trunk/equanda-generate/src/test/java/org/equanda/generate/DefaultTest.java
===================================================================
--- trunk/equanda-generate/src/test/java/org/equanda/generate/DefaultTest.java 2007-12-29 01:18:51 UTC (rev 228)
+++ trunk/equanda-generate/src/test/java/org/equanda/generate/DefaultTest.java 2007-12-30 11:22:27 UTC (rev 229)
@@ -24,7 +24,7 @@
package org.equanda.generate;
-import org.equanda.util.INIFile;
+import org.equanda.util.IniFile;
import org.equanda.generate.Generator;
import junit.framework.TestCase;
@@ -37,7 +37,7 @@
extends TestCase
{
- private INIFile ini = new INIFile();
+ private IniFile ini = new IniFile();
protected void setUp()
throws Exception
Modified: trunk/equanda-generate/src/test/java/org/equanda/generate/DisplayTest.java
===================================================================
--- trunk/equanda-generate/src/test/java/org/equanda/generate/DisplayTest.java 2007-12-29 01:18:51 UTC (rev 228)
+++ trunk/equanda-generate/src/test/java/org/equanda/generate/DisplayTest.java 2007-12-30 11:22:27 UTC (rev 229)
@@ -25,7 +25,7 @@
package org.equanda.generate;
import junit.framework.TestCase;
-import org.equanda.util.INIFile;
+import org.equanda.util.IniFile;
import org.equanda.generate.Generator;
/**
@@ -36,7 +36,7 @@
public class DisplayTest
extends TestCase
{
- private INIFile ini = new INIFile();
+ private IniFile ini = new IniFile();
protected void setUp()
throws Exception
Modified: trunk/equanda-generate/src/test/java/org/equanda/generate/FailOnInvalidDefinitionTest.java
===================================================================
--- trunk/equanda-generate/src/test/java/org/equanda/generate/FailOnInvalidDefinitionTest.java 2007-12-29 01:18:51 UTC (rev 228)
+++ trunk/equanda-generate/src/test/java/org/equanda/generate/FailOnInvalidDefinitionTest.java 2007-12-30 11:22:27 UTC (rev 229)
@@ -25,7 +25,7 @@
package org.equanda.generate;
import junit.framework.TestCase;
-import org.equanda.util.INIFile;
+import org.equanda.util.IniFile;
import org.equanda.generate.Generator;
/**
@@ -38,7 +38,7 @@
extends TestCase
{
- private INIFile ini = new INIFile();
+ private IniFile ini = new IniFile();
protected void setUp()
throws Exception
Modified: trunk/equanda-generate/src/test/java/org/equanda/generate/ImmutableAndMutableTest.java
===================================================================
--- trunk/equanda-generate/src/test/java/org/equanda/generate/ImmutableAndMutableTest.java 2007-12-29 01:18:51 UTC (rev 228)
+++ trunk/equanda-generate/src/test/java/org/equanda/generate/ImmutableAndMutableTest.java 2007-12-30 11:22:27 UTC (rev 229)
@@ -25,7 +25,7 @@
package org.equanda.generate;
import junit.framework.TestCase;
-import org.equanda.util.INIFile;
+import org.equanda.util.IniFile;
/**
* test case for immutable/mutable constraints in a parent table depending on fields from a child table
@@ -35,7 +35,7 @@
public class ImmutableAndMutableTest
extends TestCase
{
- private INIFile ini = new INIFile();
+ private IniFile ini = new IniFile();
protected void setUp()
throws Exception
Modified: trunk/equanda-generate/src/test/java/org/equanda/generate/LinksTest.java
===================================================================
--- trunk/equanda-generate/src/test/java/org/equanda/generate/LinksTest.java 2007-12-29 01:18:51 UTC (rev 228)
+++ trunk/equanda-generate/src/test/java/org/equanda/generate/LinksTest.java 2007-12-30 11:22:27 UTC (rev 229)
@@ -24,7 +24,7 @@
package org.equanda.generate;
-import org.equanda.util.INIFile;
+import org.equanda.util.IniFile;
import org.equanda.generate.Generator;
import junit.framework.TestCase;
@@ -38,7 +38,7 @@
extends TestCase
{
- private INIFile ini = new INIFile();
+ private IniFile ini = new IniFile();
protected void setUp()
throws Exception
Modified: trunk/equanda-generate/src/test/java/org/equanda/generate/LobTest.java
===================================================================
--- trunk/equanda-generate/src/test/java/org/equanda/generate/LobTest.java 2007-12-29 01:18:51 UTC (rev 228)
+++ trunk/equanda-generate/src/test/java/org/equanda/generate/LobTest.java 2007-12-30 11:22:27 UTC (rev 229)
@@ -24,7 +24,7 @@
package org.equanda.generate;
-import org.equanda.util.INIFile;
+import org.equanda.util.IniFile;
import junit.framework.TestCase;
/**
@@ -35,7 +35,7 @@
public class LobTest
extends TestCase
{
- private INIFile ini = new INIFile();
+ private IniFile ini = new IniFile();
protected void setUp()
throws Exception
Modified: trunk/equanda-generate/src/test/java/org/equanda/generate/MultipleTest.java
===================================================================
--- trunk/equanda-generate/src/test/java/org/equanda/generate/MultipleTest.java 2007-12-29 01:18:51 UTC (rev 228)
+++ trunk/equanda-generate/src/test/java/org/equanda/generate/MultipleTest.java 2007-12-30 11:22:27 UTC (rev 229)
@@ -25,7 +25,7 @@
package org.equanda.generate;
import junit.framework.TestCase;
-import org.equanda.util.INIFile;
+import org.equanda.util.IniFile;
import org.equanda.generate.Generator;
/**
@@ -37,7 +37,7 @@
extends TestCase
{
- private INIFile ini = new INIFile();
+ private IniFile ini = new IniFile();
protected void setUp()
throws Exception
Modified: trunk/equanda-generate/src/test/java/org/equanda/generate/NamesTest.java
===================================================================
--- trunk/equanda-generate/src/test/java/org/equanda/generate/NamesTest.java 2007-12-29 01:18:51 UTC (rev 228)
+++ trunk/equanda-generate/src/test/java/org/equanda/generate/NamesTest.java 2007-12-30 11:22:27 UTC (rev 229)
@@ -25,7 +25,7 @@
package org.equanda.generate;
import junit.framework.TestCase;
-import org.equanda.util.INIFile;
+import org.equanda.util.IniFile;
import org.equanda.generate.Generator;
@@ -38,7 +38,7 @@
extends TestCase
{
- private INIFile ini = new INIFile();
+ private IniFile ini = new IniFile();
protected void setUp()
throws Exception
Modified: trunk/equanda-generate/src/test/java/org/equanda/generate/SelectTest.java
===================================================================
--- trunk/equanda-generate/src/test/java/org/equanda/generate/SelectTest.java 2007-12-29 01:18:51 UTC (rev 228)
+++ trunk/equanda-generate/src/test/java/org/equanda/generate/SelectTest.java 2007-12-30 11:22:27 UTC (rev 229)
@@ -24,7 +24,7 @@
package org.equanda.generate;
-import org.equanda.util.INIFile;
+import org.equanda.util.IniFile;
import org.equanda.generate.Generator;
import junit.framework.TestCase;
@@ -37,7 +37,7 @@
extends TestCase
{
- private INIFile ini = new INIFile();
+ private IniFile ini = new IniFile();
protected void setUp()
throws Exception
Modified: trunk/equanda-generate/src/test/java/org/equanda/generate/TableIncludeAndTypeTest.java
===================================================================
--- trunk/equanda-generate/src/test/java/org/equanda/generate/TableIncludeAndTypeTest.java 2007-12-29 01:18:51 UTC (rev 228)
+++ trunk/equanda-generate/src/test/java/org/equanda/generate/TableIncludeAndTypeTest.java 2007-12-30 11:22:27 UTC (rev 229)
@@ -25,7 +25,7 @@
package org.equanda.generate;
import junit.framework.TestCase;
-import org.equanda.util.INIFile;
+import org.equanda.util.IniFile;
import org.equanda.util.xml.tree.Document;
import org.equanda.util.xml.tree.Node;
import org.equanda.persistence.xml.*;
@@ -38,7 +38,7 @@
public class TableIncludeAndTypeTest
extends TestCase
{
- private INIFile ini = new INIFile();
+ private IniFile ini = new IniFile();
protected void setUp()
throws Exception
Modified: trunk/equanda-generate/src/test/java/org/equanda/generate/UniqueNameTest.java
===================================================================
--- trunk/equanda-generate/src/test/java/org/equanda/generate/UniqueNameTest.java 2007-12-29 01:18:51 UTC (rev 228)
+++ trunk/equanda-generate/src/test/java/org/equanda/generate/UniqueNameTest.java 2007-12-30 11:22:27 UTC (rev 229)
@@ -25,7 +25,7 @@
package org.equanda.generate;
import junit.framework.TestCase;
-import org.equanda.util.INIFile;
+import org.equanda.util.IniFile;
import org.equanda.generate.Generator;
/**
@@ -38,7 +38,7 @@
extends TestCase
{
- private INIFile ini = new INIFile();
+ private IniFile ini = new IniFile();
protected void setUp()
throws Exception
Modified: trunk/equanda-generate/src/test/java/org/equanda/generate/UniqueTest.java
===================================================================
--- trunk/equanda-generate/src/test/java/org/equanda/generate/UniqueTest.java 2007-12-29 01:18:51 UTC (rev 228)
+++ trunk/equanda-generate/src/test/java/org/equanda/generate/UniqueTest.java 2007-12-30 11:22:27 UTC (rev 229)
@@ -25,7 +25,7 @@
package org.equanda.generate;
import junit.framework.TestCase;
-import org.equanda.util.INIFile;
+import org.equanda.util.IniFile;
import org.equanda.generate.Generator;
/**
@@ -37,7 +37,7 @@
extends TestCase
{
- private INIFile ini = new INIFile();
+ private IniFile ini = new IniFile();
protected void setUp()
throws Exception
Modified: trunk/equanda-generate/src/test/java/org/equanda/generate/ValueWhenNullTest.java
===================================================================
--- trunk/equanda-generate/src/test/java/org/equanda/generate/ValueWhenNullTest.java 2007-12-29 01:18:51 UTC (rev 228)
+++ trunk/equanda-generate/src/test/java/org/equanda/generate/ValueWhenNullTest.java 2007-12-30 11:22:27 UTC (rev 229)
@@ -24,7 +24,7 @@
package org.equanda.generate;
-import org.equanda.util.INIFile;
+import org.equanda.util.IniFile;
import org.equanda.generate.Generator;
import junit.framework.TestCase;
@@ -38,7 +38,7 @@
extends TestCase
{
- private INIFile ini = new INIFile();
+ private IniFile ini = new IniFile();
protected void setUp()
throws Exception
Modified: trunk/equanda-maven-plugin/src/main/java/org/equanda/plugin/DmReportPlugin.java
===================================================================
--- trunk/equanda-maven-plugin/src/main/java/org/equanda/plugin/DmReportPlugin.java 2007-12-29 01:18:51 UTC (rev 228)
+++ trunk/equanda-maven-plugin/src/main/java/org/equanda/plugin/DmReportPlugin.java 2007-12-30 11:22:27 UTC (rev 229)
@@ -29,7 +29,7 @@
import org.apache.maven.reporting.MavenReportException;
import org.codehaus.doxia.sink.Sink;
import org.codehaus.doxia.site.renderer.SiteRenderer;
-import org.equanda.util.INIFile;
+import org.equanda.util.IniFile;
import org.equanda.generate.Generator;
import java.util.Locale;
@@ -134,11 +134,11 @@
// build directories etc
- INIFile ini;
+ IniFile ini;
String iniName = sourceDirectory + File.separatorChar + configurationFile;
try
{
- ini = new INIFile( iniName );
+ ini = new IniFile( iniName );
}
catch ( IOException ioe )
{
Modified: trunk/equanda-maven-plugin/src/main/java/org/equanda/plugin/GeneratePlugin.java
===================================================================
--- trunk/equanda-maven-plugin/src/main/java/org/equanda/plugin/GeneratePlugin.java 2007-12-29 01:18:51 UTC (rev 228)
+++ trunk/equanda-maven-plugin/src/main/java/org/equanda/plugin/GeneratePlugin.java 2007-12-30 11:22:27 UTC (rev 229)
@@ -34,7 +34,7 @@
import java.util.ArrayList;
import org.equanda.generate.Generator;
-import org.equanda.util.INIFile;
+import org.equanda.util.IniFile;
/**
* Maven plugin for equanda code generation.
@@ -160,11 +160,11 @@
// build directories etc
- INIFile ini;
+ IniFile ini;
String iniName = sourceDirectory + File.separatorChar + configurationFile;
try
{
- ini = new INIFile( iniName );
+ ini = new IniFile( iniName );
}
catch ( IOException ioe )
{
Modified: trunk/equanda-test/test-test/src/test/java/org/equanda/test/export/ExportTest.java
===================================================================
--- trunk/equanda-test/test-test/src/test/java/org/equanda/test/export/ExportTest.java 2007-12-29 01:18:51 UTC (rev 228)
+++ trunk/equanda-test/test-test/src/test/java/org/equanda/test/export/ExportTest.java 2007-12-30 11:22:27 UTC (rev 229)
@@ -30,7 +30,7 @@
import org.equanda.persistence.UOID;
import org.equanda.test.dm.client.*;
import org.equanda.test.xejb.TestAdapter;
-import org.equanda.util.INIFile;
+import org.equanda.util.IniFile;
import org.equanda.util.ymport.ImportUtil;
import org.joda.time.chrono.ISOChronology;
@@ -143,7 +143,7 @@
// export cocoonMan
CocoonMan cmv = cocoonManEJB.getEquanda();
- INIFile cmIni = createCocoonManINI();
+ IniFile cmIni = createCocoonManINI();
exp.export( cmv, cmv, cmIni, map, true, null );
// first save the proxies for tests
@@ -214,7 +214,7 @@
Export exp = new Export();
// build ini
- INIFile ini = new INIFile();
+ IniFile ini = new IniFile();
ini.addSection( "Car" );
ini.addValue( "Car", "file", EXPORT_OUTPUT_FILENAME_CAR );
ini.addValue( "Car", "1", "UOID" );
@@ -252,7 +252,7 @@
Export exp = new Export();
// build ini
- INIFile ini = new INIFile();
+ IniFile ini = new IniFile();
ini.addSection( "Vehicle" );
ini.addValue( "Vehicle", "file", EXPORT_OUTPUT_FILENAME_VEHICLE );
ini.addValue( "Vehicle", "1", "EquandaType" );
@@ -299,7 +299,7 @@
Export exp = new Export();
// build ini
- INIFile ini = new INIFile();
+ IniFile ini = new IniFile();
ini.addSection( "Car" );
ini.addValue( "Car", "file", EXPORT_OUTPUT_FILENAME_CAR_WITH_OWNER );
ini.addValue( "Car", "1", "Brand" );
@@ -478,9 +478,9 @@
*
* @return ini file
*/
- private INIFile createCocoonManINI()
+ private IniFile createCocoonManINI()
{
- INIFile ini = new INIFile();
+ IniFile ini = new IniFile();
ini.addSection( "CocoonMan" );
ini.addValue( "CocoonMan", "file", EXPORT_OUTPUT_FILENAME_COCOONMAN );
ini.addValue( "CocoonMan", "1", "FirstName" );
Modified: trunk/equanda-tool/src/main/java/org/equanda/tool/export/configuration/ExportSectionObject.java
===================================================================
--- trunk/equanda-tool/src/main/java/org/equanda/tool/export/configuration/ExportSectionObject.java 2007-12-29 01:18:51 UTC (rev 228)
+++ trunk/equanda-tool/src/main/java/org/equanda/tool/export/configuration/ExportSectionObject.java 2007-12-30 11:22:27 UTC (rev 229)
@@ -28,7 +28,7 @@
import org.equanda.tool.export.object.SelectorList;
import org.equanda.tool.shared.ToolException;
import org.equanda.tool.shared.configuration.Section;
-import org.equanda.util.INIFile;
+import org.equanda.util.IniFile;
import java.util.ArrayList;
import java.util.Hashtable;
@@ -70,7 +70,7 @@
private SelectorList selectorList;
- public ExportSectionObject( INIFile ini, String sectionPrefix )
+ public ExportSectionObject( IniFile ini, String sectionPrefix )
throws ToolException
{
super( ini, sectionPrefix );
@@ -82,13 +82,13 @@
selectorList = new SelectorList();
}
- public void loadSection( INIFile ini, String resolvedSectionId )
+ public void loadSection( IniFile ini, String resolvedSectionId )
throws ToolException
{
selectorList = loadSelectorList( ini, resolvedSectionId );
}
- public SelectorList loadSelectorList( INIFile ini, String resolvedSectionId )
+ public SelectorList loadSelectorList( IniFile ini, String resolvedSectionId )
throws ToolException
{
ObjectSelector primary;
Modified: trunk/equanda-tool/src/main/java/org/equanda/tool/export/configuration/ExportSectionSettings.java
===================================================================
--- trunk/equanda-tool/src/main/java/org/equanda/tool/export/configuration/ExportSectionSettings.java 2007-12-29 01:18:51 UTC (rev 228)
+++ trunk/equanda-tool/src/main/java/org/equanda/tool/export/configuration/ExportSectionSettings.java 2007-12-30 11:22:27 UTC (rev 229)
@@ -26,7 +26,7 @@
import org.equanda.tool.shared.ToolException;
import org.equanda.tool.shared.configuration.Section;
-import org.equanda.util.INIFile;
+import org.equanda.util.IniFile;
import java.io.IOException;
import java.util.ArrayList;
@@ -58,11 +58,11 @@
private long scanPeriod;
private String exportInfo;
- private INIFile exportIni;
+ private IniFile exportIni;
private String exportDirectory;
private Collection<String> evalScripts;
- public ExportSectionSettings( INIFile ini, String sectionPrefix )
+ public ExportSectionSettings( IniFile ini, String sectionPrefix )
throws ToolException
{
super( ini, sectionPrefix );
@@ -77,7 +77,7 @@
exportDirectory = ".";
}
- public void loadSection( INIFile ini, String resolvedSectionId )
+ public void loadSection( IniFile ini, String resolvedSectionId )
throws ToolException
{
Hashtable<String, String> section = ini.getSection( resolvedSectionId );
@@ -104,7 +104,7 @@
{
try
{
- exportIni = new INIFile( value, true );
+ exportIni = new IniFile( value, true );
}
catch ( IOException e )
{
@@ -151,7 +151,7 @@
return exportInfo;
}
- public INIFile getExportIni()
+ public IniFile getExportIni()
{
return exportIni;
}
Modified: trunk/equanda-tool/src/main/java/org/equanda/tool/export/object/ExportHelper.java
===================================================================
--- trunk/equanda-tool/src/main/java/org/equanda/tool/export/object/ExportHelper.java 2007-12-29 01:18:51 UTC (rev 228)
+++ trunk/equanda-tool/src/main/java/org/equanda/tool/export/object/ExportHelper.java 2007-12-30 11:22:27 UTC (rev 229)
@@ -27,7 +27,7 @@
import org.equanda.export.Export;
import org.equanda.tool.export.configuration.ExportSectionSettings;
import org.equanda.tool.shared.ToolException;
-import org.equanda.util.INIFile;
+import org.equanda.util.IniFile;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -56,7 +56,7 @@
static Log log = LogFactory.getLog( "org.equanda.tool.export.object.ExportHelper" );
private static Map exportInfo; // Map used by export
- private static INIFile exportIni;
+ private static IniFile exportIni;
private static final Export export = new Export();
public static final Hashtable<String, Class> classesMap = new Hashtable<String, Class>();
Modified: trunk/equanda-tool/src/main/java/org/equanda/tool/print/configuration/PrintSectionScan.java
===================================================================
--- trunk/equanda-tool/src/main/java/org/equanda/tool/print/configuration/PrintSectionScan.java 2007-12-29 01:18:51 UTC (rev 228)
+++ trunk/equanda-tool/src/main/java/org/equanda/tool/print/configuration/PrintSectionScan.java 2007-12-30 11:22:27 UTC (rev 229)
@@ -25,7 +25,7 @@
import org.equanda.tool.shared.ToolException;
import org.equanda.tool.shared.configuration.Section;
-import org.equanda.util.INIFile;
+import org.equanda.util.IniFile;
import java.util.ArrayList;
import java.util.Hashtable;
@@ -50,7 +50,7 @@
private ArrayList<String> classes;
- public PrintSectionScan( INIFile ini, String sectionPrefix )
+ public PrintSectionScan( IniFile ini, String sectionPrefix )
throws ToolException
{
super( ini, sectionPrefix );
@@ -62,7 +62,7 @@
classes = new ArrayList<String>( 5 );
}
- public void loadSection( INIFile ini, String resolvedSectionId )
+ public void loadSection( IniFile ini, String resolvedSectionId )
throws ToolException
{
Hashtable<String, String> section = ini.getSection( resolvedSectionId );
Modified: trunk/equanda-tool/src/main/java/org/equanda/tool/print/configuration/PrintSectionSettings.java
===================================================================
--- trunk/equanda-tool/src/main/java/org/equanda/tool/print/configuration/PrintSectionSettings.java 2007-12-29 01:18:51 UTC (rev 228)
+++ trunk/equanda-tool/src/main/java/org/equanda/tool/print/configuration/PrintSectionSettings.java 2007-12-30 11:22:27 UTC (rev 229)
@@ -26,7 +26,7 @@
import org.equanda.tool.shared.ToolException;
import org.equanda.tool.shared.configuration.Section;
import org.equanda.tool.shared.configuration.SectionGeneral;
-import org.equanda.util.INIFile;
+import org.equanda.util.IniFile;
import java.net.MalformedURLException;
import java.net.URL;
@@ -56,7 +56,7 @@
private String printer;
private URL reportURL;
- public PrintSectionSettings( INIFile ini, String sectionPrefix, SectionGeneral cfg )
+ public PrintSectionSettings( IniFile ini, String sectionPrefix, SectionGeneral cfg )
throws ToolException
{
super( ini, sectionPrefix );
@@ -71,7 +71,7 @@
printer = ""; // default to system printer
}
- public void loadSection( INIFile ini, String resolvedSectionId )
+ public void loadSection( IniFile ini, String resolvedSectionId )
throws ToolException
{
Hashtable<String, String> section = ini.getSection( resolvedSectionId );
@@ -93,7 +93,7 @@
if ( value != null ) printer = value;
}
- private void initURL( SectionGeneral cfg, INIFile ini, String resolvedSectionId )
+ private void initURL( SectionGeneral cfg, IniFile ini, String resolvedSectionId )
throws ToolException
{
Hashtable<String, String> section = ini.getSection( resolvedSectionId );
Modified: trunk/equanda-tool/src/main/java/org/equanda/tool/shared/configuration/ConfigurationExtraImpl.java
===================================================================
--- trunk/equanda-tool/src/main/java/org/equanda/tool/shared/configuration/ConfigurationExtraImpl.java 2007-12-29 01:18:51 UTC (rev 228)
+++ trunk/equanda-tool/src/main/java/org/equanda/tool/shared/configuration/ConfigurationExtraImpl.java 2007-12-30 11:22:27 UTC (rev 229)
@@ -24,7 +24,7 @@
package org.equanda.tool.shared.configuration;
import org.equanda.tool.shared.ToolException;
-import org.equanda.util.INIFile;
+import org.equanda.util.IniFile;
import java.util.Enumeration;
@@ -64,7 +64,7 @@
return mainCfg;
}
- public INIFile getIni()
+ public IniFile getIni()
{
return mainCfg.getIni();
}
Modified: trunk/equanda-tool/src/main/java/org/equanda/tool/shared/configuration/ConfigurationMain.java
===================================================================
--- trunk/equanda-tool/src/main/java/org/equanda/tool/shared/configuration/ConfigurationMain.java 2007-12-29 01:18:51 UTC (rev 228)
+++ trunk/equanda-tool/src/main/java/org/equanda/tool/shared/configuration/ConfigurationMain.java 2007-12-30 11:22:27 UTC (rev 229)
@@ -25,7 +25,7 @@
package org.equanda.tool.shared.configuration;
import org.equanda.tool.shared.ToolException;
-import org.equanda.util.INIFile;
+import org.equanda.util.IniFile;
import java.io.IOException;
import java.util.Hashtable;
@@ -53,14 +53,14 @@
/**
* ini file
*/
- private INIFile ini;
+ private IniFile ini;
public ConfigurationMain( String iniFileName )
throws ToolException
{
try
{
- ini = new INIFile( iniFileName, true );
+ ini = new IniFile( iniFileName, true );
}
catch ( IOException e )
{
@@ -69,7 +69,7 @@
init();
}
- public ConfigurationMain( INIFile ini_ )
+ public ConfigurationMain( IniFile ini_ )
{
ini = ini_;
init();
@@ -97,7 +97,7 @@
if ( sectionOM == null ) sectionOM = new SectionOM( getIni(), null );
}
- public INIFile getIni()
+ public IniFile getIni()
{
return ini;
}
Modified: trunk/equanda-tool/src/main/java/org/equanda/tool/shared/configuration/Section.java
===================================================================
--- trunk/equanda-tool/src/main/java/org/equanda/tool/shared/configuration/Section.java 2007-12-29 01:18:51 UTC (rev 228)
+++ trunk/equanda-tool/src/main/java/org/equanda/tool/shared/configuration/Section.java 2007-12-30 11:22:27 UTC (rev 229)
@@ -24,7 +24,7 @@
package org.equanda.tool.shared.configuration;
import org.equanda.tool.shared.ToolException;
-import org.equanda.util.INIFile;
+import org.equanda.util.IniFile;
import javolution.lang.TextBuilder;
import java.lang.reflect.Field;
@@ -42,7 +42,7 @@
protected static final String EMPTY_STRING = "";
- public Section( INIFile ini, String sectionPrefix )
+ public Section( IniFile ini, String sectionPrefix )
throws ToolException
{
if ( ini == null ) throw new ToolException( "Ini file is null" );
@@ -53,7 +53,7 @@
public abstract void initDefaults()
throws ToolException;
- public abstract void loadSection( INIFile ini, String resolvedSectionId )
+ public abstract void loadSection( IniFile ini, String resolvedSectionId )
throws ToolException;
public abstract String getSectionId();
Modified: trunk/equanda-tool/src/main/java/org/equanda/tool/shared/configuration/SectionConfig.java
===================================================================
--- trunk/equanda-tool/src/main/java/org/equanda/tool/shared/configuration/SectionConfig.java 2007-12-29 01:18:51 UTC (rev 228)
+++ trunk/equanda-tool/src/main/java/org/equanda/tool/shared/configuration/SectionConfig.java 2007-12-30 11:22:27 UTC (rev 229)
@@ -24,7 +24,7 @@
package org.equanda.tool.shared.configuration;
import org.equanda.tool.shared.ToolException;
-import org.equanda.util.INIFile;
+import org.equanda.util.IniFile;
import java.util.Hashtable;
import java.util.Map;
@@ -50,7 +50,7 @@
private Map<String, String> config;
- public SectionConfig( INIFile ini, String sectionPrefix )
+ public SectionConfig( IniFile ini, String sectionPrefix )
throws ToolException
{
super( ini, sectionPrefix );
@@ -62,7 +62,7 @@
config = new Hashtable<String, String>();
}
- public void loadSection( INIFile ini, String resolvedSectionId )
+ public void loadSection( IniFile ini, String resolvedSectionId )
throws ToolException
{
Hashtable<String, String> section = ini.getSection( resolvedSectionId );
Modified: trunk/equanda-tool/src/main/java/org/equanda/tool/shared/configuration/SectionDataBase.java
===================================================================
--- trunk/equanda-tool/src/main/java/org/equanda/tool/shared/configuration/SectionDataBase.java 2007-12-29 01:18:51 UTC (rev 228)
+++ trunk/equanda-tool/src/main/java/org/equanda/tool/shared/configuration/SectionDataBase.java 2007-12-30 11:22:27 UTC (rev 229)
@@ -24,7 +24,7 @@
package org.equanda.tool.shared.configuration;
import org.equanda.tool.shared.ToolException;
-import org.equanda.util.INIFile;
+import org.equanda.util.IniFile;
import org.equanda.util.SaveException;
import java.sql.Connection;
@@ -58,7 +58,7 @@
private String dbDefault;
- public SectionDataBase( INIFile ini, String sectionPrefix )
+ public SectionDataBase( IniFile ini, String sectionPrefix )
throws ToolException
{
super( ini, sectionPrefix );
@@ -71,7 +71,7 @@
dbDefault = EMPTY_STRING;
}
- public void loadSection( INIFile ini, String resolvedSectionId )
+ public void loadSection( IniFile ini, String resolvedSectionId )
throws ToolException
{
Hashtable<String, String> section = ini.getSection( resolvedSectionId );
Modified: trunk/equanda-tool/src/main/java/org/equanda/tool/shared/configuration/SectionGeneral.java
===================================================================
--- trunk/equanda-tool/src/main/java/org/equanda/tool/shared/configuration/SectionGeneral.java 2007-12-29 01:18:51 UTC (rev 228)
+++ trunk/equanda-tool/src/main/java/org/equanda/tool/shared/configuration/SectionGeneral.java 2007-12-30 11:22:27 UTC (rev 229)
@@ -24,7 +24,7 @@
package org.equanda.tool.shared.configuration;
import org.equanda.tool.shared.ToolException;
-import org.equanda.util.INIFile;
+import org.equanda.util.IniFile;
import java.util.Hashtable;
@@ -75,7 +75,7 @@
private String protocol;
private String alertProxyName;
- public SectionGeneral( INIFile ini, String sectionPrefix )
+ public SectionGeneral( IniFile ini, String sectionPrefix )
throws ToolException
{
super( ini, sectionPrefix );
@@ -96,7 +96,7 @@
protocol = "http";
}
- public void loadSection( INIFile ini, String resolvedSectionId )
+ public void loadSection( IniFile ini, String resolvedSectionId )
throws ToolException
{
Hashtable<String, String> section = ini.getSection( resolvedSectionId );
Modified: trunk/equanda-tool/src/main/java/org/equanda/tool/shared/configuration/SectionOM.java
===================================================================
--- trunk/equanda-tool/src/main/java/org/equanda/tool/shared/configuration/SectionOM.java 2007-12-29 01:18:51 UTC (rev 228)
+++ trunk/equanda-tool/src/main/java/org/equanda/tool/shared/configuration/SectionOM.java 2007-12-30 11:22:27 UTC (rev 229)
@@ -24,7 +24,7 @@
package org.equanda.tool.shared.configuration;
import org.equanda.tool.shared.ToolException;
-import org.equanda.util.INIFile;
+import org.equanda.util.IniFile;
import java.util.ArrayList;
import java.util.Hashtable;
@@ -51,7 +51,7 @@
private ArrayList<String> omConnections;
- public SectionOM( INIFile ini, String sectionPrefix )
+ public SectionOM( IniFile ini, String sectionPrefix )
throws ToolException
{
super( ini, sectionPrefix );
@@ -63,7 +63,7 @@
omConnections = new ArrayList<String>();
}
- public void loadSection( INIFile ini, String resolvedSectionId )
+ public void loadSection( IniFile ini, String resolvedSectionId )
throws ToolException
{
Hashtable<String, String> section = ini.getSection( resolvedSectionId );
Modified: trunk/equanda-tool/src/main/java/org/equanda/tool/translationsEditor/Configuration.java
===================================================================
--- trunk/equanda-tool/src/main/java/org/equanda/tool/translationsEditor/Configuration.java 2007-12-29 01:18:51 UTC (rev 228)
+++ trunk/equanda-tool/src/main/java/org/equanda/tool/translationsEditor/Configuration.java 2007-12-30 11:22:27 UTC (rev 229)
@@ -24,8 +24,6 @@
package org.equanda.tool.translationsEditor;
-import org.equanda.util.INIFile;
-
/**
* Configuration settings for the TranslationsEditor tool
*
Modified: trunk/equanda-tool/src/main/java/org/equanda/tool/translationsEditor/IniConfiguration.java
===================================================================
--- trunk/equanda-tool/src/main/java/org/equanda/tool/translationsEditor/IniConfiguration.java 2007-12-29 01:18:51 UTC (rev 228)
+++ trunk/equanda-tool/src/main/java/org/equanda/tool/translationsEditor/IniConfiguration.java 2007-12-30 11:22:27 UTC (rev 229)
@@ -24,7 +24,7 @@
package org.equanda.tool.translationsEditor;
-import org.equanda.util.INIFile;
+import org.equanda.util.IniFile;
/**
* ...
@@ -68,8 +68,8 @@
public IniConfiguration( String iniFilePath )
throws Exception
{
- INIFile ini;
- ini = new INIFile( iniFilePath );
+ IniFile ini;
+ ini = new IniFile( iniFilePath );
if ( ini.isEmpty() ) throw new RuntimeException( "Ini file is empty or missing !!! file = " + iniFilePath );
appdir = ini.getValue( INI_SECTION_UNI_D, INI_SECTION_UNI_D_KEY_APPDIR );
Modified: trunk/equanda-tool/src/main/java/org/equanda/tool/translationsEditor/TranslationsEditor.java
===================================================================
--- trunk/equanda-tool/src/main/java/org/equanda/tool/translationsEditor/TranslationsEditor.java 2007-12-29 01:18:51 UTC (rev 228)
+++ trunk/equanda-tool/src/main/java/org/equanda/tool/translationsEditor/TranslationsEditor.java 2007-12-30 11:22:27 UTC (rev 229)
@@ -25,7 +25,7 @@
package org.equanda.tool.translationsEditor;
import org.equanda.generate.Generator;
-import org.equanda.util.INIFile;
+import org.equanda.util.IniFile;
import org.equanda.util.ExceptionGroup;
import org.equanda.util.xml.tree.Document;
import org.equanda.util.xml.tree.NodeList;
@@ -476,7 +476,7 @@
{
if ( database == null )
{
- INIFile generatorIni = new INIFile();
+ IniFile generatorIni = new IniFile();
generatorIni.addValue( "config", "definition", config.getDefinition() );
generatorIni.addValue( "extra", "infrastructure", Boolean.toString( config.getInfrastructure() ) );
Generator gen = new Generator( generatorIni, config.getAppdir() );
Modified: trunk/equanda-tool/src/main/java/org/equanda/tool/ymport/configuration/ImportSectionMail.java
===================================================================
--- trunk/equanda-tool/src/main/java/org/equanda/tool/ymport/configuration/ImportSectionMail.java 2007-12-29 01:18:51 UTC (rev 228)
+++ trunk/equanda-tool/src/main/java/org/equanda/tool/ymport/configuration/ImportSectionMail.java 2007-12-30 11:22:27 UTC (rev 229)
@@ -26,7 +26,7 @@
import org.equanda.tool.shared.configuration.Section;
import org.equanda.tool.shared.ToolException;
-import org.equanda.util.INIFile;
+import org.equanda.util.IniFile;
import java.util.Hashtable;
@@ -68,7 +68,7 @@
private int connectionTimeout;
private int socketTimeout;
- public ImportSectionMail( INIFile ini, String sectionPrefix )
+ public ImportSectionMail( IniFile ini, String sectionPrefix )
throws ToolException
{
super( ini, sectionPrefix );
@@ -79,7 +79,7 @@
return INI_SECTION_MAIL;
}
- public void loadSection( INIFile ini, String resolvedSectionId )
+ public void loadSection( IniFile ini, String resolvedSectionId )
throws ToolException
{
Hashtable<String, String> section = ini.getSection( resolvedSectionId );
Modified: trunk/equanda-tool/src/main/java/org/equanda/tool/ymport/configuration/ImportSectionScan.java
===================================================================
--- trunk/equanda-tool/src/main/java/org/equanda/tool/ymport/configuration/ImportSectionScan.java 2007-12-29 01:18:51 UTC (rev 228)
+++ trunk/equanda-tool/src/main/java/org/equanda/tool/ymport/configuration/ImportSectionScan.java 2007-12-30 11:22:27 UTC (rev 229)
@@ -26,7 +26,7 @@
import org.equanda.tool.shared.ToolException;
import org.equanda.tool.shared.configuration.Section;
-import org.equanda.util.INIFile;
+import org.equanda.util.IniFile;
import java.util.ArrayList;
import java.util.Hashtable;
@@ -57,7 +57,7 @@
private ArrayList<String> filePatterns;
private ArrayList<String> scriptFiles;
- public ImportSectionScan( INIFile ini, String sectionPrefix )
+ public ImportSectionScan( IniFile ini, String sectionPrefix )
throws ToolException
{
super( ini, sectionPrefix );
@@ -72,7 +72,7 @@
scriptFiles = new ArrayList<String>( 5 );
}
- public void loadSection( INIFile ini, String resolvedSectionId )
+ public void loadSection( IniFile ini, String resolvedSectionId )
throws ToolException
{
Hashtable<String, String> section = ini.getSection( resolvedSectionId );
Modified: trunk/equanda-tool/src/main/java/org/equanda/tool/ymport/configuration/ImportSectionScript.java
===================================================================
--- trunk/equanda-tool/src/main/java/org/equanda/tool/ymport/configuration/ImportSectionScript.java 2007-12-29 01:18:51 UTC (rev 228)
+++ trunk/equanda-tool/src/main/java/org/equanda/tool/ymport/configuration/ImportSectionScript.java 2007-12-30 11:22:27 UTC (rev 229)
@@ -26,7 +26,7 @@
import org.equanda.tool.shared.ToolException;
import org.equanda.tool.shared.configuration.Section;
-import org.equanda.util.INIFile;
+import org.equanda.util.IniFile;
import java.util.ArrayList;
import java.util.Hashtable;
@@ -53,7 +53,7 @@
private ArrayList<String> scripts;
private boolean debug;
- public ImportSectionScript( INIFile ini, String sectionPrefix )
+ public ImportSectionScript( IniFile ini, String sectionPrefix )
throws ToolException
{
super( ini, sectionPrefix );
@@ -65,7 +65,7 @@
scripts = new ArrayList<String>( 5 );
}
- public void loadSection( INIFile ini, String resolvedSectionId )
+ public void loadSection( IniFile ini, String resolvedSectionId )
throws ToolException
{
Hashtable<String, String> section = ini.getSection( resolvedSectionId );
Modified: trunk/equanda-tool/src/main/java/org/equanda/tool/ymport/configuration/ImportSectionSettings.java
===================================================================
--- trunk/equanda-tool/src/main/java/org/equanda/tool/ymport/configuration/ImportSectionSettings.java 2007-12-29 01:18:51 UTC (rev 228)
+++ trunk/equanda-tool/src/main/java/org/equanda/tool/ymport/configuration/ImportSectionSettings.java 2007-12-30 11:22:27 UTC (rev 229)
@@ -27,7 +27,7 @@
import org.equanda.tool.shared.ToolException;
import org.equanda.tool.shared.configuration.Section;
import org.equanda.tool.shared.configuration.SectionGeneral;
-import org.equanda.util.INIFile;
+import org.equanda.util.IniFile;
import java.net.MalformedURLException;
import java.net.URL;
@@ -65,7 +65,7 @@
private URL importURL;
- public ImportSectionSettings( INIFile ini, String sectionPrefix, SectionGeneral cfg )
+ public ImportSectionSettings( IniFile ini, String sectionPrefix, SectionGeneral cfg )
throws ToolException
{
super( ini, sectionPrefix );
@@ -81,7 +81,7 @@
deepSearch = false;
}
- public void loadSection( INIFile ini, String resolvedSectionId )
+ public void loadSection( IniFile ini, String resolvedSectionId )
throws ToolException
{
Hashtable<String, String> section = ini.getSection( resolvedSectionId );
@@ -114,7 +114,7 @@
}
}
- private void initURL( SectionGeneral cfg, INIFile ini, String resolvedSectionId )
+ private void initURL( SectionGeneral cfg, IniFile ini, String resolvedSectionId )
throws ToolException
{
Hashtable section = ini.getSection( resolvedSectionId );
Deleted: trunk/equanda-util/src/main/java/org/equanda/util/INIFile.java
===================================================================
--- trunk/equanda-util/src/main/java/org/equanda/util/INIFile.java 2007-12-29 01:18:51 UTC (rev 228)
+++ trunk/equanda-util/src/main/java/org/equanda/util/INIFile.java 2007-12-30 11:22:27 UTC (rev 229)
@@ -1,401 +0,0 @@
-/**
- * This file is part of the equanda project.
- *
- * The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF
- * ANY KIND, either express or implied. See the License for the specific language governing rights and
- * limitations under the License.
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- */
-
-package org.equanda.util;
-
-import javolution.lang.TextBuilder;
-
-import java.io.*;
-import java.util.Enumeration;
-import java.util.Hashtable;
-
-/**
- * Class to manipulate .ini files.
- * Keys can be case dependent or case independent.
- * Comments are discarded.
- * File is kept in memory and needs to be explicitly saved.
- *
- * @author <a href="mailto:jo...@pr...">Joachim Van der Auwera</a>
- */
-public class INIFile
-{
- private Hashtable<String, Hashtable<String, String>> sections = new Hashtable<String, Ha...
[truncated message content] |
