Ver código fonte

fix loader pom to enable jar launch

Nick Kasvosve 10 anos atrás
pai
commit
35c2b6a391

+ 32 - 1
frameworks/Java/beyondj/beyondj-data-loader/pom.xml

@@ -119,7 +119,38 @@
     </dependencies>
 
     <build>
-        <finalName>beyondj-data</finalName>
+        <finalName>beyondj-data-loader</finalName>
+        <plugins>
+            <!--<plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifest>
+                            <addClasspath>true</addClasspath>
+                            <mainClass>com.techempower.beyondj.dataset.DataLoader</mainClass>
+                            <classpathPrefix>dependency-jars/</classpathPrefix>
+                        </manifest>
+                    </archive>
+                </configuration>
+            </plugin>-->
+
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <version>${spring.boot.version}</version>
+                <configuration>
+                    <mainClass>com.techempower.beyondj.dataset.DataLoader</mainClass>
+                </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
     </build>
 
 </project>

+ 13 - 0
frameworks/Java/beyondj/beyondj-data-loader/src/main/java/com/techempower/beyondj/dataset/DataLoader.java

@@ -0,0 +1,13 @@
+package com.techempower.beyondj.dataset;
+
+import org.springframework.context.support.ClassPathXmlApplicationContext;
+
+public class DataLoader {
+
+    public static void main(String[] args) {
+
+        new ClassPathXmlApplicationContext(
+                "classpath*:**/beyondj-data-loader-jpa-spring-config.xml");
+        System.out.println("Finished loading data. Bye");
+    }
+}

+ 1 - 1
frameworks/Java/beyondj/beyondj-data-loader/src/main/resources/hibernate.cfg.xml

@@ -5,7 +5,7 @@
 <hibernate-configuration>
     <session-factory>
         <property name="dialect">org.hibernate.dialect.MySQLDialect</property>
-        <property name="show_sql">true</property>
+        <property name="show_sql">false</property>
         <mapping resource="beyondj.hbm.xml"/>
     </session-factory>
 </hibernate-configuration>

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

@@ -16,7 +16,7 @@
         <class>com.lenox.domain.Role</class>
         <class>com.lenox.domain.DeploymentRun</class>
         <properties>
-            <property name="hibernate.hbm2ddl.auto" value="create"/>
+            <property name="hibernate.hbm2ddl.auto" value="update"/>
             <property name="hibernate.ejb.naming_strategy" value="org.hibernate.cfg.ImprovedNamingStrategy"/>
             <property name="hibernate.show_sql" value="true"/>
             <property name="hibernate.format_sql" value="true"/>

+ 1 - 1
frameworks/Java/beyondj/beyondj-launcher/src/main/resources/launchers/9.3.0-minimum-jetty-deps.txt

@@ -60,7 +60,7 @@ xpp3_min-1.1.4c.jar
 xstream-1.4.8.jar
 xmlpull-1.1.3.1.jar
 #xom-1.2.5.jar
-commons-lang3-3.3.2.jar
+commons-lang3-3.4.jar
 json-20141113.jar
 json-lib-2.4-jdk15.jar
 json-simple-1.1.jar

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

@@ -1,16 +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>
-    <requiresWar>true</requiresWar>
-    <systemGateway>false</systemGateway>
-    <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 - 0
frameworks/Java/beyondj/beyondj-launcher/src/main/resources/launchers/config/beyondj-service.xml

@@ -19,6 +19,7 @@
         <printClassPath>true</printClassPath>
         <numInstances>3</numInstances>
         <loadBalancerDefType>ROUND_ROBIN_LOAD_BALANCER</loadBalancerDefType>
+        <enableHealthCheck>true</enableHealthCheck>
         <healthCheckInterval>1</healthCheckInterval>
         <healthCheckInitialDelay>1</healthCheckInitialDelay>
         <!--Possible values: DAYS ,HOURS, MICROSECONDS ,MILLISECONDS ,MINUTES ,NANOSECONDS ,SECONDS -->

