Browse Source

clean up code

Nick Kasvosve 10 years ago
parent
commit
a804cc19aa

+ 1 - 1
frameworks/Java/beyondj/beyondj-data-loader/src/main/resources/config.properties

@@ -15,7 +15,7 @@ system.platform.config=JPA
 system.platform.dbserver=localhost
 
 #MYSQL
-system.jdbc.url=jdbc:mysql://${system.platform.dbserver}:/hello_world
+system.jdbc.url=jdbc:mysql://${system.platform.dbserver}/hello_world
 system.jdbc.driver=com.mysql.jdbc.Driver
 system.jdbc.dialect=org.hibernate.dialect.MySQLDialect
 system.jdbc.database.platform=MYSQL

+ 18 - 4
frameworks/Java/beyondj/beyondj-data/src/main/java/com/techempower/beyondj/Common.java

@@ -11,12 +11,26 @@ import java.util.concurrent.TimeUnit;
  */
 public class Common {
 
-    private static final int cpuCount = Runtime.getRuntime().availableProcessors();
+    public static final int CPU_COUNT = Runtime.getRuntime().availableProcessors();
+    public static int CORE_POOL_SIZE;
+    public static int MAX_POOL_SIZE;
+    public static int keepAliveTime = 200;
+
+
+    static {
+        CORE_POOL_SIZE = CPU_COUNT * 2;
+        MAX_POOL_SIZE = CPU_COUNT * 25;
+    }
 
     // todo: parameterize multipliers
     public static ExecutorService EXECUTOR = new ThreadPoolExecutor(
-        cpuCount * 2, cpuCount * 25, 200, TimeUnit.MILLISECONDS,
-        new LinkedBlockingQueue<Runnable>(cpuCount * 100),
-        new ThreadPoolExecutor.CallerRunsPolicy());
+            CORE_POOL_SIZE, MAX_POOL_SIZE, keepAliveTime, TimeUnit.MILLISECONDS,
+            new LinkedBlockingQueue<Runnable>(CPU_COUNT * 100),
+            new ThreadPoolExecutor.CallerRunsPolicy());
 
+    static {
+        System.out.println("Common.EXECUTOR.CPU_COUNT = " + CPU_COUNT);
+        System.out.println("Common.EXECUTOR.CORE_POOL_SIZE = " + CORE_POOL_SIZE);
+        System.out.println("Common.EXECUTOR.MAX_POOL_SIZE = " + MAX_POOL_SIZE);
+    }
 }

+ 25 - 13
frameworks/Java/beyondj/beyondj-launcher/pom.xml

@@ -124,6 +124,16 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>com.cloudhopper</groupId>
+            <artifactId>ch-jetty</artifactId>
+            <version>1.1.2-BEYONDJ</version>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-client</artifactId>
+            <version>${jetty.version}</version>
+        </dependency>
         <dependency>
             <groupId>com.lenox.platform</groupId>
             <artifactId>beyondj-tomcat</artifactId>
@@ -271,6 +281,11 @@
             <version>${jstl.version}</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-log4j12</artifactId>
+            <version>${slf4j.version}</version>
+        </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
@@ -283,6 +298,16 @@
             <version>${jsp.api.version}</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>com.googlecode.json-simple</groupId>
