Skip to content

Commit 220d0ef

Browse files
NarigoNarigo
committed
move to vert-x
1 parent b648221 commit 220d0ef

22 files changed

+45
-47
lines changed

‎build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ def configurePom(def pom) {
9090
inceptionYear '2013'
9191
packaging produceJar == 'false' ? 'pom' : 'jar'
9292

93-
url 'https://github.com/campudus/vertx-mysql-postgresql'
93+
url 'https://github.com/vert-x/mod-mysql-postgresql'
9494

9595
developers {
9696
developer {
@@ -101,7 +101,7 @@ def configurePom(def pom) {
101101
}
102102

103103
scm {
104-
url 'https://github.com/campudus/vertx-mysql-postgresql'
104+
url 'https://github.com/vert-x/mod-mysql-postgresql'
105105
}
106106

107107
licenses {

‎gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# E.g. your domain name
2-
modowner=com.campudus
2+
modowner=io.vertx
33

44
# Your module name
5-
modname=async-mysql-postgresql
5+
modname=mod-mysql-postgresql
66

77
# Your module version
88
version=0.1.0-SNAPSHOT

‎src/main/resources/mod.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22

33
// Scala verticle
4-
"main":"scala:com.campudus.vertx.database.Starter",
4+
"main":"scala:io.vertx.asyncsql.Starter",
55

66
// mandatory fields
77
"description":"Using https://github.com/mauricio/postgresql-async to provide a true async connector to PostgreSQL and MySQL",

‎src/main/scala/com/campudus/vertx/database/Starter.scala renamed to ‎src/main/scala/io/vertx/asyncsql/Starter.scala

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
1-
package com.campudus.vertx.database
1+
package io.vertx.asyncsql
22

3-
import com.campudus.vertx.Verticle
4-
import com.github.mauricio.async.db.postgresql.util.URLParser
3+
import io.vertx.helpers.Verticle
54
import com.github.mauricio.async.db.Configuration
6-
import com.github.mauricio.async.db.postgresql.pool.PostgreSQLConnectionFactory
7-
import com.github.mauricio.async.db.pool.ConnectionPool
8-
import com.github.mauricio.async.db.pool.PoolConfiguration
9-
import com.campudus.vertx.VertxExecutionContext
10-
import com.campudus.vertx.database.pool.AsyncConnectionPool
115
import org.vertx.scala.core.eventbus.EventBus._
126
import org.vertx.scala.core.json._
7+
import io.vertx.asyncsql.database.ConnectionHandler
8+
import io.vertx.asyncsql.database.MySqlConnectionHandler
9+
import io.vertx.asyncsql.database.PostgreSqlConnectionHandler
10+
import org.vertx.scala.core.Future
1311

1412
class Starter extends Verticle {
1513

‎src/main/scala/com/campudus/vertx/database/ConnectionHandler.scala renamed to ‎src/main/scala/io/vertx/asyncsql/database/ConnectionHandler.scala

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
package com.campudus.vertx.database
1+
package io.vertx.asyncsql.database
22

33
import org.vertx.scala.core.eventbus.Message
44
import com.github.mauricio.async.db.Configuration
5-
import com.campudus.vertx.database.pool.PostgreSqlAsyncConnectionPool
6-
import com.campudus.vertx.VertxExecutionContext
5+
import io.vertx.asyncsql.database.pool.PostgreSqlAsyncConnectionPool
6+
import io.vertx.helpers.VertxExecutionContext
77
import com.github.mauricio.async.db.Connection
8-
import com.campudus.vertx.busmod.ScalaBusMod
8+
import io.vertx.busmod.ScalaBusMod
99
import scala.concurrent.Future
10-
import com.campudus.vertx.database.pool.AsyncConnectionPool
10+
import io.vertx.asyncsql.database.pool.AsyncConnectionPool
1111
import org.vertx.scala.core.Vertx
12-
import com.campudus.vertx.Verticle
12+
import io.vertx.helpers.Verticle
1313
import com.github.mauricio.async.db.QueryResult
14-
import com.campudus.vertx.VertxScalaHelpers
14+
import io.vertx.helpers.VertxScalaHelpers
1515
import com.github.mauricio.async.db.RowData
1616
import collection.JavaConverters._
1717
import com.github.mauricio.async.db.postgresql.exceptions.GenericDatabaseException

‎src/main/scala/com/campudus/vertx/database/MySqlConnectionHandler.scala renamed to ‎src/main/scala/io/vertx/asyncsql/database/MySqlConnectionHandler.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package com.campudus.vertx.database
1+
package io.vertx.asyncsql.database
22

3-
import com.campudus.vertx.Verticle
3+
import io.vertx.helpers.Verticle
44
import com.github.mauricio.async.db.Configuration
55

66
class MySqlConnectionHandler(val verticle: Verticle, val config: Configuration, val dbType: String = "mysql") extends ConnectionHandler {

‎src/main/scala/com/campudus/vertx/database/PostgreSqlConnectionHandler.scala renamed to ‎src/main/scala/io/vertx/asyncsql/database/PostgreSqlConnectionHandler.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package com.campudus.vertx.database
1+
package io.vertx.asyncsql.database
22

3-
import com.campudus.vertx.Verticle
3+
import io.vertx.helpers.Verticle
44
import com.github.mauricio.async.db.Configuration
55

66
class PostgreSqlConnectionHandler(val verticle: Verticle, val config: Configuration, val dbType: String = "postgresql") extends ConnectionHandler {

‎src/main/scala/com/campudus/vertx/database/pool/AsyncConnectionPool.scala renamed to ‎src/main/scala/io/vertx/asyncsql/database/pool/AsyncConnectionPool.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.campudus.vertx.database.pool
1+
package io.vertx.asyncsql.database.pool
22

33
import com.github.mauricio.async.db.Configuration
44
import scala.concurrent.Future

‎src/main/scala/com/campudus/vertx/database/pool/MySqlAsyncConnectionPool.scala renamed to ‎src/main/scala/io/vertx/asyncsql/database/pool/MySqlAsyncConnectionPool.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
package com.campudus.vertx.database.pool
1+
package io.vertx.asyncsql.database.pool
22

33
import com.github.mauricio.async.db.Configuration
44
import com.github.mauricio.async.db.postgresql.PostgreSQLConnection
55
import scala.concurrent.Future
66
import scala.concurrent.ExecutionContext
7-
import com.campudus.vertx.VertxExecutionContext
7+
import io.vertx.helpers.VertxExecutionContext
88
import com.github.mauricio.async.db.Connection
99
import org.vertx.java.core.impl.EventLoopContext
1010
import io.netty.channel.EventLoop

‎src/main/scala/com/campudus/vertx/database/pool/PostgreSqlAsyncConnectionPool.scala renamed to ‎src/main/scala/io/vertx/asyncsql/database/pool/PostgreSqlAsyncConnectionPool.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
package com.campudus.vertx.database.pool
1+
package io.vertx.asyncsql.database.pool
22

33
import com.github.mauricio.async.db.Configuration
44
import com.github.mauricio.async.db.postgresql.PostgreSQLConnection
55
import scala.concurrent.Future
66
import scala.concurrent.ExecutionContext
7-
import com.campudus.vertx.VertxExecutionContext
7+
import io.vertx.helpers.VertxExecutionContext
88
import com.github.mauricio.async.db.Connection
99
import org.vertx.java.core.impl.EventLoopContext
1010
import io.netty.channel.EventLoop

‎src/main/scala/com/campudus/vertx/messages/Reply.scala renamed to ‎src/main/scala/io/vertx/asyncsql/messages/Reply.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.campudus.vertx.messages
1+
package io.vertx.asyncsql.messages
22

33
import org.vertx.scala.core.json._
44

‎src/main/scala/com/campudus/vertx/busmod/ScalaBusMod.scala renamed to ‎src/main/scala/io/vertx/busmod/ScalaBusMod.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
package com.campudus.vertx.busmod
1+
package io.vertx.busmod
22

33
import scala.concurrent.Future
44

55
import org.vertx.scala.core.json._
66
import org.vertx.scala.core.eventbus.Message
77

8-
import com.campudus.vertx.VertxExecutionContext
9-
import com.campudus.vertx.messages.MessageHelper
8+
import io.vertx.helpers.VertxExecutionContext
9+
import io.vertx.asyncsql.messages.MessageHelper
1010

1111
trait ScalaBusMod extends MessageHelper with VertxExecutionContext with (Message[JsonObject] => Unit) {
1212

‎src/main/scala/com/campudus/vertx/busmod/UnknownActionException.scala renamed to ‎src/main/scala/io/vertx/busmod/UnknownActionException.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.campudus.vertx.busmod
1+
package io.vertx.busmod
22

33
class UnknownActionException(msg: String = null, cause: Throwable = null) extends Exception(msg, cause) {
44
}

‎src/main/scala/com/campudus/vertx/Logger.scala renamed to ‎src/main/scala/io/vertx/helpers/Logger.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.campudus.vertx
1+
package io.vertx.helpers
22

33
/**
44
* Small helper class to check for log level and delegate it to the real logger if enabled.

‎src/main/scala/com/campudus/vertx/Verticle.scala renamed to ‎src/main/scala/io/vertx/helpers/Verticle.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.campudus.vertx
1+
package io.vertx.helpers
22

33
trait Verticle extends org.vertx.scala.platform.Verticle with VertxExecutionContext {
44

‎src/main/scala/com/campudus/vertx/VertxExecutionContext.scala renamed to ‎src/main/scala/io/vertx/helpers/VertxExecutionContext.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.campudus.vertx
1+
package io.vertx.helpers
22

33
import scala.concurrent.ExecutionContext
44
import scala.concurrent.Future

‎src/main/scala/com/campudus/vertx/VertxFutureHelpers.scala renamed to ‎src/main/scala/io/vertx/helpers/VertxFutureHelpers.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.campudus.vertx
1+
package io.vertx.helpers
22

33
import java.net.URI
44
import scala.concurrent.{ Future, Promise }

‎src/main/scala/com/campudus/vertx/VertxScalaHelpers.scala renamed to ‎src/main/scala/io/vertx/helpers/VertxScalaHelpers.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.campudus.vertx
1+
package io.vertx.helpers
22

33
import org.vertx.java.core.Handler
44
import org.vertx.java.core.AsyncResult

‎src/test/scala/com/campudus/test/BaseSqlTests.scala renamed to ‎src/test/scala/io/vertx/asyncsql/test/BaseSqlTests.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.campudus.test
1+
package io.vertx.asyncsql.test
22

33
import scala.concurrent.Future
44
import org.vertx.scala.core.json.JsonArray

‎src/test/scala/com/campudus/test/SqlTestVerticle.scala renamed to ‎src/test/scala/io/vertx/asyncsql/test/SqlTestVerticle.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package com.campudus.test
1+
package io.vertx.asyncsql.test
22

3-
import com.campudus.vertx.VertxExecutionContext
3+
import io.vertx.helpers.VertxExecutionContext
44
import scala.concurrent.Future
55
import org.vertx.java.core.Handler
66
import org.vertx.java.core.AsyncResult
@@ -13,7 +13,7 @@ import org.vertx.java.core.logging.impl.LoggerFactory
1313
import scala.concurrent.Promise
1414
import org.vertx.scala.core.eventbus.Message
1515
import org.vertx.scala.core.Vertx
16-
import com.campudus.vertx.VertxScalaHelpers
16+
import io.vertx.helpers.VertxScalaHelpers
1717
import org.vertx.scala.core.json._
1818

1919
abstract class SqlTestVerticle extends org.vertx.testtools.TestVerticle with VertxExecutionContext with VertxScalaHelpers {

‎src/test/scala/com/campudus/test/mysql/MySqlTest.scala renamed to ‎src/test/scala/io/vertx/asyncsql/test/mysql/MySqlTest.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
package com.campudus.test.postgresql
1+
package io.vertx.asyncsql.test.mysql
22

33
import org.junit.Test
44
import org.vertx.scala.core.json._
5-
import com.campudus.test.{ BaseSqlTests, SqlTestVerticle }
5+
import io.vertx.asyncsql.test.{ BaseSqlTests, SqlTestVerticle }
66
import org.vertx.testtools.VertxAssert
77

88
class MySqlTest extends SqlTestVerticle with BaseSqlTests {

‎src/test/scala/com/campudus/test/postgresql/PostgreSqlTest.scala renamed to ‎src/test/scala/io/vertx/asyncsql/test/postgresql/PostgreSqlTest.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
package com.campudus.test.postgresql
1+
package io.vertx.asyncsql.test.postgresql
22

33
import org.junit.Test
44
import org.vertx.scala.core.json._
55

6-
import com.campudus.test.{ BaseSqlTests, SqlTestVerticle }
6+
import io.vertx.asyncsql.test.{ BaseSqlTests, SqlTestVerticle }
77

88
class PostgreSqlTest extends SqlTestVerticle with BaseSqlTests {
99

0 commit comments

Comments
 (0)