[forceTen-commits] [forceten~src:1810] Fixes for broken tests due to changed data at GeoNames.
- From: fabriziogiudici@kenai.com
- To: commits@forceten.kenai.com
- Subject: [forceTen-commits] [forceten~src:1810] Fixes for broken tests due to changed data at GeoNames.
- Date: Mon, 14 Mar 2011 12:13:04 +0000
Project: forceten
Repository: src
Revision: 1810
Author: fabriziogiudici
Date: 2011-03-14 12:11:26 UTC
Link:
Log Message:
------------
Removed old examples dir.
Fixes for broken tests due to changed data at GeoNames.
Revisions:
----------
1809
1810
Modified Paths:
---------------
modules/Geo/GeoLocationElmo/src/test/java/it/tidalwave/geo/location/elmo/impl/ElmoGeoLocationIntegrationTestSupport.java
modules/Geo/GeoLocationElmo/src/test/java/it/tidalwave/geo/location/elmo/impl/ElmoGeoLocationOnlineIntegrationTest.java
modules/Geo/GeoLocationElmo/src/test/resources/Geo-all-final.rdf
modules/Geo/GeoLocationElmo/src/test/resources/Geo-fr-final.rdf
modules/Geo/GeoLocationElmo/src/test/resources/Geo-fr-pre.rdf
modules/Geo/GeoLocationElmo/src/test/resources/Geo-it-final.rdf
modules/Geo/GeoLocationElmo/src/test/resources/Geo-it-pre.rdf
modules/Geo/GeoLocationElmo/src/test/resources/Geo-itsearch-final.rdf
modules/Geo/GeoLocationElmo/src/test/resources/Geo-itsearch-pre.rdf
modules/Geo/GeoLocationElmo/src/test/resources/Geo-us-final.rdf
modules/Geo/GeoLocationElmo/src/test/resources/Geo-us-pre.rdf
Diffs:
------
diff -r a15ccf75d22b -r d4700e005435
modules/examples/example1/application/pom.xml
--- a/modules/examples/example1/application/pom.xml Mon Mar 14 01:46:23
2011 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" ;
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ;
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 ;
http://maven.apache.org/maven-v4_0_0.xsd";>
- <parent>
- <groupId>it.tidalwave.geo.examples</groupId>
- <artifactId>example1</artifactId>
- <relativePath>..</relativePath>
- <version>1.24-SNAPSHOT</version>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <artifactId>application</artifactId>
- <packaging>nbm-application</packaging>
- <version>1.24-SNAPSHOT</version>
- <name>forceTen Example1 - NetBeans Platform based application</name>
-
- <dependencies>
- <dependency>
- <groupId>org.netbeans.cluster</groupId>
- <artifactId>platform11</artifactId>
- <type>pom</type>
- <version>RELEASE68</version> <!-- FIXME put in
dependencyManagement -->
- </dependency>
- <dependency>
- <groupId>it.tidalwave.geo.examples</groupId>
- <artifactId>module1</artifactId>
- <type>nbm</type>
- </dependency>
- <dependency>
- <groupId>it.tidalwave.geo.examples</groupId>
- <artifactId>branding</artifactId>
- <type>nbm</type>
- </dependency>
-
- <dependency>
- <groupId>it.tidalwave.netbeans</groupId>
-
<artifactId>it-tidalwave-netbeans-workspacemanager-impl</artifactId>
- </dependency>
- </dependencies>
-
-</project>
-
diff -r a15ccf75d22b -r d4700e005435
modules/examples/example1/branding/pom.xml
--- a/modules/examples/example1/branding/pom.xml Mon Mar 14 01:46:23
2011 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" ;
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ;
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 ;
http://maven.apache.org/maven-v4_0_0.xsd";>
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>it.tidalwave.geo.examples</groupId>
- <artifactId>example1</artifactId>
- <version>1.24-SNAPSHOT</version>
- <relativePath>..</relativePath>
- </parent>
-
- <artifactId>branding</artifactId>
- <packaging>nbm</packaging>
- <version>1.24-SNAPSHOT</version>
- <name>forceTen Example1 - Platform application branding resources</name>
-
- <dependencies>
- <dependency>
- <groupId>org.netbeans.api</groupId>
- <artifactId>org-openide-util</artifactId>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>nbm-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>branding</id>
- <phase>process-resources</phase>
- <goals>
- <goal>branding</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
-
diff -r a15ccf75d22b -r d4700e005435
modules/examples/example1/branding/src/main/nbm-branding/core/core.jar/org/netbeans/core/startup/Bundle.properties
---
a/modules/examples/example1/branding/src/main/nbm-branding/core/core.jar/org/netbeans/core/startup/Bundle.properties
Mon Mar 14 01:46:23 2011 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-currentVersion=example1 {0}
-LBL_splash_window_title=Starting example1
-SplashProgressBarBounds=0,268,472,3
-SplashRunningTextBounds=268,253,205,12
diff -r a15ccf75d22b -r d4700e005435
modules/examples/example1/branding/src/main/nbm-branding/core/core.jar/org/netbeans/core/startup/frame.gif
Binary file
modules/examples/example1/branding/src/main/nbm-branding/core/core.jar/org/netbeans/core/startup/frame.gif
has changed
diff -r a15ccf75d22b -r d4700e005435
modules/examples/example1/branding/src/main/nbm-branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties
---
a/modules/examples/example1/branding/src/main/nbm-branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties
Mon Mar 14 01:46:23 2011 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-CTL_MainWindow_Title=example1 {0}
-CTL_MainWindow_Title_No_Project=example1 {0}
diff -r a15ccf75d22b -r d4700e005435
modules/examples/example1/branding/src/main/nbm-branding/modules/org-netbeans-core.jar/org/netbeans/core/ui/Bundle.properties
---
a/modules/examples/example1/branding/src/main/nbm-branding/modules/org-netbeans-core.jar/org/netbeans/core/ui/Bundle.properties
Mon Mar 14 01:46:23 2011 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-LBL_ProductInformation=example1
diff -r a15ccf75d22b -r d4700e005435
modules/examples/example1/branding/src/main/nbm/manifest.mf
--- a/modules/examples/example1/branding/src/main/nbm/manifest.mf Mon
Mar 14 01:46:23 2011 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-OpenIDE-Module-Localizing-Bundle:
it/tidalwave/geo/examples/example1/Bundle.properties
-OpenIDE-Module-Layer: it/tidalwave/geo/examples/example1/layer.xml
diff -r a15ccf75d22b -r d4700e005435
modules/examples/example1/branding/src/main/nbm/module.xml
--- a/modules/examples/example1/branding/src/main/nbm/module.xml Mon
Mar 14 01:46:23 2011 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-<nbm>
- <!--moduleType>autoload</moduleType-->
- <!--codeNameBase>it.tidalwave.geo.examples.example1/1</codeNameBase-->
- <licenseName>Apache License, Version 2.0</licenseName>
- <licenseFile>license.txt</licenseFile>
-</nbm>
\ No newline at end of file
diff -r a15ccf75d22b -r d4700e005435
modules/examples/example1/branding/src/main/resources/it/tidalwave/geo/examples/example1/Bundle.properties
---
a/modules/examples/example1/branding/src/main/resources/it/tidalwave/geo/examples/example1/Bundle.properties
Mon Mar 14 01:46:23 2011 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-# Sample ResourceBundle properties file
-OpenIDE-Module-Display-Category=foobar
diff -r a15ccf75d22b -r d4700e005435
modules/examples/example1/branding/src/main/resources/it/tidalwave/geo/examples/example1/layer.xml
---
a/modules/examples/example1/branding/src/main/resources/it/tidalwave/geo/examples/example1/layer.xml
Mon Mar 14 01:46:23 2011 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE filesystem PUBLIC "-//NetBeans//DTD Filesystem 1.0//EN"
"http://www.netbeans.org/dtds/filesystem-1_0.dtd";>
-<filesystem>
-
-</filesystem>
diff -r a15ccf75d22b -r d4700e005435 modules/examples/example1/module1/pom.xml
--- a/modules/examples/example1/module1/pom.xml Mon Mar 14 01:46:23 2011 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,52 +0,0 @@
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" ;
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ;
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 ;
http://maven.apache.org/maven-v4_0_0.xsd";>
- <parent>
- <groupId>it.tidalwave.geo.examples</groupId>
- <artifactId>example1</artifactId>
- <version>1.24-SNAPSHOT</version>
- <relativePath>..</relativePath>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <artifactId>module1</artifactId>
- <packaging>nbm</packaging>
- <version>1.24-SNAPSHOT</version>
- <name>forceTen Example1 - Customization Module</name>
-
- <dependencies>
- <dependency>
- <groupId>it.tidalwave.geo</groupId>
- <artifactId>it-tidalwave-geo-geocoding</artifactId>
- </dependency>
- <dependency>
- <groupId>it.tidalwave.geo</groupId>
- <artifactId>it-tidalwave-geo-explorer</artifactId>
- </dependency>
- <dependency>
- <groupId>it.tidalwave.netbeans</groupId>
- <artifactId>it-tidalwave-netbeans-nodes</artifactId>
- </dependency>
- <dependency>
- <groupId>it.tidalwave.netbeans</groupId>
- <artifactId>it-tidalwave-netbeans-util</artifactId>
- </dependency>
- <dependency>
- <groupId>it.tidalwave.thesefoolishthings</groupId>
- <artifactId>it-tidalwave-util</artifactId>
- </dependency>
- <dependency>
- <groupId>com.kenai.nbpwr</groupId>
- <artifactId>javax-annotation</artifactId>
- </dependency>
- <dependency>
- <groupId>org.netbeans.api</groupId>
- <artifactId>org-openide-nodes</artifactId>
- </dependency>
- <dependency>
- <groupId>org.netbeans.api</groupId>
- <artifactId>org-openide-util</artifactId>
- </dependency>
- </dependencies>
-
-</project>
-
diff -r a15ccf75d22b -r d4700e005435
modules/examples/example1/module1/src/main/java/it/tidalwave/geo/examples/example1/SampleNodeDecorator.java
---
a/modules/examples/example1/module1/src/main/java/it/tidalwave/geo/examples/example1/SampleNodeDecorator.java
Mon Mar 14 01:46:23 2011 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-package it.tidalwave.geo.examples.example1;
-
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
-import java.util.Locale;
-import org.openide.nodes.Node;
-import it.tidalwave.geo.geocoding.GeoCoderEntity;
-import it.tidalwave.netbeans.nodes.GenericFilteredNode;
-import it.tidalwave.netbeans.nodes.ObjectFilter;
-import it.tidalwave.netbeans.nodes.role.NodeDecorator;
-import static it.tidalwave.role.LocalizedDisplayable.LocalizedDisplayable;
-
-/**
- *
- * @author fritz
- */
-public class SampleNodeDecorator implements NodeDecorator
- {
- @Override @Nonnull
- public Node decorate (final @Nonnull Node node)
- {
- final ObjectFilter<GeoCoderEntity> objectFilter = new
ObjectFilter<GeoCoderEntity>()
- {
- @Override
- public boolean accept (final @CheckForNull GeoCoderEntity
geoEntity)
- {
- return (geoEntity == null)
- ||
geoEntity.as(LocalizedDisplayable).getDisplayName(Locale.ENGLISH).matches("^[AE].*");
- }
- };
-
- return new GenericFilteredNode(node, objectFilter,
GeoCoderEntity.class);
- }
- }
diff -r a15ccf75d22b -r d4700e005435
modules/examples/example1/module1/src/main/nbm/manifest.mf
--- a/modules/examples/example1/module1/src/main/nbm/manifest.mf Mon
Mar 14 01:46:23 2011 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-OpenIDE-Module-Localizing-Bundle:
it/tidalwave/geo/examples/example1/Bundle.properties
-OpenIDE-Module-Layer: it/tidalwave/geo/examples/example1/layer.xml
diff -r a15ccf75d22b -r d4700e005435
modules/examples/example1/module1/src/main/nbm/module.xml
--- a/modules/examples/example1/module1/src/main/nbm/module.xml Mon Mar 14
01:46:23 2011 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-<nbm>
- <!--moduleType>autoload</moduleType-->
- <!--codeNameBase>it.tidalwave.geo.examples.example1/1</codeNameBase-->
- <licenseName>Apache License, Version 2.0</licenseName>
- <licenseFile>license.txt</licenseFile>
-</nbm>
\ No newline at end of file
diff -r a15ccf75d22b -r d4700e005435
modules/examples/example1/module1/src/main/resources/it/tidalwave/geo/examples/example1/Bundle.properties
---
a/modules/examples/example1/module1/src/main/resources/it/tidalwave/geo/examples/example1/Bundle.properties
Mon Mar 14 01:46:23 2011 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-# Sample ResourceBundle properties file
-OpenIDE-Module-Display-Category=foobar
diff -r a15ccf75d22b -r d4700e005435
modules/examples/example1/module1/src/main/resources/it/tidalwave/geo/examples/example1/layer.xml
---
a/modules/examples/example1/module1/src/main/resources/it/tidalwave/geo/examples/example1/layer.xml
Mon Mar 14 01:46:23 2011 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE filesystem PUBLIC "-//NetBeans//DTD Filesystem 1.1//EN"
"http://www.netbeans.org/dtds/filesystem-1_1.dtd";>
-<filesystem>
- <folder name="Roles">
- <folder name="it.tidalwave.geo.explorer.GeoExplorerPresentation">
- <file name="FlagsOfTheWorldDecorator.instance">
- <attr name="instanceClass"
stringvalue="it.tidalwave.geo.node.flagsoftheworld.GeoNodeFlagsOfTheWorldDecorator"/>
- </file>
- <file name="NodeDecorator.instance">
- <attr name="instanceClass"
stringvalue="it.tidalwave.geo.examples.example1.SampleNodeDecorator"/>
- </file>
- </folder>
- </folder>
- <folder name="Menu">
- <file name="BuildProject_hidden"/>
- <folder name="Edit">
- <file name="Separator1.instance_hidden"/>
- <file name="Separator2.instance_hidden"/>
- <file name="SeparatorAfterFindPrevious.instance_hidden"/>
- <file name="SeparatorAfterProjectsSearch.instance_hidden"/>
- <file name="WhereUsedAction.shadow_hidden"/>
- <file
name="org-netbeans-modules-editor-MainMenuAction$FindNextAction.instance_hidden"/>
- <file
name="org-netbeans-modules-editor-MainMenuAction$FindPreviousAction.instance_hidden"/>
- <file
name="org-netbeans-modules-editor-MainMenuAction$FindSelectionAction.instance_hidden"/>
- <file
name="org-netbeans-modules-editor-MainMenuAction$PasteFormattedAction.instance_hidden"/>
- <file
name="org-netbeans-modules-editor-MainMenuAction$SelectAllAction.instance_hidden"/>
- <file
name="org-netbeans-modules-editor-MainMenuAction$SelectIdentifierAction.instance_hidden"/>
- <file
name="org-netbeans-modules-editor-MainMenuAction$StartMacroRecordingAction.instance_hidden"/>
- <file
name="org-netbeans-modules-editor-MainMenuAction$StopMacroRecordingAction.instance_hidden"/>
- <file
name="org-netbeans-modules-search-FindInFilesAction.shadow_hidden"/>
- <file
name="org-netbeans-modules-search-ReplaceInFilesAction.shadow_hidden"/>
- <file name="org-openide-actions-FindAction.shadow_hidden"/>
- <file name="org-openide-actions-RedoAction.shadow_hidden"/>
- <file name="org-openide-actions-ReplaceAction.shadow_hidden"/>
- <file name="org-openide-actions-UndoAction.shadow_hidden"/>
- <file name="sep-before-reposearch.instance_hidden"/>
- </folder>
- <folder name="File">
- <file name="Import_hidden"/>
- <file name="ImporterSeparator1.instance_hidden"/>
- <file name="Separator2.instance_hidden"/>
- <file name="Separator3.instance_hidden"/>
- <file name="SeparatorNew.instance_hidden"/>
- <file name="SeparatorOpen.instance_hidden"/>
- <file
name="org-netbeans-modules-editor-ExportHtmlAction.shadow_hidden"/>
- <file
name="org-netbeans-modules-kenai-ui-OpenKenaiProjectAction.shadow_hidden"/>
- <file
name="org-netbeans-modules-openfile-OpenFileAction.shadow_hidden"/>
- <file
name="org-netbeans-modules-openfile-RecentFileAction.shadow_hidden"/>
- <file
name="org-netbeans-modules-print-action-PageSetupAction.shadow_hidden"/>
- <file
name="org-netbeans-modules-print-action-PrintAction.shadow_hidden"/>
- <file
name="org-netbeans-modules-project-ui-CloseProject.shadow_hidden"/>
- <file
name="org-netbeans-modules-project-ui-CustomizeProject.shadow_hidden"/>
- <file
name="org-netbeans-modules-project-ui-NewFile.shadow_hidden"/>
- <file
name="org-netbeans-modules-project-ui-NewProject.shadow_hidden"/>
- <file
name="org-netbeans-modules-project-ui-OpenProject.shadow_hidden"/>
- <file
name="org-netbeans-modules-project-ui-RecentProjects.shadow_hidden"/>
- <file
name="org-netbeans-modules-project-ui-groups-GroupsMenu.shadow_hidden"/>
- <file name="org-openide-actions-SaveAction.shadow_hidden"/>
- <file name="org-openide-actions-SaveAllAction.shadow_hidden"/>
- <file name="org-openide-actions-SaveAsAction.shadow_hidden"/>
- </folder>
- <file name="GoTo_hidden"/>
- <file name="Profile_hidden"/>
- <file name="Refactoring_hidden"/>
- <file name="RunProject_hidden"/>
- <file name="Source_hidden"/>
- <folder name="Tools">
- <file name="I18N_hidden"/>
- <file name="JavaPlatformsCustomizerAction.shadow_hidden"/>
- <file name="LibrariesCustomizerAction.shadow_hidden"/>
- <file name="PaletteManager_hidden"/>
- <file name="Separator1.instance_hidden"/>
- <file name="Separator2.instance_hidden"/>
- <file name="ServerManagerAction3.shadow_hidden"/>
- <file name="VariablesCustomizerAction.shadow_hidden"/>
- <file
name="org-netbeans-modules-apisupport-project-ui-platform-NbPlatformCustomizerAction.shadow_hidden"/>
- <file
name="org-netbeans-modules-favorites-templates-TemplatesAction.shadow_hidden"/>
- <file
name="org-netbeans-modules-xml-catalog-CatalogAction.shadow_hidden"/>
- <file name="org-openide-actions-ToolsAction.shadow_hidden"/>
- </folder>
- <file name="Versioning_hidden"/>
- <folder name="View">
- <file name="Separator1.instance_hidden"/>
- <file name="Separator2.instance_hidden"/>
- <file name="Separator3.instance_hidden"/>
- <file
name="org-netbeans-core-actions-HTMLViewAction.shadow_hidden"/>
- <file name="org-netbeans-core-actions-LogAction.shadow_hidden"/>
- <file
name="org-netbeans-core-multiview-EditorsAction.instance_hidden"/>
- <file
name="org-netbeans-modules-editor-NbCodeFoldingAction.instance_hidden"/>
- <file
name="org-netbeans-modules-project-ui-SyncEditorWithViewsAction.shadow_hidden"/>
- <file
name="org-netbeans-modules-versioning-ShowTextAnnotationsAction.shadow_hidden"/>
- <file
name="org-netbeans-modules-versioning-diff-ShowDiffSidebarAction.shadow_hidden"/>
- </folder>
- <folder name="Window">
- <file name="Debug_hidden"/>
- <file name="KenaiAction.shadow_hidden"/>
- <file name="Navigator_hidden"/>
- <file name="Other_hidden"/>
- <file name="Output_hidden"/>
- <file name="Profile_hidden"/>
- <file name="ProgressListAction.shadow_hidden"/>
- <file name="Separator3.instance_hidden"/>
- <file name="ShowPaletteAction.shadow_hidden"/>
- <file name="SwitchToRecentDocumentAction.shadow_hidden"/>
- <file name="Versioning_hidden"/>
- <file name="ViewFavoritesTabAction.shadow_hidden"/>
- <file
name="org-netbeans-core-ide-ServicesTabAction.shadow_hidden"/>
- <file
name="org-netbeans-core-windows-actions-GlobalPropertiesAction.shadow_hidden"/>
- <file
name="org-netbeans-modules-kenai-collab-chat-ChatAction.shadow_hidden"/>
- <file
name="org-netbeans-modules-project-ui-logical-tab-action.shadow_hidden"/>
- <file
name="org-netbeans-modules-project-ui-physical-tab-action.shadow_hidden"/>
- <file
name="org-netbeans-modules-tasklist-ui-TaskListAction.shadow_hidden"/>
- </folder>
- </folder>
- <folder name="Toolbars">
- <file name="Build_hidden"/>
- <file name="Clipboard_hidden"/>
- <file name="Debug_hidden"/>
- <file name="Debugging.xml_hidden"/>
- <file name="File_hidden"/>
- <file name="Memory_hidden"/>
- <file name="QuickSearch_hidden"/>
- <file name="Standard.xml_hidden"/>
- <file name="UndoRedo_hidden"/>
- </folder>
-</filesystem>
diff -r a15ccf75d22b -r d4700e005435 modules/examples/example1/pom.xml
--- a/modules/examples/example1/pom.xml Mon Mar 14 01:46:23 2011 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,93 +0,0 @@
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" ;
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ;
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 ;
http://maven.apache.org/maven-v4_0_0.xsd";>
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>it.tidalwave.geo</groupId>
- <artifactId>forceten-examples</artifactId>
- <version>0.5.13-SNAPSHOT</version>
- <relativePath>..</relativePath>
- </parent>
-
- <groupId>it.tidalwave.geo.examples</groupId>
- <artifactId>example1</artifactId>
- <packaging>pom</packaging>
- <version>1.24-SNAPSHOT</version>
- <name>forceTen Example1 (master)</name>
-
- <properties>
- <netbeans.brandingToken>forceten_example1</netbeans.brandingToken>
- </properties>
-
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>it.tidalwave.geo.examples</groupId>
- <artifactId>module1</artifactId>
- <version>1.24-SNAPSHOT</version>
- <type>nbm</type>
- </dependency>
- <dependency>
- <groupId>it.tidalwave.geo.examples</groupId>
- <artifactId>branding</artifactId>
- <version>1.24-SNAPSHOT</version>
- <type>nbm</type>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
- <dependencies>
- <dependency>
- <groupId>it.tidalwave.geo</groupId>
- <artifactId>it-tidalwave-geo-explorer</artifactId>
- </dependency>
- <dependency>
- <groupId>it.tidalwave.geo</groupId>
-
<artifactId>it-tidalwave-geo-geocoding-geonamesprovider</artifactId>
- </dependency>
- <dependency>
- <groupId>it.tidalwave.geo</groupId>
- <artifactId>it-tidalwave-geo-viewer</artifactId>
- </dependency>
- <dependency>
- <groupId>it.tidalwave.geo</groupId>
-
<artifactId>it-tidalwave-geo-viewer-spi-worldwindprovider</artifactId>
- </dependency>
- <dependency>
- <groupId>it.tidalwave.geo</groupId>
- <artifactId>it-tidalwave-geo-viewer-spi-jxmapviewer</artifactId>
- </dependency>
- <dependency>
- <groupId>it.tidalwave.geo</groupId>
-
<artifactId>it-tidalwave-geo-viewer-spi-openstreetmap</artifactId>
- </dependency>
- <dependency>
- <groupId>it.tidalwave.geo</groupId>
-
<artifactId>it-tidalwave-geo-viewer-spi-microsoftvirtualearth</artifactId>
- </dependency>
- </dependencies>
-
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>nbm-maven-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <descriptor>src/main/nbm/module.xml</descriptor>
-
<brandingToken>${netbeans.brandingToken}</brandingToken>
- <cluster>forceten_example1</cluster>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
-
- <modules>
- <module>application</module>
- <module>branding</module>
- <module>module1</module>
- </modules>
-
-</project>
diff -r a15ccf75d22b -r d4700e005435 modules/examples/example2/nbactions.xml
--- a/modules/examples/example2/nbactions.xml Mon Mar 14 01:46:23 2011 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<actions>
- <action>
- <actionName>run</actionName>
- <goals>
- <goal>process-classes</goal>
- <goal>org.codehaus.mojo:exec-maven-plugin:1.1.1:exec</goal>
- </goals>
- <properties>
- <exec.classpathScope>runtime</exec.classpathScope>
- <exec.args>-classpath %classpath
it.tidalwave.geo.examples.example2.Main</exec.args>
- <exec.executable>java</exec.executable>
- </properties>
- </action>
- </actions>
diff -r a15ccf75d22b -r d4700e005435 modules/examples/example2/pom.xml
--- a/modules/examples/example2/pom.xml Mon Mar 14 01:46:23 2011 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" ;
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ;
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 ;
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>it.tidalwave.geo</groupId>
- <artifactId>forceten-examples</artifactId>
- <version>0.5.13-SNAPSHOT</version>
- <relativePath>..</relativePath>
- </parent>
-
- <groupId>it.tidalwave.geo.examples</groupId>
- <artifactId>example2</artifactId>
- <version>1.6-SNAPSHOT</version>
- <name>forceTen Example2 (master)</name>
-
- <properties>
-
<tft.mainClass>it.tidalwave.geo.examples.example2.Main</tft.mainClass>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>it.tidalwave.geo</groupId>
- <artifactId>it-tidalwave-geo-geocoding</artifactId>
- </dependency>
- <dependency>
- <groupId>it.tidalwave.geo</groupId>
-
<artifactId>it-tidalwave-geo-geocoding-geonamesprovider</artifactId>
- </dependency>
- </dependencies>
-
-</project>
diff -r a15ccf75d22b -r d4700e005435
modules/examples/example2/src/main/java/it/tidalwave/geo/examples/example2/Main.java
---
a/modules/examples/example2/src/main/java/it/tidalwave/geo/examples/example2/Main.java
Mon Mar 14 01:46:23 2011 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,78 +0,0 @@
-/***********************************************************************************************************************
- *
- * forceTen - open source geography
- * ================================
- *
- * Copyright (C) 2007-2011 by Tidalwave s.a.s.
- * Project home page: http://forceten.tidalwave.it
- *
-
***********************************************************************************************************************
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may
not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
-
***********************************************************************************************************************
- *
- * $Id$
- *
-
**********************************************************************************************************************/
-package it.tidalwave.geo.examples.example2;
-
-import javax.annotation.Nonnull;
-import it.tidalwave.util.NotFoundException;
-import it.tidalwave.netbeans.util.Locator;
-import it.tidalwave.geo.Coordinate;
-import it.tidalwave.geo.Range;
-import it.tidalwave.geo.geocoding.GeoCoder;
-import it.tidalwave.geo.geocoding.GeoCoderEntity;
-import it.tidalwave.geo.geocoding.GeoCoderEntity.FactSheet;
-import it.tidalwave.geo.geocoding.GeoCoderEntity.Type;
-import static it.tidalwave.role.Displayable.Displayable;
-import static it.tidalwave.geo.Units.*;
-import static it.tidalwave.geo.GeoContainer.GeoContainer;
-import static it.tidalwave.geo.geocoding.GeoCoderManager.GeoCoderManager;
-import static it.tidalwave.geo.geocoding.GeoCoderEntity.GeoCoderEntity;
-import static it.tidalwave.geo.geocoding.GeoCoderEntity.FactSheet.*;
-import static it.tidalwave.geo.geocoding.GeoCoderEntity.FactSheet.FactSheet;
-
-/***********************************************************************************************************************
- *
- * @author Fabrizio Giudici
- * @version $Id$
- *
-
**********************************************************************************************************************/
-public class Main
- {
- public static void main (final @Nonnull String ... args)
- throws NotFoundException
- {
- final GeoCoder geoCoder =
Locator.find(GeoCoderManager).findDefaultGeoCoder();
- final Range range = Range.on(new Coordinate(43.5,
6)).withRadius(km(10));
-
- for (final GeoCoderEntity place :
range.as(GeoContainer).find(GeoCoderEntity).with(geoCoder).results())
- {
- final String displayName =
place.as(Displayable).getDisplayName();
- final Type type = place.getType();
- final Coordinate coordinate = place.getCoordinate();
- final FactSheet factSheet = place.as(FactSheet);
-
- System.err.printf("%-30s %-5s: %s\n", displayName, type,
coordinate);
-
- if (factSheet.contains(POPULATION))
- {
- System.err.printf("%42s %d\n", "population:",
factSheet.get(POPULATION));
- }
-
- if (factSheet.contains(ELEVATION))
- {
- System.err.printf("%42s %d\n", "elevation: ",
factSheet.get(ELEVATION));
- }
- }
- }
- }
diff -r a15ccf75d22b -r d4700e005435 modules/examples/pom.xml
--- a/modules/examples/pom.xml Mon Mar 14 01:46:23 2011 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" ;
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ;
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 ;
http://maven.apache.org/maven-v4_0_0.xsd";>
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>it.tidalwave.geo</groupId>
- <artifactId>forceten-modules</artifactId>
- <version>0.5.13-SNAPSHOT</version>
- <relativePath>..</relativePath>
- </parent>
-
- <groupId>it.tidalwave.geo</groupId>
- <artifactId>forceten-examples</artifactId>
- <packaging>pom</packaging>
- <version>0.5.13-SNAPSHOT</version>
- <name>forceTen (examples master)</name>
- <description>forceTen (examples master)</description>
-
- <modules>
- <module>example1</module>
- <module>example2</module>
- </modules>
-
-</project>
diff -r d4700e005435 -r 272eba30e6b4
modules/Geo/GeoLocationElmo/src/test/java/it/tidalwave/geo/location/elmo/impl/ElmoGeoLocationIntegrationTestSupport.java
---
a/modules/Geo/GeoLocationElmo/src/test/java/it/tidalwave/geo/location/elmo/impl/ElmoGeoLocationIntegrationTestSupport.java
Mon Mar 14 12:51:10 2011 +0100
+++
b/modules/Geo/GeoLocationElmo/src/test/java/it/tidalwave/geo/location/elmo/impl/ElmoGeoLocationIntegrationTestSupport.java
Mon Mar 14 13:11:26 2011 +0100
@@ -351,7 +351,7 @@
assertEquals(115, marinCounty.findChildren(geoNamesSchema).count());
assertEquals(58, california.findChildren(geoNamesSchema).count());
assertEquals(51, usa.findChildren(geoNamesSchema).count());
- assertEquals(39, northAmerica.findChildren(geoNamesSchema).count());
+ assertEquals(41, northAmerica.findChildren(geoNamesSchema).count());
assertEquals(7, earth.findChildren(geoNamesSchema).count());
dump("us-final");
diff -r d4700e005435 -r 272eba30e6b4
modules/Geo/GeoLocationElmo/src/test/java/it/tidalwave/geo/location/elmo/impl/ElmoGeoLocationOnlineIntegrationTest.java
---
a/modules/Geo/GeoLocationElmo/src/test/java/it/tidalwave/geo/location/elmo/impl/ElmoGeoLocationOnlineIntegrationTest.java
Mon Mar 14 12:51:10 2011 +0100
+++
b/modules/Geo/GeoLocationElmo/src/test/java/it/tidalwave/geo/location/elmo/impl/ElmoGeoLocationOnlineIntegrationTest.java
Mon Mar 14 13:11:26 2011 +0100
@@ -70,6 +70,14 @@
assertThat(location0.findCode(geoSchema), is(""));
assertThat(location0.findType(geoSchema),
is((Object)Type.INHABITED_PLACE));
+ final GeoLocation location1 = i.next();
+ assertGood(location1, GeoLocation.class);
+ assertThat(Wrapper.isWrapped(location1), is(true));
+ assertThat(location1.as(Displayable).getDisplayName(), is("Casone
Sanguinetto"));
+ assertThat(location1.findCoordinate(geoSchema), is(new
Coordinate(45.01667, 11.0, 0)));
+ assertThat(location1.findCode(geoSchema), is(""));
+ assertThat(location1.findType(geoSchema),
is((Object)Type.INHABITED_PLACE));
+
final GeoLocation location2 = i.next();
assertGood(location2, GeoLocation.class);
assertThat(Wrapper.isWrapped(location2), is(true));
@@ -78,14 +86,6 @@
assertThat(location2.findCode(geoSchema), is(""));
assertThat(location2.findType(geoSchema),
is((Object)Type.INHABITED_PLACE));
- final GeoLocation location1 = i.next();
- assertGood(location1, GeoLocation.class);
- assertThat(Wrapper.isWrapped(location1), is(true));
- assertThat(location1.as(Displayable).getDisplayName(), is("Casone
Sanguinetto"));
- assertThat(location1.findCoordinate(geoSchema), is(new
Coordinate(45.01667, 11.0, 0)));
- assertThat(location1.findCode(geoSchema), is(""));
- assertThat(location1.findType(geoSchema),
is((Object)Type.INHABITED_PLACE));
-
final GeoLocation location3 = i.next();
assertGood(location3, GeoLocation.class);
assertThat(Wrapper.isWrapped(location3), is(true));
diff -r d4700e005435 -r 272eba30e6b4
modules/Geo/GeoLocationElmo/src/test/resources/Geo-all-final.rdf
--- a/modules/Geo/GeoLocationElmo/src/test/resources/Geo-all-final.rdf Mon
Mar 14 12:51:10 2011 +0100
+++ b/modules/Geo/GeoLocationElmo/src/test/resources/Geo-all-final.rdf Mon
Mar 14 13:11:26 2011 +0100
@@ -1382,17 +1382,6 @@
<skos:inScheme rdf:resource="http://www.geonames.org"/>
<skos:broader rdf:resource="http://sws.geonames.org/6255149/"/>
</geo:entity>
-<geo:entity rdf:about="http://sws.geonames.org/3513447/";>
- <rdf:type rdf:resource="http://www.w3.org/2002/07/owl#Thing"/>
- <rdf:type rdf:resource="http://www.w3.org/2004/02/skos/core#Concept"/>
- <skos:prefLabel>Netherlands Antilles</skos:prefLabel>
- <wgs84_pos:lat
rdf:datatype="http://www.w3.org/2001/XMLSchema#double";>12.16667</wgs84_pos:lat>
- <wgs84_pos:long
rdf:datatype="http://www.w3.org/2001/XMLSchema#double";>-69.0</wgs84_pos:long>
- <wgs84_pos:alt
rdf:datatype="http://www.w3.org/2001/XMLSchema#double";>0.0</wgs84_pos:alt>
- <geo:type>PCLIX</geo:type>
- <skos:inScheme rdf:resource="http://www.geonames.org"/>
- <skos:broader rdf:resource="http://sws.geonames.org/6255149/"/>
-</geo:entity>
<geo:entity rdf:about="http://sws.geonames.org/3562981/";>
<rdf:type rdf:resource="http://www.w3.org/2002/07/owl#Thing"/>
<rdf:type rdf:resource="http://www.w3.org/2004/02/skos/core#Concept"/>
@@ -4567,10 +4556,12 @@
<skos:narrower rdf:resource="http://sws.geonames.org/3374084/"/>
<skos:narrower rdf:resource="http://sws.geonames.org/3582678/"/>
<skos:narrower rdf:resource="http://sws.geonames.org/3573345/"/>
+ <skos:narrower rdf:resource="http://sws.geonames.org/7626844/"/>
<skos:narrower rdf:resource="http://sws.geonames.org/3577718/"/>
<skos:narrower rdf:resource="http://sws.geonames.org/6251999/"/>
<skos:narrower rdf:resource="http://sws.geonames.org/3580718/"/>
<skos:narrower rdf:resource="http://sws.geonames.org/3624060/"/>
+ <skos:narrower rdf:resource="http://sws.geonames.org/7609695/"/>
<skos:narrower rdf:resource="http://sws.geonames.org/3562981/"/>
<skos:narrower rdf:resource="http://sws.geonames.org/3575830/"/>
<skos:narrower rdf:resource="http://sws.geonames.org/3508796/"/>
@@ -4582,10 +4573,10 @@
<skos:narrower rdf:resource="http://sws.geonames.org/3723988/"/>
<skos:narrower rdf:resource="http://sws.geonames.org/3608932/"/>
<skos:narrower rdf:resource="http://sws.geonames.org/3489940/"/>
+ <skos:narrower rdf:resource="http://sws.geonames.org/7626836/"/>
<skos:narrower rdf:resource="http://sws.geonames.org/3570311/"/>
<skos:narrower rdf:resource="http://sws.geonames.org/3996063/"/>
<skos:narrower rdf:resource="http://sws.geonames.org/3578097/"/>
- <skos:narrower rdf:resource="http://sws.geonames.org/3513447/"/>
<skos:narrower rdf:resource="http://sws.geonames.org/3617476/"/>
<skos:narrower rdf:resource="http://sws.geonames.org/3703430/"/>
<skos:narrower rdf:resource="http://sws.geonames.org/4566966/"/>
@@ -6942,7 +6933,7 @@
<geo:entity rdf:about="http://sws.geonames.org/6614509/";>
<rdf:type rdf:resource="http://www.w3.org/2002/07/owl#Thing"/>
<rdf:type rdf:resource="http://www.w3.org/2004/02/skos/core#Concept"/>
- <skos:prefLabel>Vassy</skos:prefLabel>
+ <skos:prefLabel>Vassy-sous-Pisy</skos:prefLabel>
<wgs84_pos:lat
rdf:datatype="http://www.w3.org/2001/XMLSchema#double";>47.5695</wgs84_pos:lat>
<wgs84_pos:long
rdf:datatype="http://www.w3.org/2001/XMLSchema#double";>4.1687</wgs84_pos:long>
<wgs84_pos:alt
rdf:datatype="http://www.w3.org/2001/XMLSchema#double";>0.0</wgs84_pos:alt>
@@ -7354,6 +7345,39 @@
<skos:inScheme rdf:resource="http://www.geonames.org"/>
<skos:broader rdf:resource="http://sws.geonames.org/6255148/"/>
</geo:entity>
+<geo:entity rdf:about="http://sws.geonames.org/7609695/";>
+ <rdf:type rdf:resource="http://www.w3.org/2002/07/owl#Thing"/>
+ <rdf:type rdf:resource="http://www.w3.org/2004/02/skos/core#Concept"/>
+ <skos:prefLabel>Country of Sint Maarten</skos:prefLabel>
+ <wgs84_pos:lat
rdf:datatype="http://www.w3.org/2001/XMLSchema#double";>18.04167</wgs84_pos:lat>
+ <wgs84_pos:long
rdf:datatype="http://www.w3.org/2001/XMLSchema#double";>-63.06667</wgs84_pos:long>
+ <wgs84_pos:alt
rdf:datatype="http://www.w3.org/2001/XMLSchema#double";>0.0</wgs84_pos:alt>
+ <geo:type>PCLIX</geo:type>
+ <skos:inScheme rdf:resource="http://www.geonames.org"/>
+ <skos:broader rdf:resource="http://sws.geonames.org/6255149/"/>
+</geo:entity>
+<geo:entity rdf:about="http://sws.geonames.org/7626836/";>
+ <rdf:type rdf:resource="http://www.w3.org/2002/07/owl#Thing"/>
+ <rdf:type rdf:resource="http://www.w3.org/2004/02/skos/core#Concept"/>
+ <skos:prefLabel>Land Curaçao</skos:prefLabel>
+ <wgs84_pos:lat
rdf:datatype="http://www.w3.org/2001/XMLSchema#double";>12.16667</wgs84_pos:lat>
+ <wgs84_pos:long
rdf:datatype="http://www.w3.org/2001/XMLSchema#double";>-69.0</wgs84_pos:long>
+ <wgs84_pos:alt
rdf:datatype="http://www.w3.org/2001/XMLSchema#double";>0.0</wgs84_pos:alt>
+ <geo:type>PCLIX</geo:type>
+ <skos:inScheme rdf:resource="http://www.geonames.org"/>
+ <skos:broader rdf:resource="http://sws.geonames.org/6255149/"/>
+</geo:entity>
+<geo:entity rdf:about="http://sws.geonames.org/7626844/";>
+ <rdf:type rdf:resource="http://www.w3.org/2002/07/owl#Thing"/>
+ <rdf:type rdf:resource="http://www.w3.org/2004/02/skos/core#Concept"/>
+ <skos:prefLabel>Bonaire, Saint Eustatius and Saba</skos:prefLabel>
+ <wgs84_pos:lat
rdf:datatype="http://www.w3.org/2001/XMLSchema#double";>12.21286</wgs84_pos:lat>
+ <wgs84_pos:long
rdf:datatype="http://www.w3.org/2001/XMLSchema#double";>-68.29445</wgs84_pos:long>
+ <wgs84_pos:alt
rdf:datatype="http://www.w3.org/2001/XMLSchema#double";>0.0</wgs84_pos:alt>
+ <geo:type>PCLIX</geo:type>
+ <skos:inScheme rdf:resource="http://www.geonames.org"/>
+ <skos:broader rdf:resource="http://sws.geonames.org/6255149/"/>
+</geo:entity>
<geo:entity rdf:about="http://sws.geonames.org/783754/";>
<rdf:type rdf:resource="http://www.w3.org/2002/07/owl#Thing"/>
<rdf:type rdf:resource="http://www.w3.org/2004/02/skos/core#Concept"/>
@@ -7402,2154 +7426,2172 @@
<skos:inScheme rdf:resource="http://www.geonames.org"/>
<skos:broader rdf:resource="http://sws.geonames.org/6255148/"/>
</geo:entity>
-<geo:location rdf:about="urn:tidalwave:geo/location#00000019">
+<geo:location rdf:about="urn:tidalwave:geo/location#00000016">
<rdf:type rdf:resource="http://www.w3.org/2002/07/owl#Thing"/>
<rdf:type rdf:resource="http://www.w3.org/2004/02/skos/core#Concept"/>
<owl:sameAs rdf:resource="http://sws.geonames.org/6295630/"/>
<skos:prefLabel>Earth</skos:prefLabel>
</geo:location>
-<geo:location rdf:about="urn:tidalwave:geo/location#00000020">
+<geo:location rdf:about="urn:tidalwave:geo/location#00000017">
<rdf:type rdf:resource="http://www.w3.org/2002/07/owl#Thing"/>
<rdf:type rdf:resource="http://www.w3.org/2004/02/skos/core#Concept"/>
<owl:sameAs rdf:resource="http://sws.geonames.org/6255148/"/>
<skos:prefLabel>Europe</skos:prefLabel>
</geo:location>
-<geo:location rdf:about="urn:tidalwave:geo/location#00000021">
+<geo:location rdf:about="urn:tidalwave:geo/location#00000018">
<rdf:type rdf:resource="http://www.w3.org/2002/07/owl#Thing"/>
<rdf:type rdf:resource="http://www.w3.org/2004/02/skos/core#Concept"/>
<owl:sameAs rdf:resource="http://sws.geonames.org/3175395/"/>
<skos:prefLabel>Italy</skos:prefLabel>
</geo:location>
-<geo:location rdf:about="urn:tidalwave:geo/location#00000022">
+<geo:location rdf:about="urn:tidalwave:geo/location#00000019">
<rdf:type rdf:resource="http://www.w3.org/2002/07/owl#Thing"/>
<rdf:type rdf:resource="http://www.w3.org/2004/02/skos/core#Concept"/>
<owl:sameAs rdf:resource="http://sws.geonames.org/3174725/"/>
<skos:prefLabel>Liguria</skos:prefLabel>
</geo:location>
-<geo:location rdf:about="urn:tidalwave:geo/location#00000023">
+<geo:location rdf:about="urn:tidalwave:geo/location#00000020">
<rdf:type rdf:resource="http://www.w3.org/2002/07/owl#Thing"/>
<rdf:type rdf:resource="http://www.w3.org/2004/02/skos/core#Concept"/>
<owl:sameAs rdf:resource="http://sws.geonames.org/3176217/"/>
<skos:prefLabel>Genoa</skos:prefLabel>
</geo:location>
-<geo:location rdf:about="urn:tidalwave:geo/location#00000024">
+<geo:location rdf:about="urn:tidalwave:geo/location#00000021">
<rdf:type rdf:resource="http://www.w3.org/2002/07/owl#Thing"/>
<rdf:type rdf:resource="http://www.w3.org/2004/02/skos/core#Concept"/>
<owl:sameAs rdf:resource="http://sws.geonames.org/6540563/"/>
<skos:prefLabel>Recco</skos:prefLabel>
</geo:location>
-<geo:location rdf:about="urn:tidalwave:geo/location#00000025">
+<geo:location rdf:about="urn:tidalwave:geo/location#00000022">
<rdf:type rdf:resource="http://www.w3.org/2002/07/owl#Thing"/>
<rdf:type rdf:resource="http://www.w3.org/2004/02/skos/core#Concept"/>
<owl:sameAs rdf:resource="http://sws.geonames.org/6255146/"/>
<skos:prefLabel>Africa</skos:prefLabel>
</geo:location>
-<geo:location rdf:about="urn:tidalwave:geo/location#00000026">
+<geo:location rdf:about="urn:tidalwave:geo/location#00000023">
<rdf:type rdf:resource="http://www.w3.org/2002/07/owl#Thing"/>
<rdf:type rdf:resource="http://www.w3.org/2004/02/skos/core#Concept"/>
<owl:sameAs rdf:resource="http://sws.geonames.org/6255152/"/>
<skos:prefLabel>Antarctica</skos:prefLabel>
</geo:location>
-<geo:location rdf:about="urn:tidalwave:geo/location#00000027">
+<geo:location rdf:about="urn:tidalwave:geo/location#00000024">
<rdf:type rdf:resource="http://www.w3.org/2002/07/owl#Thing"/>
<rdf:type rdf:resource="http://www.w3.org/2004/02/skos/core#Concept"/>
<owl:sameAs rdf:resource="http://sws.geonames.org/6255147/"/>
<skos:prefLabel>Asia</skos:prefLabel>
</geo:location>
-<geo:location rdf:about="urn:tidalwave:geo/location#00000028">
+<geo:location rdf:about="urn:tidalwave:geo/location#00000025">
<rdf:type rdf:resource="http://www.w3.org/2002/07/owl#Thing"/>
<rdf:type rdf:resource="http://www.w3.org/2004/02/skos/core#Concept"/>
<owl:sameAs rdf:resource="http://sws.geonames.org/6255149/"/>
<skos:prefLabel>North America</skos:prefLabel>
</geo:location>
-<geo:location rdf:about="urn:tidalwave:geo/location#00000029">
+<geo:location rdf:about="urn:tidalwave:geo/location#00000026">
<rdf:type rdf:resource="http://www.w3.org/2002/07/owl#Thing"/>
<rdf:type rdf:resource="http://www.w3.org/2004/02/skos/core#Concept"/>
<owl:sameAs rdf:resource="http://sws.geonames.org/6255151/"/>
<skos:prefLabel>Oceania</skos:prefLabel>
</geo:location>
-<geo:location rdf:about="urn:tidalwave:geo/location#00000030">
+<geo:location rdf:about="urn:tidalwave:geo/location#00000027">
<rdf:type rdf:resource="http://www.w3.org/2002/07/owl#Thing"/>
<rdf:type rdf:resource="http://www.w3.org/2004/02/skos/core#Concept"/>
<owl:sameAs rdf:resource="http://sws.geonames.org/6255150/"/>
<skos:prefLabel>South America</skos:prefLabel>
</geo:location>
-<geo:location rdf:about="urn:tidalwave:geo/location#00000031">
+<geo:location rdf:about="urn:tidalwave:geo/location#00000028">
<rdf:type rdf:resource="http://www.w3.org/2002/07/owl#Thing"/>
<rdf:type rdf:resource="http://www.w3.org/2004/02/skos/core#Concept"/>
<owl:sameAs rdf:resource="http://sws.geonames.org/783754/"/>
<skos:prefLabel>Albania</skos:prefLabel>
</geo:location>
-<geo:location rdf:about="urn:tidalwave:geo/location#00000032">
+<geo:location rdf:about="urn:tidalwave:geo/location#00000029">
<rdf:type rdf:resource="http://www.w3.org/2002/07/owl#Thing"/>
<rdf:type rdf:resource="http://www.w3.org/2004/02/skos/core#Concept"/>
<owl:sameAs rdf:resource="http://sws.geonames.org/3041565/"/>
<skos:prefLabel>Andorra</skos:prefLabel>
</geo:location>
-<geo:location rdf:about="urn:tidalwave:geo/location#00000033">
+<geo:location rdf:about="urn:tidalwave:geo/location#00000030">
<rdf:type rdf:resource="http://www.w3.org/2002/07/owl#Thing"/>
<rdf:type rdf:resource="http://www.w3.org/2004/02/skos/core#Concept"/>
<owl:sameAs rdf:resource="http://sws.geonames.org/2782113/"/>
<skos:prefLabel>Austria</skos:prefLabel>
</geo:location>
-<geo:location rdf:about="urn:tidalwave:geo/location#00000034">
+<geo:location rdf:about="urn:tidalwave:geo/location#00000031">
<rdf:type rdf:resource="http://www.w3.org/2002/07/owl#Thing"/>
<rdf:type rdf:resource="http://www.w3.org/2004/02/skos/core#Concept"/>
<owl:sameAs rdf:resource="http://sws.geonames.org/630336/"/>
<skos:prefLabel>Belarus</skos:prefLabel>
</geo:location>
-<geo:location rdf:about="urn:tidalwave:geo/location#00000035">
+<geo:location rdf:about="urn:tidalwave:geo/location#00000032">
<rdf:type rdf:resource="http://www.w3.org/2002/07/owl#Thing"/>
<rdf:type rdf:resource="http://www.w3.org/2004/02/skos/core#Concept"/>
<owl:sameAs rdf:resource="http://sws.geonames.org/2802361/"/>
<skos:prefLabel>Belgium</skos:prefLabel>
</geo:location>
-<geo:location rdf:about="urn:tidalwave:geo/location#00000036">
+<geo:location rdf:about="urn:tidalwave:geo/location#00000033">
<rdf:type rdf:resource="http://www.w3.org/2002/07/owl#Thing"/>
<rdf:type rdf:resource="http://www.w3.org/2004/02/skos/core#Concept"/>
<owl:sameAs rdf:resource="http://sws.geonames.org/3277605/"/>
<skos:prefLabel>Bosnia and Herzegovina</skos:prefLabel>
</geo:location>
-<geo:location rdf:about="urn:tidalwave:geo/location#00000037">
+<geo:location rdf:about="urn:tidalwave:geo/location#00000034">
<rdf:type rdf:resource="http://www.w3.org/2002/07/owl#Thing"/>
<rdf:type rdf:resource="http://www.w3.org/2004/02/skos/core#Concept"/>
<owl:sameAs rdf:resource="http://sws.geonames.org/732800/"/>
<skos:prefLabel>Bulgaria</skos:prefLabel>
</geo:location>
-<geo:location rdf:about="urn:tidalwave:geo/location#00000038">
+<geo:location rdf:about="urn:tidalwave:geo/location#00000035">
<rdf:type rdf:resource="http://www.w3.org/2002/07/owl#Thing"/>
<rdf:type rdf:resource="http://www.w3.org/2004/02/skos/core#Concept"/>
<owl:sameAs rdf:resource="http://sws.geonames.org/3202326/"/>
<skos:prefLabel>Croatia</skos:prefLabel>
</geo:location>
-<geo:location rdf:about="urn:tidalwave:geo/location#00000039">
+<geo:location rdf:about="urn:tidalwave:geo/location#00000036">
<rdf:type rdf:resource="http://www.w3.org/2002/07/owl#Thing"/>
<rdf:type rdf:resource="http://www.w3.org/2004/02/skos/core#Concept"/>
<owl:sameAs rdf:resource="http://sws.geonames.org/146669/"/>
<skos:prefLabel>Cyprus</skos:prefLabel>
</geo:location>
-<geo:location rdf:about="urn:tidalwave:geo/location#00000040">
+<geo:location rdf:about="urn:tidalwave:geo/location#00000037">
<rdf:type rdf:resource="http://www.w3.org/2002/07/owl#Thing"/>
<rdf:type rdf:resource="http://www.w3.org/2004/02/skos/core#Concept"/>
<owl:sameAs rdf:resource="http://sws.geonames.org/3077311/"/>
<skos:prefLabel>Czech Republic</skos:prefLabel>
</geo:location>
-<geo:location rdf:about="urn:tidalwave:geo/location#00000041">
+<geo:location rdf:about="urn:tidalwave:geo/location#00000038">
<rdf:type rdf:resource="http://www.w3.org/2002/07/owl#Thing"/>
<rdf:type rdf:resource="http://www.w3.org/2004/02/skos/core#Concept"/>
<owl:sameAs rdf:resource="http://sws.geonames.org/2623032/"/>
<skos:prefLabel>Denmark</skos:prefLabel>
</geo:location>
-<geo:location rdf:about="urn:tidalwave:geo/location#00000042">
+<geo:location rdf:about="urn:tidalwave:geo/location#00000039">
<rdf:type rdf:resource="http://www.w3.org/2002/07/owl#Thing"/>
<rdf:type rdf:resource="http://www.w3.org/2004/02/skos/core#Concept"/>
<owl:sameAs rdf:resource="http://sws.geonames.org/453733/"/>
<skos:prefLabel>Estonia</skos:prefLabel>
</geo:location>
-<geo:location rdf:about="urn:tidalwave:geo/location#00000043">
+<geo:location rdf:about="urn:tidalwave:geo/location#00000040">
<rdf:type rdf:resource="http://www.w3.org/2002/07/owl#Thing"/>
<rdf:type rdf:resource="http://www.w3.org/2004/02/skos/core#Concept"/>
<owl:sameAs rdf:resource="http://sws.geonames.org/2622320/"/>
<skos:prefLabel>Faroe Islands</skos:prefLabel>
</geo:location>
-<geo:location rdf:about="urn:tidalwave:geo/location#00000044">
+<geo:location rdf:about="urn:tidalwave:geo/location#00000041">
<rdf:type rdf:resource="http://www.w3.org/2002/07/owl#Thing"/>
<rdf:type rdf:resource="http://www.w3.org/2004/02/skos/core#Concept"/>
<owl:sameAs rdf:resource="http://sws.geonames.org/660013/"/>
<skos:prefLabel>Finland</skos:prefLabel>
</geo:location>
-<geo:location rdf:about="urn:tidalwave:geo/location#00000045">
+<geo:location rdf:about="urn:tidalwave:geo/location#00000042">
<rdf:type rdf:resource="http://www.w3.org/2002/07/owl#Thing"/>
<rdf:type rdf:resource="http://www.w3.org/2004/02/skos/core#Concept"/>
<owl:sameAs rdf:resource="http://sws.geonames.org/3017382/"/>
<skos:prefLabel>France</skos:prefLabel>
</geo:location>
-<geo:location rdf:about="urn:tidalwave:geo/location#00000046">
+<geo:location rdf:about="urn:tidalwave:geo/location#00000043">
<rdf:type rdf:resou
[truncated due to length]
|
[forceTen-commits] [forceten~src:1810] Fixes for broken tests due to changed data at GeoNames. |
fabriziogiudici | 03/14/2011 |
