Browse Source

* [ci fw-only Java/firenio] rename framework "baseio" to "firenio" (#4651)

Kai Wang 6 years ago
parent
commit
0753ed8251

+ 1 - 1
.travis.yml

@@ -44,12 +44,12 @@ env:
     - "TESTDIR=Java/activeweb"
     - "TESTDIR=Java/armeria"
     - "TESTDIR=Java/baratine"
-    - "TESTDIR=Java/baseio"
     - "TESTDIR=Java/bayou"
     - "TESTDIR=Java/blade"
     - "TESTDIR=Java/comsat"
     - "TESTDIR=Java/curacao"
     - "TESTDIR=Java/dropwizard"
+    - "TESTDIR=Java/firenio"
     - "TESTDIR=Java/gemini"
     - "TESTDIR=Java/greenlightning"
     - "TESTDIR=Java/grizzly"

+ 3 - 3
frameworks/Java/baseio/README.md → frameworks/Java/firenio/README.md

@@ -1,6 +1,6 @@
-# Baseio Benchmarking Test
+# FireNio Benchmarking Test
 
- [Baseio](https://github.com/firenio/baseio) is an easy of use io framework project based on java nio
+ [FireNio](https://github.com/firenio/firenio) is an easy of use io framework project based on java nio
  
 ### Test Type Implementation Source Code
 
@@ -10,7 +10,7 @@
 
 ## Important Libraries
 The tests were run with:
-* [baseio](https://github.com/firenio/baseio/)
+* [firenio](https://github.com/firenio/firenio/)
 * [fastjson](https://github.com/alibaba/fastjson/)
 
 ## Test URLs

+ 7 - 7
frameworks/Java/baseio/benchmark_config.json → frameworks/Java/firenio/benchmark_config.json

@@ -1,5 +1,5 @@
 {
-  "framework": "baseio",
+  "framework": "firenio",
   "tests": [{
       "default": {
         "json_url": "/json",
@@ -12,13 +12,13 @@
         "language": "Java",
         "flavor": "None",
         "orm": "None",
-        "platform": "baseio",
+        "platform": "firenio",
         "webserver": "None",
         "os": "Linux",
         "database_os": "Linux",
-        "display_name": "baseio",
+        "display_name": "firenio",
         "notes": "",
-        "versus": "baseio"
+        "versus": "firenio"
       },
       "http-lite": {
         "json_url": "/json",
@@ -31,13 +31,13 @@
         "language": "Java",
         "flavor": "None",
         "orm": "None",
-        "platform": "baseio",
+        "platform": "firenio",
         "webserver": "None",
         "os": "Linux",
         "database_os": "Linux",
-        "display_name": "baseio-http-lite",
+        "display_name": "firenio-http-lite",
         "notes": "",
-        "versus": "baseio-http-lite"
+        "versus": "firenio-http-lite"
       }
     }
   ]

+ 2 - 2
frameworks/Java/baseio/baseio-http-lite.dockerfile → frameworks/Java/firenio/firenio-http-lite.dockerfile

@@ -1,5 +1,5 @@
 FROM maven:3.5.3-jdk-10-slim as maven
-WORKDIR /baseio
+WORKDIR /firenio
 COPY pom.xml pom.xml
 COPY src src
 RUN mvn compile assembly:single -q
@@ -21,4 +21,4 @@ CMD java                       \
     -Depoll=true               \
     -Dnodelay=false            \
     -DunsafeBuf=true           \
-    -jar /baseio/target/baseio-example-0.1-jar-with-dependencies.jar
+    -jar /firenio/target/firenio-example-0.1-jar-with-dependencies.jar

+ 2 - 2
frameworks/Java/baseio/baseio.dockerfile → frameworks/Java/firenio/firenio.dockerfile

@@ -1,5 +1,5 @@
 FROM maven:3.5.3-jdk-10-slim as maven
-WORKDIR /baseio
+WORKDIR /firenio
 COPY pom.xml pom.xml
 COPY src src
 RUN mvn compile assembly:single -q
@@ -21,4 +21,4 @@ CMD java                       \
     -Depoll=true               \
     -Dnodelay=false            \
     -DunsafeBuf=true           \
-    -jar /baseio/target/baseio-example-0.1-jar-with-dependencies.jar
+    -jar /firenio/target/firenio-example-0.1-jar-with-dependencies.jar

+ 3 - 3
frameworks/Java/baseio/pom.xml → frameworks/Java/firenio/pom.xml

@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>com.techempower</groupId>
-    <artifactId>baseio-example</artifactId>
+    <artifactId>firenio-example</artifactId>
     <version>0.1</version>
 
     <properties>
@@ -18,8 +18,8 @@
 
         <dependency>
             <groupId>com.firenio</groupId>
-            <artifactId>baseio-all</artifactId>
-            <version>3.2.9.beta11</version>
+            <artifactId>firenio-all</artifactId>
+            <version>1.0.0</version>
         </dependency>
 
         <dependency>

+ 19 - 34
frameworks/Java/baseio/src/main/java/hello/TestHttpLoadServer.java → frameworks/Java/firenio/src/main/java/hello/TestHttpLoadServer.java

@@ -1,41 +1,26 @@
-/*
- * Copyright 2015 The Baseio Project
- *
- * 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.
- */
 package hello;
 
 import java.io.IOException;
 import java.util.Arrays;
 
-import com.firenio.baseio.Options;
-import com.firenio.baseio.codec.http11.HttpCodec;
-import com.firenio.baseio.codec.http11.HttpConnection;
-import com.firenio.baseio.codec.http11.HttpContentType;
-import com.firenio.baseio.codec.http11.HttpDateUtil;
-import com.firenio.baseio.codec.http11.HttpFrame;
-import com.firenio.baseio.codec.http11.HttpStatus;
-import com.firenio.baseio.collection.ByteTree;
-import com.firenio.baseio.common.Util;
-import com.firenio.baseio.component.Channel;
-import com.firenio.baseio.component.ChannelAcceptor;
-import com.firenio.baseio.component.ChannelEventListenerAdapter;
-import com.firenio.baseio.component.Frame;
-import com.firenio.baseio.component.IoEventHandle;
-import com.firenio.baseio.component.NioEventLoopGroup;
-import com.firenio.baseio.component.SocketOptions;
-import com.firenio.baseio.log.DebugUtil;
-import com.firenio.baseio.log.LoggerFactory;
+import com.firenio.Options;
+import com.firenio.codec.http11.HttpCodec;
+import com.firenio.codec.http11.HttpConnection;
+import com.firenio.codec.http11.HttpContentType;
+import com.firenio.codec.http11.HttpDateUtil;
+import com.firenio.codec.http11.HttpFrame;
+import com.firenio.codec.http11.HttpStatus;
+import com.firenio.collection.ByteTree;
+import com.firenio.common.Util;
+import com.firenio.component.Channel;
+import com.firenio.component.ChannelAcceptor;
+import com.firenio.component.ChannelEventListenerAdapter;
+import com.firenio.component.Frame;
+import com.firenio.component.IoEventHandle;
+import com.firenio.component.NioEventLoopGroup;
+import com.firenio.component.SocketOptions;
+import com.firenio.log.DebugUtil;
+import com.firenio.log.LoggerFactory;
 import com.jsoniter.output.JsonStream;
 import com.jsoniter.output.JsonStreamPool;
 import com.jsoniter.spi.JsonException;
@@ -148,7 +133,7 @@ public class TestHttpLoadServer {
                 }
             });
         }
-        context.addProtocolCodec(new HttpCodec("baseio", fcache, lite, inline, cachedUrls));
+        context.addProtocolCodec(new HttpCodec("firenio", fcache, lite, inline, cachedUrls));
         context.setIoEventHandle(eventHandle);
         context.bind();
     }