+ 1 - 0
frameworks/Java/beyondj/beyondj-launcher/src/main/resources/launchers/config/gateway.xml

@@ -15,6 +15,7 @@
     <healthCheckInterval>1</healthCheckInterval>
     <!--Possible values are JETTY, TOMCAT -->
     <containerType>JETTY</containerType>
+    <enableHealthCheck>true</enableHealthCheck>
     <healthCheckInitialDelay>1</healthCheckInitialDelay>
     <!--Possible values: DAYS ,HOURS, MICROSECONDS ,MILLISECONDS ,MINUTES ,NANOSECONDS ,SECONDS -->
     <healthCheckIntervalUnit>MINUTES</healthCheckIntervalUnit>

+ 42 - 0
frameworks/Java/beyondj/beyondj-launcher/src/main/resources/launchers/java-process-deps.txt

@@ -0,0 +1,42 @@
+
+asm-5.0.1.jar
+asm-commons-5.0.1.jar
+asm-tree-5.0.1.jar
+slf4j-api-1.7.7.jar
+log4j-1.2.16.jar
+slf4j-log4j12-1.7.7.jar
+
+#start beyondj related
+beyondj-common-util-1.0-SNAPSHOT.jar
+beyondj-config-1.0-SNAPSHOT.jar
+beyondj-parse-1.0-SNAPSHOT.jar
+jaxb2-basics-runtime-0.6.1.jar
+beyondj-schema-1.0-SNAPSHOT.jar
+beyondj-gateway-model-1.0-SNAPSHOT.jar
+beyondj-gateway-core-1.0-SNAPSHOT.jar
+beyondj-gateway-servlet-1.0-SNAPSHOT.jar
+beyondj-parse-model-1.0-SNAPSHOT.jar
+beyondj-java-process-launch-1.0-SNAPSHOT.jar
+beyondj-class-utils-1.0-SNAPSHOT.jar
+
+json-simple-1.1.jar
+commons-fileupload-1.3.1.jar
+commons-compress-1.9.jar
+
+stax2-api-3.1.4.jar
+xpp3_min-1.1.4c.jar
+xstream-1.4.8.jar
+xmlpull-1.1.3.1.jar
+commons-lang3-3.4.jar
+json-20141113.jar
+json-lib-2.4-jdk15.jar
+json-simple-1.1.jar
+jstl-impl-1.2.jar
+commons-exec-1.3.jar
+commons-cli-1.3.1.jar
+commons-collections-3.2.1.jar
+commons-io-2.4.jar
+okhttp-2.5.0.jar
+okio-1.6.0.jar
+jolokia-core-1.3.1.jar
+joda-time-2.6.jar

+ 40 - 0
frameworks/Java/beyondj/beyondj-launcher/src/main/resources/launchers/script-process-deps.txt

@@ -0,0 +1,40 @@
+asm-5.0.1.jar
+asm-commons-5.0.1.jar
+asm-tree-5.0.1.jar
+slf4j-api-1.7.7.jar
+log4j-1.2.16.jar
+slf4j-log4j12-1.7.7.jar
+
+#start beyondj related
+beyondj-common-util-1.0-SNAPSHOT.jar
+beyondj-config-1.0-SNAPSHOT.jar
+beyondj-parse-1.0-SNAPSHOT.jar
+jaxb2-basics-runtime-0.6.1.jar
+beyondj-schema-1.0-SNAPSHOT.jar
+beyondj-gateway-model-1.0-SNAPSHOT.jar
+beyondj-gateway-core-1.0-SNAPSHOT.jar
+beyondj-gateway-servlet-1.0-SNAPSHOT.jar
+beyondj-parse-model-1.0-SNAPSHOT.jar
+beyondj-java-process-launch-1.0-SNAPSHOT.jar
+beyondj-class-utils-1.0-SNAPSHOT.jar
+json-simple-1.1.jar
+commons-fileupload-1.3.1.jar
+commons-compress-1.9.jar
+
+stax2-api-3.1.4.jar
+xpp3_min-1.1.4c.jar
+xstream-1.4.8.jar
+xmlpull-1.1.3.1.jar
+commons-lang3-3.4.jar
+json-20141113.jar
+json-lib-2.4-jdk15.jar
+json-simple-1.1.jar
+jstl-impl-1.2.jar
+commons-exec-1.3.jar
+commons-cli-1.3.1.jar
+commons-collections-3.2.1.jar
+commons-io-2.4.jar
+okhttp-2.5.0.jar
+okio-1.6.0.jar
+jolokia-core-1.3.1.jar
+joda-time-2.6.jar

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

