[breaking] servers - renamed restx-server-jetty artefact to restx-ser…

…ver-jetty8 in order to have a more meaningful name
restx · Aug 23, 2017 · 9a93edf · 9a93edf
1 parent b4d8650
commit 9a93edf
Show file tree

Hide file tree

Showing 19 changed files with 46 additions and 45 deletions.
diff --git a/README.md b/README.md
@@ -88,7 +88,7 @@ Here is a brief summary of each module:
 ### Servers support:
 
 - `restx-servlet`: Servlet 2.5+ adapter for RESTX, allowing to embed RESTX in any servlet 2.5+ container.
-- `restx-server-jetty`: Embedded Jetty support.
+- `restx-server-jetty8`: Embedded Jetty 8 support.
 - `restx-server-tomcat`: Embedded Tomcat support.
 - `restx-server-simple`: SimpleFramework adapter for RESTX, this is the lightest and fastest solution.
 - `restx-server-testing`: JUnit tests for all the supported embedded servers.

diff --git a/pom.xml b/pom.xml
@@ -235,7 +235,7 @@
             </dependency>
             <dependency>
                 <groupId>io.restx</groupId>
-                <artifactId>restx-server-jetty</artifactId>
+                <artifactId>restx-server-jetty8</artifactId>
                 <version>${restx.version}</version>
             </dependency>
             <dependency>
@@ -581,7 +581,7 @@
         <module>restx-jongo</module>
         <module>restx-jongo-specs-tests</module>
         <module>restx-servlet</module>
-        <module>restx-server-jetty</module>
+        <module>restx-server-jetty8</module>
         <module>restx-server-tomcat</module>
         <module>restx-server-simple</module>
         <module>restx-server-testing</module>

diff --git a/restx-core-shell/src/main/resources/templates/srv/main/_md.restx.json b/restx-core-shell/src/main/resources/templates/srv/main/_md.restx.json
@@ -31,7 +31,7 @@
             "io.restx:restx-stats-admin:${restx.version}",
 {{/includeStatsModule}}
             "io.restx:restx-servlet:${restx.version}",
-            "io.restx:restx-server-jetty:${restx.version}!optional",
+            "io.restx:restx-server-jetty8:${restx.version}!optional",
             "io.restx:restx-apidocs:${restx.version}",
             "io.restx:restx-specs-admin:${restx.version}",
             "io.restx:restx-admin:${restx.version}",

diff --git a/restx-samplest/pom.xml b/restx-samplest/pom.xml
@@ -49,7 +49,8 @@
         </dependency>
         <dependency>
             <groupId>io.restx</groupId>
-            <artifactId>restx-server-jetty</artifactId>
+            <artifactId>restx-server-jetty8</artifactId>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>io.restx</groupId>

diff --git a/restx-server-jetty/md.restx.json b/restx-server-jetty/md.restx.json
diff --git a/restx-server-jetty8/md.restx.json b/restx-server-jetty8/md.restx.json
@@ -0,0 +1,23 @@
+{
+    "parent": "io.restx:restx-parent:${restx.version}",
+    "module": "io.restx:restx-server-jetty8:${restx.version}",
+
+    "properties": {
+        "@files": ["../restx.build.properties.json"]
+    },
+
+    "dependencies": {
+        "compile": [
+            "io.restx:restx-factory:${restx.version}",
+            "io.restx:restx-core:${restx.version}",
+            "javax.servlet:javax.servlet-api:3.0.1",
+            "io.restx:restx-servlet:${restx.version}",
+            "org.eclipse.jetty:jetty-server:${jetty8.version}",
+            "org.eclipse.jetty:jetty-servlet:${jetty8.version}",
+            "org.eclipse.jetty:jetty-security:${jetty8.version}",
+            "org.eclipse.jetty:jetty-util:${jetty8.version}",
+            "org.eclipse.jetty:jetty-webapp:${jetty8.version}",
+            "org.eclipse.jetty:jetty-servlets:${jetty8.version}"
+        ]
+    }
+}
diff --git a/restx-server-jetty/module.ivy → restx-server-jetty8/module.ivy b/restx-server-jetty/module.ivy → restx-server-jetty8/module.ivy
@@ -1,5 +1,5 @@
 <ivy-module version="2.0" xmlns:ea="http://www.easyant.org">
-    <info organisation="io.restx" module="restx-server-jetty" revision="0.35" status="integration">
+    <info organisation="io.restx" module="restx-server-jetty8" revision="0.35" status="integration">
         <ea:build organisation="org.apache.easyant.buildtypes" module="build-std-java" revision="0.9"
             compile.java.source.version="1.7"
             compile.java.target.version="1.7"

diff --git a/restx-server-jetty/pom.xml → restx-server-jetty8/pom.xml b/restx-server-jetty/pom.xml → restx-server-jetty8/pom.xml
@@ -10,11 +10,11 @@
         <version>0.35-SNAPSHOT</version>
     </parent>
 
-    <artifactId>restx-server-jetty</artifactId>
-    <name>restx-server-jetty</name>
+    <artifactId>restx-server-jetty8</artifactId>
+    <name>restx-server-jetty8</name>
 
     <properties>
