Menu
▾
▴
[GeoNetwork-commit] SF.net SVN: geonetwork:[5882] sandbox/maven/gast/src/main
|
From: <fxp...@us...> - 2010-03-25 08:18:20
|
Revision: 5882
http://geonetwork.svn.sourceforge.net/geonetwork/?rev=5882&view=rev
Author: fxprunayre
Date: 2010-03-25 08:18:12 +0000 (Thu, 25 Mar 2010)
Log Message:
-----------
Added a lib path parameter to be able to load information from GeoNetwork WEB-INF folder and to Gast resources folder (which are in 2 separate projects).
Added manifest (to be improved).
Jetty is no more embedded in maven repository, so we can not use Gast to start Jetty and init McKoi.
Align to r5868.
Modified Paths:
--------------
sandbox/maven/gast/src/main/java/org/fao/gast/Gast.java
sandbox/maven/gast/src/main/java/org/fao/gast/app/App.java
sandbox/maven/gast/src/main/java/org/fao/gast/boot/Starter.java
sandbox/maven/gast/src/main/java/org/fao/gast/boot/Util.java
sandbox/maven/gast/src/main/java/org/fao/gast/cli/Cli.java
sandbox/maven/gast/src/main/java/org/fao/gast/gui/GuiBuilder.java
sandbox/maven/gast/src/main/java/org/fao/gast/gui/MainFrame.java
sandbox/maven/gast/src/main/java/org/fao/gast/gui/panels/database/sample/Worker.java
sandbox/maven/gast/src/main/java/org/fao/gast/gui/panels/manag/conversion/Worker.java
sandbox/maven/gast/src/main/java/org/fao/gast/gui/panels/migration/oldinst/Worker.java
sandbox/maven/gast/src/main/java/org/fao/gast/lib/ConfigLib.java
sandbox/maven/gast/src/main/java/org/fao/gast/lib/DatabaseLib.java
sandbox/maven/gast/src/main/java/org/fao/gast/lib/EmbeddedDBLib.java
sandbox/maven/gast/src/main/java/org/fao/gast/lib/EmbeddedSCLib.java
sandbox/maven/gast/src/main/java/org/fao/gast/lib/Lib.java
sandbox/maven/gast/src/main/java/org/fao/gast/lib/LogLib.java
sandbox/maven/gast/src/main/java/org/fao/gast/lib/MefLib.java
sandbox/maven/gast/src/main/java/org/fao/gast/lib/MetadataLib.java
sandbox/maven/gast/src/main/java/org/fao/gast/lib/ProfileLib.java
sandbox/maven/gast/src/main/java/org/fao/gast/lib/ServerLib.java
sandbox/maven/gast/src/main/java/org/fao/gast/lib/SiteLib.java
Added Paths:
-----------
sandbox/maven/gast/src/main/resources/META-INF/
sandbox/maven/gast/src/main/resources/META-INF/MANIFEST.MF
sandbox/maven/gast/src/main/resources/log4j.cfg
sandbox/maven/gast/src/main/resources/org/
sandbox/maven/gast/src/main/resources/org/fao/
sandbox/maven/gast/src/main/resources/org/fao/gast/
sandbox/maven/gast/src/main/resources/org/fao/gast/localization/
sandbox/maven/gast/src/main/resources/org/fao/gast/localization/messages.properties
sandbox/maven/gast/src/main/resources/org/fao/gast/localization/messages_fr.properties
Removed Paths:
-------------
sandbox/maven/gast/src/main/java/org/fao/gast/localization/messages.properties
sandbox/maven/gast/src/main/java/org/fao/gast/localization/messages_fr.properties
Modified: sandbox/maven/gast/src/main/java/org/fao/gast/Gast.java
===================================================================
--- sandbox/maven/gast/src/main/java/org/fao/gast/Gast.java 2010-03-25 08:10:10 UTC (rev 5881)
+++ sandbox/maven/gast/src/main/java/org/fao/gast/Gast.java 2010-03-25 08:18:12 UTC (rev 5882)
@@ -40,15 +40,16 @@
public static void main(String args[]) throws Exception
{
String jarFile = Util.getJarFile("org/fao/gast/Gast.class");
- String appPath = getPath(jarFile);
- String[] jarUrls = { appPath +"/web/geonetwork/WEB-INF/lib", appPath +"/jetty/lib" };
+ String libPath = getPath(jarFile) + "/../web/src/main/webapp";
+ String appPath = getPath(jarFile) + "/gast/";
+ String[] jarUrls = { libPath +"/WEB-INF/lib" };//, appPath +"/jetty/lib"
URL[] jars = Util.getJarUrls(jarUrls);
String starter = (args.length == 0)
? "org.fao.gast.gui.MainFrame"
: "org.fao.gast.cli.Cli";
- Util.boot(appPath, jars, starter, args);
+ Util.boot(appPath, libPath, jars, starter, args);
}
//---------------------------------------------------------------------------
Modified: sandbox/maven/gast/src/main/java/org/fao/gast/app/App.java
===================================================================
--- sandbox/maven/gast/src/main/java/org/fao/gast/app/App.java 2010-03-25 08:10:10 UTC (rev 5881)
+++ sandbox/maven/gast/src/main/java/org/fao/gast/app/App.java 2010-03-25 08:18:12 UTC (rev 5882)
@@ -28,6 +28,7 @@
public class App
{
public static String path;
+ public static String libPath;
public static Configuration config;
//---------------------------------------------------------------------------
@@ -36,9 +37,10 @@
//---
//---------------------------------------------------------------------------
- public static void init(String appPath, Configuration c)
+ public static void init(String appPath, String libPath, Configuration c)
{
path = appPath;
+ libPath = libPath;
config = c;
}
}
Modified: sandbox/maven/gast/src/main/java/org/fao/gast/boot/Starter.java
===================================================================
--- sandbox/maven/gast/src/main/java/org/fao/gast/boot/Starter.java 2010-03-25 08:10:10 UTC (rev 5881)
+++ sandbox/maven/gast/src/main/java/org/fao/gast/boot/Starter.java 2010-03-25 08:18:12 UTC (rev 5882)
@@ -27,7 +27,7 @@
public interface Starter
{
- public void start(String appPath, String args[]) throws Exception;
+ public void start(String appPath, String libPath, String args[]) throws Exception;
}
//==============================================================================
Modified: sandbox/maven/gast/src/main/java/org/fao/gast/boot/Util.java
===================================================================
--- sandbox/maven/gast/src/main/java/org/fao/gast/boot/Util.java 2010-03-25 08:10:10 UTC (rev 5881)
+++ sandbox/maven/gast/src/main/java/org/fao/gast/boot/Util.java 2010-03-25 08:18:12 UTC (rev 5882)
@@ -127,7 +127,7 @@
//---------------------------------------------------------------------------
- public static void boot(String appPath, URL[] jarFiles, String className,
+ public static void boot(String appPath, String libPath, URL[] jarFiles, String className,
String args[]) throws Exception
{
//-- load jars and make this classloader the context class loader
@@ -136,7 +136,7 @@
//-- because we are using the URLClassLoader we need to take some
//-- additional steps to select an XSLT transformerFactory
- String tfName = appPath + "/web/geonetwork/WEB-INF/classes/META-INF/services/javax.xml.transform.TransformerFactory";
+ String tfName = libPath + "/WEB-INF/classes/META-INF/services/javax.xml.transform.TransformerFactory";
BufferedReader bReader = null;
try {
bReader = new BufferedReader(new FileReader(tfName));
@@ -163,7 +163,7 @@
try {
Starter starter = (Starter) Class.forName(className, true, mcl).newInstance();
- starter.start(appPath, args);
+ starter.start(appPath, libPath, args);
} catch(Throwable e) {
e.printStackTrace();
showError(e);
Modified: sandbox/maven/gast/src/main/java/org/fao/gast/cli/Cli.java
===================================================================
--- sandbox/maven/gast/src/main/java/org/fao/gast/cli/Cli.java 2010-03-25 08:10:10 UTC (rev 5881)
+++ sandbox/maven/gast/src/main/java/org/fao/gast/cli/Cli.java 2010-03-25 08:18:12 UTC (rev 5882)
@@ -35,9 +35,9 @@
public class Cli implements Starter
{
- public void start(String appPath, String args[]) throws Exception
+ public void start(String appPath, String libPath, String args[]) throws Exception
{
- Lib.init(appPath);
+ Lib.init(appPath, libPath);
//--- convert args into a list
Modified: sandbox/maven/gast/src/main/java/org/fao/gast/gui/GuiBuilder.java
===================================================================
--- sandbox/maven/gast/src/main/java/org/fao/gast/gui/GuiBuilder.java 2010-03-25 08:10:10 UTC (rev 5881)
+++ sandbox/maven/gast/src/main/java/org/fao/gast/gui/GuiBuilder.java 2010-03-25 08:18:12 UTC (rev 5882)
@@ -282,7 +282,7 @@
if (hmImages.containsKey(image))
return hmImages.get(image);
- ImageIcon icon = new ImageIcon(appPath +"/gast/images/" +image);
+ ImageIcon icon = new ImageIcon(appPath +"/images/" +image);
hmImages.put(image, icon);
return icon;
Modified: sandbox/maven/gast/src/main/java/org/fao/gast/gui/MainFrame.java
===================================================================
--- sandbox/maven/gast/src/main/java/org/fao/gast/gui/MainFrame.java 2010-03-25 08:10:10 UTC (rev 5881)
+++ sandbox/maven/gast/src/main/java/org/fao/gast/gui/MainFrame.java 2010-03-25 08:18:12 UTC (rev 5882)
@@ -79,14 +79,14 @@
//---
//---------------------------------------------------------------------------
- public void start(String appPath, String[] args) throws Exception
+ public void start(String appPath, String libPath, String[] args) throws Exception
{
- Lib.init(appPath);
+ Lib.init(appPath, libPath);
dlgConfig = new ConfigDialog(this);
- App.init(appPath, dlgConfig.getConfig());
+ App.init(appPath, libPath, dlgConfig.getConfig());
GuiBuilder builder = new GuiBuilder(appPath, panView, panWork);
- builder.build("/gast/data/gui.xml", getLocale());
+ builder.build("data/gui.xml", getLocale());
checkAndCreateDB();
Modified: sandbox/maven/gast/src/main/java/org/fao/gast/gui/panels/database/sample/Worker.java
===================================================================
--- sandbox/maven/gast/src/main/java/org/fao/gast/gui/panels/database/sample/Worker.java 2010-03-25 08:10:10 UTC (rev 5881)
+++ sandbox/maven/gast/src/main/java/org/fao/gast/gui/panels/database/sample/Worker.java 2010-03-25 08:18:12 UTC (rev 5882)
@@ -100,7 +100,7 @@
//--- scan for mef files
- File mapsDir = new File(App.path +"/gast/setup/sample-data");
+ File mapsDir = new File(App.path +"/setup/sample-data");
List<File> files = Lib.io.scanDir(mapsDir, "mef");
Modified: sandbox/maven/gast/src/main/java/org/fao/gast/gui/panels/manag/conversion/Worker.java
===================================================================
--- sandbox/maven/gast/src/main/java/org/fao/gast/gui/panels/manag/conversion/Worker.java 2010-03-25 08:10:10 UTC (rev 5881)
+++ sandbox/maven/gast/src/main/java/org/fao/gast/gui/panels/manag/conversion/Worker.java 2010-03-25 08:18:12 UTC (rev 5882)
@@ -85,7 +85,7 @@
private void executeJob(Dbms dbms) throws Exception
{
- String log = Lib.server.getAppPath() +"/gast/logs/unmapped.log";
+ String log = Lib.server.getAppPath() +"/logs/unmapped.log";
PrintWriter out = new PrintWriter(new FileOutputStream(log));
dlg.reset(1);
Modified: sandbox/maven/gast/src/main/java/org/fao/gast/gui/panels/migration/oldinst/Worker.java
===================================================================
--- sandbox/maven/gast/src/main/java/org/fao/gast/gui/panels/migration/oldinst/Worker.java 2010-03-25 08:10:10 UTC (rev 5881)
+++ sandbox/maven/gast/src/main/java/org/fao/gast/gui/panels/migration/oldinst/Worker.java 2010-03-25 08:18:12 UTC (rev 5882)
@@ -880,11 +880,11 @@
LocalizFixer grp = new LocalizFixer();
r.setHandler(grp);
- r.load(App.path + "/gast/setup/db/Groups.ddf");
+ r.load(App.path + "/setup/db/Groups.ddf");
LocalizFixer grpDes = new LocalizFixer();
r.setHandler(grpDes);
- r.load(App.path + "/gast/setup/db/GroupsDes.ddf");
+ r.load(App.path + "/setup/db/GroupsDes.ddf");
restoreLocalizedRecords(newDbms, "GroupsDes", grp, grpDes);
@@ -892,11 +892,11 @@
LocalizFixer cat = new LocalizFixer();
r.setHandler(cat);
- r.load(App.path + "/gast/setup/db/Categories.ddf");
+ r.load(App.path + "/setup/db/Categories.ddf");
LocalizFixer catDes = new LocalizFixer();
r.setHandler(catDes);
- r.load(App.path + "/gast/setup/db/CategoriesDes.ddf");
+ r.load(App.path + "/setup/db/CategoriesDes.ddf");
restoreLocalizedRecords(newDbms, "CategoriesDes", cat, catDes);
}
Modified: sandbox/maven/gast/src/main/java/org/fao/gast/lib/ConfigLib.java
===================================================================
--- sandbox/maven/gast/src/main/java/org/fao/gast/lib/ConfigLib.java 2010-03-25 08:10:10 UTC (rev 5881)
+++ sandbox/maven/gast/src/main/java/org/fao/gast/lib/ConfigLib.java 2010-03-25 08:18:12 UTC (rev 5882)
@@ -45,7 +45,7 @@
{
this.appPath = appPath;
- config = Lib.xml.load(appPath +"/web/geonetwork/WEB-INF/config.xml");
+ config = Lib.xml.load(appPath +"/WEB-INF/config.xml");
dbmsElem = retrieveDbms(config);
appHandElem = config.getRootElement().getChild(ConfigFile.Child.APP_HANDLER);
}
@@ -156,14 +156,14 @@
public void save() throws FileNotFoundException, IOException
{
- Lib.xml.save(appPath +"/web/geonetwork/WEB-INF/config.xml", config);
+ Lib.xml.save(appPath +"/WEB-INF/config.xml", config);
}
//---------------------------------------------------------------------------
public Resource createResource() throws Exception
{
- return new Resource(appPath +"/web/geonetwork/", dbmsElem);
+ return new Resource(appPath +"/", dbmsElem);
}
//---------------------------------------------------------------------------
Modified: sandbox/maven/gast/src/main/java/org/fao/gast/lib/DatabaseLib.java
===================================================================
--- sandbox/maven/gast/src/main/java/org/fao/gast/lib/DatabaseLib.java 2010-03-25 08:10:10 UTC (rev 5881)
+++ sandbox/maven/gast/src/main/java/org/fao/gast/lib/DatabaseLib.java 2010-03-25 08:18:12 UTC (rev 5882)
@@ -585,8 +585,8 @@
//--- duplicate dummy logo to reflect the uuid
- FileInputStream is = new FileInputStream (appPath +"/gast/images/dummy.gif");
- FileOutputStream os = new FileOutputStream(appPath +"/web/geonetwork/images/logos/"+ uuid +".gif");
+ FileInputStream is = new FileInputStream (appPath +"/images/dummy.gif");
+ FileOutputStream os = new FileOutputStream(appPath +"/images/logos/"+ uuid +".gif");
BinaryFile.copy(is, os, true, true);
dbms.execute("UPDATE Settings SET value=? WHERE name='siteId'", uuid);
@@ -613,7 +613,7 @@
//---------------------------------------------------------------------------
- private static final String SETUP_DIR = "/gast/setup";
+ private static final String SETUP_DIR = "/setup";
}
//=============================================================================
Modified: sandbox/maven/gast/src/main/java/org/fao/gast/lib/EmbeddedDBLib.java
===================================================================
--- sandbox/maven/gast/src/main/java/org/fao/gast/lib/EmbeddedDBLib.java 2010-03-25 08:10:10 UTC (rev 5881)
+++ sandbox/maven/gast/src/main/java/org/fao/gast/lib/EmbeddedDBLib.java 2010-03-25 08:18:12 UTC (rev 5882)
@@ -145,9 +145,9 @@
private String appPath;
private List<String> lines;
- private static final String MCKOI_CONFIG = "/web/geonetwork/WEB-INF/db/db.conf";
- private static final String MCKOI_ACCOUNT= "/web/geonetwork/WEB-INF/db/account.prop";
- private static final String MCKOI_DATA = "/web/geonetwork/WEB-INF/db/data";
+ private static final String MCKOI_CONFIG = "/WEB-INF/db/db.conf";
+ private static final String MCKOI_ACCOUNT= "/WEB-INF/db/account.prop";
+ private static final String MCKOI_DATA = "/WEB-INF/db/data";
}
//=============================================================================
Modified: sandbox/maven/gast/src/main/java/org/fao/gast/lib/EmbeddedSCLib.java
===================================================================
--- sandbox/maven/gast/src/main/java/org/fao/gast/lib/EmbeddedSCLib.java 2010-03-25 08:10:10 UTC (rev 5881)
+++ sandbox/maven/gast/src/main/java/org/fao/gast/lib/EmbeddedSCLib.java 2010-03-25 08:18:12 UTC (rev 5882)
@@ -53,7 +53,7 @@
{
this.appPath = appPath;
-
+/*
String jetty = appPath + JETTY_FILE;
webXml = Lib.xml.load(appPath + WEBXML_FILE);
@@ -72,7 +72,9 @@
System.out.println("Jetty on Port: "+port);
} else {
throw new Exception("Confusion: more than one connector in "+jetty);
- }
+ }*/
+ host = "localhost";
+ port = "8080";
}
//---------------------------------------------------------------------------
@@ -163,10 +165,10 @@
private Document webXml;
private static final String JETTY_FILE = "/bin/jetty.xml";
- private static final String WEBXML_FILE = "/web/geonetwork/WEB-INF/web.xml";
+ private static final String WEBXML_FILE = "/WEB-INF/web.xml";
- private static final String INDEX_SRC_FILE = "/gast/data/index.html";
- private static final String INDEX_DES_FILE = "/web/geonetwork/index.html";
+ private static final String INDEX_SRC_FILE = "/data/index.html";
+ private static final String INDEX_DES_FILE = "/index.html";
}
//=============================================================================
Modified: sandbox/maven/gast/src/main/java/org/fao/gast/lib/Lib.java
===================================================================
--- sandbox/maven/gast/src/main/java/org/fao/gast/lib/Lib.java 2010-03-25 08:10:10 UTC (rev 5881)
+++ sandbox/maven/gast/src/main/java/org/fao/gast/lib/Lib.java 2010-03-25 08:18:12 UTC (rev 5882)
@@ -51,14 +51,14 @@
//---
//---------------------------------------------------------------------------
- public static void init(String appPath) throws Exception
+ public static void init(String appPath, String libPath) throws Exception
{
- config = new ConfigLib (appPath);
+ config = new ConfigLib (libPath);
embeddedSC = new EmbeddedSCLib(appPath);
- embeddedDB = new EmbeddedDBLib(appPath);
+ embeddedDB = new EmbeddedDBLib(libPath);
database = new DatabaseLib (appPath);
metadata = new MetadataLib (appPath);
- server = new ServerLib (appPath);
+ server = new ServerLib (libPath);
log = new LogLib (appPath);
}
}
Modified: sandbox/maven/gast/src/main/java/org/fao/gast/lib/LogLib.java
===================================================================
--- sandbox/maven/gast/src/main/java/org/fao/gast/lib/LogLib.java 2010-03-25 08:10:10 UTC (rev 5881)
+++ sandbox/maven/gast/src/main/java/org/fao/gast/lib/LogLib.java 2010-03-25 08:18:12 UTC (rev 5882)
@@ -23,9 +23,10 @@
package org.fao.gast.lib;
-import java.io.FileInputStream;
import java.io.IOException;
+import java.io.InputStream;
import java.util.Properties;
+
import org.apache.log4j.Logger;
import org.apache.log4j.PropertyConfigurator;
@@ -43,11 +44,11 @@
{
Properties props = new Properties();
- FileInputStream is = new FileInputStream(appPath + LOG4J_CFG);
+ InputStream is = this.getClass().getResourceAsStream("/" + LOG4J_CFG);
props.load(is);
is.close();
- props.setProperty("log4j.appender.gast.file", appPath + LOG4J_FILE);
+ //props.setProperty("log4j.appender.gast.file", LOG4J_FILE);
PropertyConfigurator.configure(props);
}
@@ -98,8 +99,8 @@
//---------------------------------------------------------------------------
private static final String MODULE = "gast";
- private static final String LOG4J_CFG = "/gast/logs/log4j.cfg";
- private static final String LOG4J_FILE = "/gast/logs/gast.log";
+ private static final String LOG4J_CFG = "log4j.cfg";
+ //private static final String LOG4J_FILE = "/gast/logs/gast.log";
}
//=============================================================================
Modified: sandbox/maven/gast/src/main/java/org/fao/gast/lib/MefLib.java
===================================================================
--- sandbox/maven/gast/src/main/java/org/fao/gast/lib/MefLib.java 2010-03-25 08:10:10 UTC (rev 5881)
+++ sandbox/maven/gast/src/main/java/org/fao/gast/lib/MefLib.java 2010-03-25 08:18:12 UTC (rev 5882)
@@ -169,16 +169,12 @@
String isTemplate = general.getChildText("isTemplate").equals("true") ? "y"
: "n";
- boolean dcore = schema.equals("dublin-core");
- boolean fgdc = schema.equals("fgdc-std");
- boolean iso115 = schema.equals("iso19115");
- boolean iso139 = schema.equals("iso19139");
- boolean iso139fra = schema.equals("iso19139fra");
-
- // TODO : Add this as parameters for GAST
- if (!dcore && !fgdc && !iso115 && !iso139 && !iso139fra)
+ // Check schema is registered in current installation
+ if (!Lib.metadata.schemaExists(schema))
throw new Exception("Unknown schema format : " + schema);
-
+ else
+ Lib.log.debug(" - Schema " + schema + " is registered in current installation.");
+
if (uuid == null) {
uuid = UUID.randomUUID().toString();
source = Lib.site.getSiteId(dbms);
Modified: sandbox/maven/gast/src/main/java/org/fao/gast/lib/MetadataLib.java
===================================================================
--- sandbox/maven/gast/src/main/java/org/fao/gast/lib/MetadataLib.java 2010-03-25 08:10:10 UTC (rev 5881)
+++ sandbox/maven/gast/src/main/java/org/fao/gast/lib/MetadataLib.java 2010-03-25 08:18:12 UTC (rev 5882)
@@ -53,7 +53,7 @@
{
this.appPath = appPath;
-// searchMan = new SearchManager(appPath +"/web/geonetwork/", Lib.config.getLuceneDir());
+// searchMan = new SearchManager(appPath +"/", Lib.config.getLuceneDir());
}
//---------------------------------------------------------------------------
@@ -69,10 +69,24 @@
//---------------------------------------------------------------------------
+ /**
+ * Check that a schema exist in current GeoNetwork installation.
+ *
+ * @param The schema identifier (based on schema directory name).
+ * @return True if schema is registered in current node.
+ */
+ public boolean schemaExists(String schema)
+ {
+ String path = appPath +"/web/geonetwork/xml/schemas/" + schema;
+ return new File(path).exists();
+ }
+
+ //---------------------------------------------------------------------------
+
public boolean canConvert(String fromSchema, String toSchema)
{
String format = fromSchema +"-to-"+ toSchema;
- String path = appPath +"/web/geonetwork/conversion/"+format+"/main.xsl";
+ String path = appPath +"/conversion/"+format+"/main.xsl";
return new File(path).exists();
}
@@ -85,7 +99,7 @@
throw new Exception("Cannot convert to schema :"+ toSchema);
String format = fromSchema +"-to-"+ toSchema;
- String path = appPath +"/web/geonetwork/conversion/"+format;
+ String path = appPath +"/conversion/"+format;
Element result = Xml.transform(md, path +"/main.xsl");
Element unmapped = Xml.transform(md, path +"/unmapped.xsl");
@@ -159,7 +173,7 @@
//--- do an XSL transformation
- String styleSheet = appPath +"/web/geonetwork/xml/schemas/"+schema+"/"+ Geonet.File.UPDATE_FIXED_INFO;
+ String styleSheet = appPath +"/xml/schemas/"+schema+"/"+ Geonet.File.UPDATE_FIXED_INFO;
return Xml.transform(root, styleSheet);
}
@@ -175,7 +189,7 @@
public void clearIndexes() throws Exception
{
- File dir = new File(appPath +"/web/geonetwork/"+ Lib.config.getLuceneDir());
+ File dir = new File(appPath +"/"+ Lib.config.getLuceneDir());
Lib.io.cleanDir(dir);
}
@@ -190,7 +204,7 @@
//--- do an XSL transformation
- String styleSheet = appPath +"/web/geonetwork/xml/schemas/"+ schema +"/"+ Geonet.File.EXTRACT_THUMBNAILS;
+ String styleSheet = appPath +"/xml/schemas/"+ schema +"/"+ Geonet.File.EXTRACT_THUMBNAILS;
return Xml.transform(md, styleSheet);
}
@@ -202,7 +216,7 @@
String dataDir = Lib.config.getHandlerProp(Geonet.Config.DATA_DIR);
if (!new File(dataDir).isAbsolute())
- dataDir = appPath +"/web/geonetwork/"+ dataDir;
+ dataDir = appPath +"/"+ dataDir;
return dataDir;
}
@@ -237,7 +251,7 @@
//--- do an XSL transformation
- String styleSheet = appPath +"/web/geonetwork/xml/schemas/"+ schema +"/"+ Geonet.File.SET_UUID;
+ String styleSheet = appPath +"/xml/schemas/"+ schema +"/"+ Geonet.File.SET_UUID;
return Xml.transform(root, styleSheet);
}
Modified: sandbox/maven/gast/src/main/java/org/fao/gast/lib/ProfileLib.java
===================================================================
--- sandbox/maven/gast/src/main/java/org/fao/gast/lib/ProfileLib.java 2010-03-25 08:10:10 UTC (rev 5881)
+++ sandbox/maven/gast/src/main/java/org/fao/gast/lib/ProfileLib.java 2010-03-25 08:18:12 UTC (rev 5882)
@@ -43,7 +43,7 @@
{
this.appPath = appPath;
- profiles = Xml.loadFile(appPath +"/web/geonetwork/xml/user-profiles.xml");
+ profiles = Xml.loadFile(appPath +"/xml/user-profiles.xml");
}
//---------------------------------------------------------------------------
Modified: sandbox/maven/gast/src/main/java/org/fao/gast/lib/ServerLib.java
===================================================================
--- sandbox/maven/gast/src/main/java/org/fao/gast/lib/ServerLib.java 2010-03-25 08:10:10 UTC (rev 5881)
+++ sandbox/maven/gast/src/main/java/org/fao/gast/lib/ServerLib.java 2010-03-25 08:18:12 UTC (rev 5882)
@@ -67,7 +67,7 @@
private String appPath;
private Properties serverProps;
- private static final String SERVER_PROPS = "/web/geonetwork/WEB-INF/server.prop";
+ private static final String SERVER_PROPS = "/WEB-INF/server.prop";
}
//=============================================================================
Modified: sandbox/maven/gast/src/main/java/org/fao/gast/lib/SiteLib.java
===================================================================
--- sandbox/maven/gast/src/main/java/org/fao/gast/lib/SiteLib.java 2010-03-25 08:10:10 UTC (rev 5881)
+++ sandbox/maven/gast/src/main/java/org/fao/gast/lib/SiteLib.java 2010-03-25 08:18:12 UTC (rev 5882)
@@ -75,8 +75,8 @@
dbms.execute("UPDATE Settings SET value=? WHERE name='siteId'", uuid);
dbms.execute("UPDATE Sources SET uuid=? WHERE uuid=?", uuid, oldUuid);
- File srcImg = new File(appPath +"/web/geonetwork/images/logos/"+ oldUuid +".gif");
- File desImg = new File(appPath +"/web/geonetwork/images/logos/"+ uuid +".gif");
+ File srcImg = new File(appPath +"/images/logos/"+ oldUuid +".gif");
+ File desImg = new File(appPath +"/images/logos/"+ uuid +".gif");
srcImg.renameTo(desImg);
}
Deleted: sandbox/maven/gast/src/main/java/org/fao/gast/localization/messages.properties
===================================================================
--- sandbox/maven/gast/src/main/java/org/fao/gast/localization/messages.properties 2010-03-25 08:10:10 UTC (rev 5881)
+++ sandbox/maven/gast/src/main/java/org/fao/gast/localization/messages.properties 2010-03-25 08:18:12 UTC (rev 5882)
@@ -1,111 +0,0 @@
-accountPanelTitle=Account
-assignMetadata=Assign unowned metadata to this user:
-browse=Browse
-candidatesFounds=Candidates found
-choose=Choose
-chooseInputFolder=Choose input folder
-chooseOutputFolder=Choose output folder
-chooseUser=Choose user
-chooseUsersDialogTitle=Popup dialog to choose users
-config=Configuration
-configException=Raised an exception while saving the configuration:\n
-configSaved=Configuration saved
-confirmation=Confirmation
-currentDbErased=The current database will be erased.\n
-database=Database
-databaseNotEmpty=The database cannot be empty
-dbNotEmpty=The database cannot be empty
-embedded=Embedded
-mckoi.defaultPort=The default port is 9157
-error=Error
-exportingData=Exporting data
-external=External
-format=Format
-freeText=Free text
-genericJDBCConnection=Generic JDBC connection
-group=Group
-groupOwner=Group owner
-host=Host
-importData=Importing data
-importingFile=Importing file : {0}
-info=Information
-inputFolder=Input folder
-jdbcDriver=JDBC Driver
-loginto=Login into : {0}
-logoutFrom=Logout from : {0}
-MainFrame.configMenuItem=Config
-MainFrame.optionMenu=Options
-MainFrame.title=GAST : GeoNetwork's administrator survival tool
-MainPanel.convertingData=Converting data
-MainPanel.metadataSync=Metadata synchronized
-migrateData=Migrating data
-MySQLPan.defaultPort=The default port is 3306
-noAuth=No authentication
-noMessage=<no message>
-ok=Ok
-oldGeoNetwork=Old GeoNetwork
-outputFolder=Output folder
-OraclePanel.defaultPort=The default port is 1521
-password=Password
-pleaaseChooseDirectory=Please choose a directory
-pleaseEnterGroupName=Please enter a group name
-pleaseEnterUsername=Please enter a user name
-port=Port
-portInt=The port must be an integer
-postgres.defaultPort=The default port is 5432
-retrieve=Retrieve
-runs=Runs
-ServerPanel.title=Server
-search=Search
-server=Server
-serverNotEmpty=The server cannot be empty
-servlet=Servlet
-setInProgress=Setup in progress
-sidNotEmpty=The sid cannot be empty
-siteId=Site ID
-siteIdChanged=Site ID changed
-skipUUID=Skip UUID
-templates=Templates
-thisAcct=Use this account
-user=User
-username=Username
-userOneOfFollowing=Use one of the following user/group
-wantContinue=Do you want to continue ?
-Worker.0=It seems that the specified folder does not \ncontain an old GeoNetwork installation
-Worker.11=User "{0}" doesn't belong to group "{1}"
-Worker.12=Checking old user and group
-Worker.13=Removing data in new installation
-Worker.14=Migrating users
-Worker.15=Migrating groups
-Worker.16=Migrating categories
-Worker.17=Migrating metadata
-Worker.18=Migrating privileges
-Worker.19=Migrating metadata categories
-Worker.2=Can't find user "{0}" in the old GeoNetwork
-Worker.20=Migrating settings
-Worker.21=Restoring localized labels
-Worker.22=Migrated metadata : {0}\n \
- metadata had no editor and were assigned to {2}:{3}\n\
- {4} metadata had no admin privileges and were assigned to {5}:{6}\n\
- {7} users were successfully assigned from their surname\n\
- {8} metadata were assigned to first candidate
-Worker.3=No candidate owner found for metadata with id: {0}
-Worker.5=User "{0}" is not an Editor
-Worker.8=Can't find group "{0}" in the old GeoNetwork
-Worker.conversionTerm=Conversion terminated.\nPlease, see gast/logs/unmapped.log for more info
-Worker.convertMetadata=Converting metadata with id : {0}
-Worker.creating=Creating : {0}
-Worker.cyclicReference=Cyclic reference found:\n{0}
-Worker.errorServer=Error from server:\n{0}
-Worker.exportUUID=Exporting uuid : {0}
-Worker.fillingTable=Filling table : {0}
-Worker.importFile=Importing file :
-Worker.loginto=Login into : {0}
-Worker.loginto=Login into : {0}
-Worker.logoutFrom=Logout from : {0}
-Worker.logoutFrom=Logout from : {0}
-Worker.mapWarning=Mapping warning for metadata with id {0} : {1}
-Worker.removing=Removing : {0}
-Worker.retrieveIds=Retrieving metadata ids
-Worker.scanFolder=Scanning folder : {0}
-Worker.search=Searching on : {0}
Deleted: sandbox/maven/gast/src/main/java/org/fao/gast/localization/messages_fr.properties
===================================================================
--- sandbox/maven/gast/src/main/java/org/fao/gast/localization/messages_fr.properties 2010-03-25 08:10:10 UTC (rev 5881)
+++ sandbox/maven/gast/src/main/java/org/fao/gast/localization/messages_fr.properties 2010-03-25 08:18:12 UTC (rev 5882)
@@ -1,111 +0,0 @@
-
-MainFrame.configMenuItem = Config
-MainFrame.optionMenu = Options
-MainFrame.title = GAST : outil de survie de l'administrateur GeoNetwork
-
-MainPanel.convertingData = Conversion de donn\u00E9es
-MainPanel.metadataSync = M\u00E9tadonn\u00E9es synchronis\u00E9e
-
-MySQLPan.defaultPort = Le port par d\u00E9faut est 3306
-
-OraclePanel.defaultPort = Le port par d\u00E9faut est 1521
-
-ServerPanel.title = Serveur
-
-Worker.0 = Il semble que le dossier sp\u00E9cifi\u00E9 ne correspond pas à une ancienne installation GeoNetwork
-Worker.11 = Utilisateur "{0}" n'appartient pas au groupe "{1}"
-Worker.12 = V\u00E9rification ancien utilisateur et groupe
-Worker.13 = La suppression des donn\u00E9es dans une nouvelle installation
-Worker.14 = Migration utilisateurs
-Worker.15 = Migration des groupes
-Worker.16 = Migration des cat\u00E9gories
-Worker.17 = Migration des m\u00E9tadonn\u00E9es
-Worker.18 = Migration des privil\u00E8ges
-Worker.19 = Migration des m\u00E9tadonn\u00E9es cat\u00E9gories
-Worker.2 = Vous ne trouvez pas l'utilisateur "{0}" dans l'ancienne installation GeoNetwork
-Worker.20 = Migration des param\u00E8tres
-Worker.21 = Restauration localis\u00E9s \u00E9tiquettes
-Worker.22 = Migration de m\u00E9tadonn\u00E9es : {0}\n m\u00E9tadonn\u00E9es n'a pas d'\u00E9diteur et ont \u00E9t\u00E9 affect\u00E9s \u00E0 {2}:{3}\n{4} m\u00E9tadonn\u00E9es n'a pas des privil\u00E8ges d'administrateur et ont \u00E9t\u00E9 affect\u00E9s \u00E0 {5}:{6}\n{7} utilisateurs ont \u00E9t\u00E9 affect\u00E9s de leur nom de famille\n{8} m\u00E9tadonn\u00E9es ont \u00E9t\u00E9 affect\u00E9s \u00E0 la premi\u00E8re candidats
-Worker.3 = Aucun candidat propri\u00E9taire trouv\u00E9e pour les m\u00E9tadonn\u00E9es dont l'ID est: {0}
-Worker.5 = Utilisateur "{0}" n'est pas un \u00E9diteur
-Worker.8 = Vous ne trouvez pas de groupe "{0}" dans l'ancienne installation GeoNetwork
-Worker.conversionTerm = Fin de conversion. Veuillez v\u00E9rifier gast/logs/unmapped.log
-Worker.convertMetadata = Conversion de m\u00E9ta-donn\u00E9es avec ID : {0}
-Worker.creating = Cr\u00E9er : {0}
-Worker.cyclicReference = R\u00E9f\u00E9rence cyclique trouv\u00E9e :\n{0}
-Worker.errorServer = Error from server :\n{0}
-Worker.exportUUID = Exportation uuid : {0}
-Worker.fillingTable = Remplir le tableau : {0}
-Worker.importFile = Importation de fichier :
-Worker.loginto = Ouverture de session en : {0}
-Worker.logoutFrom = D\u00E9connexion de : {0}
-Worker.mapWarning = Cartographie d'alerte pour les m\u00E9tadonn\u00E9es dont l'ID est {0} : {1}
-Worker.removing = Supprimer : {0}
-Worker.retrieveIds = R\u00E9cup\u00E9ration des m\u00E9ta-identifiants
-Worker.scanFolder = Num\u00E9risation dossier : {0}
-Worker.search = Recherche sur : {0}
-accountPanelTitle = Compte
-assignMetadata = Assigner les m\u00E9tadonn\u00E9es sans r\u00E9dacteur \u00E0 cet utilisateur:
-browse = Parcourir
-candidatesFounds = Les candidats jug\u00E9s
-choose = Choisir
-chooseInputFolder = Choisissez le dossier d'entr\u00E9e
-chooseOutputFolder = Choisissez dossier de sortie
-chooseUser = Choisissez utilisateur
-chooseUsersDialogTitle = Bo\u00EEte de dialogue pour choisir les utilisateurs
-config = Configuration
-configException = A soulev\u00E9 une exception lors de l'enregistrement de la configuration:\n
-configSaved = Configuration sauvegard\u00E9e
-confirmation = Confirmation
-currentDbErased = L'actuelle base de donn\u00E9es sera effac\u00E9e.\n
-database = Base de donn\u00E9es
-databaseNotEmpty = La base de donn\u00E9es ne peut pas \u00EAtre vide
-dbNotEmpty = La base de donn\u00E9es ne peut pas \u00EAtre vide
-embedded = Embarqu\u00E9 (i.e. Jetty et McKoi)
-error = Erreur
-exportingData = Exportation des donn\u00E9es
-external = Distant
-format = Format
-freeText = Texte libre
-genericJDBCConnection = Connexion générique JDBC
-group = Groupe
-groupOwner = Propri\u00E9taire du groupe
-host = H\u00F4te
-importData = Importation de donn\u00E9es
-importingFile = Importation de fichier : {0}
-info = Information
-inputFolder = Dossier
-jdbcDriver = JDBC Driver
-loginto = Ouverture de session en : {0}
-logoutFrom = D\u00E9connexion de : {0}
-mckoi.defaultPort = Le port par d\u00E9faut est 9157
-migrateData = Migration de donn\u00E9es
-noAuth = Aucune authentification
-noMessage = <pas message>
-ok = Ok
-oldGeoNetwork = Ancienne installation GeoNetwork
-outputFolder = Dossier de sortie
-password = Mot de passe
-pleaaseChooseDirectory = S\u2019il vous pla\u00EEt choisir un dossier
-pleaseEnterGroupName = S\u2019il vous pla\u00EEt, entrez un nom de groupe
-pleaseEnterUsername = S\u2019il vous pla\u00EEt, entrez un nom d'utilisateur
-port = Port
-portInt = Le port doit \u00EAtre un entier
-postgres.defaultPort = Le port par d\u00E9faut est 5432
-retrieve = R\u00E9cup\u00E9rer
-runs = Nombre de r\u00E9p\u00E9tition
-search = Recherche
-server = Serveur
-serverNotEmpty = Le serveur ne peut pas \u00EAtre vide
-servlet = Servlet
-setInProgress = Configuration en cours
-sidNotEmpty = Le sid ne peut pas \u00EAtre vide
-siteId = ID du site
-siteIdChanged = ID du site a chang\u00E9
-skipUUID = \u00C9viter UUID
-templates = Mod\u00E8les
-thisAcct = Utilisez ce compte
-user = Utilisateur
-userOneOfFollowing = Utilisez l'une de ces utilisateur/groupe
-username = Nom d'utilisateur
-wantContinue = Voulez-vous continuer ?
Added: sandbox/maven/gast/src/main/resources/META-INF/MANIFEST.MF
===================================================================
--- sandbox/maven/gast/src/main/resources/META-INF/MANIFEST.MF (rev 0)
+++ sandbox/maven/gast/src/main/resources/META-INF/MANIFEST.MF 2010-03-25 08:18:12 UTC (rev 5882)
@@ -0,0 +1,74 @@
+Manifest-Version: 1.0
+Archiver-Version: Plexus Archiver
+Created-By: Apache Maven
+Built-By: fx
+Build-Jdk: 1.6.0_16
+Package: org.fao.gast
+Main-Class: org.fao.gast.Gast
+Class-Path: ../../web/target/geonetwork-main-2.5.0-SNAPSHOT.jar ../../web/target/geonetwork/WEB-INF/lib/postgresql-8.4-701.jdbc4.jar ../../web/target/geonetwork/WEB-INF/lib/jetty-6.1.14.jar
+ ../../web/target/geonetwork/WEB-INF/lib/jetty-util-6.1.14.jar ../../we
+ b/target/geonetwork/WEB-INF/lib/servlet-api-2.5-6.1.14.jar ../../web/
+ target/geonetwork/WEB-INF/lib/dlib-1.0.jar ../../web/target/geonetwor
+ k/WEB-INF/lib/jeeves-2.5.0-SNAPSHOT.jar ../../web/target/geonetwork/W
+ EB-INF/lib/commons-httpclient-3.0.1.jar ../../web/target/geonetwork/W
+ EB-INF/lib/commons-logging-1.1.1.jar ../../web/target/geonetwork/WEB-
+ INF/lib/commons-codec-1.2.jar ../../web/target/geonetwork/WEB-INF/lib
+ /commons-lang-2.1.jar ../../web/target/geonetwork/WEB-INF/lib/commons
+ -fileupload-1.2.1.jar ../../web/target/geonetwork/WEB-INF/lib/jsch-0.
+ 1.8.jar ../../web/target/geonetwork/WEB-INF/lib/fop-0.93-jdk14.jar ..
+ /../web/target/geonetwork/WEB-INF/lib/jcs-1.3.jar ../../web/target/ge
+ onetwork/WEB-INF/lib/concurrent-1.0.jar ../../web/target/geonetwork/W
+ EB-INF/lib/saxon-9.0.jar ../../web/target/geonetwork/WEB-INF/lib/cog-
+ jglobus-1.2-060802.jar ../../web/target/geonetwork/WEB-INF/lib/jdom-1
+ .0.jar ../../web/target/geonetwork/WEB-INF/lib/log4j-1.2.13.jar ../..
+ /web/target/geonetwork/WEB-INF/lib/geonetwork-main-2.5.0-SNAPSHOT.jar
+ ../../web/target/geonetwork/WEB-INF/lib/xalan-2.7.1.jar ../../web/ta
+ rget/geonetwork/WEB-INF/lib/serializer-2.7.1.jar ../../web/target/geo
+ network/WEB-INF/lib/xml-apis-1.3.04.jar ../../web/target/geonetwork/W
+ EB-INF/lib/openrdf-model-1.2.7.jar ../../web/target/geonetwork/WEB-IN
+ F/lib/sesame-1.2.7.jar ../../web/target/geonetwork/WEB-INF/lib/openrd
+ f-util-1.2.7.jar ../../web/target/geonetwork/WEB-INF/lib/rio-1.0.9.ja
+ r ../../web/target/geonetwork/WEB-INF/lib/gt-api-2.5.8.jar ../../web/
+ target/geonetwork/WEB-INF/lib/jts-1.9.jar ../../web/target/geonetwork
+ /WEB-INF/lib/gt-referencing-2.5.8.jar ../../web/target/geonetwork/WEB
+ -INF/lib/vecmath-1.3.1.jar ../../web/target/geonetwork/WEB-INF/lib/co
+ mmons-pool-1.3.jar ../../web/target/geonetwork/WEB-INF/lib/gt-metadat
+ a-2.5.8.jar ../../web/target/geonetwork/WEB-INF/lib/geoapi-2.2.0.jar
+ ../../web/target/geonetwork/WEB-INF/lib/jsr-275-1.0-beta-2.jar ../../
+ web/target/geonetwork/WEB-INF/lib/gt-xsd-gml3-2.5.8.jar ../../web/tar
+ get/geonetwork/WEB-INF/lib/gt-coverage-2.5.8.jar ../../web/target/geo
+ network/WEB-INF/lib/gt-main-2.5.8.jar ../../web/target/geonetwork/WEB
+ -INF/lib/commons-beanutils-1.7.0.jar ../../web/target/geonetwork/WEB-
+ INF/lib/gt-xsd-core-2.5.8.jar ../../web/target/geonetwork/WEB-INF/lib
+ /gt-graph-2.5.8.jar ../../web/target/geonetwork/WEB-INF/lib/picoconta
+ iner-1.2.jar ../../web/target/geonetwork/WEB-INF/lib/xercesImpl-2.7.1
+ .jar ../../web/target/geonetwork/WEB-INF/lib/xml-apis-xerces-2.7.1.ja
+ r ../../web/target/geonetwork/WEB-INF/lib/commons-jxpath-1.2.jar ../.
+ ./web/target/geonetwork/WEB-INF/lib/ant-optional-1.5.1.jar ../../web/
+ target/geonetwork/WEB-INF/lib/commons-collections-3.1.jar ../../web/t
+ arget/geonetwork/WEB-INF/lib/xsd-2.2.2.jar ../../web/target/geonetwor
+ k/WEB-INF/lib/common-2.2.1.jar ../../web/target/geonetwork/WEB-INF/li
+ b/ecore-2.2.2.jar ../../web/target/geonetwork/WEB-INF/lib/gt-xsd-gml2
+ -2.5.8.jar ../../web/target/geonetwork/WEB-INF/lib/gt-cql-2.5.8.jar .
+ ./../web/target/geonetwork/WEB-INF/lib/gt-shapefile-2.5.8.jar ../../w
+ eb/target/geonetwork/WEB-INF/lib/velocity-1.4.jar ../../web/target/ge
+ onetwork/WEB-INF/lib/velocity-dep-1.4.jar ../../web/target/geonetwork
+ /WEB-INF/lib/gt-xsd-filter-2.5.8.jar ../../web/target/geonetwork/WEB-
+ INF/lib/gt-epsg-extension-2.5.8.jar ../../web/target/geonetwork/WEB-I
+ NF/lib/gt-epsg-hsql-2.5.8.jar ../../web/target/geonetwork/WEB-INF/lib
+ /hsqldb-1.8.0.7.jar ../../web/target/geonetwork/WEB-INF/lib/lucene-co
+ re-2.3.2.jar ../../web/target/geonetwork/WEB-INF/lib/lucene-analyzers
+ -2.3.2.jar ../../web/target/geonetwork/WEB-INF/lib/commons-email-1.1.
+ jar ../../web/target/geonetwork/WEB-INF/lib/mail-1.4.jar ../../web/ta
+ rget/geonetwork/WEB-INF/lib/activation-1.1.jar ../../web/target/geone
+ twork/WEB-INF/lib/mckoi-1.0.2.jar ../../web/target/geonetwork/WEB-INF
+ /lib/a2jruntime-X.jar ../../web/target/geonetwork/WEB-INF/lib/ki-jzki
+ t-iface-X.jar ../../web/target/geonetwork/WEB-INF/lib/ki-util-X.jar .
+ ./../web/target/geonetwork/WEB-INF/lib/ki-jzkit-z3950-X.jar ../../web
+ /target/geonetwork/WEB-INF/lib/xmlunit-1.2.jar ../../web/target/geone
+ twork/WEB-INF/lib/cachingxslt-2.5.0-SNAPSHOT.jar ../../web/target/geo
+ network/WEB-INF/lib/oaipmh-2.5.0-SNAPSHOT.jar ../../web/target/geonet
+ work/WEB-INF/lib/dummy-api-2.5.0-SNAPSHOT.jar ../../web/target/geonet
+ work/WEB-INF/lib/lizard-tiff-1.0.jar ../../web/target/geonetwork/WEB-
+ INF/lib/jzkit-hss-1.2.3.jar ../../web/target/geonetwork/WEB-INF/lib/j
+ akarta-slide-webdavlib-2.1.jar
\ No newline at end of file
Added: sandbox/maven/gast/src/main/resources/log4j.cfg
===================================================================
--- sandbox/maven/gast/src/main/resources/log4j.cfg (rev 0)
+++ sandbox/maven/gast/src/main/resources/log4j.cfg 2010-03-25 08:18:12 UTC (rev 5882)
@@ -0,0 +1,20 @@
+# Default Logging Configuration
+log4j.rootLogger = OFF
+
+### GAST SETTINGS ########################################################
+
+log4j.logger.gast = DEBUG, gast, console
+
+### GAST APPENDER ############################################################
+
+log4j.appender.gast =org.apache.log4j.DailyRollingFileAppender
+log4j.appender.gast.DatePattern='.'yyyy-MM-dd
+log4j.appender.gast.file = gast.log
+log4j.appender.gast.layout = org.apache.log4j.PatternLayout
+log4j.appender.gast.layout.ConversionPattern=%d{ISO8601} %-5p [%c] - %m%n
+
+### CONSOLE SETTINGS ###########################################################
+
+log4j.appender.console = org.apache.log4j.ConsoleAppender
+log4j.appender.console.layout = org.apache.log4j.PatternLayout
+log4j.appender.console.layout.ConversionPattern=%d{ISO8601} %-5p [%c] - %m%n
Added: sandbox/maven/gast/src/main/resources/org/fao/gast/localization/messages.properties
===================================================================
--- sandbox/maven/gast/src/main/resources/org/fao/gast/localization/messages.properties (rev 0)
+++ sandbox/maven/gast/src/main/resources/org/fao/gast/localization/messages.properties 2010-03-25 08:18:12 UTC (rev 5882)
@@ -0,0 +1,111 @@
+accountPanelTitle=Account
+assignMetadata=Assign unowned metadata to this user:
+browse=Browse
+candidatesFounds=Candidates found
+choose=Choose
+chooseInputFolder=Choose input folder
+chooseOutputFolder=Choose output folder
+chooseUser=Choose user
+chooseUsersDialogTitle=Popup dialog to choose users
+config=Configuration
+configException=Raised an exception while saving the configuration:\n
+configSaved=Configuration saved
+confirmation=Confirmation
+currentDbErased=The current database will be erased.\n
+database=Database
+databaseNotEmpty=The database cannot be empty
+dbNotEmpty=The database cannot be empty
+embedded=Embedded
+mckoi.defaultPort=The default port is 9157
+error=Error
+exportingData=Exporting data
+external=External
+format=Format
+freeText=Free text
+genericJDBCConnection=Generic JDBC connection
+group=Group
+groupOwner=Group owner
+host=Host
+importData=Importing data
+importingFile=Importing file : {0}
+info=Information
+inputFolder=Input folder
+jdbcDriver=JDBC Driver
+loginto=Login into : {0}
+logoutFrom=Logout from : {0}
+MainFrame.configMenuItem=Config
+MainFrame.optionMenu=Options
+MainFrame.title=GAST : GeoNetwork's administrator survival tool
+MainPanel.convertingData=Converting data
+MainPanel.metadataSync=Metadata synchronized
+migrateData=Migrating data
+MySQLPan.defaultPort=The default port is 3306
+noAuth=No authentication
+noMessage=<no message>
+ok=Ok
+oldGeoNetwork=Old GeoNetwork
+outputFolder=Output folder
+OraclePanel.defaultPort=The default port is 1521
+password=Password
+pleaaseChooseDirectory=Please choose a directory
+pleaseEnterGroupName=Please enter a group name
+pleaseEnterUsername=Please enter a user name
+port=Port
+portInt=The port must be an integer
+postgres.defaultPort=The default port is 5432
+retrieve=Retrieve
+runs=Runs
+ServerPanel.title=Server
+search=Search
+server=Server
+serverNotEmpty=The server cannot be empty
+servlet=Servlet
+setInProgress=Setup in progress
+sidNotEmpty=The sid cannot be empty
+siteId=Site ID
+siteIdChanged=Site ID changed
+skipUUID=Skip UUID
+templates=Templates
+thisAcct=Use this account
+user=User
+username=Username
+userOneOfFollowing=Use one of the following user/group
+wantContinue=Do you want to continue ?
+Worker.0=It seems that the specified folder does not \ncontain an old GeoNetwork installation
+Worker.11=User "{0}" doesn't belong to group "{1}"
+Worker.12=Checking old user and group
+Worker.13=Removing data in new installation
+Worker.14=Migrating users
+Worker.15=Migrating groups
+Worker.16=Migrating categories
+Worker.17=Migrating metadata
+Worker.18=Migrating privileges
+Worker.19=Migrating metadata categories
+Worker.2=Can't find user "{0}" in the old GeoNetwork
+Worker.20=Migrating settings
+Worker.21=Restoring localized labels
+Worker.22=Migrated metadata : {0}\n \
+ metadata had no editor and were assigned to {2}:{3}\n\
+ {4} metadata had no admin privileges and were assigned to {5}:{6}\n\
+ {7} users were successfully assigned from their surname\n\
+ {8} metadata were assigned to first candidate
+Worker.3=No candidate owner found for metadata with id: {0}
+Worker.5=User "{0}" is not an Editor
+Worker.8=Can't find group "{0}" in the old GeoNetwork
+Worker.conversionTerm=Conversion terminated.\nPlease, see gast/logs/unmapped.log for more info
+Worker.convertMetadata=Converting metadata with id : {0}
+Worker.creating=Creating : {0}
+Worker.cyclicReference=Cyclic reference found:\n{0}
+Worker.errorServer=Error from server:\n{0}
+Worker.exportUUID=Exporting uuid : {0}
+Worker.fillingTable=Filling table : {0}
+Worker.importFile=Importing file :
+Worker.loginto=Login into : {0}
+Worker.loginto=Login into : {0}
+Worker.logoutFrom=Logout from : {0}
+Worker.logoutFrom=Logout from : {0}
+Worker.mapWarning=Mapping warning for metadata with id {0} : {1}
+Worker.removing=Removing : {0}
+Worker.retrieveIds=Retrieving metadata ids
+Worker.scanFolder=Scanning folder : {0}
+Worker.search=Searching on : {0}
Added: sandbox/maven/gast/src/main/resources/org/fao/gast/localization/messages_fr.properties
===================================================================
--- sandbox/maven/gast/src/main/resources/org/fao/gast/localization/messages_fr.properties (rev 0)
+++ sandbox/maven/gast/src/main/resources/org/fao/gast/localization/messages_fr.properties 2010-03-25 08:18:12 UTC (rev 5882)
@@ -0,0 +1,111 @@
+
+MainFrame.configMenuItem = Config
+MainFrame.optionMenu = Options
+MainFrame.title = GAST : outil de survie de l'administrateur GeoNetwork
+
+MainPanel.convertingData = Conversion de donn\u00E9es
+MainPanel.metadataSync = M\u00E9tadonn\u00E9es synchronis\u00E9e
+
+MySQLPan.defaultPort = Le port par d\u00E9faut est 3306
+
+OraclePanel.defaultPort = Le port par d\u00E9faut est 1521
+
+ServerPanel.title = Serveur
+
+Worker.0 = Il semble que le dossier sp\u00E9cifi\u00E9 ne correspond pas \xE0 une ancienne installation GeoNetwork
+Worker.11 = Utilisateur "{0}" n'appartient pas au groupe "{1}"
+Worker.12 = V\u00E9rification ancien utilisateur et groupe
+Worker.13 = La suppression des donn\u00E9es dans une nouvelle installation
+Worker.14 = Migration utilisateurs
+Worker.15 = Migration des groupes
+Worker.16 = Migration des cat\u00E9gories
+Worker.17 = Migration des m\u00E9tadonn\u00E9es
+Worker.18 = Migration des privil\u00E8ges
+Worker.19 = Migration des m\u00E9tadonn\u00E9es cat\u00E9gories
+Worker.2 = Vous ne trouvez pas l'utilisateur "{0}" dans l'ancienne installation GeoNetwork
+Worker.20 = Migration des param\u00E8tres
+Worker.21 = Restauration localis\u00E9s \u00E9tiquettes
+Worker.22 = Migration de m\u00E9tadonn\u00E9es : {0}\n m\u00E9tadonn\u00E9es n'a pas d'\u00E9diteur et ont \u00E9t\u00E9 affect\u00E9s \u00E0 {2}:{3}\n{4} m\u00E9tadonn\u00E9es n'a pas des privil\u00E8ges d'administrateur et ont \u00E9t\u00E9 affect\u00E9s \u00E0 {5}:{6}\n{7} utilisateurs ont \u00E9t\u00E9 affect\u00E9s de leur nom de famille\n{8} m\u00E9tadonn\u00E9es ont \u00E9t\u00E9 affect\u00E9s \u00E0 la premi\u00E8re candidats
+Worker.3 = Aucun candidat propri\u00E9taire trouv\u00E9e pour les m\u00E9tadonn\u00E9es dont l'ID est: {0}
+Worker.5 = Utilisateur "{0}" n'est pas un \u00E9diteur
+Worker.8 = Vous ne trouvez pas de groupe "{0}" dans l'ancienne installation GeoNetwork
+Worker.conversionTerm = Fin de conversion. Veuillez v\u00E9rifier gast/logs/unmapped.log
+Worker.convertMetadata = Conversion de m\u00E9ta-donn\u00E9es avec ID : {0}
+Worker.creating = Cr\u00E9er : {0}
+Worker.cyclicReference = R\u00E9f\u00E9rence cyclique trouv\u00E9e :\n{0}
+Worker.errorServer = Error from server :\n{0}
+Worker.exportUUID = Exportation uuid : {0}
+Worker.fillingTable = Remplir le tableau : {0}
+Worker.importFile = Importation de fichier :
+Worker.loginto = Ouverture de session en : {0}
+Worker.logoutFrom = D\u00E9connexion de : {0}
+Worker.mapWarning = Cartographie d'alerte pour les m\u00E9tadonn\u00E9es dont l'ID est {0} : {1}
+Worker.removing = Supprimer : {0}
+Worker.retrieveIds = R\u00E9cup\u00E9ration des m\u00E9ta-identifiants
+Worker.scanFolder = Num\u00E9risation dossier : {0}
+Worker.search = Recherche sur : {0}
+accountPanelTitle = Compte
+assignMetadata = Assigner les m\u00E9tadonn\u00E9es sans r\u00E9dacteur \u00E0 cet utilisateur:
+browse = Parcourir
+candidatesFounds = Les candidats jug\u00E9s
+choose = Choisir
+chooseInputFolder = Choisissez le dossier d'entr\u00E9e
+chooseOutputFolder = Choisissez dossier de sortie
+chooseUser = Choisissez utilisateur
+chooseUsersDialogTitle = Bo\u00EEte de dialogue pour choisir les utilisateurs
+config = Configuration
+configException = A soulev\u00E9 une exception lors de l'enregistrement de la configuration:\n
+configSaved = Configuration sauvegard\u00E9e
+confirmation = Confirmation
+currentDbErased = L'actuelle base de donn\u00E9es sera effac\u00E9e.\n
+database = Base de donn\u00E9es
+databaseNotEmpty = La base de donn\u00E9es ne peut pas \u00EAtre vide
+dbNotEmpty = La base de donn\u00E9es ne peut pas \u00EAtre vide
+embedded = Embarqu\u00E9 (i.e. Jetty et McKoi)
+error = Erreur
+exportingData = Exportation des donn\u00E9es
+external = Distant
+format = Format
+freeText = Texte libre
+genericJDBCConnection = Connexion g\u00E9n\u00E9rique JDBC
+group = Groupe
+groupOwner = Propri\u00E9taire du groupe
+host = H\u00F4te
+importData = Importation de donn\u00E9es
+importingFile = Importation de fichier : {0}
+info = Information
+inputFolder = Dossier
+jdbcDriver = JDBC Driver
+loginto = Ouverture de session en : {0}
+logoutFrom = D\u00E9connexion de : {0}
+mckoi.defaultPort = Le port par d\u00E9faut est 9157
+migrateData = Migration de donn\u00E9es
+noAuth = Aucune authentification
+noMessage = <pas message>
+ok = Ok
+oldGeoNetwork = Ancienne installation GeoNetwork
+outputFolder = Dossier de sortie
+password = Mot de passe
+pleaaseChooseDirectory = S\u2019il vous pla\u00EEt choisir un dossier
+pleaseEnterGroupName = S\u2019il vous pla\u00EEt, entrez un nom de groupe
+pleaseEnterUsername = S\u2019il vous pla\u00EEt, entrez un nom d'utilisateur
+port = Port
+portInt = Le port doit \u00EAtre un entier
+postgres.defaultPort = Le port par d\u00E9faut est 5432
+retrieve = R\u00E9cup\u00E9rer
+runs = Nombre de r\u00E9p\u00E9tition
+search = Recherche
+server = Serveur
+serverNotEmpty = Le serveur ne peut pas \u00EAtre vide
+servlet = Servlet
+setInProgress = Configuration en cours
+sidNotEmpty = Le sid ne peut pas \u00EAtre vide
+siteId = ID du site
+siteIdChanged = ID du site a chang\u00E9
+skipUUID = \u00C9viter UUID
+templates = Mod\u00E8les
+thisAcct = Utilisez ce compte
+user = Utilisateur
+userOneOfFollowing = Utilisez l'une de ces utilisateur/groupe
+username = Nom d'utilisateur
+wantContinue = Voulez-vous continuer ?
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|