@@ -8,7 +8,7 @@
         <class>com.techempower.beyondj.domain.World</class>
         <class>com.techempower.beyondj.domain.Fortune</class>
         <properties>
-            <property name="hibernate.hbm2ddl.auto" value="create"/>
+            <property name="hibernate.hbm2ddl.auto" value="update"/>
             <property name="hibernate.ejb.naming_strategy" value="org.hibernate.cfg.EJB3NamingStrategy"/>
             <property name="hibernate.show_sql" value="false"/>
             <property name="hibernate.format_sql" value="false"/>

+ 0 - 2
frameworks/Java/beyondj/beyondj-service/src/main/resources/beyondj-service-jpa-spring-config.xml

@@ -49,8 +49,6 @@
         <property name="dataSource" ref="dataSource"/>
     </bean>
 
-    <!-- <bean id="WorldDataSet" class="com.techempower.beyondj.dataset.WorldDataSet"/>
- -->
     <bean id="jpaDialect" class="org.springframework.orm.jpa.vendor.HibernateJpaDialect"/>
 
     <bean id="jpaVendorAdapter"

+ 1 - 1
frameworks/Java/beyondj/beyondj-service/src/main/resources/hibernate.cfg.xml

@@ -5,7 +5,7 @@
 <hibernate-configuration>
     <session-factory>
         <property name="dialect">org.hibernate.dialect.MySQLDialect</property>
-        <property name="show_sql">true</property>
+        <property name="show_sql">false</property>
         <mapping resource="beyondj.hbm.xml"/>
     </session-factory>
 </hibernate-configuration>

+ 20 - 12
frameworks/Java/beyondj/source_code

@@ -1,12 +1,20 @@
-./beyondj/src/main/java/com/techempower/beyondj/domain/Fortune.java
-./beyondj/src/main/java/com/techempower/beyondj/domain/World.java
-./beyondj/src/main/java/com/techempower/beyondj/repository/FortuneRepository.java
-./beyondj/src/main/java/com/techempower/beyondj/repository/WorldRepository.java
-./beyondj/src/main/java/com/techempower/beyondj/SampleApplication.java
-./beyondj/src/main/java/com/techempower/beyondj/web/FortuneController.java
-./beyondj/src/main/java/com/techempower/beyondj/web/HelloController.java
-./beyondj/src/main/java/com/techempower/beyondj/web/WorldDatabaseController.java
-./beyondj/src/main/resources/application.yml
-./beyondj/src/main/resources/log4.properties
-./beyondj/src/main/resources/schema.sql
-./beyondj/src/main/resources/templates/fortunes.html
+./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
+./beyondj-data/src/main/java/com/techempower/beyondj/Message.java
+./beyondj-data/src/main/java/com/techempower/beyondj/repository/FortuneRepository.java
+./beyondj-data/src/main/java/com/techempower/beyondj/repository/FortuneRepositoryImpl.java
+./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/src/main/java/com/techempower/beyondj/dataset/DataLoader.java
+./beyondj-data-loader/src/main/java/com/techempower/beyondj/dataset/WorldDataSet.java
+./beyondj-launcher/src/main/java/com/techempower/beyondj/BeyondJApplication.java
+./beyondj-launcher/src/main/java/com/techempower/beyondj/BeyondJApplicationService.java
+./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
+./beyondj-service/src/main/java/com/techempower/beyondj/action/HelloActionBean.java
+./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