Browse Source

refine startp script

Nick Kasvosve 10 years ago
parent
commit
796039077c

+ 2 - 2
frameworks/Java/beyondj/benchmark_config.json

@@ -9,7 +9,7 @@
       "fortune_url": "/beyondj-service/perf/fortunes",
       "plaintext_url": "/beyondj-service/perf/hello/plaintext",
       "update_url": "/beyondj-service/perf/database/updates?&queries=",
-      "port": 8080,
+      "port": 7070,
       "approach": "Realistic",
       "classification": "Fullstack",
       "database": "MySQL",
@@ -21,7 +21,7 @@
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "Beyondj",
-      "notes": "BeyondJ is the Next Generation Reactive and Modular Java container",
+      "notes": "BeyondJ, the Next Generation Reactive and Modular Java Container. One Jar to rule them all!",
       "versus": "servlet"
     }
   }]

+ 2 - 2
frameworks/Java/beyondj/beyondj-launcher/src/main/resources/config/spring/core-jpa-spring-config.xml

@@ -63,8 +63,8 @@
         <property name="password" value="${system.jdbc.password}"/>
     </bean>
 
-    <bean id="systemDataSet" class="com.lenox.dataset.SystemDataSet"/>
-
+   <!-- <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>

+ 2 - 15
frameworks/Java/beyondj/beyondj-launcher/src/main/resources/config/spring/core-spring-and-camel-config.xml

@@ -58,15 +58,6 @@
     <camelContext id="core-camel-context"
                   useMDCLogging="true" xmlns="http://camel.apache.org/schema/spring" trace="true" autoStartup="true">
 
-        <camel:jmxAgent id="com.lenox.beyondj.jmxagent" createConnector="true"
-                        mbeanObjectDomainName="com.lenox.beyondj.routes"
-                        mbeanServerDefaultDomain="com.lenox.beyondj"
-                        xmlns:camel="http://camel.apache.org/schema/spring"
-                        registryPort="{{system.camel.jmx.registryPort}}"
-                        connectorPort="{{system.camel.jmx.connectorPort}}"
-                        usePlatformMBeanServer="true"
-                        onlyRegisterProcessorWithCustomId="true"/>
-
         <route id="updateGatewayRuleRoute" autoStartup="true">
             <from uri="direct-vm://updateGatewayRules"/>
             <setExchangePattern pattern="InOut"/>
@@ -110,12 +101,6 @@
             <setExchangePattern pattern="InOnly"/>
             <bean ref="metricMonitoringService" method="provide"/>
         </route>
-
- <!--       <route id="scheduledMetricsCollectionRoute" autoStartup="true">
-            <from uri="quartz://metricsCollectionGroup/metricsCollectionTimer?cron={{system.metrics.collection.cron}}"/>
-            <bean ref="metricMonitoringService" method="collectAndPublish"/>
-        </route>-->
-
     </camelContext>
 
     <bean id="branding" class="com.lenox.beyondj.configuration.Branding"/>
@@ -185,11 +170,13 @@
 
     <bean id="coreMetricsService" class="com.lenox.beyondj.CoreMetricsService">
         <property name="metricPublishingDelegate" ref="metricPublishingDelegate"/>
+        <property name="metricsEnabled" value="false"/>
     </bean>
 
     <bean id="metricMonitoringService" class="com.lenox.beyondj.services.BeyondJMetricMonitoringService">
         <property name="metricPublishingDelegate" ref="metricPublishingDelegate"/>
         <property name="metricPublishingListener" ref="metricPublishingListener"/>
+        <property name="metricsEnabled" value="false"/>
     </bean>
 
     <bean id="deploymentRunService" class="com.lenox.service.DeploymentRunService"/>

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

@@ -0,0 +1,28 @@
+#Fields to capture for metrics in the Gateway HTTP Multiplexed applications
+
+Date=true
+Referer=true
+User-Agent=true
+contextPath=true
+CamelHttpUri=true
+CamelHttpUrl=true
+CamelHttpPath=true
+CamelHttpQuery=tru
+CamelHttpMethod=true
+CamelHttpResponseCode=true
+CamelHttpServletRequest=true
+CamelHttpServletResponse=true
+
+DNT=false
+Server=false
+Accept=false
+Connection=false
+Content-Type=false
+breadcrumbId=false
+Cache-Control=false
+Content-Length=false
+Accept-Encoding=false
+Accept-Language=false
+Transfer-Encoding=false
+CamelServletContextPath=false
+CamelSkipWwwFormUrlEncoding=false

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

@@ -16,7 +16,6 @@ public class TypeConverterFactory extends DefaultTypeConverterFactory {
 
 	@SuppressWarnings("rawtypes")
 	@Override
-
 	public TypeConverter getInstance(Class<? extends TypeConverter> clazz,
 			Locale locale) throws Exception {
 		TypeConverter converter = super.getInstance(clazz, locale);

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

@@ -2,6 +2,14 @@
 
 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/
+
 mvn clean package
 
 java -jar beyondj-launcher/target/beyondj.jar &