Skip to content
Browse files

rename project twofish -> twofishes

  • Loading branch information...
1 parent 32df2da commit 2a364e8cd191ac754b7b63ca5438d990ab12e800 @blackmad blackmad committed Apr 1, 2012
Showing with 49 additions and 53 deletions.
  1. +1 −1 core/src/main/scala/GeocodeStorage.scala
  2. +1 −1 core/src/main/scala/HFileStorageService.scala
  3. +1 −1 core/src/main/scala/Helpers.scala
  4. +3 −3 core/src/main/scala/LogHelper.scala
  5. +2 −2 core/src/main/scala/YahooWoeTypes.scala
  6. +1 −1 indexer/src/main/scala/GeocodeRecordWriter.scala
  7. +1 −1 indexer/src/main/scala/OutputHFile.scala
  8. +2 −2 indexer/src/main/scala/importers/geonames/BoundingBoxImporter.scala
  9. +3 −3 indexer/src/main/scala/importers/geonames/GeonamesFeature.scala
  10. +2 −2 indexer/src/main/scala/importers/geonames/GeonamesImporterConfig.scala
  11. +4 −4 indexer/src/main/scala/importers/geonames/GeonamesParser.scala
  12. +2 −2 indexer/src/main/scala/importers/geonames/TsvHelperFileParser.scala
  13. +1 −1 interface/src/main/java/gen-java/com/foursquare/{twofish → twofishes}/FeatureGeometry.java
  14. +1 −1 interface/src/main/java/gen-java/com/foursquare/{twofish → twofishes}/FeatureId.java
  15. +1 −1 interface/src/main/java/gen-java/com/foursquare/{twofish → twofishes}/FeatureName.java
  16. +1 −1 interface/src/main/java/gen-java/com/foursquare/{twofish → twofishes}/FeatureNameFlags.java
  17. +1 −1 interface/src/main/java/gen-java/com/foursquare/{twofish → twofishes}/GeocodeBoundingBox.java
  18. +1 −1 interface/src/main/java/gen-java/com/foursquare/{twofish → twofishes}/GeocodeFeature.java
  19. +1 −1 interface/src/main/java/gen-java/com/foursquare/{twofish → twofishes}/GeocodeInterpretation.java
  20. +1 −1 interface/src/main/java/gen-java/com/foursquare/{twofish → twofishes}/GeocodePoint.java
  21. +1 −1 interface/src/main/java/gen-java/com/foursquare/{twofish → twofishes}/GeocodeRequest.java
  22. +1 −1 interface/src/main/java/gen-java/com/foursquare/{twofish → twofishes}/GeocodeResponse.java
  23. +1 −1 interface/src/main/java/gen-java/com/foursquare/{twofish → twofishes}/GeocodeServingFeature.java
  24. +1 −1 interface/src/main/java/gen-java/com/foursquare/{twofish → twofishes}/Geocoder.java
  25. +1 −1 interface/src/main/java/gen-java/com/foursquare/{twofish → twofishes}/ScoringFeatures.java
  26. +1 −1 interface/src/main/java/gen-java/com/foursquare/{twofish → twofishes}/YahooWoeType.java
  27. +1 −1 interface/src/main/thrift/geocoder.thrift
  28. +6 −6 project/GeocoderBuild.scala
  29. +2 −6 server/src/main/scala/GeocodeImpl.scala
  30. +1 −1 server/src/main/scala/GeocodeServer.scala
  31. +2 −2 server/src/main/scala/GeocodeServerConfig.scala
