Skip to content
This repository was archived by the owner on Oct 30, 2019. It is now read-only.

Commit 81cf699

Browse files
committed
change package/groupId from com.wordnik to io.swagger and adjust the whole project
1 parent 53ad0bb commit 81cf699

File tree

161 files changed

+447
-445
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

161 files changed

+447
-445
lines changed

modules/swagger-integration/pom.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<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">
22
<parent>
3-
<groupId>com.wordnik</groupId>
3+
<groupId>io.swagger</groupId>
44
<artifactId>swaggersocket-project</artifactId>
55
<version>2.2.0-SNAPSHOT</version>
66
<relativePath>../../</relativePath>
77
</parent>
88

99
<modelVersion>4.0.0</modelVersion>
10-
<groupId>com.wordnik</groupId>
10+
<groupId>io.swagger</groupId>
1111
<artifactId>swagger-integration</artifactId>
1212
<packaging>jar</packaging>
1313
<version>2.2.0-SNAPSHOT</version>
@@ -33,15 +33,15 @@
3333
</dependency>
3434

3535
<dependency>
36-
<groupId>com.wordnik</groupId>
36+
<groupId>io.swagger</groupId>
3737
<artifactId>swaggersocket-scala-client</artifactId>
3838
</dependency>
3939
<dependency>
40-
<groupId>com.wordnik</groupId>
40+
<groupId>io.swagger</groupId>
4141
<artifactId>swaggersocket-server</artifactId>
4242
</dependency>
4343
<dependency>
44-
<groupId>com.wordnik</groupId>
44+
<groupId>io.swagger</groupId>
4545
<artifactId>swaggersocket-protocol</artifactId>
4646
</dependency>
4747

modules/swagger-integration/src/main/scala/com/wordnik/api/ApiInvoker.scala renamed to modules/swagger-integration/src/main/scala/io/swagger/swaggersocket/api/ApiInvoker.scala

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright 2011 Wordnik, Inc.
2+
* Copyright 2016 SmartBear Software
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -13,16 +13,16 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package com.wordnik.api
16+
package io.swagger.swaggersocket.api
1717

1818

1919
import scala.collection.JavaConversions._
2020
import org.slf4j.LoggerFactory
2121
import java.util.concurrent._
2222
import com.fasterxml.jackson.annotation.JsonInclude
2323
import com.fasterxml.jackson.databind.{ObjectMapper, DeserializationFeature, SerializationFeature}
24-
import com.wordnik.swaggersocket.protocol.{Header, QueryString, Response, Request}
25-
import com.wordnik.swaggersocket.client.{SwaggerSocketException, SwaggerSocketListener, SwaggerSocket, APIInvoker}
24+
import io.swagger.swaggersocket.protocol.{Header, QueryString, Response, Request}
25+
import io.swagger.swaggersocket.client.{SwaggerSocketException, SwaggerSocketListener, SwaggerSocket, APIInvoker}
2626
import java.net.URLEncoder
2727
import collection.mutable.HashMap
2828

modules/swagger-integration/src/test/scala/com/wordnik/swaggersocket/test/ApiInvokerTest.scala renamed to modules/swagger-integration/src/test/scala/io/swagger/swaggersocket/test/ApiInvokerTest.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package com.wordnik.swaggersocket.tests
16+
package io.swagger.swaggersocket.test
1717

1818
import org.slf4j.{ LoggerFactory, Logger }
1919
import org.eclipse.jetty.server.AbstractConnector
@@ -22,7 +22,7 @@ import org.eclipse.jetty.server.Server
2222

2323
import org.scalatest.{ FlatSpec, BeforeAndAfterAll, ConfigMap }
2424
import org.eclipse.jetty.servlet.{ServletHolder, ServletContextHandler}
25-
import com.wordnik.swaggersocket.server.SwaggerSocketServlet
25+
import io.swagger.swaggersocket.server.SwaggerSocketServlet
2626

