Merge branch 'master' of https://github.com/nkasvosve/FrameworkBenchmarks

frameworks/Java/beyondj/README.md

@@ -80,6 +80,7 @@ public class BeyondJApplication {
         LaunchUtil.defaultConfig = config;
 
         LOG.debug("Resource install path is {}", config.getProperty(ApplicationConfiguration.BEYONDJ_HOME));
+        System.out.println("Resource install path is " + config.getProperty(ApplicationConfiguration.BEYONDJ_HOME));
 
         String path = LaunchUtil.getContainerInstallationDir(config);
         ProtectionDomain protectionDomain = BeyondJApplication.class.getProtectionDomain();
@@ -91,11 +92,13 @@ public class BeyondJApplication {
         if (codeSource.toString().indexOf(".jar") != -1) {
             if (codeSource.toString().indexOf(".jar!") != -1) {
                 LOG.debug("Copying jar resources to install folder");
+                System.out.println("Copying jar resources to install folder");
                 JarURLConnection conn = (JarURLConnection) location.openConnection();
                 LaunchUtil.copyJarResourcesToFolder(conn, installationDir);
             } else {
                 //assume we launched this from the bin folder
                 LOG.debug("Extracting jar resources to install folder");
+                System.out.println("Extracting jar resources to install folder");
                 File locFile = new File(location.toURI());
                 LaunchUtil.extractJar(locFile.getAbsolutePath(), installationDir.getAbsolutePath());
             }
@@ -110,6 +113,7 @@ public class BeyondJApplication {
         String[] fileNames = webAppLaunchersDir.list();
         if (fileNames != null) {
             LOG.debug("Extracting web-app resources to install folder");
+            System.out.println("Extracting web-app resources to install folder");
             for (String fileName : fileNames) {
                 String jarOrWarName = webAppsPath + File.separator + fileName.replace(".jar", "");
                 jarOrWarName = jarOrWarName.replace(".war", "");
@@ -128,6 +132,7 @@ public class BeyondJApplication {
 
         if (fileNames != null) {
             LOG.debug("Extracting jar-app resources to install folder");
+            System.out.println("Extracting jar-app resources to install folder");
             for (String fileName : fileNames) {
                 String jarOrWarName = jarAppsPath + File.separator + fileName.replace(".jar", "");
                 jarOrWarName = jarOrWarName.replace(".tar", "");
@@ -146,6 +151,7 @@ public class BeyondJApplication {
 
         if (fileNames != null) {
             LOG.debug("Extracting script-app resources to install folder");
+            System.out.println("Extracting script-app resources to install folder");
             for (String fileName : fileNames) {
                 String jarOrWarName = scriptAppsPath + File.separator + fileName.replace(".jar", "");
                 jarOrWarName = jarOrWarName.replace(".tar", "");

frameworks/Java/beyondj/beyondj-launcher/src/main/resources/META-INF/persistence.xml

@@ -1,4 +1,3 @@
-
 BEYONDJ_HOME=results
 system.platform.enable.activemq=false
 bundleActor.healthcheck.initial.delay.value=1

frameworks/Java/beyondj/beyondj-launcher/src/main/resources/props/fields-metrics.properties

@@ -106,3 +106,4 @@ public abstract class BaseActionBean implements
         getContext().getResponse().setHeader(DATE, new java.util.Date().toString());
     }
 }
+

frameworks/Java/beyondj/beyondj-service/src/main/java/com/techempower/beyondj/action/ErrorActionBean.java

@@ -26,3 +26,4 @@ public class ErrorActionBean extends BaseActionBean {
         return null;
     }
 }
+

frameworks/Java/beyondj/beyondj-service/src/main/java/com/techempower/beyondj/action/FortuneActionBean.java

@@ -40,3 +40,4 @@ public class FortuneActionBean extends BaseActionBean {
     public static final String JSP = "/WEB-INF/templates/fortunes.jsp";
     public static final String TRANSFER_ENCODING = "Transfer-Encoding";
 }
+

frameworks/Java/beyondj/beyondj-service/src/main/java/com/techempower/beyondj/action/HelloActionBean.java

@@ -56,3 +56,4 @@ public class HelloActionBean extends BaseActionBean {
     private static final String HELLO_WORLD = "Hello, World!";
     private static final String TEXT_PLAIN = "text/plain";
 }
+

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

@@ -174,3 +174,4 @@ public class WorldDatabaseActionBean extends BaseActionBean {
     private static final String UPDATES = "updates";
     public static final String CONTENT_LENGTH = "Content-Length";
 }
+

frameworks/Java/beyondj/beyondj-service/src/main/resources/META-INF/persistence.xml

@@ -3,7 +3,8 @@
 fw_depends java8 maven
 
 # rm beyondj-launcher/src/main/resources/launchers/webapp-launchers/beyondj-service.war
-mvn clean package
+sudo chmod -R 777 .
+mvn package
 # cp beyondj-service/target/beyondj-service.war beyondj-launcher/src/main/resources/launchers/webapp-launchers/
 # mvn clean package