From: <aca...@us...> - 2007-03-08 17:46:37
|
Revision: 212 http://geonetwork.svn.sourceforge.net/geonetwork/?rev=212&view=rev Author: acarboni Date: 2007-03-08 09:46:35 -0800 (Thu, 08 Mar 2007) Log Message: ----------- Added 'skip uuid' option to GAST Modified Paths: -------------- trunk/src/org/fao/gast/gui/panels/manag/mefexport/MainPanel.java trunk/src/org/fao/gast/gui/panels/manag/mefexport/Worker.java trunk/src/org/fao/geonet/kernel/mef/Exporter.java trunk/src/org/fao/geonet/kernel/mef/MEFLib.java trunk/src/org/fao/geonet/services/mef/Export.java Modified: trunk/src/org/fao/gast/gui/panels/manag/mefexport/MainPanel.java =================================================================== --- trunk/src/org/fao/gast/gui/panels/manag/mefexport/MainPanel.java 2007-02-27 21:22:42 UTC (rev 211) +++ trunk/src/org/fao/gast/gui/panels/manag/mefexport/MainPanel.java 2007-03-08 17:46:35 UTC (rev 212) @@ -27,6 +27,7 @@ import java.awt.event.ActionEvent; import java.io.File; import javax.swing.JButton; +import javax.swing.JCheckBox; import javax.swing.JComboBox; import javax.swing.JComponent; import javax.swing.JFileChooser; @@ -94,6 +95,7 @@ worker.setOutDir(txtOutDir.getText()); worker.setFormat(cmbFormat.getSelectedItem().toString().toLowerCase()); + worker.setSkipUuid(chbSkipUuid.isSelected()); dialog.run(worker); } @@ -108,7 +110,7 @@ { JPanel p = new JPanel(); - FlexLayout fl = new FlexLayout(3,3); + FlexLayout fl = new FlexLayout(3,4); fl.setColProp(1, FlexLayout.EXPAND); p.setLayout(fl); @@ -119,8 +121,11 @@ p.add("0,1", new JLabel("Format")); p.add("1,1", cmbFormat); - p.add("0,2,x,c,3,1", panSearch); + p.add("0,2", new JLabel("Skip UUID")); + p.add("1,2", chbSkipUuid); + p.add("0,3,x,c,3,1", panSearch); + btnBrowse.addActionListener(this); btnBrowse.setActionCommand("browse"); @@ -140,6 +145,7 @@ private JTextField txtOutDir = new JTextField(20); private JButton btnBrowse = new JButton("Browse"); private JComboBox cmbFormat = new JComboBox(); + private JCheckBox chbSkipUuid= new JCheckBox(); private JFileChooser jfcBrowser = new JFileChooser(); private SearchPanel panSearch = new SearchPanel(); } Modified: trunk/src/org/fao/gast/gui/panels/manag/mefexport/Worker.java =================================================================== --- trunk/src/org/fao/gast/gui/panels/manag/mefexport/Worker.java 2007-02-27 21:22:42 UTC (rev 211) +++ trunk/src/org/fao/gast/gui/panels/manag/mefexport/Worker.java 2007-03-08 17:46:35 UTC (rev 212) @@ -60,8 +60,9 @@ //--- //--------------------------------------------------------------------------- - public void setOutDir(String dir) { this.outDir = dir; } - public void setFormat(String format) { this.format = format; } + public void setOutDir (String dir) { this.outDir = dir; } + public void setFormat (String format) { this.format = format; } + public void setSkipUuid(boolean yesno) { this.skipUuid = yesno; } //--------------------------------------------------------------------------- //--- @@ -207,8 +208,9 @@ //--- //--------------------------------------------------------------------------- - private String outDir; - private String format; + private String outDir; + private String format; + private boolean skipUuid; private ProgressDialog dlg; private SearchPanel panSearch; Modified: trunk/src/org/fao/geonet/kernel/mef/Exporter.java =================================================================== --- trunk/src/org/fao/geonet/kernel/mef/Exporter.java 2007-02-27 21:22:42 UTC (rev 211) +++ trunk/src/org/fao/geonet/kernel/mef/Exporter.java 2007-03-08 17:46:35 UTC (rev 212) @@ -33,6 +33,7 @@ import java.sql.SQLException; import java.util.ArrayList; import java.util.HashMap; +import java.util.HashSet; import java.util.List; import java.util.zip.ZipEntry; import java.util.zip.ZipOutputStream; @@ -40,8 +41,10 @@ import jeeves.server.context.ServiceContext; import jeeves.utils.BinaryFile; import jeeves.utils.Xml; +import org.fao.geonet.GeonetContext; import org.fao.geonet.constants.Geonet; import org.fao.geonet.exceptions.MetadataNotFoundEx; +import org.fao.geonet.kernel.AccessManager; import org.fao.geonet.kernel.mef.MEFLib.Format; import org.fao.geonet.lib.Lib; import org.fao.geonet.util.ISODate; @@ -60,7 +63,8 @@ //--- //-------------------------------------------------------------------------- - public static String doExport(ServiceContext context, String uuid, Format format) throws Exception + public static String doExport(ServiceContext context, String uuid, Format format, + boolean skipUUID) throws Exception { Dbms dbms = (Dbms) context.getResourceManager().open(Geonet.Res.MAIN_DB); @@ -96,7 +100,7 @@ //--- save info file - binData = buildInfoFile(dbms, record, format, pubDir, priDir).getBytes("UTF-8"); + binData = buildInfoFile(context, record, format, pubDir, priDir, skipUUID).getBytes("UTF-8"); addFile(zos, FILE_INFO, new ByteArrayInputStream(binData)); @@ -186,15 +190,18 @@ //--- //-------------------------------------------------------------------------- - private static String buildInfoFile(Dbms dbms, Element md, Format format, - String pubDir, String priDir) throws SQLException + private static String buildInfoFile(ServiceContext context, Element md, Format format, + String pubDir, String priDir, boolean skipUUID) + throws Exception { + Dbms dbms = (Dbms) context.getResourceManager().open(Geonet.Res.MAIN_DB); + Element info = new Element("info"); info.setAttribute("version", VERSION); - info.addContent(buildInfoGeneral(md, format)); + info.addContent(buildInfoGeneral(md, format, skipUUID)); info.addContent(buildInfoCategories(dbms, md)); - info.addContent(buildInfoPrivileges(dbms, md)); + info.addContent(buildInfoPrivileges(context, md)); info.addContent(buildInfoFiles("public", pubDir)); info.addContent(buildInfoFiles("private", priDir)); @@ -204,7 +211,7 @@ //-------------------------------------------------------------------------- - private static Element buildInfoGeneral(Element md, Format format) + private static Element buildInfoGeneral(Element md, Format format, boolean skipUUID) { String id = md.getChildText("id"); String uuid = md.getChildText("uuid"); @@ -214,8 +221,7 @@ String changeDate = md.getChildText("changedate"); String siteId = md.getChildText("source"); - return new Element("general") - .addContent(new Element("uuid") .setText(uuid)) + Element general = new Element("general") .addContent(new Element("createDate").setText(createDate)) .addContent(new Element("changeDate").setText(changeDate)) .addContent(new Element("siteId") .setText(siteId)) @@ -223,6 +229,11 @@ .addContent(new Element("isTemplate").setText(isTemplate)) .addContent(new Element("localId") .setText(id)) .addContent(new Element("format") .setText(format.toString())); + + if (!skipUUID) + general.addContent(new Element("uuid").setText(uuid)); + + return general; } //-------------------------------------------------------------------------- @@ -253,10 +264,13 @@ //-------------------------------------------------------------------------- - private static Element buildInfoPrivileges(Dbms dbms, Element md) throws SQLException + private static Element buildInfoPrivileges(ServiceContext context, + Element md) throws Exception { + Dbms dbms = (Dbms) context.getResourceManager().open(Geonet.Res.MAIN_DB); + String id = md.getChildText("id"); - String query = "SELECT Groups.name as grpName, Operations.name as operName "+ + String query = "SELECT Groups.id as grpid, Groups.name as grpName, Operations.name as operName "+ "FROM OperationAllowed, Groups, Operations "+ "WHERE groupId = Groups.id "+ " AND operationId = Operations.id "+ @@ -264,6 +278,13 @@ HashMap<String, ArrayList<String>> hmPriv = new HashMap<String, ArrayList<String>>(); + //--- retrieve accessible groups + + GeonetContext gc = (GeonetContext) context.getHandlerContext(Geonet.CONTEXT_NAME); + AccessManager am = gc.getAccessManager(); + + HashSet<String> userGroups = am.getUserGroups(dbms, context.getUserSession(), context.getIpAddress()); + //--- scan query result to collect info List list = dbms.select(query).getChildren(); @@ -271,9 +292,13 @@ for (int i=0; i<list.size(); i++) { Element record = (Element) list.get(i); + String grpId = record.getChildText("grpid"); String grpName = record.getChildText("grpname"); String operName = record.getChildText("opername"); + if (!userGroups.contains(grpId)) + continue; + ArrayList<String> al = hmPriv.get(grpName); if (al == null) Modified: trunk/src/org/fao/geonet/kernel/mef/MEFLib.java =================================================================== --- trunk/src/org/fao/geonet/kernel/mef/MEFLib.java 2007-02-27 21:22:42 UTC (rev 211) +++ trunk/src/org/fao/geonet/kernel/mef/MEFLib.java 2007-03-08 17:46:35 UTC (rev 212) @@ -49,9 +49,10 @@ //-------------------------------------------------------------------------- - public static String doExport(ServiceContext context, String uuid, String format) throws Exception + public static String doExport(ServiceContext context, String uuid, String format, + boolean skipUUID) throws Exception { - return Exporter.doExport(context, uuid, Format.parse(format)); + return Exporter.doExport(context, uuid, Format.parse(format), skipUUID); } //-------------------------------------------------------------------------- Modified: trunk/src/org/fao/geonet/services/mef/Export.java =================================================================== --- trunk/src/org/fao/geonet/services/mef/Export.java 2007-02-27 21:22:42 UTC (rev 211) +++ trunk/src/org/fao/geonet/services/mef/Export.java 2007-03-08 17:46:35 UTC (rev 212) @@ -57,9 +57,10 @@ Dbms dbms = (Dbms) context.getResourceManager().open(Geonet.Res.MAIN_DB); - String uuid = Util.getParam(params, "uuid"); - String id = dm.getMetadataId(dbms, uuid); - String format = Util.getParam(params, "format"); + String uuid = Util.getParam(params, "uuid"); + String id = dm.getMetadataId(dbms, uuid); + String format = Util.getParam(params, "format"); + String skipUUID= Util.getParam(params, "skipUuid", "true"); if (id == null) throw new MetadataNotFoundEx("uuid="+uuid); @@ -73,7 +74,7 @@ Lib.resource.checkPrivilege(context, id, AccessManager.OPER_DOWNLOAD); } - String file = MEFLib.doExport(context, uuid, format); + String file = MEFLib.doExport(context, uuid, format, skipUUID.equals("true")); return BinaryFile.encode(200, file, uuid +".mef", true); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tic...@us...> - 2007-03-10 23:01:22
|
Revision: 234 http://geonetwork.svn.sourceforge.net/geonetwork/?rev=234&view=rev Author: ticheler Date: 2007-03-10 15:01:22 -0800 (Sat, 10 Mar 2007) Log Message: ----------- Updated headers to ensure all code has proper copyright, GNU-GPL license and addresses. This commit is part of the code provenance review for OSGEO incubation Modified Paths: -------------- trunk/src/org/fao/gast/Gast.java trunk/src/org/fao/gast/app/App.java trunk/src/org/fao/gast/app/Configuration.java trunk/src/org/fao/gast/boot/Starter.java trunk/src/org/fao/gast/boot/Util.java trunk/src/org/fao/gast/cli/Cli.java trunk/src/org/fao/gast/cli/setup/Setup.java trunk/src/org/fao/gast/gui/GuiBuilder.java trunk/src/org/fao/gast/gui/MainFrame.java trunk/src/org/fao/gast/gui/ViewPanel.java trunk/src/org/fao/gast/gui/WorkPanel.java trunk/src/org/fao/gast/gui/dialogs/AccountPanel.java trunk/src/org/fao/gast/gui/dialogs/ConfigDialog.java trunk/src/org/fao/gast/gui/dialogs/ConfigPanel.java trunk/src/org/fao/gast/gui/dialogs/ServerPanel.java trunk/src/org/fao/gast/gui/panels/FormPanel.java trunk/src/org/fao/gast/gui/panels/config/dbms/EmbeddedPanel.java trunk/src/org/fao/gast/gui/panels/config/dbms/GenericPanel.java trunk/src/org/fao/gast/gui/panels/config/dbms/MainPanel.java trunk/src/org/fao/gast/gui/panels/config/dbms/MySQLPanel.java trunk/src/org/fao/gast/gui/panels/config/dbms/OraclePanel.java trunk/src/org/fao/gast/gui/panels/config/dbms/PostgresPanel.java trunk/src/org/fao/gast/gui/panels/config/jetty/MainPanel.java trunk/src/org/fao/gast/gui/panels/config/siteid/MainPanel.java trunk/src/org/fao/gast/gui/panels/database/setup/MainPanel.java trunk/src/org/fao/gast/gui/panels/manag/mdsync/MainPanel.java trunk/src/org/fao/gast/gui/panels/manag/mefexport/MainPanel.java trunk/src/org/fao/gast/gui/panels/manag/mefexport/SearchPanel.java trunk/src/org/fao/gast/gui/panels/manag/mefexport/Worker.java trunk/src/org/fao/gast/gui/panels/manag/mefimport/MainPanel.java trunk/src/org/fao/gast/gui/panels/manag/mefimport/Worker.java trunk/src/org/fao/gast/gui/panels/migration/oldinst/GNSource.java trunk/src/org/fao/gast/gui/panels/migration/oldinst/MainPanel.java trunk/src/org/fao/gast/gui/panels/migration/oldinst/Util.java trunk/src/org/fao/gast/gui/panels/migration/oldinst/Worker.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/GuiLib.java trunk/src/org/fao/gast/lib/IOLib.java trunk/src/org/fao/gast/lib/Lib.java trunk/src/org/fao/gast/lib/MetadataLib.java trunk/src/org/fao/gast/lib/Resource.java trunk/src/org/fao/gast/lib/ServerLib.java trunk/src/org/fao/gast/lib/ServiceLib.java trunk/src/org/fao/gast/lib/TextLib.java trunk/src/org/fao/gast/lib/XMLLib.java trunk/src/org/fao/geonet/GeonetContext.java trunk/src/org/fao/geonet/Geonetwork.java trunk/src/org/fao/geonet/activators/McKoiActivator.java trunk/src/org/fao/geonet/apps/CheckLocalizedFiles.java trunk/src/org/fao/geonet/apps/common/SimpleLogger.java trunk/src/org/fao/geonet/apps/trash/Export.java trunk/src/org/fao/geonet/apps/trash/Transform.java trunk/src/org/fao/geonet/apps/trash/Util.java trunk/src/org/fao/geonet/constants/Edit.java trunk/src/org/fao/geonet/constants/Geonet.java trunk/src/org/fao/geonet/constants/Params.java trunk/src/org/fao/geonet/csw/client/CswClient.java trunk/src/org/fao/geonet/csw/client/DescribeRecordPanel.java trunk/src/org/fao/geonet/csw/client/GetCapabilitiesPanel.java trunk/src/org/fao/geonet/csw/client/GetRecordByIdPanel.java trunk/src/org/fao/geonet/csw/client/GetRecordsPanel.java trunk/src/org/fao/geonet/csw/client/MainFrame.java trunk/src/org/fao/geonet/csw/common/Csw.java trunk/src/org/fao/geonet/csw/common/exceptions/CatalogException.java trunk/src/org/fao/geonet/csw/common/exceptions/InvalidParameterValueEx.java trunk/src/org/fao/geonet/csw/common/exceptions/InvalidUpdateSequenceEx.java trunk/src/org/fao/geonet/csw/common/exceptions/MissingParameterValueEx.java trunk/src/org/fao/geonet/csw/common/exceptions/NoApplicableCodeEx.java trunk/src/org/fao/geonet/csw/common/exceptions/OperationNotSupportedEx.java trunk/src/org/fao/geonet/csw/common/exceptions/VersionNegotiationFailedEx.java trunk/src/org/fao/geonet/csw/common/requests/CatalogRequest.java trunk/src/org/fao/geonet/csw/common/requests/DescribeRecordRequest.java trunk/src/org/fao/geonet/csw/common/requests/GetCapabilitiesRequest.java trunk/src/org/fao/geonet/csw/common/requests/GetRecordByIdRequest.java trunk/src/org/fao/geonet/csw/common/requests/GetRecordsRequest.java trunk/src/org/fao/geonet/csw/common/util/Xml.java trunk/src/org/fao/geonet/exceptions/ConcurrentUpdateEx.java trunk/src/org/fao/geonet/exceptions/MetadataNotFoundEx.java trunk/src/org/fao/geonet/guiservices/groups/GetMine.java trunk/src/org/fao/geonet/guiservices/keywords/Get.java trunk/src/org/fao/geonet/guiservices/languages/Get.java trunk/src/org/fao/geonet/guiservices/metadata/GetLatestUpdated.java trunk/src/org/fao/geonet/guiservices/metadata/GetRandom.java trunk/src/org/fao/geonet/guiservices/regions/Get.java trunk/src/org/fao/geonet/guiservices/schemas/Get.java trunk/src/org/fao/geonet/guiservices/search/GetDefaults.java trunk/src/org/fao/geonet/guiservices/search/GetResultsInfo.java trunk/src/org/fao/geonet/guiservices/templates/Get.java trunk/src/org/fao/geonet/guiservices/util/Env.java trunk/src/org/fao/geonet/guiservices/util/GetCurrentMDTab.java trunk/src/org/fao/geonet/guiservices/util/GetImportXSLs.java trunk/src/org/fao/geonet/guiservices/util/GetSiteURL.java trunk/src/org/fao/geonet/guiservices/util/Sources.java trunk/src/org/fao/geonet/kernel/AccessManager.java trunk/src/org/fao/geonet/kernel/DataManager.java trunk/src/org/fao/geonet/kernel/EditLib.java trunk/src/org/fao/geonet/kernel/SchemaSuggestions.java trunk/src/org/fao/geonet/kernel/XmlSerializer.java trunk/src/org/fao/geonet/kernel/csw/CatalogDispatcher.java trunk/src/org/fao/geonet/kernel/csw/CatalogService.java trunk/src/org/fao/geonet/kernel/csw/services/AbstractOperation.java trunk/src/org/fao/geonet/kernel/csw/services/DescribeRecord.java trunk/src/org/fao/geonet/kernel/csw/services/GetCapabilities.java trunk/src/org/fao/geonet/kernel/csw/services/GetDomain.java trunk/src/org/fao/geonet/kernel/csw/services/GetRecordById.java trunk/src/org/fao/geonet/kernel/csw/services/GetRecords.java trunk/src/org/fao/geonet/kernel/csw/services/Harvest.java trunk/src/org/fao/geonet/kernel/csw/services/Transaction.java trunk/src/org/fao/geonet/kernel/csw/services/getrecords/CatalogSearcher.java trunk/src/org/fao/geonet/kernel/csw/services/getrecords/FieldMapper.java trunk/src/org/fao/geonet/kernel/csw/services/getrecords/SearchController.java trunk/src/org/fao/geonet/kernel/csw/services/getrecords/SortField.java trunk/src/org/fao/geonet/kernel/harvest/Common.java trunk/src/org/fao/geonet/kernel/harvest/HarvestManager.java trunk/src/org/fao/geonet/kernel/harvest/harvester/AbstractHarvester.java trunk/src/org/fao/geonet/kernel/harvest/harvester/AbstractParams.java trunk/src/org/fao/geonet/kernel/harvest/harvester/CategoryMapper.java trunk/src/org/fao/geonet/kernel/harvest/harvester/Executor.java trunk/src/org/fao/geonet/kernel/harvest/harvester/GroupMapper.java trunk/src/org/fao/geonet/kernel/harvest/harvester/UUIDMapper.java trunk/src/org/fao/geonet/kernel/harvest/harvester/geonet/Aligner.java trunk/src/org/fao/geonet/kernel/harvest/harvester/geonet/GeonetHarvester.java trunk/src/org/fao/geonet/kernel/harvest/harvester/geonet/GeonetParams.java trunk/src/org/fao/geonet/kernel/harvest/harvester/webfolder/WAFHarvester.java trunk/src/org/fao/geonet/kernel/harvest/harvester/webfolder/WAFParams.java trunk/src/org/fao/geonet/kernel/mef/Exporter.java trunk/src/org/fao/geonet/kernel/mef/Importer.java trunk/src/org/fao/geonet/kernel/mef/MEFConstants.java trunk/src/org/fao/geonet/kernel/mef/MEFLib.java trunk/src/org/fao/geonet/kernel/mef/MEFVisitor.java trunk/src/org/fao/geonet/kernel/mef/Visitor.java trunk/src/org/fao/geonet/kernel/schema/AttributeEntry.java trunk/src/org/fao/geonet/kernel/schema/ComplexContentEntry.java trunk/src/org/fao/geonet/kernel/schema/ComplexTypeEntry.java trunk/src/org/fao/geonet/kernel/schema/ElementEntry.java trunk/src/org/fao/geonet/kernel/schema/GroupEntry.java trunk/src/org/fao/geonet/kernel/schema/Logger.java trunk/src/org/fao/geonet/kernel/schema/MetadataAttribute.java trunk/src/org/fao/geonet/kernel/schema/MetadataSchema.java trunk/src/org/fao/geonet/kernel/schema/MetadataType.java trunk/src/org/fao/geonet/kernel/schema/SchemaLoader.java trunk/src/org/fao/geonet/kernel/schema/SimpleContentEntry.java trunk/src/org/fao/geonet/kernel/schema/SimpleTypeEntry.java trunk/src/org/fao/geonet/kernel/search/LuceneSearcher.java trunk/src/org/fao/geonet/kernel/search/MetaSearcher.java trunk/src/org/fao/geonet/kernel/search/SearchManager.java trunk/src/org/fao/geonet/kernel/search/UnusedSearcher.java trunk/src/org/fao/geonet/kernel/search/Z3950Searcher.java trunk/src/org/fao/geonet/kernel/setting/Setting.java trunk/src/org/fao/geonet/kernel/setting/SettingManager.java trunk/src/org/fao/geonet/kernel/setting/Task.java trunk/src/org/fao/geonet/lib/DbLib.java trunk/src/org/fao/geonet/lib/ElementLib.java trunk/src/org/fao/geonet/lib/Lib.java trunk/src/org/fao/geonet/lib/LocalLib.java trunk/src/org/fao/geonet/lib/NetLib.java trunk/src/org/fao/geonet/lib/ResourceLib.java trunk/src/org/fao/geonet/lib/TypeLib.java trunk/src/org/fao/geonet/schedules/MetadataHarvest.java trunk/src/org/fao/geonet/services/banner/Get.java trunk/src/org/fao/geonet/services/category/Get.java trunk/src/org/fao/geonet/services/category/List.java trunk/src/org/fao/geonet/services/category/Remove.java trunk/src/org/fao/geonet/services/category/Update.java trunk/src/org/fao/geonet/services/category/XmlUpdate.java trunk/src/org/fao/geonet/services/config/Get.java trunk/src/org/fao/geonet/services/config/Set.java trunk/src/org/fao/geonet/services/feedback/Insert.java trunk/src/org/fao/geonet/services/group/Get.java trunk/src/org/fao/geonet/services/group/List.java trunk/src/org/fao/geonet/services/group/Remove.java trunk/src/org/fao/geonet/services/group/Update.java trunk/src/org/fao/geonet/services/group/XmlUpdate.java trunk/src/org/fao/geonet/services/harvesting/Add.java trunk/src/org/fao/geonet/services/harvesting/Get.java trunk/src/org/fao/geonet/services/harvesting/Remove.java trunk/src/org/fao/geonet/services/harvesting/Run.java trunk/src/org/fao/geonet/services/harvesting/Start.java trunk/src/org/fao/geonet/services/harvesting/Stop.java trunk/src/org/fao/geonet/services/harvesting/Update.java trunk/src/org/fao/geonet/services/harvesting/Util.java trunk/src/org/fao/geonet/services/login/Login.java trunk/src/org/fao/geonet/services/login/Logout.java trunk/src/org/fao/geonet/services/main/CswDispatcher.java trunk/src/org/fao/geonet/services/main/Forward.java trunk/src/org/fao/geonet/services/main/Info.java trunk/src/org/fao/geonet/services/main/RemoteShow.java trunk/src/org/fao/geonet/services/main/Result.java trunk/src/org/fao/geonet/services/main/Search.java trunk/src/org/fao/geonet/services/main/XmlSearch.java trunk/src/org/fao/geonet/services/mef/Export.java trunk/src/org/fao/geonet/services/mef/Import.java trunk/src/org/fao/geonet/services/metadata/AddAttribute.java trunk/src/org/fao/geonet/services/metadata/AddElement.java trunk/src/org/fao/geonet/services/metadata/Create.java trunk/src/org/fao/geonet/services/metadata/Delete.java trunk/src/org/fao/geonet/services/metadata/DeleteAttribute.java trunk/src/org/fao/geonet/services/metadata/DeleteElement.java trunk/src/org/fao/geonet/services/metadata/EditUtils.java trunk/src/org/fao/geonet/services/metadata/GetAdminOper.java trunk/src/org/fao/geonet/services/metadata/GetCategories.java trunk/src/org/fao/geonet/services/metadata/GetEditableData.java trunk/src/org/fao/geonet/services/metadata/ImportFromDir.java trunk/src/org/fao/geonet/services/metadata/Insert.java trunk/src/org/fao/geonet/services/metadata/MoveElement.java trunk/src/org/fao/geonet/services/metadata/SearchUnused.java trunk/src/org/fao/geonet/services/metadata/Show.java trunk/src/org/fao/geonet/services/metadata/Update.java trunk/src/org/fao/geonet/services/metadata/UpdateAdminOper.java trunk/src/org/fao/geonet/services/metadata/UpdateCategories.java trunk/src/org/fao/geonet/services/operation/Update.java trunk/src/org/fao/geonet/services/region/Update.java trunk/src/org/fao/geonet/services/resources/Download.java trunk/src/org/fao/geonet/services/resources/Remove.java trunk/src/org/fao/geonet/services/resources/Upload.java trunk/src/org/fao/geonet/services/thumbnail/Get.java trunk/src/org/fao/geonet/services/thumbnail/Set.java trunk/src/org/fao/geonet/services/thumbnail/Unset.java trunk/src/org/fao/geonet/services/user/Get.java trunk/src/org/fao/geonet/services/user/InfoUpdate.java trunk/src/org/fao/geonet/services/user/List.java trunk/src/org/fao/geonet/services/user/PwUpdate.java trunk/src/org/fao/geonet/services/user/Remove.java trunk/src/org/fao/geonet/services/user/Update.java trunk/src/org/fao/geonet/services/util/MainUtil.java trunk/src/org/fao/geonet/services/util/z3950/GNSearchTask.java trunk/src/org/fao/geonet/services/util/z3950/GNSearchable.java trunk/src/org/fao/geonet/services/util/z3950/Server.java trunk/src/org/fao/geonet/util/ISODate.java trunk/src/org/fao/geonet/util/MailSender.java trunk/src/org/fao/geonet/util/McKoiDB.java Modified: trunk/src/org/fao/gast/Gast.java =================================================================== --- trunk/src/org/fao/gast/Gast.java 2007-03-09 21:01:52 UTC (rev 233) +++ trunk/src/org/fao/gast/Gast.java 2007-03-10 23:01:22 UTC (rev 234) @@ -1,5 +1,5 @@ //============================================================================= -//=== Copyright (C) 2001-2005 Food and Agriculture Organization of the +//=== Copyright (C) 2001-2007 Food and Agriculture Organization of the //=== United Nations (FAO-UN), United Nations World Food Programme (WFP) //=== and United Nations Environment Programme (UNEP) //=== @@ -15,10 +15,10 @@ //=== //=== You should have received a copy of the GNU General Public License //=== along with this program; if not, write to the Free Software -//=== Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +//=== Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA //=== //=== Contact: Jeroen Ticheler - FAO - Viale delle Terme di Caracalla 2, -//=== Rome - Italy. email: Geo...@fa... +//=== Rome - Italy. email: geo...@os... //============================================================================== package org.fao.gast; Modified: trunk/src/org/fao/gast/app/App.java =================================================================== --- trunk/src/org/fao/gast/app/App.java 2007-03-09 21:01:52 UTC (rev 233) +++ trunk/src/org/fao/gast/app/App.java 2007-03-10 23:01:22 UTC (rev 234) @@ -1,5 +1,5 @@ //============================================================================= -//=== Copyright (C) 2001-2005 Food and Agriculture Organization of the +//=== Copyright (C) 2001-2007 Food and Agriculture Organization of the //=== United Nations (FAO-UN), United Nations World Food Programme (WFP) //=== and United Nations Environment Programme (UNEP) //=== @@ -15,10 +15,10 @@ //=== //=== You should have received a copy of the GNU General Public License //=== along with this program; if not, write to the Free Software -//=== Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +//=== Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA //=== //=== Contact: Jeroen Ticheler - FAO - Viale delle Terme di Caracalla 2, -//=== Rome - Italy. email: Geo...@fa... +//=== Rome - Italy. email: geo...@os... //============================================================================== package org.fao.gast.app; Modified: trunk/src/org/fao/gast/app/Configuration.java =================================================================== --- trunk/src/org/fao/gast/app/Configuration.java 2007-03-09 21:01:52 UTC (rev 233) +++ trunk/src/org/fao/gast/app/Configuration.java 2007-03-10 23:01:22 UTC (rev 234) @@ -1,5 +1,5 @@ //============================================================================== -//=== Copyright (C) 2001-2005 Food and Agriculture Organization of the +//=== Copyright (C) 2001-2007 Food and Agriculture Organization of the //=== United Nations (FAO-UN), United Nations World Food Programme (WFP) //=== and United Nations Environment Programme (UNEP) //=== @@ -15,10 +15,10 @@ //=== //=== You should have received a copy of the GNU General Public License //=== along with this program; if not, write to the Free Software -//=== Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +//=== Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA //=== //=== Contact: Jeroen Ticheler - FAO - Viale delle Terme di Caracalla 2, -//=== Rome - Italy. email: Geo...@fa... +//=== Rome - Italy. email: geo...@os... //============================================================================== package org.fao.gast.app; Modified: trunk/src/org/fao/gast/boot/Starter.java =================================================================== --- trunk/src/org/fao/gast/boot/Starter.java 2007-03-09 21:01:52 UTC (rev 233) +++ trunk/src/org/fao/gast/boot/Starter.java 2007-03-10 23:01:22 UTC (rev 234) @@ -1,5 +1,5 @@ //============================================================================== -//=== Copyright (C) 2001-2005 Food and Agriculture Organization of the +//=== Copyright (C) 2001-2007 Food and Agriculture Organization of the //=== United Nations (FAO-UN), United Nations World Food Programme (WFP) //=== and United Nations Environment Programme (UNEP) //=== @@ -15,10 +15,10 @@ //=== //=== You should have received a copy of the GNU General Public License //=== along with this program; if not, write to the Free Software -//=== Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +//=== Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA //=== //=== Contact: Jeroen Ticheler - FAO - Viale delle Terme di Caracalla 2, -//=== Rome - Italy. email: Geo...@fa... +//=== Rome - Italy. email: geo...@os... //============================================================================== package org.fao.gast.boot; Modified: trunk/src/org/fao/gast/boot/Util.java =================================================================== --- trunk/src/org/fao/gast/boot/Util.java 2007-03-09 21:01:52 UTC (rev 233) +++ trunk/src/org/fao/gast/boot/Util.java 2007-03-10 23:01:22 UTC (rev 234) @@ -1,5 +1,5 @@ //============================================================================== -//=== Copyright (C) 2001-2005 Food and Agriculture Organization of the +//=== Copyright (C) 2001-2007 Food and Agriculture Organization of the //=== United Nations (FAO-UN), United Nations World Food Programme (WFP) //=== and United Nations Environment Programme (UNEP) //=== @@ -15,10 +15,10 @@ //=== //=== You should have received a copy of the GNU General Public License //=== along with this program; if not, write to the Free Software -//=== Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +//=== Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA //=== //=== Contact: Jeroen Ticheler - FAO - Viale delle Terme di Caracalla 2, -//=== Rome - Italy. email: Geo...@fa... +//=== Rome - Italy. email: geo...@os... //============================================================================== package org.fao.gast.boot; Modified: trunk/src/org/fao/gast/cli/Cli.java =================================================================== --- trunk/src/org/fao/gast/cli/Cli.java 2007-03-09 21:01:52 UTC (rev 233) +++ trunk/src/org/fao/gast/cli/Cli.java 2007-03-10 23:01:22 UTC (rev 234) @@ -1,5 +1,5 @@ //============================================================================== -//=== Copyright (C) 2001-2005 Food and Agriculture Organization of the +//=== Copyright (C) 2001-2007 Food and Agriculture Organization of the //=== United Nations (FAO-UN), United Nations World Food Programme (WFP) //=== and United Nations Environment Programme (UNEP) //=== @@ -15,10 +15,10 @@ //=== //=== You should have received a copy of the GNU General Public License //=== along with this program; if not, write to the Free Software -//=== Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +//=== Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA //=== //=== Contact: Jeroen Ticheler - FAO - Viale delle Terme di Caracalla 2, -//=== Rome - Italy. email: Geo...@fa... +//=== Rome - Italy. email: geo...@os... //============================================================================== package org.fao.gast.cli; Modified: trunk/src/org/fao/gast/cli/setup/Setup.java =================================================================== --- trunk/src/org/fao/gast/cli/setup/Setup.java 2007-03-09 21:01:52 UTC (rev 233) +++ trunk/src/org/fao/gast/cli/setup/Setup.java 2007-03-10 23:01:22 UTC (rev 234) @@ -1,5 +1,5 @@ //============================================================================== -//=== Copyright (C) 2001-2005 Food and Agriculture Organization of the +//=== Copyright (C) 2001-2007 Food and Agriculture Organization of the //=== United Nations (FAO-UN), United Nations World Food Programme (WFP) //=== and United Nations Environment Programme (UNEP) //=== @@ -15,10 +15,10 @@ //=== //=== You should have received a copy of the GNU General Public License //=== along with this program; if not, write to the Free Software -//=== Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +//=== Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA //=== //=== Contact: Jeroen Ticheler - FAO - Viale delle Terme di Caracalla 2, -//=== Rome - Italy. email: Geo...@fa... +//=== Rome - Italy. email: geo...@os... //============================================================================== package org.fao.gast.cli.setup; Modified: trunk/src/org/fao/gast/gui/GuiBuilder.java =================================================================== --- trunk/src/org/fao/gast/gui/GuiBuilder.java 2007-03-09 21:01:52 UTC (rev 233) +++ trunk/src/org/fao/gast/gui/GuiBuilder.java 2007-03-10 23:01:22 UTC (rev 234) @@ -1,5 +1,5 @@ //============================================================================== -//=== Copyright (C) 2001-2005 Food and Agriculture Organization of the +//=== Copyright (C) 2001-2007 Food and Agriculture Organization of the //=== United Nations (FAO-UN), United Nations World Food Programme (WFP) //=== and United Nations Environment Programme (UNEP) //=== @@ -15,10 +15,10 @@ //=== //=== You should have received a copy of the GNU General Public License //=== along with this program; if not, write to the Free Software -//=== Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +//=== Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA //=== //=== Contact: Jeroen Ticheler - FAO - Viale delle Terme di Caracalla 2, -//=== Rome - Italy. email: Geo...@fa... +//=== Rome - Italy. email: geo...@os... //============================================================================== package org.fao.gast.gui; Modified: trunk/src/org/fao/gast/gui/MainFrame.java =================================================================== --- trunk/src/org/fao/gast/gui/MainFrame.java 2007-03-09 21:01:52 UTC (rev 233) +++ trunk/src/org/fao/gast/gui/MainFrame.java 2007-03-10 23:01:22 UTC (rev 234) @@ -1,5 +1,5 @@ //============================================================================== -//=== Copyright (C) 2001-2005 Food and Agriculture Organization of the +//=== Copyright (C) 2001-2007 Food and Agriculture Organization of the //=== United Nations (FAO-UN), United Nations World Food Programme (WFP) //=== and United Nations Environment Programme (UNEP) //=== @@ -15,10 +15,10 @@ //=== //=== You should have received a copy of the GNU General Public License //=== along with this program; if not, write to the Free Software -//=== Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +//=== Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA //=== //=== Contact: Jeroen Ticheler - FAO - Viale delle Terme di Caracalla 2, -//=== Rome - Italy. email: Geo...@fa... +//=== Rome - Italy. email: geo...@os... //============================================================================== package org.fao.gast.gui; Modified: trunk/src/org/fao/gast/gui/ViewPanel.java =================================================================== --- trunk/src/org/fao/gast/gui/ViewPanel.java 2007-03-09 21:01:52 UTC (rev 233) +++ trunk/src/org/fao/gast/gui/ViewPanel.java 2007-03-10 23:01:22 UTC (rev 234) @@ -1,5 +1,5 @@ //============================================================================== -//=== Copyright (C) 2001-2005 Food and Agriculture Organization of the +//=== Copyright (C) 2001-2007 Food and Agriculture Organization of the //=== United Nations (FAO-UN), United Nations World Food Programme (WFP) //=== and United Nations Environment Programme (UNEP) //=== @@ -15,10 +15,10 @@ //=== //=== You should have received a copy of the GNU General Public License //=== along with this program; if not, write to the Free Software -//=== Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +//=== Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA //=== //=== Contact: Jeroen Ticheler - FAO - Viale delle Terme di Caracalla 2, -//=== Rome - Italy. email: Geo...@fa... +//=== Rome - Italy. email: geo...@os... //============================================================================== package org.fao.gast.gui; Modified: trunk/src/org/fao/gast/gui/WorkPanel.java =================================================================== --- trunk/src/org/fao/gast/gui/WorkPanel.java 2007-03-09 21:01:52 UTC (rev 233) +++ trunk/src/org/fao/gast/gui/WorkPanel.java 2007-03-10 23:01:22 UTC (rev 234) @@ -1,5 +1,5 @@ //============================================================================== -//=== Copyright (C) 2001-2005 Food and Agriculture Organization of the +//=== Copyright (C) 2001-2007 Food and Agriculture Organization of the //=== United Nations (FAO-UN), United Nations World Food Programme (WFP) //=== and United Nations Environment Programme (UNEP) //=== @@ -15,10 +15,10 @@ //=== //=== You should have received a copy of the GNU General Public License //=== along with this program; if not, write to the Free Software -//=== Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +//=== Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA //=== //=== Contact: Jeroen Ticheler - FAO - Viale delle Terme di Caracalla 2, -//=== Rome - Italy. email: Geo...@fa... +//=== Rome - Italy. email: geo...@os... //============================================================================== package org.fao.gast.gui; Modified: trunk/src/org/fao/gast/gui/dialogs/AccountPanel.java =================================================================== --- trunk/src/org/fao/gast/gui/dialogs/AccountPanel.java 2007-03-09 21:01:52 UTC (rev 233) +++ trunk/src/org/fao/gast/gui/dialogs/AccountPanel.java 2007-03-10 23:01:22 UTC (rev 234) @@ -1,5 +1,5 @@ //============================================================================== -//=== Copyright (C) 2001-2005 Food and Agriculture Organization of the +//=== Copyright (C) 2001-2007 Food and Agriculture Organization of the //=== United Nations (FAO-UN), United Nations World Food Programme (WFP) //=== and United Nations Environment Programme (UNEP) //=== @@ -15,10 +15,10 @@ //=== //=== You should have received a copy of the GNU General Public License //=== along with this program; if not, write to the Free Software -//=== Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +//=== Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA //=== //=== Contact: Jeroen Ticheler - FAO - Viale delle Terme di Caracalla 2, -//=== Rome - Italy. email: Geo...@fa... +//=== Rome - Italy. email: geo...@os... //============================================================================== package org.fao.gast.gui.dialogs; Modified: trunk/src/org/fao/gast/gui/dialogs/ConfigDialog.java =================================================================== --- trunk/src/org/fao/gast/gui/dialogs/ConfigDialog.java 2007-03-09 21:01:52 UTC (rev 233) +++ trunk/src/org/fao/gast/gui/dialogs/ConfigDialog.java 2007-03-10 23:01:22 UTC (rev 234) @@ -1,5 +1,5 @@ //============================================================================== -//=== Copyright (C) 2001-2005 Food and Agriculture Organization of the +//=== Copyright (C) 2001-2007 Food and Agriculture Organization of the //=== United Nations (FAO-UN), United Nations World Food Programme (WFP) //=== and United Nations Environment Programme (UNEP) //=== @@ -15,10 +15,10 @@ //=== //=== You should have received a copy of the GNU General Public License //=== along with this program; if not, write to the Free Software -//=== Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +//=== Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA //=== //=== Contact: Jeroen Ticheler - FAO - Viale delle Terme di Caracalla 2, -//=== Rome - Italy. email: Geo...@fa... +//=== Rome - Italy. email: geo...@os... //============================================================================== package org.fao.gast.gui.dialogs; Modified: trunk/src/org/fao/gast/gui/dialogs/ConfigPanel.java =================================================================== --- trunk/src/org/fao/gast/gui/dialogs/ConfigPanel.java 2007-03-09 21:01:52 UTC (rev 233) +++ trunk/src/org/fao/gast/gui/dialogs/ConfigPanel.java 2007-03-10 23:01:22 UTC (rev 234) @@ -1,5 +1,5 @@ //============================================================================== -//=== Copyright (C) 2001-2005 Food and Agriculture Organization of the +//=== Copyright (C) 2001-2007 Food and Agriculture Organization of the //=== United Nations (FAO-UN), United Nations World Food Programme (WFP) //=== and United Nations Environment Programme (UNEP) //=== @@ -15,10 +15,10 @@ //=== //=== You should have received a copy of the GNU General Public License //=== along with this program; if not, write to the Free Software -//=== Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +//=== Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA //=== //=== Contact: Jeroen Ticheler - FAO - Viale delle Terme di Caracalla 2, -//=== Rome - Italy. email: Geo...@fa... +//=== Rome - Italy. email: geo...@os... //============================================================================== package org.fao.gast.gui.dialogs; Modified: trunk/src/org/fao/gast/gui/dialogs/ServerPanel.java =================================================================== --- trunk/src/org/fao/gast/gui/dialogs/ServerPanel.java 2007-03-09 21:01:52 UTC (rev 233) +++ trunk/src/org/fao/gast/gui/dialogs/ServerPanel.java 2007-03-10 23:01:22 UTC (rev 234) @@ -1,5 +1,5 @@ //============================================================================== -//=== Copyright (C) 2001-2005 Food and Agriculture Organization of the +//=== Copyright (C) 2001-2007 Food and Agriculture Organization of the //=== United Nations (FAO-UN), United Nations World Food Programme (WFP) //=== and United Nations Environment Programme (UNEP) //=== @@ -15,10 +15,10 @@ //=== //=== You should have received a copy of the GNU General Public License //=== along with this program; if not, write to the Free Software -//=== Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +//=== Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA //=== //=== Contact: Jeroen Ticheler - FAO - Viale delle Terme di Caracalla 2, -//=== Rome - Italy. email: Geo...@fa... +//=== Rome - Italy. email: geo...@os... //============================================================================== package org.fao.gast.gui.dialogs; Modified: trunk/src/org/fao/gast/gui/panels/FormPanel.java =================================================================== --- trunk/src/org/fao/gast/gui/panels/FormPanel.java 2007-03-09 21:01:52 UTC (rev 233) +++ trunk/src/org/fao/gast/gui/panels/FormPanel.java 2007-03-10 23:01:22 UTC (rev 234) @@ -1,5 +1,5 @@ //============================================================================== -//=== Copyright (C) 2001-2005 Food and Agriculture Organization of the +//=== Copyright (C) 2001-2007 Food and Agriculture Organization of the //=== United Nations (FAO-UN), United Nations World Food Programme (WFP) //=== and United Nations Environment Programme (UNEP) //=== @@ -15,10 +15,10 @@ //=== //=== You should have received a copy of the GNU General Public License //=== along with this program; if not, write to the Free Software -//=== Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +//=== Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA //=== //=== Contact: Jeroen Ticheler - FAO - Viale delle Terme di Caracalla 2, -//=== Rome - Italy. email: Geo...@fa... +//=== Rome - Italy. email: geo...@os... //============================================================================== package org.fao.gast.gui.panels; Modified: trunk/src/org/fao/gast/gui/panels/config/dbms/EmbeddedPanel.java =================================================================== --- trunk/src/org/fao/gast/gui/panels/config/dbms/EmbeddedPanel.java 2007-03-09 21:01:52 UTC (rev 233) +++ trunk/src/org/fao/gast/gui/panels/config/dbms/EmbeddedPanel.java 2007-03-10 23:01:22 UTC (rev 234) @@ -1,5 +1,5 @@ //============================================================================== -//=== Copyright (C) 2001-2005 Food and Agriculture Organization of the +//=== Copyright (C) 2001-2007 Food and Agriculture Organization of the //=== United Nations (FAO-UN), United Nations World Food Programme (WFP) //=== and United Nations Environment Programme (UNEP) //=== @@ -15,10 +15,10 @@ //=== //=== You should have received a copy of the GNU General Public License //=== along with this program; if not, write to the Free Software -//=== Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +//=== Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA //=== //=== Contact: Jeroen Ticheler - FAO - Viale delle Terme di Caracalla 2, -//=== Rome - Italy. email: Geo...@fa... +//=== Rome - Italy. email: geo...@os... //============================================================================== package org.fao.gast.gui.panels.config.dbms; Modified: trunk/src/org/fao/gast/gui/panels/config/dbms/GenericPanel.java =================================================================== --- trunk/src/org/fao/gast/gui/panels/config/dbms/GenericPanel.java 2007-03-09 21:01:52 UTC (rev 233) +++ trunk/src/org/fao/gast/gui/panels/config/dbms/GenericPanel.java 2007-03-10 23:01:22 UTC (rev 234) @@ -1,5 +1,5 @@ //============================================================================== -//=== Copyright (C) 2001-2005 Food and Agriculture Organization of the +//=== Copyright (C) 2001-2007 Food and Agriculture Organization of the //=== United Nations (FAO-UN), United Nations World Food Programme (WFP) //=== and United Nations Environment Programme (UNEP) //=== @@ -15,10 +15,10 @@ //=== //=== You should have received a copy of the GNU General Public License //=== along with this program; if not, write to the Free Software -//=== Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +//=== Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA //=== //=== Contact: Jeroen Ticheler - FAO - Viale delle Terme di Caracalla 2, -//=== Rome - Italy. email: Geo...@fa... +//=== Rome - Italy. email: geo...@os... //============================================================================== package org.fao.gast.gui.panels.config.dbms; Modified: trunk/src/org/fao/gast/gui/panels/config/dbms/MainPanel.java =================================================================== --- trunk/src/org/fao/gast/gui/panels/config/dbms/MainPanel.java 2007-03-09 21:01:52 UTC (rev 233) +++ trunk/src/org/fao/gast/gui/panels/config/dbms/MainPanel.java 2007-03-10 23:01:22 UTC (rev 234) @@ -1,5 +1,5 @@ //============================================================================== -//=== Copyright (C) 2001-2005 Food and Agriculture Organization of the +//=== Copyright (C) 2001-2007 Food and Agriculture Organization of the //=== United Nations (FAO-UN), United Nations World Food Programme (WFP) //=== and United Nations Environment Programme (UNEP) //=== @@ -15,10 +15,10 @@ //=== //=== You should have received a copy of the GNU General Public License //=== along with this program; if not, write to the Free Software -//=== Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +//=== Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA //=== //=== Contact: Jeroen Ticheler - FAO - Viale delle Terme di Caracalla 2, -//=== Rome - Italy. email: Geo...@fa... +//=== Rome - Italy. email: geo...@os... //============================================================================== package org.fao.gast.gui.panels.config.dbms; Modified: trunk/src/org/fao/gast/gui/panels/config/dbms/MySQLPanel.java =================================================================== --- trunk/src/org/fao/gast/gui/panels/config/dbms/MySQLPanel.java 2007-03-09 21:01:52 UTC (rev 233) +++ trunk/src/org/fao/gast/gui/panels/config/dbms/MySQLPanel.java 2007-03-10 23:01:22 UTC (rev 234) @@ -1,5 +1,5 @@ //============================================================================== -//=== Copyright (C) 2001-2005 Food and Agriculture Organization of the +//=== Copyright (C) 2001-2007 Food and Agriculture Organization of the //=== United Nations (FAO-UN), United Nations World Food Programme (WFP) //=== and United Nations Environment Programme (UNEP) //=== @@ -15,10 +15,10 @@ //=== //=== You should have received a copy of the GNU General Public License //=== along with this program; if not, write to the Free Software -//=== Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +//=== Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA //=== //=== Contact: Jeroen Ticheler - FAO - Viale delle Terme di Caracalla 2, -//=== Rome - Italy. email: Geo...@fa... +//=== Rome - Italy. email: geo...@os... //============================================================================== package org.fao.gast.gui.panels.config.dbms; Modified: trunk/src/org/fao/gast/gui/panels/config/dbms/OraclePanel.java =================================================================== --- trunk/src/org/fao/gast/gui/panels/config/dbms/OraclePanel.java 2007-03-09 21:01:52 UTC (rev 233) +++ trunk/src/org/fao/gast/gui/panels/config/dbms/OraclePanel.java 2007-03-10 23:01:22 UTC (rev 234) @@ -1,5 +1,5 @@ //============================================================================== -//=== Copyright (C) 2001-2005 Food and Agriculture Organization of the +//=== Copyright (C) 2001-2007 Food and Agriculture Organization of the //=== United Nations (FAO-UN), United Nations World Food Programme (WFP) //=== and United Nations Environment Programme (UNEP) //=== @@ -15,10 +15,10 @@ //=== //=== You should have received a copy of the GNU General Public License //=== along with this program; if not, write to the Free Software -//=== Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +//=== Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA //=== //=== Contact: Jeroen Ticheler - FAO - Viale delle Terme di Caracalla 2, -//=== Rome - Italy. email: Geo...@fa... +//=== Rome - Italy. email: geo...@os... //============================================================================== package org.fao.gast.gui.panels.config.dbms; Modified: trunk/src/org/fao/gast/gui/panels/config/dbms/PostgresPanel.java =================================================================== --- trunk/src/org/fao/gast/gui/panels/config/dbms/PostgresPanel.java 2007-03-09 21:01:52 UTC (rev 233) +++ trunk/src/org/fao/gast/gui/panels/config/dbms/PostgresPanel.java 2007-03-10 23:01:22 UTC (rev 234) @@ -1,5 +1,5 @@ //============================================================================== -//=== Copyright (C) 2001-2005 Food and Agriculture Organization of the +//=== Copyright (C) 2001-2007 Food and Agriculture Organization of the //=== United Nations (FAO-UN), United Nations World Food Programme (WFP) //=== and United Nations Environment Programme (UNEP) //=== @@ -15,10 +15,10 @@ //=== //=== You should have received a copy of the GNU General Public License //=== along with this program; if not, write to the Free Software -//=== Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +//=== Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA //=== //=== Contact: Jeroen Ticheler - FAO - Viale delle Terme di Caracalla 2, -//=== Rome - Italy. email: Geo...@fa... +//=== Rome - Italy. email: geo...@os... //============================================================================== package org.fao.gast.gui.panels.config.dbms; Modified: trunk/src/org/fao/gast/gui/panels/config/jetty/MainPanel.java =================================================================== --- trunk/src/org/fao/gast/gui/panels/config/jetty/MainPanel.java 2007-03-09 21:01:52 UTC (rev 233) +++ trunk/src/org/fao/gast/gui/panels/config/jetty/MainPanel.java 2007-03-10 23:01:22 UTC (rev 234) @@ -1,5 +1,5 @@ //============================================================================== -//=== Copyright (C) 2001-2005 Food and Agriculture Organization of the +//=== Copyright (C) 2001-2007 Food and Agriculture Organization of the //=== United Nations (FAO-UN), United Nations World Food Programme (WFP) //=== and United Nations Environment Programme (UNEP) //=== @@ -15,10 +15,10 @@ //=== //=== You should have received a copy of the GNU General Public License //=== along with this program; if not, write to the Free Software -//=== Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +//=== Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA //=== //=== Contact: Jeroen Ticheler - FAO - Viale delle Terme di Caracalla 2, -//=== Rome - Italy. email: Geo...@fa... +//=== Rome - Italy. email: geo...@os... //============================================================================== package org.fao.gast.gui.panels.config.jetty; Modified: trunk/src/org/fao/gast/gui/panels/config/siteid/MainPanel.java =================================================================== --- trunk/src/org/fao/gast/gui/panels/config/siteid/MainPanel.java 2007-03-09 21:01:52 UTC (rev 233) +++ trunk/src/org/fao/gast/gui/panels/config/siteid/MainPanel.java 2007-03-10 23:01:22 UTC (rev 234) @@ -1,5 +1,5 @@ //============================================================================== -//=== Copyright (C) 2001-2005 Food and Agriculture Organization of the +//=== Copyright (C) 2001-2007 Food and Agriculture Organization of the //=== United Nations (FAO-UN), United Nations World Food Programme (WFP) //=== and United Nations Environment Programme (UNEP) //=== @@ -15,10 +15,10 @@ //=== //=== You should have received a copy of the GNU General Public License //=== along with this program; if not, write to the Free Software -//=== Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +//=== Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA //=== //=== Contact: Jeroen Ticheler - FAO - Viale delle Terme di Caracalla 2, -//=== Rome - Italy. email: Geo...@fa... +//=== Rome - Italy. email: geo...@os... //============================================================================== package org.fao.gast.gui.panels.config.siteid; Modified: trunk/src/org/fao/gast/gui/panels/database/setup/MainPanel.java =================================================================== --- trunk/src/org/fao/gast/gui/panels/database/setup/MainPanel.java 2007-03-09 21:01:52 UTC (rev 233) +++ trunk/src/org/fao/gast/gui/panels/database/setup/MainPanel.java 2007-03-10 23:01:22 UTC (rev 234) @@ -1,5 +1,5 @@ //============================================================================== -//=== Copyright (C) 2001-2005 Food and Agriculture Organization of the +//=== Copyright (C) 2001-2007 Food and Agriculture Organization of the //=== United Nations (FAO-UN), United Nations World Food Programme (WFP) //=== and United Nations Environment Programme (UNEP) //=== @@ -15,10 +15,10 @@ //=== //=== You should have received a copy of the GNU General Public License //=== along with this program; if not, write to the Free Software -//=== Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +//=== Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA //=== //=== Contact: Jeroen Ticheler - FAO - Viale delle Terme di Caracalla 2, -//=== Rome - Italy. email: Geo...@fa... +//=== Rome - Italy. email: geo...@os... //============================================================================== package org.fao.gast.gui.panels.database.setup; Modified: trunk/src/org/fao/gast/gui/panels/manag/mdsync/MainPanel.java =================================================================== --- trunk/src/org/fao/gast/gui/panels/manag/mdsync/MainPanel.java 2007-03-09 21:01:52 UTC (rev 233) +++ trunk/src/org/fao/gast/gui/panels/manag/mdsync/MainPanel.java 2007-03-10 23:01:22 UTC (rev 234) @@ -1,5 +1,5 @@ //============================================================================== -//=== Copyright (C) 2001-2005 Food and Agriculture Organization of the +//=== Copyright (C) 2001-2007 Food and Agriculture Organization of the //=== United Nations (FAO-UN), United Nations World Food Programme (WFP) //=== and United Nations Environment Programme (UNEP) //=== @@ -15,10 +15,10 @@ //=== //=== You should have received a copy of the GNU General Public License //=== along with this program; if not, write to the Free Software -//=== Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +//=== Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA //=== //=== Contact: Jeroen Ticheler - FAO - Viale delle Terme di Caracalla 2, -//=== Rome - Italy. email: Geo...@fa... +//=== Rome - Italy. email: geo...@os... //============================================================================== package org.fao.gast.gui.panels.manag.mdsync; Modified: trunk/src/org/fao/gast/gui/panels/manag/mefexport/MainPanel.java =================================================================== --- trunk/src/org/fao/gast/gui/panels/manag/mefexport/MainPanel.java 2007-03-09 21:01:52 UTC (rev 233) +++ trunk/src/org/fao/gast/gui/panels/manag/mefexport/MainPanel.java 2007-03-10 23:01:22 UTC (rev 234) @@ -1,5 +1,5 @@ //============================================================================== -//=== Copyright (C) 2001-2005 Food and Agriculture Organization of the +//=== Copyright (C) 2001-2007 Food and Agriculture Organization of the //=== United Nations (FAO-UN), United Nations World Food Programme (WFP) //=== and United Nations Environment Programme (UNEP) //=== @@ -15,10 +15,10 @@ //=== //=== You should have received a copy of the GNU General Public License //=== along with this program; if not, write to the Free Software -//=== Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +//=== Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA //=== //=== Contact: Jeroen Ticheler - FAO - Viale delle Terme di Caracalla 2, -//=== Rome - Italy. email: Geo...@fa... +//=== Rome - Italy. email: geo...@os... //============================================================================== package org.fao.gast.gui.panels.manag.mefexport; Modified: trunk/src/org/fao/gast/gui/panels/manag/mefexport/SearchPanel.java =================================================================== --- trunk/src/org/fao/gast/gui/panels/manag/mefexport/SearchPanel.java 2007-03-09 21:01:52 UTC (rev 233) +++ trunk/src/org/fao/gast/gui/panels/manag/mefexport/SearchPanel.java 2007-03-10 23:01:22 UTC (rev 234) @@ -1,5 +1,5 @@ //============================================================================== -//=== Copyright (C) 2001-2005 Food and Agriculture Organization of the +//=== Copyright (C) 2001-2007 Food and Agriculture Organization of the //=== United Nations (FAO-UN), United Nations World Food Programme (WFP) //=== and United Nations Environment Programme (UNEP) //=== @@ -15,10 +15,10 @@ //=== //=== You should have received a copy of the GNU General Public License //=== along with this program; if not, write to the Free Software -//=== Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +//=== Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA //=== //=== Contact: Jeroen Ticheler - FAO - Viale delle Terme di Caracalla 2, -//=== Rome - Italy. email: Geo...@fa... +//=== Rome - Italy. email: geo...@os... //============================================================================== package org.fao.gast.gui.panels.manag.mefexport; Modified: trunk/src/org/fao/gast/gui/panels/manag/mefexport/Worker.java =================================================================== --- trunk/src/org/fao/gast/gui/panels/manag/mefexport/Worker.java 2007-03-09 21:01:52 UTC (rev 233) +++ trunk/src/org/fao/gast/gui/panels/manag/mefexport/Worker.java 2007-03-10 23:01:22 UTC (rev 234) @@ -1,5 +1,5 @@ //============================================================================== -//=== Copyright (C) 2001-2005 Food and Agriculture Organization of the +//=== Copyright (C) 2001-2007 Food and Agriculture Organization of the //=== United Nations (FAO-UN), United Nations World Food Programme (WFP) //=== and United Nations Environment Programme (UNEP) //=== @@ -15,10 +15,10 @@ //=== //=== You should have received a copy of the GNU General Public License //=== along with this program; if not, write to the Free Software -//=== Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +//=== Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA //=== //=== Contact: Jeroen Ticheler - FAO - Viale delle Terme di Caracalla 2, -//=== Rome - Italy. email: Geo...@fa... +//=== Rome - Italy. email: geo...@os... //============================================================================== package org.fao.gast.gui.panels.manag.mefexport; Modified: trunk/src/org/fao/gast/gui/panels/manag/mefimport/MainPanel.java =================================================================== --- trunk/src/org/fao/gast/gui/panels/manag/mefimport/MainPanel.java 2007-03-09 21:01:52 UTC (rev 233) +++ trunk/src/org/fao/gast/gui/panels/manag/mefimport/MainPanel.java 2007-03-10 23:01:22 UTC (rev 234) @@ -1,5 +1,5 @@ //============================================================================== -//=== Copyright (C) 2001-2005 Food and Agriculture Organization of the +//=== Copyright (C) 2001-2007 Food and Agriculture Organization of the //=== United Nations (FAO-UN), United Nations World Food Programme (WFP) //=== and United Nations Environment Programme (UNEP) //=== @@ -15,10 +15,10 @@ //=== //=== You should have received a copy of the GNU General Public License //=== along with this program; if not, write to the Free Software -//=== Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +//=== Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA //=== //=== Contact: Jeroen Ticheler - FAO - Viale delle Terme di Caracalla 2, -//=== Rome - Italy. email: Geo...@fa... +//=== Rome - Italy. email: geo...@os... //============================================================================== package org.fao.gast.gui.panels.manag.mefimport; Modified: trunk/src/org/fao/gast/gui/panels/manag/mefimport/Worker.java =================================================================== --- trunk/src/org/fao/gast/gui/panels/manag/mefimport/Worker.java 2007-03-09 21:01:52 UTC (rev 233) +++ trunk/src/org/fao/gast/gui/panels/manag/mefimport/Worker.java 2007-03-10 23:01:22 UTC (rev 234) @@ -1,5 +1,5 @@ //============================================================================== -//=== Copyright (C) 2001-2005 Food and Agriculture Organization of the +//=== Copyright (C) 2001-2007 Food and Agriculture Organization of the //=== United Nations (FAO-UN), United Nations World Food Programme (WFP) //=== and United Nations Environment Programme (UNEP) //=== @@ -15,10 +15,10 @@ //=== //=== You should have received a copy of the GNU General Public License //=== along with this program; if not, write to the Free Software -//=== Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +//=== Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA //=== //=== Contact: Jeroen Ticheler - FAO - Viale delle Terme di Caracalla 2, -//=== Rome - Italy. email: Geo...@fa... +//=== Rome - Italy. email: geo...@os... //============================================================================== package org.fao.gast.gui.panels.manag.mefimport; Modified: trunk/src/org/fao/gast/gui/panels/migration/oldinst/GNSource.java =================================================================== --- trunk/src/org/fao/gast/gui/panels/migration/oldinst/GNSource.java 2007-03-09 21:01:52 UTC (rev 233) +++ trunk/src/org/fao/gast/gui/panels/migration/oldinst/GNSource.java 2007-03-10 23:01:22 UTC (rev 234) @@ -1,5 +1,5 @@ //============================================================================== -//=== Copyright (C) 2001-2005 Food and Agriculture Organization of the +//=== Copyright (C) 2001-2007 Food and Agriculture Organization of the //=== United Nations (FAO-UN), United Nations World Food Programme (WFP) //=== and United Nations Environment Programme (UNEP) //=== @@ -15,10 +15,10 @@ //=== //=== You should have received a copy of the GNU General Public License //=== along with this program; if not, write to the Free Software -//=== Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +//=== Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA //=== //=== Contact: Jeroen Ticheler - FAO - Viale delle Terme di Caracalla 2, -//=== Rome - Italy. email: Geo...@fa... +//=== Rome - Italy. email: geo...@os... //============================================================================== package org.fao.gast.gui.panels.migration.oldinst; Modified: trunk/src/org/fao/gast/gui/panels/migration/oldinst/MainPanel.java =================================================================== --- trunk/src/org/fao/gast/gui/panels/migration/oldinst/MainPanel.java 2007-03-09 21:01:52 UTC (rev 233) +++ trunk/src/org/fao/gast/gui/panels/migration/oldinst/MainPanel.java 2007-03-10 23:01:22 UTC (rev 234) @@ -1,5 +1,5 @@ //============================================================================== -//=== Copyright (C) 2001-2005 Food and Agriculture Organization of the +//=== Copyright (C) 2001-2007 Food and Agriculture Organization of the //=== United Nations (FAO-UN), United Nations World Food Programme (WFP) //=== and United Nations Environment Programme (UNEP) //=== @@ -15,10 +15,10 @@ //=== //=== You should have received a copy of the GNU General Public License //=== along with this program; if not, write to the Free Software -//=== Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +//=== Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA //=== //=== Contact: Jeroen Ticheler - FAO - Viale delle Terme di Caracalla 2, -//=== Rome - Italy. email: Geo...@fa... +//=== Rome - Italy. email: geo...@os... //============================================================================== package org.fao.gast.gui.panels.migration.oldinst; Modified: trunk/src/org/fao/gast/gui/panels/migration/oldinst/Util.java =================================================================== --- trunk/src/org/fao/gast/gui/panels/migration/oldinst/Util.java 2007-03-09 21:01:52 UTC (rev 233) +++ trunk/src/org/fao/gast/gui/panels/migration/oldinst/Util.java 2007-03-10 23:01:22 UTC (rev 234) @@ -1,5 +1,5 @@ //============================================================================== -//=== Copyright (C) 2001-2005 Food and Agriculture Organization of the +//=== Copyright (C) 2001-2007 Food and Agriculture Organization of the //=== United Nations (FAO-UN), United Nations World Food Programme (WFP) //=== and United Nations Environment Programme (UNEP) //=== @@ -15,10 +15,10 @@ //=== //=== You should have received a copy of the GNU General Public License //=== along with this program; if not, write to the Free Software -//=== Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +//=== Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA //=== //=== Contact: Jeroen Ticheler - FAO - Viale delle Terme di Caracalla 2, -//=== Rome - Italy. email: Geo...@fa... +//=== Rome - Italy. email: geo...@os... //============================================================================== package org.fao.gast.gui.panels.migration.oldinst; Modified: trunk/src/org/fao/gast/gui/panels/migration/oldinst/Worker.java =================================================================== --- trunk/src/org/fao/gast/gui/panels/migration/oldinst/Worker.java 2007-03-09 21:01:52 UTC (rev 233) +++ trunk/src/org/fao/gast/gui/panels/migration/oldinst/Worker.java 2007-03-10 23:01:22 UTC (rev 234) @@ -1,5 +1,5 @@ //============================================================================== -//=== Copyright (C) 2001-2005 Food and Agriculture Organization of the +//=== Copyright (C) 2001-2007 Food and Agriculture Organization of the //=== United Nations (FAO-UN), United Nations World Food Programme (WFP) //=== and United Nations Environment Programme (UNEP) //=== @@ -15,10 +15,10 @@ //=== //=== You should have received a copy of the GNU General Public License //=== along with this program; if not, write to the Free Software -//=== Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +//=== Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA //=== //=== Contact: Jeroen Ticheler - FAO - Viale delle Terme di Caracalla 2, -//=== Rome - Italy. email: Geo...@fa... +//=== Rome - Italy. email: geo...@os... //==================================================... [truncated message content] |
From: <aca...@us...> - 2007-03-14 16:41:24
|
Revision: 266 http://geonetwork.svn.sourceforge.net/geonetwork/?rev=266&view=rev Author: acarboni Date: 2007-03-14 09:41:22 -0700 (Wed, 14 Mar 2007) Log Message: ----------- Added metadata templates to setup by default Modified Paths: -------------- trunk/src/org/fao/gast/cli/setup/Setup.java trunk/src/org/fao/gast/gui/panels/database/sample/MainPanel.java trunk/src/org/fao/gast/gui/panels/database/sample/Worker.java trunk/src/org/fao/gast/lib/ConfigLib.java trunk/src/org/fao/gast/lib/DatabaseLib.java trunk/src/org/fao/gast/lib/IOLib.java trunk/src/org/fao/gast/lib/MetadataLib.java trunk/src/org/fao/gast/lib/Resource.java trunk/src/org/fao/gast/lib/XMLLib.java trunk/src/org/fao/geonet/kernel/XmlSerializer.java Modified: trunk/src/org/fao/gast/cli/setup/Setup.java =================================================================== --- trunk/src/org/fao/gast/cli/setup/Setup.java 2007-03-14 16:35:58 UTC (rev 265) +++ trunk/src/org/fao/gast/cli/setup/Setup.java 2007-03-14 16:41:22 UTC (rev 266) @@ -51,18 +51,8 @@ //--- proper setup: open a database connection and setup data - Resource resource = null; - - try - { - resource = Lib.config.createResource(); - Lib.database.setup(resource, null); - } - finally - { - if (resource != null) - resource.close(); - } + Resource resource = Lib.config.createResource(); + Lib.database.setup(resource, null); } } Modified: trunk/src/org/fao/gast/gui/panels/database/sample/MainPanel.java =================================================================== --- trunk/src/org/fao/gast/gui/panels/database/sample/MainPanel.java 2007-03-14 16:35:58 UTC (rev 265) +++ trunk/src/org/fao/gast/gui/panels/database/sample/MainPanel.java 2007-03-14 16:41:22 UTC (rev 266) @@ -25,7 +25,6 @@ import java.awt.Frame; import java.awt.event.ActionEvent; -import javax.swing.JCheckBox; import javax.swing.JComboBox; import javax.swing.JComponent; import javax.swing.JLabel; @@ -73,9 +72,7 @@ String runs = cmbRuns.getSelectedItem().toString(); runs = Util.replaceString(runs, ".", ""); - worker.setImportMetadata (chbMetadata .isSelected()); - worker.setImportTemplates(chbTemplates.isSelected()); - worker.setImportRuns(Integer.parseInt(runs)); + worker.setRuns(Integer.parseInt(runs)); dialog.run(worker); } @@ -90,20 +87,13 @@ { JPanel p = new JPanel(); - FlexLayout fl = new FlexLayout(2,3); + FlexLayout fl = new FlexLayout(2,1); fl.setColProp(1, FlexLayout.EXPAND); p.setLayout(fl); - p.add("0,0", new JLabel("Metadata")); - p.add("1,0", chbMetadata); + p.add("0,0", new JLabel("Runs")); + p.add("1,0", cmbRuns); - p.add("0,1", new JLabel("Templates")); - p.add("1,1", chbTemplates); - - p.add("0,2", new JLabel("Runs")); - p.add("1,2", cmbRuns); - - cmbRuns.addItem("1"); cmbRuns.addItem("10"); cmbRuns.addItem("100"); @@ -121,9 +111,7 @@ //--- //--------------------------------------------------------------------------- - private JCheckBox chbMetadata = new JCheckBox(); - private JCheckBox chbTemplates= new JCheckBox(); - private JComboBox cmbRuns = new JComboBox(); + private JComboBox cmbRuns = new JComboBox(); } //============================================================================== Modified: trunk/src/org/fao/gast/gui/panels/database/sample/Worker.java =================================================================== --- trunk/src/org/fao/gast/gui/panels/database/sample/Worker.java 2007-03-14 16:35:58 UTC (rev 265) +++ trunk/src/org/fao/gast/gui/panels/database/sample/Worker.java 2007-03-14 16:41:22 UTC (rev 266) @@ -26,8 +26,6 @@ import java.io.File; import java.util.ArrayList; import java.util.List; -import jeeves.exceptions.UserNotFoundEx; -import jeeves.utils.Xml; import jeeves.utils.XmlRequest; import org.dlib.gui.ProgressDialog; import org.fao.gast.app.App; @@ -57,12 +55,7 @@ //--- //--------------------------------------------------------------------------- - public void setImportMetadata (boolean yesno) { impMetadata = yesno; } - public void setImportTemplates(boolean yesno) { impTemplates = yesno; } - - //--------------------------------------------------------------------------- - - public void setImportRuns(int runs) + public void setRuns(int runs) { this.runs =runs; } @@ -104,11 +97,13 @@ //--- scan for mef files - List<File> files = getFileList(); + File mapsDir = new File(App.path +"/gast/setup/sample-data"); + List<File> files = Lib.io.scanDir(mapsDir, "mef"); + //--- export - dlg.reset((files.size() + runs)); + dlg.reset((files.size() * runs)); for (int i=0; i<runs; i++) for (File file : files) @@ -142,23 +137,6 @@ //--------------------------------------------------------------------------- - private List<File> getFileList() - { - ArrayList<File> files = new ArrayList<File>(); - - File sampleDir = new File(App.path +"/gast/setup/sample-data"); - - if (impMetadata) - files.addAll(Lib.io.scanDir(new File(sampleDir, "maps"), "mef")); - - if (impTemplates) - files.addAll(Lib.io.scanDir(new File(sampleDir, "templates"), "mef")); - - return files; - } - - //--------------------------------------------------------------------------- - private void send(XmlRequest req, File mefFile) throws Exception { dlg.advance("Importing file : "+ mefFile.getName()); @@ -175,9 +153,6 @@ //--- //--------------------------------------------------------------------------- - private boolean impMetadata; - private boolean impTemplates; - private int runs; private ProgressDialog dlg; Modified: trunk/src/org/fao/gast/lib/ConfigLib.java =================================================================== --- trunk/src/org/fao/gast/lib/ConfigLib.java 2007-03-14 16:35:58 UTC (rev 265) +++ trunk/src/org/fao/gast/lib/ConfigLib.java 2007-03-14 16:41:22 UTC (rev 266) @@ -85,7 +85,7 @@ public String getLuceneDir() { - return appHandElem.getChildText(Geonet.Config.LUCENE_DIR); + return findInHandler(Geonet.Config.LUCENE_DIR); } //--------------------------------------------------------------------------- @@ -184,6 +184,24 @@ } //--------------------------------------------------------------------------- + + private String findInHandler(String paramName) + { + for (Object o : appHandElem.getChildren("param")) + { + Element param = (Element) o; + + String name = param.getAttributeValue("name"); + String value= param.getAttributeValue("value"); + + if (paramName.equals(name)) + return value; + } + + return null; + } + + //--------------------------------------------------------------------------- //--- //--- Variables //--- Modified: trunk/src/org/fao/gast/lib/DatabaseLib.java =================================================================== --- trunk/src/org/fao/gast/lib/DatabaseLib.java 2007-03-14 16:35:58 UTC (rev 265) +++ trunk/src/org/fao/gast/lib/DatabaseLib.java 2007-03-14 16:41:22 UTC (rev 266) @@ -37,6 +37,10 @@ import jeeves.resources.dbms.Dbms; import jeeves.utils.BinaryFile; import org.fao.gast.lib.druid.Import; +import org.fao.geonet.kernel.AccessManager; +import org.fao.geonet.kernel.XmlSerializer; +import org.fao.geonet.util.ISODate; +import org.jdom.Document; import org.jdom.Element; //============================================================================= @@ -51,6 +55,7 @@ public static interface CallBack { + public void schemaObjects(int count); public void removed(String object, String type); public void cyclicRefs(List<String> objects); public void creating(String object, String type); @@ -75,20 +80,40 @@ //--- //--------------------------------------------------------------------------- + /** Transactional */ + public void setup(Resource resource, CallBack cb) throws Exception { Dbms dbms = (Dbms) resource.open(); - removeObjects(dbms, cb); - createSchema (dbms, cb); - fillTables (dbms, cb); - setupSite(dbms); + try + { + removeObjects(dbms, cb); + createSchema (dbms, cb); + fillTables (dbms, cb); + setupSiteId (dbms); + setupVersion (dbms); + + //--- the commit is needed by subsequent addTemplates method + dbms.commit(); + + addTemplates(dbms); + Lib.metadata.clearIndexes(); + + resource.close(); + } + catch(Exception e) + { + resource.abort(); + throw e; + } } //--------------------------------------------------------------------------- + /** Transactional */ public void removeObjects(Dbms dbms, CallBack cb) - throws FileNotFoundException, IOException, SQLException + throws FileNotFoundException, IOException { List<String> schema = loadSchemaFile(dbms.getURL()); @@ -103,11 +128,15 @@ oi.name = getObjectName(row); oi.type = getObjectType(row); - objects.add(oi); + if (!oi.type.toLowerCase().equals("index")) + objects.add(oi); } //--- step 2 : remove objects + if (cb != null) + cb.schemaObjects(objects.size()); + while(true) { boolean removed = false; @@ -150,63 +179,84 @@ } //--------------------------------------------------------------------------- + /** Transactional */ - public void createSchema(Dbms dbms, CallBack cb) - throws FileNotFoundException, IOException, SQLException + public void createSchema(Dbms dbms, CallBack cb) throws FileNotFoundException, + IOException, SQLException { List<String> schema = loadSchemaFile(dbms.getURL()); StringBuffer sb = new StringBuffer(); - for (String row : schema) - if (!row.toUpperCase().startsWith("REM") && !row.startsWith("--") && !row.trim().equals("")) - { - sb.append(" "); - sb.append(row); - - if (row.endsWith(";")) + try + { + for (String row : schema) + if (!row.toUpperCase().startsWith("REM") && !row.startsWith("--") && !row.trim().equals("")) { - String sql = sb.toString(); + sb.append(" "); + sb.append(row); - sql = sql.substring(0, sql.length() -1); + if (row.endsWith(";")) + { + String sql = sb.toString(); - if (cb != null) - cb.creating(getObjectName(sql), getObjectType(sql)); + sql = sql.substring(0, sql.length() -1); - dbms.execute(sql); - sb = new StringBuffer(); + if (cb != null) + cb.creating(getObjectName(sql), getObjectType(sql)); + + dbms.execute(sql); + dbms.commit(); + sb = new StringBuffer(); + } } - } + } + catch(SQLException e) + { + dbms.abort(); + throw e; + } } //--------------------------------------------------------------------------- + /** Transactional */ - public void fillTables(Dbms dbms, CallBack cb) throws FileNotFoundException, IOException, SQLException + public void fillTables(Dbms dbms, CallBack cb) throws Exception { List<String> schema = loadSchemaFile(dbms.getURL()); - for(String row : schema) - if (row.toUpperCase().startsWith("CREATE TABLE ")) - { - String table = getObjectName(row); - String file = appPath +SETUP_DIR+ "/db/"+ table +".ddf"; - - if (!new File(file).exists()) + try + { + for(String row : schema) + if (row.toUpperCase().startsWith("CREATE TABLE ")) { - if (cb != null) - cb.skipping(table); - } - else - { - if (cb != null) - cb.filling(table, file); + String table = getObjectName(row); + String file = appPath +SETUP_DIR+ "/db/"+ table +".ddf"; - Import.load(dbms.getConnection(), table, file); + if (!new File(file).exists()) + { + if (cb != null) + cb.skipping(table); + } + else + { + if (cb != null) + cb.filling(table, file); + + Import.load(dbms.getConnection(), table, file); + dbms.commit(); + } } - } + } + catch(Exception e) + { + dbms.abort(); + throw e; + } } //--------------------------------------------------------------------------- + /** NOT Transactional */ public String getSetting(Dbms dbms, String path) throws SQLException { @@ -235,6 +285,17 @@ } //--------------------------------------------------------------------------- + + public String getSiteId(Dbms dbms) throws SQLException + { + String query = "SELECT value FROM Settings WHERE name='siteId'"; + List list = dbms.select(query).getChildren(); + Element rec = (Element) list.get(0); + + return rec.getChildText("value"); + } + + //--------------------------------------------------------------------------- //--- //--- Private methods //--- @@ -288,18 +349,63 @@ try { dbms.execute(query); + dbms.commit(); + return true; } catch (SQLException e) { + dbms.abort(); + return false; } } //--------------------------------------------------------------------------- - private void setupSite(Dbms dbms) throws SQLException, IOException + private void addTemplates(Dbms dbms) throws Exception { + String siteId = getSiteId(dbms); + String siteURL= Lib.metadata.getSiteURL(dbms); + String date = new ISODate().toString(); + + int serial = 1; + + File schemaDir = new File(appPath, "gast/setup/templates"); + + for (File schema : Lib.io.scanDir(schemaDir)) + //--- skip '.svn' folders and other hidden files + if (!schema.getName().startsWith(".")) + for (File temp : Lib.io.scanDir(schema, "xml")) + { + Document doc = Lib.xml.load(temp); + String uuid = UUID.randomUUID().toString(); + Element xml = Lib.metadata.updateFixedInfo(serial+"", doc.getRootElement(), + uuid, date, schema.getName(), siteURL); + + XmlSerializer.insert(dbms, schema.getName(), xml, serial, + siteId, uuid, date, date, null, "y", null); + + setupTemplatePriv(dbms, serial); + dbms.commit(); + serial++; + } + } + + //--------------------------------------------------------------------------- + + private void setupTemplatePriv(Dbms dbms, int id) throws SQLException + { + String query = "INSERT INTO OperationAllowed(groupId, metadataId, operationId) "+ + "VALUES(?, ?, ?)"; + + dbms.execute(query, 1, id, AccessManager.OPER_VIEW); + } + + //--------------------------------------------------------------------------- + + private void setupSiteId(Dbms dbms) throws SQLException, IOException + { String uuid = UUID.randomUUID().toString(); //--- duplicate dummy logo to reflect the uuid @@ -308,13 +414,18 @@ FileOutputStream os = new FileOutputStream(appPath +"/web/images/logos/"+ uuid +".png"); BinaryFile.copy(is, os, true, true); + dbms.execute("UPDATE Settings SET value=? WHERE name='siteId'", uuid); + } + + //--------------------------------------------------------------------------- + + private void setupVersion(Dbms dbms) throws SQLException + { String version = Lib.server.getVersion(); String subVersion = Lib.server.getSubVersion(); - dbms.execute("UPDATE Settings SET value=? WHERE name='siteId'", uuid); dbms.execute("UPDATE Settings SET value=? WHERE name='version'", version); dbms.execute("UPDATE Settings SET value=? WHERE name='subVersion'", subVersion); - dbms.commit(); } //--------------------------------------------------------------------------- Modified: trunk/src/org/fao/gast/lib/IOLib.java =================================================================== --- trunk/src/org/fao/gast/lib/IOLib.java 2007-03-14 16:35:58 UTC (rev 265) +++ trunk/src/org/fao/gast/lib/IOLib.java 2007-03-14 16:41:22 UTC (rev 266) @@ -41,18 +41,28 @@ { File files[] = dir.listFiles(); - for(int i=0; i<files.length; i++) - if (files[i].isDirectory()) + if (files == null) + return; + + for(File file : files) + if (file.isDirectory()) { - if (!files[i].getName().equals(".svn")) - cleanDir(files[i]); + if (!file.getName().equals(".svn")) + cleanDir(file); } - else if (!files[i].delete()) - throw new Exception("Cannot delete file : "+files[i]); + else if (!file.delete()) + throw new Exception("Cannot delete file : "+ file); } //--------------------------------------------------------------------------- + public List<File> scanDir(File folder) + { + return scanDir(folder, null); + } + + //--------------------------------------------------------------------------- + public List<File> scanDir(File folder, String extension) { List<File> alFiles = new ArrayList<File>(); @@ -61,7 +71,7 @@ if (files != null) for (File file : files) - if (file.getName().endsWith("."+extension)) + if (extension == null || file.getName().endsWith("."+extension)) alFiles.add(file); return alFiles; Modified: trunk/src/org/fao/gast/lib/MetadataLib.java =================================================================== --- trunk/src/org/fao/gast/lib/MetadataLib.java 2007-03-14 16:35:58 UTC (rev 265) +++ trunk/src/org/fao/gast/lib/MetadataLib.java 2007-03-14 16:41:22 UTC (rev 266) @@ -23,6 +23,7 @@ package org.fao.gast.lib; +import java.io.File; import java.sql.SQLException; import java.util.List; import jeeves.constants.Jeeves; @@ -84,9 +85,11 @@ //-------------------------------------------------------------------------- - private Element updateFixedInfo(String id, Element md, String uuid, String date, + public Element updateFixedInfo(String id, Element md, String uuid, String date, String schema, String siteURL) throws Exception { + md.detach(); + //--- setup environment Element env = new Element("env"); @@ -112,7 +115,7 @@ //-------------------------------------------------------------------------- - private String getSiteURL(Dbms dbms) throws SQLException + public String getSiteURL(Dbms dbms) throws SQLException { String host = Lib.database.getSetting(dbms, "system/server/host"); String port = Lib.database.getSetting(dbms, "system/server/port"); @@ -125,9 +128,18 @@ //--------------------------------------------------------------------------- - public void index(Dbms dbms, String id) throws Exception +// public void index(Dbms dbms, String id) throws Exception +// { +// DataManager.indexMetadata(dbms, id, searchMan); +// } + + //--------------------------------------------------------------------------- + + public void clearIndexes() throws Exception { - DataManager.indexMetadata(dbms, id, searchMan); + File dir = new File(appPath +"/web/"+ Lib.config.getLuceneDir()); + System.out.println("dir:"+dir.getAbsolutePath()); + Lib.io.cleanDir(dir); } //--------------------------------------------------------------------------- Modified: trunk/src/org/fao/gast/lib/Resource.java =================================================================== --- trunk/src/org/fao/gast/lib/Resource.java 2007-03-14 16:35:58 UTC (rev 265) +++ trunk/src/org/fao/gast/lib/Resource.java 2007-03-14 16:41:22 UTC (rev 266) @@ -95,15 +95,7 @@ catch (Exception e) { e.printStackTrace(); - - try - { - resMan.abort(); - } - catch (Exception ex) - { - e.printStackTrace(); - } + abort(); } provMan.end(); @@ -113,6 +105,20 @@ } //-------------------------------------------------------------------------- + + public void abort() + { + try + { + resMan.abort(); + } + catch (Exception e) + { + e.printStackTrace(); + } + } + + //-------------------------------------------------------------------------- //--- //--- Variables //--- Modified: trunk/src/org/fao/gast/lib/XMLLib.java =================================================================== --- trunk/src/org/fao/gast/lib/XMLLib.java 2007-03-14 16:35:58 UTC (rev 265) +++ trunk/src/org/fao/gast/lib/XMLLib.java 2007-03-14 16:41:22 UTC (rev 266) @@ -23,13 +23,13 @@ package org.fao.gast.lib; +import java.io.File; import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.IOException; import org.jdom.Document; import org.jdom.JDOMException; import org.jdom.input.SAXBuilder; -import org.jdom.output.Format; import org.jdom.output.XMLOutputter; //============================================================================= @@ -44,6 +44,13 @@ public Document load(String file) throws JDOMException, IOException { + return load(new File(file)); + } + + //--------------------------------------------------------------------------- + + public Document load(File file) throws JDOMException, IOException + { SAXBuilder builder = new SAXBuilder(); Document jdoc = builder.build(file); Modified: trunk/src/org/fao/geonet/kernel/XmlSerializer.java =================================================================== --- trunk/src/org/fao/geonet/kernel/XmlSerializer.java 2007-03-14 16:35:58 UTC (rev 265) +++ trunk/src/org/fao/geonet/kernel/XmlSerializer.java 2007-03-14 16:41:22 UTC (rev 266) @@ -70,9 +70,9 @@ //-------------------------------------------------------------------------- public static String insert(Dbms dbms, String schema, Element xml, int serial, - String source, String uuid) throws SQLException + String siteId, String uuid) throws SQLException { - return insert(dbms, schema, xml, serial, source, uuid, null, null, null); + return insert(dbms, schema, xml, serial, siteId, uuid, null, null, null); } //-------------------------------------------------------------------------- @@ -88,9 +88,9 @@ public static String insert(Dbms dbms, String schema, Element xml, int serial, String siteId, String uuid, - String template, String title) throws SQLException + String isTemplate, String title) throws SQLException { - return insert(dbms, schema, xml, serial, siteId, uuid, null, null, null, template, title); + return insert(dbms, schema, xml, serial, siteId, uuid, null, null, null, isTemplate, title); } //-------------------------------------------------------------------------- @@ -108,8 +108,9 @@ if (changeDate == null) changeDate = date; - StringBuffer fields = new StringBuffer("id, schemaId, data, createDate, changeDate, source, uuid, isTemplate, root"); - StringBuffer values = new StringBuffer("?, ?, ?, ?, ?, ?, ?, ?, ?"); + StringBuffer fields = new StringBuffer("id, schemaId, data, createDate, changeDate, "+ + "source, uuid, isTemplate, isHarvested, root"); + StringBuffer values = new StringBuffer("?, ?, ?, ?, ?, ?, ?, ?, ?, ?"); Vector args = new Vector(); args.add(new Integer(serial)); args.add(schema); @@ -119,6 +120,7 @@ args.add(siteId); args.add(uuid); args.add(isTemplate); + args.add("n"); args.add(xml.getQualifiedName()); if (sourceUri != null) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <aca...@us...> - 2007-03-16 18:33:51
|
Revision: 290 http://geonetwork.svn.sourceforge.net/geonetwork/?rev=290&view=rev Author: acarboni Date: 2007-03-16 10:34:02 -0700 (Fri, 16 Mar 2007) Log Message: ----------- File removed Removed Paths: ------------- trunk/src/org/fao/gast/gui/panels/migration/oldinst/MainFrame.java trunk/src/org/fao/gast/gui/panels/migration/oldinst/Util.java trunk/src/org/fao/geonet/apps/common/SimpleLogger.java Deleted: trunk/src/org/fao/gast/gui/panels/migration/oldinst/MainFrame.java =================================================================== --- trunk/src/org/fao/gast/gui/panels/migration/oldinst/MainFrame.java 2007-03-16 17:32:49 UTC (rev 289) +++ trunk/src/org/fao/gast/gui/panels/migration/oldinst/MainFrame.java 2007-03-16 17:34:02 UTC (rev 290) @@ -1,132 +0,0 @@ -//============================================================================== -//=== Copyright (C) 2001-2007 Food and Agriculture Organization of the -//=== United Nations (FAO-UN), United Nations World Food Programme (WFP) -//=== and United Nations Environment Programme (UNEP) -//=== -//=== This program is free software; you can redistribute it and/or modify -//=== it under the terms of the GNU General Public License as published by -//=== the Free Software Foundation; either version 2 of the License, or (at -//=== your option) any later version. -//=== -//=== This program is distributed in the hope that it will be useful, but -//=== WITHOUT ANY WARRANTY; without even the implied warranty of -//=== MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -//=== General Public License for more details. -//=== -//=== You should have received a copy of the GNU General Public License -//=== along with this program; if not, write to the Free Software -//=== Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA -//=== -//=== Contact: Jeroen Ticheler - FAO - Viale delle Terme di Caracalla 2, -//=== Rome - Italy. email: geo...@os... -//============================================================================== - -package org.fao.gast.gui.panels.migration.oldinst; - -import java.awt.Font; -import javax.swing.JFrame; -import javax.swing.JPanel; -import javax.swing.JScrollPane; -import javax.swing.JTextArea; -import javax.swing.SwingUtilities; -import org.dlib.gui.FlexLayout; -import org.dlib.gui.TPanel; -import org.fao.geonet.apps.common.SimpleLogger; - -//============================================================================== - -public class MainFrame extends JFrame implements SimpleLogger -{ - private JTextArea txaLog = new JTextArea(30,40); - - //--------------------------------------------------------------------------- - //--- - //--- Constructor - //--- - //--------------------------------------------------------------------------- - - public MainFrame() - { - txaLog.setFont(new Font("Monospaced", Font.PLAIN, 12)); - txaLog.setEditable(false); - } - - //--------------------------------------------------------------------------- - //--- - //--- Private methods - //--- - //--------------------------------------------------------------------------- - - private JPanel buildLogPanel() - { - JPanel p = new TPanel("Migration log"); - - FlexLayout flexL = new FlexLayout(1,2); - flexL.setColProp(0, FlexLayout.EXPAND); - flexL.setRowProp(0, FlexLayout.EXPAND); - p.setLayout(flexL); - - p.add("0,0,x,x", new JScrollPane(txaLog)); - - return p; - } - - //--------------------------------------------------------------------------- - //--- - //--- SimpleLogger interface - //--- - //--------------------------------------------------------------------------- - - public void clear() - { - SwingUtilities.invokeLater(new Runnable() - { - public void run() - { - txaLog.setText(""); - } - }); - } - - //--------------------------------------------------------------------------- - - public void logInfo(final String message) - { - SwingUtilities.invokeLater(new Runnable() - { - public void run() - { - txaLog.append("| I | "+ message +"\n"); - } - }); - } - - //--------------------------------------------------------------------------- - - public void logError(final String message) - { - SwingUtilities.invokeLater(new Runnable() - { - public void run() - { - txaLog.append("|EEE| "+ message +"\n"); - } - }); - } - - //--------------------------------------------------------------------------- - - public void finish() - { - SwingUtilities.invokeLater(new Runnable() - { - public void run() - { -// enableControls(true); - } - }); - } -} - -//============================================================================== - Deleted: trunk/src/org/fao/gast/gui/panels/migration/oldinst/Util.java =================================================================== --- trunk/src/org/fao/gast/gui/panels/migration/oldinst/Util.java 2007-03-16 17:32:49 UTC (rev 289) +++ trunk/src/org/fao/gast/gui/panels/migration/oldinst/Util.java 2007-03-16 17:34:02 UTC (rev 290) @@ -1,101 +0,0 @@ -//============================================================================== -//=== Copyright (C) 2001-2007 Food and Agriculture Organization of the -//=== United Nations (FAO-UN), United Nations World Food Programme (WFP) -//=== and United Nations Environment Programme (UNEP) -//=== -//=== This program is free software; you can redistribute it and/or modify -//=== it under the terms of the GNU General Public License as published by -//=== the Free Software Foundation; either version 2 of the License, or (at -//=== your option) any later version. -//=== -//=== This program is distributed in the hope that it will be useful, but -//=== WITHOUT ANY WARRANTY; without even the implied warranty of -//=== MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -//=== General Public License for more details. -//=== -//=== You should have received a copy of the GNU General Public License -//=== along with this program; if not, write to the Free Software -//=== Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA -//=== -//=== Contact: Jeroen Ticheler - FAO - Viale delle Terme di Caracalla 2, -//=== Rome - Italy. email: geo...@os... -//============================================================================== - -package org.fao.gast.gui.panels.migration.oldinst; - -import java.io.File; -import java.sql.Connection; -import java.sql.SQLException; -import java.util.List; -import jeeves.constants.ConfigFile; -import jeeves.constants.Jeeves; -import jeeves.interfaces.Activator; -import jeeves.resources.dbms.Dbms; -import jeeves.utils.Xml; -import org.fao.geonet.apps.common.SimpleLogger; -import org.jdom.Element; - -//============================================================================== - -public class Util -{ - //--------------------------------------------------------------------------- - //--- - //--- API methods - //--- - //--------------------------------------------------------------------------- - - public static Element getConfigFile(SimpleLogger logger, String file) throws Exception - { - try - { - return Xml.loadFile(file); - } - catch (Exception e) - { - logger.logError("Cannot open config file"); - logger.logError("Error is : "+ e.getMessage()); - - throw new Exception("error"); - } - } - - //--------------------------------------------------------------------------- - - public static Element getUserProfiles(SimpleLogger logger, String file) throws Exception - { - try - { - return Xml.loadFile(file); - } - catch (Exception e) - { - logger.logError("Cannot open user profiles"); - logger.logError("Error is : "+ e.getMessage()); - - throw new Exception("error"); - } - } - - //--------------------------------------------------------------------------- - - public static Element getDBResource(Element config) throws Exception - { - List resources = config .getChild(ConfigFile.Child.RESOURCES) - .getChildren(ConfigFile.Resources.Child.RESOURCE); - - for(int i=0; i<resources.size(); i++) - { - Element res = (Element) resources.get(i); - - if ("true".equals(res.getAttributeValue("enabled"))) - if ("main-db".equals(res.getChildText("name"))) - return res; - } - - throw new Exception("error"); - } -} - -//============================================================================== - Deleted: trunk/src/org/fao/geonet/apps/common/SimpleLogger.java =================================================================== --- trunk/src/org/fao/geonet/apps/common/SimpleLogger.java 2007-03-16 17:32:49 UTC (rev 289) +++ trunk/src/org/fao/geonet/apps/common/SimpleLogger.java 2007-03-16 17:34:02 UTC (rev 290) @@ -1,41 +0,0 @@ -//============================================================================== -//=== -//=== SimpleLogger -//=== -//============================================================================== -//=== Copyright (C) 2001-2007 Food and Agriculture Organization of the -//=== United Nations (FAO-UN), United Nations World Food Programme (WFP) -//=== and United Nations Environment Programme (UNEP) -//=== -//=== This program is free software; you can redistribute it and/or modify -//=== it under the terms of the GNU General Public License as published by -//=== the Free Software Foundation; either version 2 of the License, or (at -//=== your option) any later version. -//=== -//=== This program is distributed in the hope that it will be useful, but -//=== WITHOUT ANY WARRANTY; without even the implied warranty of -//=== MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -//=== General Public License for more details. -//=== -//=== You should have received a copy of the GNU General Public License -//=== along with this program; if not, write to the Free Software -//=== Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA -//=== -//=== Contact: Jeroen Ticheler - FAO - Viale delle Terme di Caracalla 2, -//=== Rome - Italy. email: geo...@os... -//============================================================================== - -package org.fao.geonet.apps.common; - -//============================================================================== - -public interface SimpleLogger -{ - public void clear(); - public void logInfo(String message); - public void logError(String message); - public void finish(); -} - -//============================================================================== - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <aca...@us...> - 2007-05-30 15:49:39
|
Revision: 445 http://geonetwork.svn.sourceforge.net/geonetwork/?rev=445&view=rev Author: acarboni Date: 2007-05-30 08:49:39 -0700 (Wed, 30 May 2007) Log Message: ----------- Added password encryption Modified Paths: -------------- trunk/src/org/fao/gast/gui/panels/migration/oldinst/Worker.java trunk/src/org/fao/gast/lib/DatabaseLib.java trunk/src/org/fao/geonet/services/login/Login.java Modified: trunk/src/org/fao/gast/gui/panels/migration/oldinst/Worker.java =================================================================== --- trunk/src/org/fao/gast/gui/panels/migration/oldinst/Worker.java 2007-05-30 15:48:23 UTC (rev 444) +++ trunk/src/org/fao/gast/gui/panels/migration/oldinst/Worker.java 2007-05-30 15:49:39 UTC (rev 445) @@ -29,6 +29,7 @@ import java.util.List; import java.util.Set; import jeeves.resources.dbms.Dbms; +import jeeves.utils.Util; import jeeves.utils.Xml; import org.dlib.gui.ProgressDialog; import org.fao.gast.app.App; @@ -216,7 +217,7 @@ //--- copy users for (Object user : oldUsers) - Lib.database.insert(newDbms, "Users", (Element) user, idMapper); + Lib.database.insert(newDbms, "Users", (Element) user, userMapper); oldDbms.commit(); newDbms.commit(); @@ -570,6 +571,22 @@ return value; } }; + + //--------------------------------------------------------------------------- + + private DatabaseLib.Mapper userMapper = new DatabaseLib.Mapper() + { + public Object map(String field, Object value) + { + if (field.equals("id")) + return new Integer(value.toString()); + + if (field.equals("password")) + return Util.scramble(value.toString()); + + return value; + } + }; } //============================================================================== Modified: trunk/src/org/fao/gast/lib/DatabaseLib.java =================================================================== --- trunk/src/org/fao/gast/lib/DatabaseLib.java 2007-05-30 15:48:23 UTC (rev 444) +++ trunk/src/org/fao/gast/lib/DatabaseLib.java 2007-05-30 15:49:39 UTC (rev 445) @@ -155,18 +155,6 @@ //--------------------------------------------------------------------------- /** NOT Transactional */ - public String getSiteId(Dbms dbms) throws SQLException - { - String query = "SELECT value FROM Settings WHERE name='siteId'"; - List list = dbms.select(query).getChildren(); - Element rec = (Element) list.get(0); - - return rec.getChildText("value"); - } - - //--------------------------------------------------------------------------- - /** NOT Transactional */ - public void insert(Dbms dbms, String table, List records, String fields[], Mapper mapper) throws SQLException { @@ -494,7 +482,21 @@ } //--------------------------------------------------------------------------- + /** NOT Transactional */ + /** This method should be called only during setup, when the database is empty + * and there is only 1 siteId string into settings */ + private String getSiteId(Dbms dbms) throws SQLException + { + String query = "SELECT value FROM Settings WHERE name='siteId'"; + List list = dbms.select(query).getChildren(); + Element rec = (Element) list.get(0); + + return rec.getChildText("value"); + } + + //--------------------------------------------------------------------------- + private void setupTemplatePriv(Dbms dbms, int id) throws SQLException { String query = "INSERT INTO OperationAllowed(groupId, metadataId, operationId) "+ Modified: trunk/src/org/fao/geonet/services/login/Login.java =================================================================== --- trunk/src/org/fao/geonet/services/login/Login.java 2007-05-30 15:48:23 UTC (rev 444) +++ trunk/src/org/fao/geonet/services/login/Login.java 2007-05-30 15:49:39 UTC (rev 445) @@ -63,9 +63,10 @@ //--- attempt to load user from db - Dbms dbms = (Dbms) context.getResourceManager().open(Geonet.Res.MAIN_DB); + Dbms dbms = (Dbms) context.getResourceManager().open(Geonet.Res.MAIN_DB); + String query = "SELECT * FROM Users WHERE username = ? AND password = ?"; - Element elUser = dbms.select("SELECT * FROM Users WHERE username = ? AND password = ?", user, pass); + Element elUser = dbms.select(query, user,Util.scramble(pass)); List list = elUser.getChildren(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <aca...@us...> - 2007-07-04 22:21:45
|
Revision: 545 http://geonetwork.svn.sourceforge.net/geonetwork/?rev=545&view=rev Author: acarboni Date: 2007-07-04 15:21:47 -0700 (Wed, 04 Jul 2007) Log Message: ----------- Forced namespace prefix Modified Paths: -------------- trunk/src/org/fao/gast/lib/DatabaseLib.java trunk/src/org/fao/geonet/kernel/DataManager.java trunk/src/org/fao/geonet/services/metadata/ImportFromDir.java trunk/src/org/fao/geonet/services/metadata/Insert.java Modified: trunk/src/org/fao/gast/lib/DatabaseLib.java =================================================================== --- trunk/src/org/fao/gast/lib/DatabaseLib.java 2007-07-04 22:19:55 UTC (rev 544) +++ trunk/src/org/fao/gast/lib/DatabaseLib.java 2007-07-04 22:21:47 UTC (rev 545) @@ -41,6 +41,7 @@ import jeeves.utils.BinaryFile; import org.fao.gast.lib.druid.Import; import org.fao.geonet.kernel.AccessManager; +import org.fao.geonet.kernel.DataManager; import org.fao.geonet.kernel.XmlSerializer; import org.fao.geonet.util.ISODate; import org.jdom.Document; @@ -472,6 +473,7 @@ Element xml = Lib.metadata.updateFixedInfo(serial+"", doc.getRootElement(), uuid, date, schema.getName(), siteURL); + DataManager.setNamespacePrefix(xml); XmlSerializer.insert(dbms, schema.getName(), xml, serial, siteId, uuid, date, date, "y", null); Modified: trunk/src/org/fao/geonet/kernel/DataManager.java =================================================================== --- trunk/src/org/fao/geonet/kernel/DataManager.java 2007-07-04 22:19:55 UTC (rev 544) +++ trunk/src/org/fao/geonet/kernel/DataManager.java 2007-07-04 22:21:47 UTC (rev 545) @@ -549,6 +549,9 @@ if (source == null) source = getSiteID(); + //--- force namespace prefix for iso19139 metadata + setNamespacePrefix(md); + //--- Note: we cannot index metadata here. Indexing is done in the harvesting part return XmlSerializer.insert(dbms, schema, md, id, source, uuid, createDate, @@ -578,6 +581,9 @@ if (isTemplate.equals("n")) xml = updateFixedInfo(schema, Integer.toString(serial), xml, uuid); + //--- force namespace prefix for iso19139 metadata + setNamespacePrefix(xml); + //--- store metadata String id = XmlSerializer.insert(dbms, schema, xml, serial, source, uuid, isTemplate, title); @@ -1415,22 +1421,6 @@ setOperation(dbms, id, groupId, AccessManager.OPER_NOTIFY); setOperation(dbms, id, groupId, AccessManager.OPER_ADMIN); setOperation(dbms, id, groupId, AccessManager.OPER_DYNAMIC); -// setOperation(dbms, id, groupId, AccessManager.OPER_FEATURED); - - //--- store default operations - -// List listDef = dbms.select("SELECT groupId, operationId FROM DefaultOper "+ -// "WHERE groupId > 1 AND groupId <> "+groupId).getChildren(); -// -// for(int i=0; i<listDef.size(); i++) -// { -// Element elRec = (Element) listDef.get(i); -// -// String sGrp = elRec.getChildText("groupid"); -// String sOper = elRec.getChildText("operationid"); -// -// setOperation(dbms, id, sGrp, sOper); -// } } //-------------------------------------------------------------------------- @@ -1440,6 +1430,36 @@ return settingMan.getValue("system/site/siteId"); } + //--------------------------------------------------------------------------- + //--- + //--- Static methods + //--- + //--------------------------------------------------------------------------- + + public static void setNamespacePrefix(Element md) + { + //--- if the metadata has no namespace, we must skip this phase + + if (md.getNamespace() == Namespace.NO_NAMESPACE) + return; + + //--- set prefix for iso19139 metadata + + Namespace ns = Namespace.getNamespace("gmd", md.getNamespace().getURI()); + setNamespacePrefix(md, ns); + } + + //--------------------------------------------------------------------------- + + private static void setNamespacePrefix(Element md, Namespace ns) + { + if (md.getNamespaceURI().equals(ns.getURI())) + md.setNamespace(ns); + + for (Object o : md.getChildren()) + setNamespacePrefix((Element) o, ns); + } + //-------------------------------------------------------------------------- //--- //--- Variables Modified: trunk/src/org/fao/geonet/services/metadata/ImportFromDir.java =================================================================== --- trunk/src/org/fao/geonet/services/metadata/ImportFromDir.java 2007-07-04 22:19:55 UTC (rev 544) +++ trunk/src/org/fao/geonet/services/metadata/ImportFromDir.java 2007-07-04 22:21:47 UTC (rev 545) @@ -270,15 +270,6 @@ uuid = UUID.randomUUID().toString(); //----------------------------------------------------------------------- - //--- we have to explicitly set the prefix of iso 19139 metadata - - if (schema.equals("iso19139")) - { - Namespace ns = Namespace.getNamespace("gmd", xml.getNamespace().getURI()); - fixNamespace(xml, ns); - } - - //----------------------------------------------------------------------- //--- insert metadata into the system Dbms dbms = (Dbms) context.getResourceManager().open(Geonet.Res.MAIN_DB); @@ -289,17 +280,6 @@ if (!"_none_".equals(category)) dm.setCategory(dbms, id, category); } - - //--------------------------------------------------------------------------- - - private void fixNamespace(Element md, Namespace ns) - { - if (md.getNamespaceURI().equals(ns.getURI())) - md.setNamespace(ns); - - for (Object o : md.getChildren()) - fixNamespace((Element) o, ns); - } } //============================================================================= Modified: trunk/src/org/fao/geonet/services/metadata/Insert.java =================================================================== --- trunk/src/org/fao/geonet/services/metadata/Insert.java 2007-07-04 22:19:55 UTC (rev 544) +++ trunk/src/org/fao/geonet/services/metadata/Insert.java 2007-07-04 22:21:47 UTC (rev 545) @@ -97,15 +97,6 @@ dataMan.validate(schema, xml); //----------------------------------------------------------------------- - //--- we have to explicitly set the prefix of iso 19139 metadata - - if (schema.equals("iso19139")) - { - Namespace ns = Namespace.getNamespace("gmd", xml.getNamespace().getURI()); - fixNamespace(xml, ns); - } - - //----------------------------------------------------------------------- //--- if the uuid does not exist and is not a template we generate it String uuid; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <aca...@us...> - 2007-07-26 17:12:17
|
Revision: 665 http://geonetwork.svn.sourceforge.net/geonetwork/?rev=665&view=rev Author: acarboni Date: 2007-07-26 10:12:16 -0700 (Thu, 26 Jul 2007) Log Message: ----------- Maybe fixed GAST bug with PostgreSQL Modified Paths: -------------- trunk/src/org/fao/gast/lib/DatabaseLib.java trunk/src/org/fao/geonet/kernel/DataManager.java trunk/src/org/fao/geonet/kernel/XmlSerializer.java trunk/src/org/fao/geonet/kernel/harvest/harvester/csw/Aligner.java trunk/src/org/fao/geonet/kernel/harvest/harvester/geonet/Aligner.java trunk/src/org/fao/geonet/kernel/harvest/harvester/geonet20/Aligner.java trunk/src/org/fao/geonet/kernel/mef/Importer.java trunk/src/org/fao/geonet/services/metadata/Create.java trunk/src/org/fao/geonet/services/metadata/ImportFromDir.java trunk/src/org/fao/geonet/services/metadata/Insert.java Modified: trunk/src/org/fao/gast/lib/DatabaseLib.java =================================================================== --- trunk/src/org/fao/gast/lib/DatabaseLib.java 2007-07-26 16:38:51 UTC (rev 664) +++ trunk/src/org/fao/gast/lib/DatabaseLib.java 2007-07-26 17:12:16 UTC (rev 665) @@ -477,7 +477,7 @@ //--- templates are by default assigned to administrator/intranet group XmlSerializer.insert(dbms, schema.getName(), xml, serial, - siteId, uuid, date, date, "y", null, "1", null); + siteId, uuid, date, date, "y", null, 1, null); setupTemplatePriv(dbms, serial); dbms.commit(); @@ -506,7 +506,7 @@ String query = "INSERT INTO OperationAllowed(groupId, metadataId, operationId) "+ "VALUES(?, ?, ?)"; - dbms.execute(query, 1, id, AccessManager.OPER_VIEW); + dbms.execute(query, 1, id, new Integer(AccessManager.OPER_VIEW)); } //--------------------------------------------------------------------------- Modified: trunk/src/org/fao/geonet/kernel/DataManager.java =================================================================== --- trunk/src/org/fao/geonet/kernel/DataManager.java 2007-07-26 16:38:51 UTC (rev 664) +++ trunk/src/org/fao/geonet/kernel/DataManager.java 2007-07-26 17:12:16 UTC (rev 665) @@ -486,7 +486,7 @@ */ public String createMetadata(Dbms dbms, String templateId, String groupOwner, - SerialFactory sf, String source, String owner) throws Exception + SerialFactory sf, String source, int owner) throws Exception { String query = "SELECT schemaId, data FROM Metadata WHERE id="+ templateId; @@ -540,7 +540,7 @@ public String insertMetadataExt(Dbms dbms, String schema, Element md, SerialFactory sf, String source, String createDate, String changeDate, - String uuid, String owner, String groupOwner) throws Exception + String uuid, int owner, String groupOwner) throws Exception { //--- generate a new metadata id int id = sf.getSerial(dbms, "Metadata"); @@ -555,7 +555,7 @@ public String insertMetadataExt(Dbms dbms, String schema, Element md, int id, String source, String createDate, String changeDate, - String uuid, String owner, String groupOwner) throws Exception + String uuid, int owner, String groupOwner) throws Exception { if (source == null) source = getSiteID(); @@ -576,7 +576,7 @@ */ public String insertMetadata(Dbms dbms, String schema, String groupId, Element xml, - SerialFactory sf, String source, String uuid, String owner) throws Exception + SerialFactory sf, String source, String uuid, int owner) throws Exception { return insertMetadata(dbms, schema, groupId, xml, sf, source, uuid, "n", null, owner); } @@ -585,7 +585,7 @@ public String insertMetadata(Dbms dbms, String schema, String groupOwner, Element xml, SerialFactory sf, String source, String uuid, String isTemplate, - String title, String owner) throws Exception + String title, int owner) throws Exception { //--- generate a new metadata id int serial = sf.getSerial(dbms, "Metadata"); Modified: trunk/src/org/fao/geonet/kernel/XmlSerializer.java =================================================================== --- trunk/src/org/fao/geonet/kernel/XmlSerializer.java 2007-07-26 16:38:51 UTC (rev 664) +++ trunk/src/org/fao/geonet/kernel/XmlSerializer.java 2007-07-26 17:12:16 UTC (rev 665) @@ -74,7 +74,7 @@ //-------------------------------------------------------------------------- public static String insert(Dbms dbms, String schema, Element xml, int serial, - String source, String uuid, String owner, String groupOwner) throws SQLException + String source, String uuid, int owner, String groupOwner) throws SQLException { return insert(dbms, schema, xml, serial, source, uuid, null, null, "n", null, owner, groupOwner); } @@ -83,7 +83,7 @@ public static String insert(Dbms dbms, String schema, Element xml, int serial, String source, String uuid, String isTemplate, - String title, String owner, String groupOwner) throws SQLException + String title, int owner, String groupOwner) throws SQLException { return insert(dbms, schema, xml, serial, source, uuid, null, null, isTemplate, title, owner, groupOwner); } @@ -93,7 +93,7 @@ public static String insert(Dbms dbms, String schema, Element xml, int serial, String source, String uuid, String createDate, String changeDate, String isTemplate, String title, - String owner, String groupOwner) throws SQLException + int owner, String groupOwner) throws SQLException { String date = new ISODate().toString(); @@ -120,7 +120,7 @@ args.add(isTemplate); args.add("n"); args.add(xml.getQualifiedName()); - args.add(new Integer(owner)); + args.add(owner); if (groupOwner != null) args.add(new Integer(groupOwner)); else args.add(null); Modified: trunk/src/org/fao/geonet/kernel/harvest/harvester/csw/Aligner.java =================================================================== --- trunk/src/org/fao/geonet/kernel/harvest/harvester/csw/Aligner.java 2007-07-26 16:38:51 UTC (rev 664) +++ trunk/src/org/fao/geonet/kernel/harvest/harvester/csw/Aligner.java 2007-07-26 17:12:16 UTC (rev 665) @@ -164,7 +164,7 @@ log.debug(" - Adding metadata with remote uuid:"+ ri.uuid); String id = dataMan.insertMetadataExt(dbms, schema, md, context.getSerialFactory(), - params.uuid, ri.changeDate, ri.changeDate, ri.uuid, "1", null); + params.uuid, ri.changeDate, ri.changeDate, ri.uuid, 1, null); int iId = Integer.parseInt(id); Modified: trunk/src/org/fao/geonet/kernel/harvest/harvester/geonet/Aligner.java =================================================================== --- trunk/src/org/fao/geonet/kernel/harvest/harvester/geonet/Aligner.java 2007-07-26 16:38:51 UTC (rev 664) +++ trunk/src/org/fao/geonet/kernel/harvest/harvester/geonet/Aligner.java 2007-07-26 17:12:16 UTC (rev 665) @@ -241,7 +241,7 @@ log.debug(" - Adding metadata with remote uuid:"+ ri.uuid); String id = dataMan.insertMetadataExt(dbms, ri.schema, md, context.getSerialFactory(), - siteId, createDate, changeDate, ri.uuid, "1", null); + siteId, createDate, changeDate, ri.uuid, 1, null); int iId = Integer.parseInt(id); Modified: trunk/src/org/fao/geonet/kernel/harvest/harvester/geonet20/Aligner.java =================================================================== --- trunk/src/org/fao/geonet/kernel/harvest/harvester/geonet20/Aligner.java 2007-07-26 16:38:51 UTC (rev 664) +++ trunk/src/org/fao/geonet/kernel/harvest/harvester/geonet20/Aligner.java 2007-07-26 17:12:16 UTC (rev 665) @@ -153,7 +153,7 @@ Element md = getRemoteMetadata(req, remoteId); String id = dataMan.insertMetadataExt(dbms, schema, md, context.getSerialFactory(), - siteId, createDate, changeDate, remoteUuid, "1", null); + siteId, createDate, changeDate, remoteUuid, 1, null); int iId = Integer.parseInt(id); Modified: trunk/src/org/fao/geonet/kernel/mef/Importer.java =================================================================== --- trunk/src/org/fao/geonet/kernel/mef/Importer.java 2007-07-26 16:38:51 UTC (rev 664) +++ trunk/src/org/fao/geonet/kernel/mef/Importer.java 2007-07-26 17:12:16 UTC (rev 665) @@ -117,7 +117,7 @@ id[0] = dm.insertMetadataExt(dbms, schema, md[0], context.getSerialFactory(), source, createDate, changeDate, uuid, - context.getUserSession().getUserId(), null); + context.getUserSession().getUserIdAsInt(), null); int iId = Integer.parseInt(id[0]); Modified: trunk/src/org/fao/geonet/services/metadata/Create.java =================================================================== --- trunk/src/org/fao/geonet/services/metadata/Create.java 2007-07-26 16:38:51 UTC (rev 664) +++ trunk/src/org/fao/geonet/services/metadata/Create.java 2007-07-26 17:12:16 UTC (rev 665) @@ -65,7 +65,7 @@ DataManager dm = gc.getDataManager(); String id = dm.createMetadata(dbms, template, groupOwner, context.getSerialFactory(), - gc.getSiteId(), context.getUserSession().getUserId()); + gc.getSiteId(), context.getUserSession().getUserIdAsInt()); return new Element(Jeeves.Elem.RESPONSE) .addContent(new Element(Geonet.Elem.ID).setText(id)); Modified: trunk/src/org/fao/geonet/services/metadata/ImportFromDir.java =================================================================== --- trunk/src/org/fao/geonet/services/metadata/ImportFromDir.java 2007-07-26 16:38:51 UTC (rev 664) +++ trunk/src/org/fao/geonet/services/metadata/ImportFromDir.java 2007-07-26 17:12:16 UTC (rev 665) @@ -275,7 +275,7 @@ Dbms dbms = (Dbms) context.getResourceManager().open(Geonet.Res.MAIN_DB); String id = dm.insertMetadata(dbms, schema, group, xml, context.getSerialFactory(), - gc.getSiteId(), uuid, context.getUserSession().getUserId()); + gc.getSiteId(), uuid, context.getUserSession().getUserIdAsInt()); if (!"_none_".equals(category)) dm.setCategory(dbms, id, category); Modified: trunk/src/org/fao/geonet/services/metadata/Insert.java =================================================================== --- trunk/src/org/fao/geonet/services/metadata/Insert.java 2007-07-26 16:38:51 UTC (rev 664) +++ trunk/src/org/fao/geonet/services/metadata/Insert.java 2007-07-26 17:12:16 UTC (rev 665) @@ -115,7 +115,7 @@ String id = dataMan.insertMetadata(dbms, schema, group, xml, context.getSerialFactory(), gc.getSiteId(), uuid, isTemplate, title, - context.getUserSession().getUserId()); + context.getUserSession().getUserIdAsInt()); //--- Insert category if requested if (!"_none_".equals(category)) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |