Browse Source

Bump OfficeFloor to 3.20.0 (#5504)

* Removing Rapidoid as seems dead project (no commit last year)

* Downloading from SourceForge

* Bump maven-compiler-plugin in /frameworks/Java/officefloor/src

Bumps [maven-compiler-plugin](https://github.com/apache/maven-compiler-plugin) from 3.8.0 to 3.8.1.
- [Release notes](https://github.com/apache/maven-compiler-plugin/releases)
- [Commits](https://github.com/apache/maven-compiler-plugin/compare/maven-compiler-plugin-3.8.0...maven-compiler-plugin-3.8.1)

Signed-off-by: dependabot-preview[bot] <[email protected]>

* Bump maven-shade-plugin in /frameworks/Java/officefloor/src

Bumps [maven-shade-plugin](https://github.com/apache/maven-shade-plugin) from 3.2.1 to 3.2.2.
- [Release notes](https://github.com/apache/maven-shade-plugin/releases)
- [Commits](https://github.com/apache/maven-shade-plugin/compare/maven-shade-plugin-3.2.1...maven-shade-plugin-3.2.2)

Signed-off-by: dependabot-preview[bot] <[email protected]>

* Fixing Raw OfficeFloor

* Specifying Spring plugin version

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Daniel 5 years ago
parent
commit
c9e6dd8806

+ 0 - 21
frameworks/Java/officefloor/benchmark_config.json

@@ -128,27 +128,6 @@
 				"notes": "",
 				"notes": "",
 				"versus": "netty"
 				"versus": "netty"
 			},
 			},
-			"rapidoid": {
-				"json_url": "/json",
-				"plaintext_url": "/plaintext",
-				"db_url": "/db",
-				"fortune_url": "/fortunes",
-				"port": 8080,
-				"approach": "Realistic",
-				"classification": "Fullstack",
-				"database": "Postgres",
-				"framework": "OfficeFloor",
-				"language": "Java",
-				"flavor": "None",
-				"orm": "Full",
-				"platform": "OfficeFloor",
-				"webserver": "WoOF",
-				"os": "Linux",
-				"database_os": "Linux",
-				"display_name": "OfficeFloor-rapidoid",
-				"notes": "",
-				"versus": "rapidoid"
-			},
 			"spring_data": {
 			"spring_data": {
 				"json_url": "/json",
 				"json_url": "/json",
 				"plaintext_url": "/plaintext",
 				"plaintext_url": "/plaintext",

+ 0 - 14
frameworks/Java/officefloor/officefloor-rapidoid.dockerfile

@@ -1,14 +0,0 @@
-FROM maven:3.6.1-jdk-11-slim as maven
-WORKDIR /officefloor
-COPY src src
-WORKDIR /officefloor/src
-RUN mvn -q -N clean install
-WORKDIR /officefloor/src/woof_benchmark
-RUN mvn -q clean install
-WORKDIR /officefloor/src/woof_benchmark_rapidoid
-RUN mvn -q clean package
-
-FROM openjdk:11.0.3-jdk-slim
-WORKDIR /officefloor
-COPY --from=maven /officefloor/src/woof_benchmark_rapidoid/target/woof_benchmark_rapidoid-1.0.0.jar server.jar
-CMD ["java", "-server", "-Xms2g", "-Xmx2g", "-XX:+UseNUMA", "-Dhttp.port=8080", "-Dhttp.server.name=OF", "-Dhttp.date.header=true", "-jar", "server.jar"]

+ 3 - 10
frameworks/Java/officefloor/src/pom.xml

@@ -9,10 +9,9 @@
 	<packaging>pom</packaging>
 	<packaging>pom</packaging>
 	<name>OfficeFloor Benchmarks</name>
 	<name>OfficeFloor Benchmarks</name>
 	<properties>
 	<properties>
-		<officefloor.version>3.10.2</officefloor.version>
+		<officefloor.version>3.20.0</officefloor.version>
 		<maven.compiler.source>11</maven.compiler.source>
 		<maven.compiler.source>11</maven.compiler.source>
 		<maven.compiler.target>11</maven.compiler.target>
 		<maven.compiler.target>11</maven.compiler.target>
-		<jaxb.version>2.3.0</jaxb.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 	</properties>
 	</properties>
 	<modules>
 	<modules>
@@ -22,7 +21,6 @@
 		<module>woof_benchmark_thread_affinity</module>
 		<module>woof_benchmark_thread_affinity</module>
 		<module>woof_benchmark_raw</module>
 		<module>woof_benchmark_raw</module>
 		<module>woof_benchmark_netty</module>
 		<module>woof_benchmark_netty</module>
-		<module>woof_benchmark_rapidoid</module>
 		<module>woof_benchmark_spring</module>
 		<module>woof_benchmark_spring</module>
 	</modules>
 	</modules>
 	<repositories>
 	<repositories>
@@ -51,11 +49,6 @@
 				<artifactId>woof_benchmark_micro</artifactId>
 				<artifactId>woof_benchmark_micro</artifactId>
 				<version>${project.version}</version>
 				<version>${project.version}</version>
 			</dependency>
 			</dependency>
-			<dependency>
-				<groupId>com.fasterxml.jackson.core</groupId>
-				<artifactId>jackson-databind</artifactId>
-				<version>2.9.9</version>
-			</dependency>
 		</dependencies>
 		</dependencies>
 	</dependencyManagement>
 	</dependencyManagement>
 	<build>
 	<build>
@@ -64,7 +57,7 @@
 				<plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-compiler-plugin</artifactId>
 					<artifactId>maven-compiler-plugin</artifactId>
-					<version>3.8.0</version>
+					<version>3.8.1</version>
 					<configuration>
 					<configuration>
 						<debug>false</debug>
 						<debug>false</debug>
 					</configuration>
 					</configuration>
@@ -72,7 +65,7 @@
 				<plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-shade-plugin</artifactId>
 					<artifactId>maven-shade-plugin</artifactId>
-					<version>3.2.1</version>
+					<version>3.2.2</version>
 				</plugin>
 				</plugin>
 			</plugins>
 			</plugins>
 		</pluginManagement>
 		</pluginManagement>

+ 0 - 45
frameworks/Java/officefloor/src/woof_benchmark_rapidoid/pom.xml

@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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/maven-v4_0_0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>net.officefloor.benchmarks</groupId>
-		<artifactId>benchmarks</artifactId>
-		<version>1.0.0</version>
-	</parent>
-	<artifactId>woof_benchmark_rapidoid</artifactId>
-	<dependencies>
-		<dependency>
-			<groupId>net.officefloor.benchmarks</groupId>
-			<artifactId>woof_benchmark</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>net.officefloor.server</groupId>
-			<artifactId>officeserver_rapidoid</artifactId>
-		</dependency>
-	</dependencies>
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-shade-plugin</artifactId>
-				<executions>
-					<execution>
-						<phase>package</phase>
-						<goals>
-							<goal>shade</goal>
-						</goals>
-						<configuration>
-							<transformers>
-								<transformer
-									implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-									<mainClass>net.officefloor.OfficeFloorMain</mainClass>
-								</transformer>
-							</transformers>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-</project>

+ 22 - 5
frameworks/Java/officefloor/src/woof_benchmark_raw/src/main/java/net/officefloor/benchmark/RawOfficeFloorMain.java

@@ -25,6 +25,7 @@ import java.time.format.DateTimeFormatter;
 import java.util.Timer;
 import java.util.Timer;
 import java.util.TimerTask;
 import java.util.TimerTask;
 import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.ThreadFactory;
+import java.util.logging.Logger;
 
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.module.afterburner.AfterburnerModule;
 import com.fasterxml.jackson.module.afterburner.AfterburnerModule;
@@ -32,7 +33,7 @@ import com.fasterxml.jackson.module.afterburner.AfterburnerModule;
 import lombok.Data;
 import lombok.Data;
 import net.officefloor.frame.api.manage.OfficeFloor;
 import net.officefloor.frame.api.manage.OfficeFloor;
 import net.officefloor.frame.api.manage.ProcessManager;
 import net.officefloor.frame.api.manage.ProcessManager;
-import net.officefloor.frame.api.managedobject.ProcessAwareContext;
+import net.officefloor.frame.api.managedobject.ManagedObjectContext;
 import net.officefloor.frame.api.managedobject.ProcessSafeOperation;
 import net.officefloor.frame.api.managedobject.ProcessSafeOperation;
 import net.officefloor.server.SocketManager;
 import net.officefloor.server.SocketManager;
 import net.officefloor.server.http.AbstractHttpServicerFactory;
 import net.officefloor.server.http.AbstractHttpServicerFactory;
@@ -64,6 +65,11 @@ public class RawOfficeFloorMain {
 	 */
 	 */
 	public static SocketManager socketManager = null;
 	public static SocketManager socketManager = null;
 
 
+	/**
+	 * {@link Logger}.
+	 */
+	private static Logger logger = Logger.getLogger(RawOfficeFloorMain.class.getName());
+
 	/**
 	/**
 	 * Run application.
 	 * Run application.
 	 */
 	 */
@@ -145,9 +151,20 @@ public class RawOfficeFloorMain {
 		private final ObjectMapper objectMapper = new ObjectMapper();
 		private final ObjectMapper objectMapper = new ObjectMapper();
 
 
 		/**
 		/**
-		 * {@link ProcessAwareContext}.
+		 * {@link ManagedObjectContext}.
 		 */
 		 */
-		private static ProcessAwareContext processAwareContext = new ProcessAwareContext() {
+		private static ManagedObjectContext managedObjectContext = new ManagedObjectContext() {
+
+			@Override
+			public String getBoundName() {
+				return RawOfficeFloorMain.class.getSimpleName();
+			}
+
+			@Override
+			public Logger getLogger() {
+				return logger;
+			}
+
 			@Override
 			@Override
 			public <R, T extends Throwable> R run(ProcessSafeOperation<R, T> operation) throws T {
 			public <R, T extends Throwable> R run(ProcessSafeOperation<R, T> operation) throws T {
 				return operation.run();
 				return operation.run();
@@ -189,8 +206,8 @@ public class RawOfficeFloorMain {
 		protected ProcessManager service(ProcessAwareServerHttpConnectionManagedObject<ByteBuffer> connection)
 		protected ProcessManager service(ProcessAwareServerHttpConnectionManagedObject<ByteBuffer> connection)
 				throws IOException {
 				throws IOException {
 
 
-			// Configure process awareness
-			connection.setProcessAwareContext(processAwareContext);
+			// Configure context
+			connection.setManagedObjectContext(managedObjectContext);
 
 
 			// Service the connection
 			// Service the connection
 			HttpRequest request = connection.getRequest();
 			HttpRequest request = connection.getRequest();

+ 1 - 0
frameworks/Java/officefloor/src/woof_benchmark_spring/pom.xml

@@ -39,6 +39,7 @@
 			<plugin>
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
+				<version>2.2.4.RELEASE</version>
 				<configuration>
 				<configuration>
 					<mainClass>net.officefloor.OfficeFloorMain</mainClass>
 					<mainClass>net.officefloor.OfficeFloorMain</mainClass>
 					<classifier>exec</classifier>
 					<classifier>exec</classifier>