2727
class ApiInvokerTest extends FlatSpec with BeforeAndAfterAll {
2828
protected final val log: Logger = LoggerFactory.getLogger(classOf[ApiInvokerTest])

modules/swagger-integration/src/test/scala/com/wordnik/swaggersocket/test/RootResource.scala renamed to modules/swagger-integration/src/test/scala/io/swagger/swaggersocket/test/RootResource.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package com.wordnik.swaggersocket.tests
16+
package io.swagger.swaggersocket.test
1717

1818
import org.slf4j.LoggerFactory
1919
import javax.ws.rs.{GET, POST, Produces, Path}

modules/swagger-integration/src/test/scala/com/wordnik/swaggersocket/test/RootResourceTest.scala renamed to modules/swagger-integration/src/test/scala/io/swagger/swaggersocket/test/RootResourceTest.scala

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,16 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package com.wordnik.swaggersocket.tests
16+
package io.swagger.swaggersocket.test
1717

1818
import org.junit.runner.RunWith
1919
import org.scalatest.junit.JUnitRunner
2020
import org.scalatest.FlatSpec
2121

22-
import com.wordnik.swaggersocket.protocol.{Handshake, Request, Response}
22+
import io.swagger.swaggersocket.protocol.{Handshake, Request, Response}
2323
import java.util.concurrent.{TimeUnit, CountDownLatch}
24-
import com.wordnik.swaggersocket.client.{SwaggerSocketException, SwaggerSocketListener, SwaggerSocket}
25-
import com.wordnik.api.ApiInvoker
24+
import io.swagger.swaggersocket.client.{SwaggerSocketException, SwaggerSocketListener, SwaggerSocket}
25+
import io.swagger.swaggersocket.api.ApiInvoker
2626
import collection.mutable.HashMap
2727

2828
@RunWith(classOf[JUnitRunner])

modules/swaggersocket-protocol/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<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">
22
<parent>
3-
<groupId>com.wordnik</groupId>
3+
<groupId>io.swagger</groupId>
44
<artifactId>swaggersocket-project</artifactId>
55
<version>2.2.0-SNAPSHOT</version>
66
<relativePath>../../</relativePath>
77
</parent>
88

99
<modelVersion>4.0.0</modelVersion>
10-
<groupId>com.wordnik</groupId>
10+
<groupId>io.swagger</groupId>
1111
<artifactId>swaggersocket-protocol</artifactId>
1212
<packaging>bundle</packaging>
1313
<version>2.2.0-SNAPSHOT</version>
@@ -34,7 +34,7 @@
3434
<configuration>
3535
<instructions>
3636
<Export-Package>
37-
com.wordnik.swaggersocket.protocol
37+
io.swagger.swaggersocket.protocol
3838
</Export-Package>
3939
<Import-Package>
4040
*

modules/swaggersocket-protocol/src/main/java/com/wordnik/swaggersocket/protocol/Close.java renamed to modules/swaggersocket-protocol/src/main/java/io/swagger/swaggersocket/protocol/Close.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package com.wordnik.swaggersocket.protocol;
16+
package io.swagger.swaggersocket.protocol;
1717

1818
public class Close {
1919

modules/swaggersocket-protocol/src/main/java/com/wordnik/swaggersocket/protocol/CloseMessage.java renamed to modules/swaggersocket-protocol/src/main/java/io/swagger/swaggersocket/protocol/CloseMessage.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package com.wordnik.swaggersocket.protocol;
16+
package io.swagger.swaggersocket.protocol;
1717

1818
public class CloseMessage {
1919
private Close close;

modules/swaggersocket-protocol/src/main/java/com/wordnik/swaggersocket/protocol/Handshake.java renamed to modules/swaggersocket-protocol/src/main/java/io/swagger/swaggersocket/protocol/Handshake.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package com.wordnik.swaggersocket.protocol;
16+
package io.swagger.swaggersocket.protocol;
1717

1818
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
1919
import java.util.List;
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package com.wordnik.swaggersocket.protocol;
16+
package io.swagger.swaggersocket.protocol;
1717

1818
public class HandshakeMessage {
1919

modules/swaggersocket-protocol/src/main/java/com/wordnik/swaggersocket/protocol/Header.java renamed to modules/swaggersocket-protocol/src/main/java/io/swagger/swaggersocket/protocol/Header.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package com.wordnik.swaggersocket.protocol;
16+
package io.swagger.swaggersocket.protocol;
1717

1818
public class Header {
1919

modules/swaggersocket-protocol/src/main/java/com/wordnik/swaggersocket/protocol/Heartbeat.java renamed to modules/swaggersocket-protocol/src/main/java/io/swagger/swaggersocket/protocol/Heartbeat.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.wordnik.swaggersocket.protocol;
1+
package io.swagger.swaggersocket.protocol;
22

33
public class Heartbeat {
44

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package com.wordnik.swaggersocket.protocol;
16+
package io.swagger.swaggersocket.protocol;
1717

1818
public class HeatbeatMessage {
1919
private Heartbeat heartbeat;

modules/swaggersocket-protocol/src/main/java/com/wordnik/swaggersocket/protocol/Message.java renamed to modules/swaggersocket-protocol/src/main/java/io/swagger/swaggersocket/protocol/Message.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package com.wordnik.swaggersocket.protocol;
16+
package io.swagger.swaggersocket.protocol;
1717

1818
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
1919

modules/swaggersocket-protocol/src/main/java/com/wordnik/swaggersocket/protocol/Method.java renamed to modules/swaggersocket-protocol/src/main/java/io/swagger/swaggersocket/protocol/Method.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package com.wordnik.swaggersocket.protocol;
16+
package io.swagger.swaggersocket.protocol;
1717

1818
public interface Method {
1919

modules/swaggersocket-protocol/src/main/java/com/wordnik/swaggersocket/protocol/ProtocolBase.java renamed to modules/swaggersocket-protocol/src/main/java/io/swagger/swaggersocket/protocol/ProtocolBase.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package com.wordnik.swaggersocket.protocol;
16+
package io.swagger.swaggersocket.protocol;
1717

1818
import java.util.List;
1919

modules/swaggersocket-protocol/src/main/java/com/wordnik/swaggersocket/protocol/QueryString.java renamed to modules/swaggersocket-protocol/src/main/java/io/swagger/swaggersocket/protocol/QueryString.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package com.wordnik.swaggersocket.protocol;
16+
package io.swagger.swaggersocket.protocol;
1717

1818
public class QueryString {
1919
private String name;

modules/swaggersocket-protocol/src/main/java/com/wordnik/swaggersocket/protocol/Request.java renamed to modules/swaggersocket-protocol/src/main/java/io/swagger/swaggersocket/protocol/Request.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package com.wordnik.swaggersocket.protocol;
16+
package io.swagger.swaggersocket.protocol;
1717

1818
import java.util.Collections;
1919
import java.util.List;
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package com.wordnik.swaggersocket.protocol;
16+
package io.swagger.swaggersocket.protocol;
1717

1818
public class RequestMessage {
1919

modules/swaggersocket-protocol/src/main/java/com/wordnik/swaggersocket/protocol/Response.java renamed to modules/swaggersocket-protocol/src/main/java/io/swagger/swaggersocket/protocol/Response.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package com.wordnik.swaggersocket.protocol;
16+
package io.swagger.swaggersocket.protocol;
1717

1818
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
1919
import java.util.ArrayList;
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package com.wordnik.swaggersocket.protocol;
16+
package io.swagger.swaggersocket.protocol;
1717

1818
import java.util.ArrayList;
1919
import java.util.List;

modules/swaggersocket-protocol/src/main/java/com/wordnik/swaggersocket/protocol/StatusMessage.java renamed to modules/swaggersocket-protocol/src/main/java/io/swagger/swaggersocket/protocol/StatusMessage.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package com.wordnik.swaggersocket.protocol;
16+
package io.swagger.swaggersocket.protocol;
1717

1818
public class StatusMessage {
1919

modules/swaggersocket-scala-client/pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<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">
22
<parent>
3-
<groupId>com.wordnik</groupId>
3+
<groupId>io.swagger</groupId>
44
<artifactId>swaggersocket-project</artifactId>
55
<version>2.2.0-SNAPSHOT</version>
66
<relativePath>../../</relativePath>
77
</parent>
88

99
<modelVersion>4.0.0</modelVersion>
10-
<groupId>com.wordnik</groupId>
10+
<groupId>io.swagger</groupId>
1111
<artifactId>swaggersocket-scala-client</artifactId>
1212
<packaging>jar</packaging>
1313
<version>2.2.0-SNAPSHOT</version>
@@ -31,7 +31,7 @@
3131
</dependency>
3232

3333
<dependency>
34-
<groupId>com.wordnik</groupId>
34+
<groupId>io.swagger</groupId>
3535
<artifactId>swaggersocket-protocol</artifactId>
3636
</dependency>
3737

@@ -43,7 +43,7 @@
4343
</dependency>
4444

4545
<dependency>
46-
<groupId>com.wordnik</groupId>
46+
<groupId>io.swagger</groupId>
4747
<artifactId>swaggersocket-server</artifactId>
4848
<scope>test</scope>
4949
</dependency>
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package com.wordnik.swaggersocket.client
16+
package io.swagger.swaggersocket.client
1717

1818
import com.fasterxml.jackson.annotation.JsonInclude
1919
import com.fasterxml.jackson.databind.ObjectMapper
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,16 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package com.wordnik.swaggersocket.client
16+
package io.swagger.swaggersocket.client
1717

1818
import scala.collection.JavaConversions._
1919
import org.slf4j.{Logger, LoggerFactory}
2020
import org.jfarcand.wcs.{TextListener, WebSocket}
21-
import com.wordnik.swaggersocket.protocol.RequestMessage.Builder
22-
import com.wordnik.swaggersocket.protocol.StatusMessage.Status
21+
import io.swagger.swaggersocket.protocol.RequestMessage.Builder
22+
import io.swagger.swaggersocket.protocol.StatusMessage.Status
2323
import java.util.concurrent.{ConcurrentHashMap, TimeoutException, TimeUnit, CountDownLatch}
2424
import java.util.concurrent.atomic.AtomicInteger
25-
import com.wordnik.swaggersocket.protocol.{Close, StatusMessage, Handshake, Request}
25+
import io.swagger.swaggersocket.protocol.{Close, StatusMessage, Handshake, Request}
2626

2727
/**
2828
* A WebSocket connection supporting the SwaggerSocket protocol. As simple as:
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package com.wordnik.swaggersocket.client
16+
package io.swagger.swaggersocket.client
1717

18-
import com.wordnik.swaggersocket.protocol.{Response, ResponseMessage, StatusMessage}
18+
import io.swagger.swaggersocket.protocol.{Response, ResponseMessage, StatusMessage}
1919

2020
class SwaggerSocketDeserializer {
2121

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package com.wordnik.swaggersocket.client
16+
package io.swagger.swaggersocket.client
1717

1818
/**
1919
* When a SwaggerSocket protocol exception occurs.
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package com.wordnik.swaggersocket.client
16+
package io.swagger.swaggersocket.client
1717

18-
import com.wordnik.swaggersocket.protocol.{Request, Response}
18+
import io.swagger.swaggersocket.protocol.{Request, Response}
1919

2020
trait SwaggerSocketListener {
2121

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package com.wordnik.swaggersocket.client
16+
package io.swagger.swaggersocket.client
1717

1818
import com.fasterxml.jackson.databind.ObjectMapper
19-
import com.wordnik.swaggersocket.protocol._
19+
import io.swagger.swaggersocket.protocol._
2020

2121
class SwaggerSocketSerializer {
2222

0 commit comments

Comments
 (0)