Menu
▾
▴
[GeoNetwork-commit] SF.net SVN: geonetwork: [575] trunk/src/org/fao/gast
|
From: <aca...@us...> - 2007-07-05 21:27:15
|
Revision: 575
http://geonetwork.svn.sourceforge.net/geonetwork/?rev=575&view=rev
Author: acarboni
Date: 2007-07-05 14:27:12 -0700 (Thu, 05 Jul 2007)
Log Message:
-----------
Fixed path
Modified Paths:
--------------
trunk/src/org/fao/gast/Gast.java
trunk/src/org/fao/gast/lib/ConfigLib.java
trunk/src/org/fao/gast/lib/DatabaseLib.java
trunk/src/org/fao/gast/lib/EmbeddedDBLib.java
trunk/src/org/fao/gast/lib/EmbeddedSCLib.java
trunk/src/org/fao/gast/lib/MetadataLib.java
trunk/src/org/fao/gast/lib/ProfileLib.java
trunk/src/org/fao/gast/lib/ServerLib.java
Modified: trunk/src/org/fao/gast/Gast.java
===================================================================
--- trunk/src/org/fao/gast/Gast.java 2007-07-05 21:05:42 UTC (rev 574)
+++ trunk/src/org/fao/gast/Gast.java 2007-07-05 21:27:12 UTC (rev 575)
@@ -41,7 +41,7 @@
{
String jarFile = Util.getJarFile("org/fao/gast/Gast.class");
String appPath = getPath(jarFile);
- URL[] jars = Util.getJarUrls(appPath +"/web/WEB-INF/lib");
+ URL[] jars = Util.getJarUrls(appPath +"/web/geonetwork/WEB-INF/lib");
String starter = (args.length == 0)
? "org.fao.gast.gui.MainFrame"
Modified: trunk/src/org/fao/gast/lib/ConfigLib.java
===================================================================
--- trunk/src/org/fao/gast/lib/ConfigLib.java 2007-07-05 21:05:42 UTC (rev 574)
+++ trunk/src/org/fao/gast/lib/ConfigLib.java 2007-07-05 21:27:12 UTC (rev 575)
@@ -45,7 +45,7 @@
{
this.appPath = appPath;
- config = Lib.xml.load(appPath +"/web/WEB-INF/config.xml");
+ config = Lib.xml.load(appPath +"/web/geonetwork/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/WEB-INF/config.xml", config);
+ Lib.xml.save(appPath +"/web/geonetwork/WEB-INF/config.xml", config);
}
//---------------------------------------------------------------------------
public Resource createResource() throws Exception
{
- return new Resource(appPath +"/web/", dbmsElem);
+ return new Resource(appPath +"/web/geonetwork/", dbmsElem);
}
//---------------------------------------------------------------------------
Modified: trunk/src/org/fao/gast/lib/DatabaseLib.java
===================================================================
--- trunk/src/org/fao/gast/lib/DatabaseLib.java 2007-07-05 21:05:42 UTC (rev 574)
+++ trunk/src/org/fao/gast/lib/DatabaseLib.java 2007-07-05 21:27:12 UTC (rev 575)
@@ -516,7 +516,7 @@
//--- duplicate dummy logo to reflect the uuid
FileInputStream is = new FileInputStream (appPath +"/gast/images/dummy.gif");
- FileOutputStream os = new FileOutputStream(appPath +"/web/images/logos/"+ uuid +".gif");
+ FileOutputStream os = new FileOutputStream(appPath +"/web/geonetwork/images/logos/"+ uuid +".gif");
BinaryFile.copy(is, os, true, true);
dbms.execute("UPDATE Settings SET value=? WHERE name='siteId'", uuid);
Modified: trunk/src/org/fao/gast/lib/EmbeddedDBLib.java
===================================================================
--- trunk/src/org/fao/gast/lib/EmbeddedDBLib.java 2007-07-05 21:05:42 UTC (rev 574)
+++ trunk/src/org/fao/gast/lib/EmbeddedDBLib.java 2007-07-05 21:27:12 UTC (rev 575)
@@ -145,9 +145,9 @@
private String appPath;
private List<String> lines;
- private static final String MCKOI_CONFIG = "/web/WEB-INF/db/db.conf";
- private static final String MCKOI_ACCOUNT= "/web/WEB-INF/db/account.prop";
- private static final String MCKOI_DATA = "/web/WEB-INF/db/data";
+ 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";
}
//=============================================================================
Modified: trunk/src/org/fao/gast/lib/EmbeddedSCLib.java
===================================================================
--- trunk/src/org/fao/gast/lib/EmbeddedSCLib.java 2007-07-05 21:05:42 UTC (rev 574)
+++ trunk/src/org/fao/gast/lib/EmbeddedSCLib.java 2007-07-05 21:27:12 UTC (rev 575)
@@ -167,10 +167,10 @@
private Document webXml;
private static final String JETTY_FILE = "/bin/jetty.xml";
- private static final String WEBXML_FILE = "/web/WEB-INF/web.xml";
+ private static final String WEBXML_FILE = "/web/geonetwork/WEB-INF/web.xml";
private static final String INDEX_SRC_FILE = "/gast/data/index.html";
- private static final String INDEX_DES_FILE = "/web/index.html";
+ private static final String INDEX_DES_FILE = "/web/geonetwork/index.html";
}
//=============================================================================
Modified: trunk/src/org/fao/gast/lib/MetadataLib.java
===================================================================
--- trunk/src/org/fao/gast/lib/MetadataLib.java 2007-07-05 21:05:42 UTC (rev 574)
+++ trunk/src/org/fao/gast/lib/MetadataLib.java 2007-07-05 21:27:12 UTC (rev 575)
@@ -49,7 +49,7 @@
{
this.appPath = appPath;
-// searchMan = new SearchManager(appPath +"/web/", Lib.config.getLuceneDir());
+// searchMan = new SearchManager(appPath +"/web/geonetwork/", Lib.config.getLuceneDir());
}
//---------------------------------------------------------------------------
@@ -68,7 +68,7 @@
public boolean canConvert(String fromSchema, String toSchema)
{
String format = fromSchema +"-to-"+ toSchema;
- String path = appPath +"/web/conversion/"+format+"/main.xsl";
+ String path = appPath +"/web/geonetwork/conversion/"+format+"/main.xsl";
return new File(path).exists();
}
@@ -81,7 +81,7 @@
throw new Exception("Cannot convert to schema :"+ toSchema);
String format = fromSchema +"-to-"+ toSchema;
- String path = appPath +"/web/conversion/"+format;
+ String path = appPath +"/web/geonetwork/conversion/"+format;
Element result = Xml.transform(md, path +"/main.xsl");
Element unmapped = Xml.transform(md, path +"/unmapped.xsl");
@@ -156,7 +156,7 @@
//--- do an XSL transformation
- String styleSheet = appPath +"/web/xml/schemas/"+schema+"/"+ Geonet.File.UPDATE_FIXED_INFO;
+ String styleSheet = appPath +"/web/geonetwork/xml/schemas/"+schema+"/"+ Geonet.File.UPDATE_FIXED_INFO;
return Xml.transform(root, styleSheet);
}
@@ -172,7 +172,7 @@
public void clearIndexes() throws Exception
{
- File dir = new File(appPath +"/web/"+ Lib.config.getLuceneDir());
+ File dir = new File(appPath +"/web/geonetwork/"+ Lib.config.getLuceneDir());
Lib.io.cleanDir(dir);
}
@@ -187,7 +187,7 @@
//--- do an XSL transformation
- String styleSheet = appPath +"/web/xml/schemas/"+ schema +"/"+ Geonet.File.EXTRACT_THUMBNAILS;
+ String styleSheet = appPath +"/web/geonetwork/xml/schemas/"+ schema +"/"+ Geonet.File.EXTRACT_THUMBNAILS;
return Xml.transform(md, styleSheet);
}
Modified: trunk/src/org/fao/gast/lib/ProfileLib.java
===================================================================
--- trunk/src/org/fao/gast/lib/ProfileLib.java 2007-07-05 21:05:42 UTC (rev 574)
+++ trunk/src/org/fao/gast/lib/ProfileLib.java 2007-07-05 21:27:12 UTC (rev 575)
@@ -43,7 +43,7 @@
{
this.appPath = appPath;
- profiles = Xml.loadFile(appPath +"/web/xml/user-profiles.xml");
+ profiles = Xml.loadFile(appPath +"/web/geonetwork/xml/user-profiles.xml");
}
//---------------------------------------------------------------------------
Modified: trunk/src/org/fao/gast/lib/ServerLib.java
===================================================================
--- trunk/src/org/fao/gast/lib/ServerLib.java 2007-07-05 21:05:42 UTC (rev 574)
+++ trunk/src/org/fao/gast/lib/ServerLib.java 2007-07-05 21:27:12 UTC (rev 575)
@@ -67,7 +67,7 @@
private String appPath;
private Properties serverProps;
- private static final String SERVER_PROPS = "/web/WEB-INF/server.prop";
+ private static final String SERVER_PROPS = "/web/geonetwork/WEB-INF/server.prop";
}
//=============================================================================
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|