+            <artifactId>json-simple</artifactId>
+            <version>${json.simple.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.jdt.core.compiler</groupId>
+            <artifactId>ecj</artifactId>
+            <version>${ecj.version}</version>
+        </dependency>
         <dependency>
             <groupId>joda-time</groupId>
             <artifactId>joda-time</artifactId>
@@ -388,10 +413,6 @@
             <artifactId>spring-expression</artifactId>
             <version>${spring.version}</version>
         </dependency>
-        <!--        <dependency>
-                    <groupId>org.springframework.boot</groupId>
-                    <artifactId>spring-boot-loader</artifactId>
-                </dependency>-->
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-jdbc</artifactId>
@@ -591,15 +612,6 @@
                                         <include>linux-x86-64</include>
                                     </includes>
                                     <configuration>
-                                        <!--     <property>
-                                                 <name>configuration.directory.in.classpath.first</name>
-                                                 <value>repo</value>
-                                             </property>
-                                             <property>
-                                                 <name>set.default.REPO_DIR</name>
-                                                 <value>repo</value>
-                                             </property>
-                                             -->
                                         <property>
                                             <name>wrapper.logfile</name>
                                             <value>logs/beyondj-wrapper.log</value>

+ 0 - 18
frameworks/Java/beyondj/beyondj-launcher/src/main/resources/launchers/config/beyondj-data-loader.xml

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<applicationOptions>
-    <friendlyName>BeyondJ Performance Test Web App Data Loader</friendlyName>
-    <deploymentType>JAVA_PROCESS_VIA_JAR</deploymentType>
-    <jarFile>beyondj-data-loader.jar</jarFile>
-    <deploymentFile>beyondj-data-loader.jar</deploymentFile>
-    <contextPath>beyondj-data-loader</contextPath>
-    <requiresWar>false</requiresWar>
-    <systemGateway>false</systemGateway>
-    <enableHealthCheck>false</enableHealthCheck>
-    <bundleId>2dc8404-a8b7-4a79-a02d-31a715359f60</bundleId>
-    <version>1.0</version>
-    <printClassPath>true</printClassPath>
-    <numInstances>1</numInstances>
-    <deployedPostContainerStart>false</deployedPostContainerStart>
-    <enableJolokia>false</enableJolokia>
-    <printHealthCheckNotice>false</printHealthCheckNotice>
-</applicationOptions>

+ 1 - 1
frameworks/Java/beyondj/beyondj-launcher/src/main/resources/props/core-config.properties

@@ -1,5 +1,5 @@
 
-BEYONDJ_HOME=/opt/beyondj
+BEYONDJ_HOME=/tmp/beyondj
 system.platform.enable.activemq=false
 bundleActor.healthcheck.initial.delay.value=1
 bundleActor.healthcheck.initial.delay.unit=MINUTES

+ 1 - 0
frameworks/Java/beyondj/beyondj-service/src/main/java/com/techempower/beyondj/action/WorldDatabaseActionBean.java

@@ -41,6 +41,7 @@ public class WorldDatabaseActionBean extends BaseActionBean {
     public Resolution queries() {
         boundQueryCount();
         List<Future<World>> wfs = new ArrayList<>(queries);
+
         for (int i = 0; i < queries; i++) {
             wfs.add(
                     Common.EXECUTOR.submit(

+ 1 - 1
frameworks/Java/beyondj/beyondj-service/src/main/resources/config.properties

@@ -16,7 +16,7 @@ system.platform.dbserver=localhost
 
 
 #MYSQL
-system.jdbc.url=jdbc:mysql://${system.platform.dbserver}:/hello_world
+system.jdbc.url=jdbc:mysql://${system.platform.dbserver}/hello_world
 system.jdbc.driver=com.mysql.jdbc.Driver
 system.jdbc.dialect=org.hibernate.dialect.MySQLDialect
 system.jdbc.database.platform=MYSQL

+ 3 - 1
frameworks/Java/beyondj/pom.xml

@@ -45,8 +45,10 @@
         <hazelcast.version>3.5.2</hazelcast.version>
         <jsp.api.version>2.2</jsp.api.version>
         <servlet.api.version>3.1.0</servlet.api.version>
-
+        <jetty.version>9.3.0-BEYONDJ</jetty.version>
         <joda.time.version>2.6</joda.time.version>
+        <ecj.version>4.4</ecj.version>
+        <json.simple.version>1.1</json.simple.version>
         <commons.codec.version>1.10</commons.codec.version>
         <commons.compress.version>1.9</commons.compress.version>
         <maven.dependency.plugin.version>2.2</maven.dependency.plugin.version>

+ 3 - 8
frameworks/Java/beyondj/setup.sh

@@ -2,14 +2,9 @@
 
 fw_depends java8 maven
 
-rm beyondj-launcher/src/main/resources/launchers/webapp-launchers/beyondj-service.war
-rm beyondj-launcher/src/main/resources/launchers/jar-launchers/beyondj-data-loader.jar
-
-mvn clean package
-
-cp beyondj-service/target/beyondj-service.war beyondj-launcher/src/main/resources/launchers/webapp-launchers/
-cp beyondj-data-loader/target/beyondj-data-loader.jar beyondj-launcher/src/main/resources/launchers/jar-launchers/
-
+# rm beyondj-launcher/src/main/resources/launchers/webapp-launchers/beyondj-service.war
 mvn clean package
+# cp beyondj-service/target/beyondj-service.war beyondj-launcher/src/main/resources/launchers/webapp-launchers/
+# mvn clean package
 
 java -jar beyondj-launcher/target/beyondj.jar &