add some documentation

frameworks/Java/beyondj/README.md

@@ -19,41 +19,42 @@ See [BeyondJ projects documentation](http://beyondj.com/dist/docs/README.html).
 
 ## Application Endpoints
 
-When deployed locally, the application uses the 'ROOT' context; for the benchmark, all
-URLs are prefixed with "/beyondj".
-Check out [SampleApplication, the main Application file](src/main/java/com/techempower/beyondj/SampleApplication.java)
+When deployed locally, the application uses the 'beyondj-service' context; for the benchmark, all
+URLs are prefixed with "/perf".
+Check out [SampleApplication, the main Application file]
+(beyondj-launcher/src/main/java/com/techempower/beyondj/BeyondJApplication.java)
 
 ### JSON serialization
 
-* http://localhost:8080/servlets/performance?op=json
-* [JSON Controller](src/main/java/com/techempower/beyondj/web/HelloController.java)
+* http://localhost:8080/beyondj-service/perf/hello
+* [JSON ActionBean](beyondj-service/src/main/java/com/techempower/beyondj/action/HelloActionBean.java)
 
 ### Single database query
 
-* http://localhost:8080/db
-* [Database Controller](src/main/java/com/techempower/beyondj/web/WorldDatabaseController.java)
-* [Database Entity](src/main/java/com/techempower/beyondj/domain/World.java)
-* [Database Repository](src/main/java/com/techempower/beyondj/service/WorldRepository.java)
+* http://localhost:8080/beyondj-service/perf/database/db
+* [Database ActionBean](beyondj-service/src/main/java/com/techempower/beyondj/action/WorldDatabaseActionBean.java)
+* [Database Entity](beyondj-data/src/main/java/com/techempower/beyondj/domain/World.java)
+* [Database Repository](beyondj-data/src/main/java/com/techempower/beyondj/repository/WorldRepositoryImpl.java)
 
 ### Multiple database queries
 
-* http://localhost:8080/servlets/performance?queries=5
-* [Database Controller](src/main/java/com/techempower/beyondj/web/WorldDatabaseController.java)
+* http://localhost:8080/beyondj-service/perf/database/queries?&queries=5
+* [Database ActionBean](beyondj-service/src/main/java/com/techempower/beyondj/action/WorldDatabaseActionBean.java)
 
 ### Fortunes
 
-* http://localhost:8080/servlets/performance?op=fortunes
-* [Fortune Controller](src/main/java/com/techempower/beyondj/web/FortuneController.java)
+* http://localhost:8080/beyondj-service/perf/fortunes
+* [Fortune ActionBean](beyondj-service/src/main/java/com/techempower/beyondj/action/FortuneActionBean.java)
 
 ### Database updates
 
-* http://localhost:8080//servlets/performance?op=updates&queries=5
-* [Database Controller](src/main/java/com/techempower/beyondj/web/WorldDatabaseController.java)
+* http://localhost:8080/beyondj-service/perf/database/updates?&queries=5
+* [Database ActionBean](beyondj-service/src/main/java/com/techempower/beyondj/action/WorldDatabaseActionBean.java)
 
 ### Plaintext
 
-* http://localhost:8080/servlets/performance?op=plaintext
-* [Controller](src/main/java/com/techempower/beyondj/web/HelloController.java)
+* http://localhost:8080/beyondj-service/perf/hello/plaintext
+* [ActionBean](beyondj-service/src/main/java/com/techempower/beyondj/action/HelloActionBean.java)
 
 
 ## Infrastructure Software Versions

frameworks/Java/beyondj/beyondj-launcher/src/main/resources/config/spring/core-mongo-spring-config.xml

@@ -1,54 +0,0 @@
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:context="http://www.springframework.org/schema/context"
-       xmlns:mongo="http://www.springframework.org/schema/data/mongo"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans
-       http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
-       http://www.springframework.org/schema/context
-       http://www.springframework.org/schema/context/spring-context-3.0.xsd
-       http://www.springframework.org/schema/data/mongo
-          http://www.springframework.org/schema/data/mongo/spring-mongo-1.0.xsd">
-
-    <context:annotation-config/>
-    <mongo:mongo host="localhost" port="27017"/>
-
-    <mongo:db-factory dbname="beyondj"/>
-    <mongo:repositories base-package="com.lenox.repository"/>
-
-    <bean id="mongoTemplate" class="org.springframework.data.mongodb.core.MongoTemplate">
-        <constructor-arg name="mongoDbFactory" ref="mongoDbFactory"/>
-    </bean>
-
-    <bean id="mongoEventListener" class="com.lenox.util.CascadingMongoEventListener">
-        <constructor-arg name="mongoOperations" ref="mongoTemplate"/>
-    </bean>
-
-    <bean id="systemDataSet" class="com.lenox.dataset.SystemDataSet"/>
-
-    <bean id="roleNameParser" class="com.lenox.security.RoleNameParser">
-        <constructor-arg index="0" value="config/roles.xml"/>
-    </bean>
-
-    <bean id="featureNameParser" class="com.lenox.security.FeatureNameParser">
-        <constructor-arg index="0" value="config/features.xml"/>
-    </bean>
-
-    <bean id="protectedElementParser" class="com.lenox.security.ProtectedElementParser">
-        <constructor-arg index="0" value="config/security-policy.xml"/>
-        <constructor-arg index="1" ref="featureNameParser"/>
-        <constructor-arg index="2" ref="roleNameParser"/>
-    </bean>
-
-    <bean id ="beyondJCoreSecurityManager" class="com.lenox.security.BeyondJCoreSecurityManager">
-        <property name="elementParser" ref="protectedElementParser"/>
-        <property name="featureNameParser" ref="featureNameParser"/>
-    </bean>
-
-    <bean id="emailService" class="com.lenox.custom.EmailService"/>
-
-</beans>
-
-
-
-
-

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
@@ -105,7 +105,7 @@ akkaVersion=2.3.12
 camelVersion=2.15.2
 springVersion=4.1.2.RELEASE
 hazelcastVersion=3.5.2
-showBanding=FALSE
+showBanding=TRUE
 
 
 system.metrics.collection.cron=0+0/1+*+*+*+?

frameworks/Java/beyondj/beyondj-service/pom.xml

@@ -37,6 +37,10 @@
             <artifactId>spring-orm</artifactId>
             <version>${spring.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-log4j12</artifactId>
+        </dependency>
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>

frameworks/Java/beyondj/beyondj-service/src/main/webapp/site.html

@@ -6,7 +6,10 @@
             <td>Site Index</td>
         </tr>
         <tr>
-            <td><a href="/beyondj-service/perf/hello">Hello World</a></td>
+            <td><a href="/beyondj-service/perf/hello">Hello World (json)</a></td>
+        </tr>
+        <tr>
+            <td><a href="/beyondj-service/perf/hello/plaintext">Hello World (plaintext)</a></td>
         </tr>
         <tr>
             <td><a href="/beyondj-service/perf/fortunes">Fortunes</a></td>

frameworks/Java/beyondj/setup.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-fw_depends java7 maven
+fw_depends java8 maven
 
 mvn clean package
 cd target

frameworks/Java/beyondj/source_code

@@ -1,3 +1,5 @@
+
+./beyondj-data/pom.xml
 ./beyondj-data/src/main/java/com/techempower/beyondj/Common.java
 ./beyondj-data/src/main/java/com/techempower/beyondj/domain/Fortune.java
 ./beyondj-data/src/main/java/com/techempower/beyondj/domain/World.java
@@ -7,10 +9,47 @@
 ./beyondj-data/src/main/java/com/techempower/beyondj/repository/Repository.java
 ./beyondj-data/src/main/java/com/techempower/beyondj/repository/WorldRepository.java
 ./beyondj-data/src/main/java/com/techempower/beyondj/repository/WorldRepositoryImpl.java
+./beyondj-data-loader/pom.xml
 ./beyondj-data-loader/src/main/java/com/techempower/beyondj/dataset/DataLoader.java
 ./beyondj-data-loader/src/main/java/com/techempower/beyondj/dataset/WorldDataSet.java
+./beyondj-data-loader/src/main/resources/beyondj-data-loader-jpa-spring-config.xml
+./beyondj-data-loader/src/main/resources/beyondj.hbm.xml
+./beyondj-data-loader/src/main/resources/config.properties
+./beyondj-data-loader/src/main/resources/hibernate.cfg.xml
+./beyondj-data-loader/src/main/resources/import.sql
+./beyondj-data-loader/src/main/resources/log4j.properties
+./beyondj-data-loader/src/main/resources/META-INF/persistence.xml
+./beyondj-launcher/pom.xml
 ./beyondj-launcher/src/main/java/com/techempower/beyondj/BeyondJApplication.java
 ./beyondj-launcher/src/main/java/com/techempower/beyondj/BeyondJApplicationService.java
+./beyondj-launcher/src/main/resources/application.conf
+./beyondj-launcher/src/main/resources/config/beyondj-hazelcast.xml
+./beyondj-launcher/src/main/resources/config/features.xml
+./beyondj-launcher/src/main/resources/config/mime-mappings.xml
+./beyondj-launcher/src/main/resources/config/roles.xml
+./beyondj-launcher/src/main/resources/config/security-policy.xml
+./beyondj-launcher/src/main/resources/config/spring/core-derby.xml
+./beyondj-launcher/src/main/resources/config/spring/core-jpa-spring-config.xml
+./beyondj-launcher/src/main/resources/config/spring/core-mongo-spring-config.xml
+./beyondj-launcher/src/main/resources/config/spring/core-spring-and-camel-config.xml
+./beyondj-launcher/src/main/resources/jetty-logging.properties
+./beyondj-launcher/src/main/resources/launchers/9.3.0-minimum-jetty-deps.txt
+./beyondj-launcher/src/main/resources/launchers/config/.DS_Store
+./beyondj-launcher/src/main/resources/launchers/config/beyondj-data-loader.xml
+./beyondj-launcher/src/main/resources/launchers/config/beyondj-service.xml
+./beyondj-launcher/src/main/resources/launchers/config/gateway.xml
+./beyondj-launcher/src/main/resources/launchers/jar-launchers/beyondj-data-loader.jar
+./beyondj-launcher/src/main/resources/launchers/java-process-deps.txt
+./beyondj-launcher/src/main/resources/launchers/script-process-deps.txt
+./beyondj-launcher/src/main/resources/launchers/webapp-launchers/.DS_Store
+./beyondj-launcher/src/main/resources/launchers/webapp-launchers/beyondj-service.war
+./beyondj-launcher/src/main/resources/log4j.properties
+./beyondj-launcher/src/main/resources/META-INF/persistence.xml
+./beyondj-launcher/src/main/resources/props/core-config.properties
+./beyondj-launcher/src/main/resources/props/filelist.properties
+./beyondj-launcher/src/main/resources/templates/velocity/authentication.tpl
+./beyondj-service/beyondj-service.iml
+./beyondj-service/pom.xml
 ./beyondj-service/src/main/java/com/techempower/beyondj/action/BaseActionBean.java
 ./beyondj-service/src/main/java/com/techempower/beyondj/action/ErrorActionBean.java
 ./beyondj-service/src/main/java/com/techempower/beyondj/action/FortuneActionBean.java
@@ -18,3 +57,22 @@
 ./beyondj-service/src/main/java/com/techempower/beyondj/action/WorldDatabaseActionBean.java
 ./beyondj-service/src/main/java/com/techempower/beyondj/BeyondJActionBeanContext.java
 ./beyondj-service/src/main/java/com/techempower/beyondj/TypeConverterFactory.java
+./beyondj-service/src/main/resources/beyondj-service-jpa-spring-config.xml
+./beyondj-service/src/main/resources/beyondj.hbm.xml
+./beyondj-service/src/main/resources/config.properties
+./beyondj-service/src/main/resources/hibernate.cfg.xml
+./beyondj-service/src/main/resources/import.sql
+./beyondj-service/src/main/resources/log4j.properties
+./beyondj-service/src/main/resources/META-INF/persistence.xml
+./beyondj-service/src/main/resources/StripesResources.properties
+./beyondj-service/src/main/webapp/index.html
+./beyondj-service/src/main/webapp/site.html
+./beyondj-service/src/main/webapp/WEB-INF/tags/taglibs.jsp
+./beyondj-service/src/main/webapp/WEB-INF/templates/error.jsp
+./beyondj-service/src/main/webapp/WEB-INF/templates/fortunes.jsp
+./beyondj-service/src/main/webapp/WEB-INF/templates/layout.jsp
+./beyondj-service/src/main/webapp/WEB-INF/tld/funcs.tld
+./beyondj-service/src/main/webapp/WEB-INF/tld/menunewline.tld
+./beyondj-service/src/main/webapp/WEB-INF/tld/security.tld
+./beyondj-service/src/main/webapp/WEB-INF/web.xml
+./pom.xml