View
2 core/src/main/scala/GeocodeStorage.scala
@@ -1,5 +1,5 @@
// Copyright 2012 Foursquare Labs Inc. All Rights Reserved.
-package com.foursquare.twofish
+package com.foursquare.twofishes
import com.twitter.util.{Future, FuturePool}
import org.bson.types.ObjectId
View
2 core/src/main/scala/HFileStorageService.scala
@@ -1,4 +1,4 @@
-package com.foursquare.twofish
+package com.foursquare.twofishes
import java.io._
import java.net.URI
View
2 core/src/main/scala/Helpers.scala
@@ -1,5 +1,5 @@
// Copyright 2012 Foursquare Labs Inc. All Rights Reserved.
-package com.foursquare.twofish
+package com.foursquare.twofishes
import java.text.Normalizer
import java.util.regex.Pattern
View
6 core/src/main/scala/LogHelper.scala
@@ -1,5 +1,5 @@
// Copyright 2012 Foursquare Labs Inc. All Rights Reserved.
-package com.foursquare.twofish
+package com.foursquare.twofishes
import com.twitter.logging.Logger
import com.twitter.logging.config._
@@ -17,8 +17,8 @@ object LogHelper {
}
object NullLogger {
- def ifTrace(msg: => String) {
- println(msg)
+ def ifTrace(msg: => String) {
+ // println(msg)
}
def error(s: String) {}
def info(s: String) {}
View
4 core/src/main/scala/YahooWoeTypes.scala
@@ -1,7 +1,7 @@
// Copyright 2012 Foursquare Labs Inc. All Rights Reserved.
-package com.foursquare.twofish
+package com.foursquare.twofishes
-import com.foursquare.twofish.YahooWoeType._
+import com.foursquare.twofishes.YahooWoeType._
object YahooWoeTypes {
val order = List(POSTAL_CODE, AIRPORT, TOWN, SUBURB, ADMIN3, ADMIN2, ADMIN1, COUNTRY)
View
2 indexer/src/main/scala/GeocodeRecordWriter.scala
@@ -1,5 +1,5 @@
// Copyright 2012 Foursquare Labs Inc. All Rights Reserved.
-package com.foursquare.twofish
+package com.foursquare.twofishes
import com.novus.salat._
import com.novus.salat.global._
View
2 indexer/src/main/scala/OutputHFile.scala
@@ -1,4 +1,4 @@
-package com.foursquare.twofish
+package com.foursquare.twofishes
import com.mongodb.casbah.Imports._
import com.mongodb.casbah.MongoConnection
View
4 indexer/src/main/scala/importers/geonames/BoundingBoxImporter.scala
@@ -1,7 +1,7 @@
// Copyright 2012 Foursquare Labs Inc. All Rights Reserved.
-package com.foursquare.twofish.importers.geonames
+package com.foursquare.twofishes.importers.geonames
-import com.foursquare.twofish._
+import com.foursquare.twofishes._
import java.io.File
// I could not for the life of me get the java geojson libraries to work
View
6 indexer/src/main/scala/importers/geonames/GeonamesFeature.scala
@@ -1,8 +1,8 @@
// Copyright 2012 Foursquare Labs Inc. All Rights Reserved.
-package com.foursquare.twofish.importers.geonames
+package com.foursquare.twofishes.importers.geonames
-import com.foursquare.twofish.Helpers._
-import com.foursquare.twofish.{Helpers, LogHelper, YahooWoeType}
+import com.foursquare.twofishes.Helpers._
+import com.foursquare.twofishes.{Helpers, LogHelper, YahooWoeType}
import org.bson.types.ObjectId
object GeonamesFeatureColumns extends Enumeration {
View
4 indexer/src/main/scala/importers/geonames/GeonamesImporterConfig.scala
@@ -1,5 +1,5 @@
// Copyright 2012 Foursquare Labs Inc. All Rights Reserved.
-package com.foursquare.twofish.importers.geonames
+package com.foursquare.twofishes.importers.geonames
class GeonamesImporterConfig(args: Array[String]) {
// Buildings are places like the eiffel tower, but also schools and federal offices.
@@ -26,7 +26,7 @@ class GeonamesImporterConfig(args: Array[String]) {
private val config = this
val parser =
- new scopt.OptionParser("twofish", "0.12") {
+ new scopt.OptionParser("twofishes", "0.12") {
booleanOpt("parse_world", "parse the whole world, or one country",
{ v: Boolean => config.parseWorld = v } )
opt("parse_country", "country to parse, two letter iso code",
View
8 indexer/src/main/scala/importers/geonames/GeonamesParser.scala
@@ -1,9 +1,9 @@
// Copyright 2012 Foursquare Labs Inc. All Rights Reserved.
-package com.foursquare.twofish.importers.geonames
+package com.foursquare.twofishes.importers.geonames
-import com.foursquare.twofish._
-import com.foursquare.twofish.Helpers._
-import com.foursquare.twofish.Implicits._
+import com.foursquare.twofishes._
+import com.foursquare.twofishes.Helpers._
+import com.foursquare.twofishes.Implicits._
import java.io.File
object GeonamesParser {
View
4 indexer/src/main/scala/importers/geonames/TsvHelperFileParser.scala
@@ -1,7 +1,7 @@
// Copyright 2012 Foursquare Labs Inc. All Rights Reserved.
-package com.foursquare.twofish.importers.geonames
+package com.foursquare.twofishes.importers.geonames
-import com.foursquare.twofish.LogHelper
+import com.foursquare.twofishes.LogHelper
import java.io.File
class TsvHelperFileParser(filename: String) extends LogHelper {
View
2 ...m/foursquare/twofish/FeatureGeometry.java → ...foursquare/twofishes/FeatureGeometry.java
@@ -3,7 +3,7 @@
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
-package com.foursquare.twofish;
+package com.foursquare.twofishes;
import java.util.List;
import java.util.ArrayList;
View
2 ...ava/com/foursquare/twofish/FeatureId.java → ...a/com/foursquare/twofishes/FeatureId.java
@@ -3,7 +3,7 @@
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
-package com.foursquare.twofish;
+package com.foursquare.twofishes;
import java.util.List;
import java.util.ArrayList;
View
2 ...a/com/foursquare/twofish/FeatureName.java → ...com/foursquare/twofishes/FeatureName.java
@@ -3,7 +3,7 @@
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
-package com.foursquare.twofish;
+package com.foursquare.twofishes;
import java.util.List;
import java.util.ArrayList;
View
2 .../foursquare/twofish/FeatureNameFlags.java → ...oursquare/twofishes/FeatureNameFlags.java
@@ -3,7 +3,7 @@
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
-package com.foursquare.twofish;
+package com.foursquare.twofishes;
import java.util.Map;
View
2 ...oursquare/twofish/GeocodeBoundingBox.java → ...rsquare/twofishes/GeocodeBoundingBox.java
@@ -3,7 +3,7 @@
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
-package com.foursquare.twofish;
+package com.foursquare.twofishes;
import java.util.List;
import java.util.ArrayList;
View
2 ...om/foursquare/twofish/GeocodeFeature.java → .../foursquare/twofishes/GeocodeFeature.java
@@ -3,7 +3,7 @@
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
-package com.foursquare.twofish;
+package com.foursquare.twofishes;
import java.util.List;
import java.util.ArrayList;
View
2 ...square/twofish/GeocodeInterpretation.java → ...uare/twofishes/GeocodeInterpretation.java
@@ -3,7 +3,7 @@
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
-package com.foursquare.twofish;
+package com.foursquare.twofishes;
import java.util.List;
import java.util.ArrayList;
View
2 .../com/foursquare/twofish/GeocodePoint.java → ...om/foursquare/twofishes/GeocodePoint.java
@@ -3,7 +3,7 @@
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
-package com.foursquare.twofish;
+package com.foursquare.twofishes;
import java.util.List;
import java.util.ArrayList;
View
2 ...om/foursquare/twofish/GeocodeRequest.java → .../foursquare/twofishes/GeocodeRequest.java
@@ -3,7 +3,7 @@
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
-package com.foursquare.twofish;
+package com.foursquare.twofishes;
import java.util.List;
import java.util.ArrayList;
View
2 ...m/foursquare/twofish/GeocodeResponse.java → ...foursquare/twofishes/GeocodeResponse.java
@@ -3,7 +3,7 @@
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
-package com.foursquare.twofish;
+package com.foursquare.twofishes;
import java.util.List;
import java.util.ArrayList;
View
2 ...square/twofish/GeocodeServingFeature.java → ...uare/twofishes/GeocodeServingFeature.java
@@ -3,7 +3,7 @@
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
-package com.foursquare.twofish;
+package com.foursquare.twofishes;
import java.util.List;
import java.util.ArrayList;
View
2 ...java/com/foursquare/twofish/Geocoder.java → ...va/com/foursquare/twofishes/Geocoder.java
@@ -3,7 +3,7 @@
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
-package com.foursquare.twofish;
+package com.foursquare.twofishes;
import java.util.List;
import java.util.ArrayList;
View
2 ...m/foursquare/twofish/ScoringFeatures.java → ...foursquare/twofishes/ScoringFeatures.java
@@ -3,7 +3,7 @@
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
-package com.foursquare.twofish;
+package com.foursquare.twofishes;
import java.util.List;
import java.util.ArrayList;
View
2 .../com/foursquare/twofish/YahooWoeType.java → ...om/foursquare/twofishes/YahooWoeType.java
@@ -3,7 +3,7 @@
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
-package com.foursquare.twofish;
+package com.foursquare.twofishes;
import java.util.Map;
View
2 interface/src/main/thrift/geocoder.thrift
@@ -1,4 +1,4 @@
-namespace java com.foursquare.twofish
+namespace java com.foursquare.twofishes
// comments from http://developer.yahoo.com/geo/geoplanet/guide/concepts.html
enum YahooWoeType {
View
12 project/GeocoderBuild.scala
@@ -5,8 +5,8 @@ import AssemblyKeys._
object GeocoderBuild extends Build {
lazy val buildSettings = Seq(
- organization := "com.foursquare.twofish",
- name := "twofish",
+ organization := "com.foursquare.twofishes",
+ name := "twofishes",
version := "0.12",
scalaVersion := "2.9.1"
)
@@ -28,7 +28,7 @@ object GeocoderBuild extends Build {
Keys.publishArtifact in (Compile, Keys.packageDoc) := false,
pomExtra := (
- <url>http://github.com/foursquare/twofish</url>
+ <url>http://github.com/foursquare/twofishes</url>
<licenses>
<license>
<name>Apache</name>
@@ -37,8 +37,8 @@ object GeocoderBuild extends Build {
</license>
</licenses>
<scm>
- <url>git@github.com:foursquare/twofish.git</url>
- <connection>scm:git:git@github.com:foursquare/twofish.git</connection>
+ <url>git@github.com:foursquare/twofishes.git</url>
+ <connection>scm:git:git@github.com:foursquare/twofishes.git</connection>
</scm>
<developers>
<developer>
@@ -105,7 +105,7 @@ object GeocoderBuild extends Build {
lazy val server = Project(id = "server",
settings = defaultSettings ++ assemblySettings ++ Seq(
- mainClass in assembly := Some("com.foursquare.twofish.GeocodeFinagleServer"),
+ mainClass in assembly := Some("com.foursquare.twofishes.GeocodeFinagleServer"),
publishArtifact := true,
libraryDependencies ++= Seq(
"com.twitter" % "finagle-http_2.9.1" % "1.9.12",
View
8 server/src/main/scala/GeocodeImpl.scala
@@ -1,7 +1,7 @@
// Copyright 2012 Foursquare Labs Inc. All Rights Reserved
-package com.foursquare.twofish
+package com.foursquare.twofishes
-import com.foursquare.twofish.Implicits._
+import com.foursquare.twofishes.Implicits._
import com.twitter.util.{Future, FuturePool}
import java.util.concurrent.ConcurrentHashMap
import org.bson.types.ObjectId
@@ -266,14 +266,10 @@ class GeocoderImpl(store: GeocodeStorageFutureReadService) extends LogHelper {
val connectorEnd = connectorStart
val hadConnector = connectorStart != -1
- println(hadConnector)
-
val tokens = if (hadConnector) {
originalTokens.drop(connectorEnd + 1)
} else { originalTokens }
- println(tokens)
-
val cache = generateParses(tokens)
val futureCache: Iterable[Future[(Int, ParseSeq)]] = cache.map({case (k, v) => {
Future.value(k).join(v)
View
2 server/src/main/scala/GeocodeServer.scala
@@ -1,5 +1,5 @@
// Copyright 2012 Foursquare Labs Inc. All Rights Reserved
-package com.foursquare.twofish
+package com.foursquare.twofishes
import collection.JavaConverters._
import com.twitter.finagle.builder.{ServerBuilder, Server}
View
4 server/src/main/scala/GeocodeServerConfig.scala
@@ -1,5 +1,5 @@
// Copyright 2012 Foursquare Labs Inc. All Rights Reserved
-package com.foursquare.twofish
+package com.foursquare.twofishes
class GeocodeServerConfig(args: Array[String]) {
var runHttpServer: Boolean = true
@@ -9,7 +9,7 @@ class GeocodeServerConfig(args: Array[String]) {
private val config = this
val parser =
- new scopt.OptionParser("twofish", "0.12") {
+ new scopt.OptionParser("twofishes", "0.12") {
intOpt("p", "port", "port to run thrift server on",
{ v: Int => config.thriftServerPort = v } )
booleanOpt("h", "run_http_server", "whether or not to run http/json server on port+1",

0 comments on commit 2a364e8

Please sign in to comment.
Something went wrong with that request. Please try again.