-        <jetty.version>8.1.8.v20121106</jetty.version>
+        <jetty8.version>8.1.8.v20121106</jetty8.version>
         <servlet-api.version>3.0.1</servlet-api.version>
     </properties>
 
@@ -42,32 +42,32 @@
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-server</artifactId>
-            <version>${jetty.version}</version>
+            <version>${jetty8.version}</version>
         </dependency>
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-servlet</artifactId>
-            <version>${jetty.version}</version>
+            <version>${jetty8.version}</version>
         </dependency>
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-security</artifactId>
-            <version>${jetty.version}</version>
+            <version>${jetty8.version}</version>
         </dependency>
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-util</artifactId>
-            <version>${jetty.version}</version>
+            <version>${jetty8.version}</version>
         </dependency>
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-webapp</artifactId>
-            <version>${jetty.version}</version>
+            <version>${jetty8.version}</version>
         </dependency>
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-servlets</artifactId>
-            <version>${jetty.version}</version>
+            <version>${jetty8.version}</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/.../java/restx/server/JettyServerModule.java → .../java/restx/server/JettyServerModule.java b/.../java/restx/server/JettyServerModule.java → .../java/restx/server/JettyServerModule.java
diff --git a/...ain/java/restx/server/JettyWebServer.java → ...ain/java/restx/server/JettyWebServer.java b/...ain/java/restx/server/JettyWebServer.java → ...ain/java/restx/server/JettyWebServer.java
diff --git a/...t/java/restx/server/WebServerExample.java → ...t/java/restx/server/WebServerExample.java b/...t/java/restx/server/WebServerExample.java → ...t/java/restx/server/WebServerExample.java
diff --git a/...ces/restx/server/WebServerExample-web.xml → ...ces/restx/server/WebServerExample-web.xml b/...ces/restx/server/WebServerExample-web.xml → ...ces/restx/server/WebServerExample-web.xml
diff --git a/restx-server-testing/md.restx.json b/restx-server-testing/md.restx.json
@@ -10,7 +10,7 @@
         "compile": [
         ],
         "test": [
-            "io.restx:restx-server-jetty:${restx.version}",
+            "io.restx:restx-server-jetty8:${restx.version}",
             "io.restx:restx-server-simple:${restx.version}",
             "io.restx:restx-server-tomcat:${restx.version}",
             "io.restx:restx-specs-tests:${restx.version}",

diff --git a/restx-server-testing/module.ivy b/restx-server-testing/module.ivy
@@ -14,7 +14,7 @@
         <artifact type="jar"/>
     </publications>
     <dependencies>
-        <dependency org="io.restx" name="restx-server-jetty" rev="latest.integration" conf="test->default" />
+        <dependency org="io.restx" name="restx-server-jetty8" rev="latest.integration" conf="test->default" />
         <dependency org="io.restx" name="restx-server-simple" rev="latest.integration" conf="test->default" />
         <dependency org="io.restx" name="restx-server-tomcat" rev="latest.integration" conf="test->default" />
         <dependency org="io.restx" name="restx-specs-tests" rev="latest.integration" conf="test->default" />

diff --git a/restx-server-testing/pom.xml b/restx-server-testing/pom.xml
@@ -16,7 +16,7 @@
     <dependencies>
         <dependency>
             <groupId>io.restx</groupId>
-            <artifactId>restx-server-jetty</artifactId>
+            <artifactId>restx-server-jetty8</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/restx-specs-tests/md.restx.json b/restx-specs-tests/md.restx.json
@@ -17,7 +17,7 @@
             "com.googlecode.java-diff-utils:diffutils:${diffutils.version}"
         ],
         "test": [
-            "io.restx:restx-server-jetty:${restx.version}"
+            "io.restx:restx-server-jetty8:${restx.version}"
         ]
     }
 }
diff --git a/restx-specs-tests/module.ivy b/restx-specs-tests/module.ivy
@@ -21,6 +21,6 @@
         <dependency org="org.assertj" name="assertj-core" rev="1.6.0" conf="default" />
         <dependency org="com.github.kevinsawicki" name="http-request" rev="5.5" conf="default" />
         <dependency org="com.googlecode.java-diff-utils" name="diffutils" rev="1.3.0" conf="default" />
-        <dependency org="io.restx" name="restx-server-jetty" rev="latest.integration" conf="test->default" />
+        <dependency org="io.restx" name="restx-server-jetty8" rev="latest.integration" conf="test->default" />
     </dependencies>
 </ivy-module>
diff --git a/restx-specs-tests/pom.xml b/restx-specs-tests/pom.xml
@@ -48,7 +48,7 @@
         </dependency>
         <dependency>
             <groupId>io.restx</groupId>
-            <artifactId>restx-server-jetty</artifactId>
+            <artifactId>restx-server-jetty8</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>

diff --git a/restx.build.properties.json b/restx.build.properties.json
@@ -36,7 +36,7 @@
 
     "servlet-api.version": "2.5",
 
-    "jetty.version": "8.1.8.v20121106",
+    "jetty8.version": "8.1.8.v20121106",
     "embedded.tomcat.version": "7.0.47",
     "simple.version": "5.1.6",