Permalink
Browse files

Indentation fixes; removing no longer needed files and configuration (#…

…530)

* adding default bitronix config files to fix tlog file locations
   (we want them in target/ not in current working dir)
  • Loading branch information...
1 parent bae8224 commit 382f8f0582bd0ae24731ad76852dfef4f6922669 @psiroky psiroky committed with mswiderski Aug 9, 2016
View
@@ -162,14 +162,14 @@
<build>
<testResources>
- <testResource>
- <directory>src/test/resources</directory>
- <filtering>false</filtering>
- </testResource>
- <testResource>
- <directory>src/test/filtered-resources</directory>
- <filtering>true</filtering>
- </testResource>
+ <testResource>
+ <directory>src/test/resources</directory>
+ <filtering>false</filtering>
+ </testResource>
+ <testResource>
+ <directory>src/test/filtered-resources</directory>
+ <filtering>true</filtering>
+ </testResource>
</testResources>
<plugins>
@@ -1,10 +0,0 @@
-#
-
-bin.includes = .,\
- model/,\
- META-INF/,\
- plugin.xml,\
- plugin.properties
-jars.compile.order = .
-source.. = src/main/java/
-output.. = bin/
@@ -1,8 +0,0 @@
-
-# <copyright>
-# </copyright>
-#
-# $Id$
-
-pluginName = Bpmn2extensionmodel Model
-providerName = www.example.org
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<!--
- <copyright>
- </copyright>
-
- $Id$
--->
-
-<plugin>
-
- <extension point="org.eclipse.emf.ecore.generated_package">
- <package
- uri="http://www.jbpm.org/bpmn2/jbpmbpmn2extensionmodel"
- class="org.jbpm.bpmn2.jbpmbpmn2extensionmodel.Jbpmbpmn2extensionmodelPackage"
- genModel="src/main/resources/model/bpmn2extensionmodel.genmodel"/>
- </extension>
-
- <extension point="org.eclipse.emf.ecore.extension_parser">
- <parser
- type="jbpmbpmn2extensionmodel"
- class="org.jbpm.bpmn2.jbpmbpmn2extensionmodel.util.Jbpmbpmn2extensionmodelResourceFactoryImpl"/>
- </extension>
-
-</plugin>
View
@@ -142,7 +142,6 @@
<build>
-
<resources>
<resource>
<directory>src/main/resources</directory>
@@ -204,7 +203,7 @@
<configuration>
<systemProperties>
<!-- enforce strict variable checking for the sake of tests -->
- <org.jbpm.variable.strict>true </org.jbpm.variable.strict>
+ <org.jbpm.variable.strict>true</org.jbpm.variable.strict>
</systemProperties>
</configuration>
</plugin>
@@ -32,7 +32,7 @@
<bpmn2:incoming>SequenceFlow_6</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_13</bpmn2:outgoing>
<bpmn2:script>try{
-java.io.BufferedWriter bw = new java.io.BufferedWriter(new java.io.FileWriter("log" + testCaseNumber + ".txt", true));
+java.io.BufferedWriter bw = new java.io.BufferedWriter(new java.io.FileWriter("target/log" + testCaseNumber + ".txt", true));
bw.append("task1");
bw.newLine();
bw.close();
@@ -44,7 +44,7 @@ bw.close();
<bpmn2:incoming>SequenceFlow_2</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_1</bpmn2:outgoing>
<bpmn2:script>try{
-java.io.File f = new java.io.File("log" + testCaseNumber + ".txt");
+java.io.File f = new java.io.File("target/log" + testCaseNumber + ".txt");
f.createNewFile();
}catch(java.io.IOException e){}</bpmn2:script>
</bpmn2:scriptTask>
@@ -59,7 +59,7 @@ f.createNewFile();
<bpmn2:incoming>SequenceFlow_5</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_4</bpmn2:outgoing>
<bpmn2:script>try{
-java.io.BufferedWriter bw = new java.io.BufferedWriter(new java.io.FileWriter("log" + testCaseNumber + ".txt", true));
+java.io.BufferedWriter bw = new java.io.BufferedWriter(new java.io.FileWriter("target/log" + testCaseNumber + ".txt", true));
bw.append("success");
bw.close();
}catch(java.io.IOException e){}</bpmn2:script>
@@ -88,7 +88,7 @@ bw.close();
<bpmn2:incoming>SequenceFlow_8</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_3</bpmn2:outgoing>
<bpmn2:script>try{
-java.io.BufferedWriter bw = new java.io.BufferedWriter(new java.io.FileWriter("log" + testCaseNumber + ".txt", true));
+java.io.BufferedWriter bw = new java.io.BufferedWriter(new java.io.FileWriter("target/log" + testCaseNumber + ".txt", true));
bw.append("task2");
bw.newLine();
bw.close();
@@ -9,10 +9,4 @@
/*.iws
/*.iml
-# META-INF is generated by the maven-felix-plugin - TODO no longer applies, remove this line
-/META-INF
-# test files
-/*.db
-/btm*log
-/lognull.txt
@@ -14,7 +14,7 @@
<name>jBPM :: Case Management</name>
<description>jBPM Case Management</description>
-
+
<dependencies>
<dependency>
<groupId>org.kie</groupId>
@@ -39,4 +39,17 @@
</dependency>
</dependencies>
+ <build>
+ <testResources>
+ <testResource>
+ <directory>src/test/resources</directory>
+ <filtering>false</filtering>
+ </testResource>
+ <testResource>
+ <directory>src/test/filtered-resources</directory>
+ <filtering>true</filtering>
+ </testResource>
+ </testResources>
+ </build>
+
</project>
@@ -0,0 +1,2 @@
+bitronix.tm.journal.disk.logPart1Filename=${project.build.directory}/btm1.tlog
+bitronix.tm.journal.disk.logPart2Filename=${project.build.directory}/btm2.tlog
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>jbpm</artifactId>
<groupId>org.jbpm</groupId>
<version>7.0.0-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>jbpm-document</artifactId>
@@ -37,7 +37,7 @@
<groupId>org.drools</groupId>
<artifactId>drools-core</artifactId>
</dependency>
- <!-- Test: logging -->
+ <!-- Test: logging -->
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
View
@@ -13,25 +13,6 @@
<name>jBPM :: Examples</name>
<description>Run JBPMExamplesApp to try the jBPM examples.</description>
- <repositories>
- <!-- TODO remove this once maven central replicates the jboss repository -->
- <!-- Included so the examples sources in the distribution zip build out-of-the-box with maven -->
- <repository>
- <id>jboss-public-repository-group</id>
- <name>JBoss Public Repository Group</name>
- <url>https://repository.jboss.org/nexus/content/groups/public/</url>
- <layout>default</layout>
- <releases>
- <enabled>true</enabled>
- <updatePolicy>never</updatePolicy>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- <updatePolicy>daily</updatePolicy>
- </snapshots>
- </repository>
- </repositories>
-
<build>
<pluginManagement>
<plugins>
@@ -68,7 +49,7 @@
</goals>
</pluginExecutionFilter>
<action>
- <ignore></ignore>
+ <ignore/>
</action>
</pluginExecution>
</pluginExecutions>
View
@@ -67,7 +67,7 @@
org.jbpm.persistence.timer;resolution:=optional,
*
</Import-Package>
- <Private-Package></Private-Package>
+ <Private-Package/>
<Export-Package>
org.jbpm.flow.util.*,
org.jbpm.marshalling.*,
@@ -175,7 +175,7 @@
org.jbpm.services.task.lifecycle.listeners,
*
</Import-Package>
- <Private-Package></Private-Package>
+ <Private-Package/>
<Export-Package>
org.jbpm.services.task.audit*,
org.jbpm.services.task.lifecycle.listeners
@@ -247,7 +247,7 @@
org.drools.persistence.jta;resolution:=optional,
*
</Import-Package>
- <Private-Package></Private-Package>
+ <Private-Package/>
<Export-Package>
org.jbpm.services.task*
</Export-Package>
@@ -135,7 +135,7 @@
!org.jbpm.services.task.wih,
*
</Import-Package>
- <Private-Package></Private-Package>
+ <Private-Package/>
<Export-Package>
org.jbpm.services.task.wih*
</Export-Package>
@@ -141,7 +141,6 @@
<exclude>**/*.jar</exclude>
</excludes>
</resource>
-
</resources>
<plugins>
@@ -58,7 +58,7 @@
<Import-Package>
*
</Import-Package>
- <Private-Package></Private-Package>
+ <Private-Package/>
<Export-Package>
org.jbpm.query.*,
</Export-Package>
@@ -282,7 +282,7 @@
org.eclipse.aether.artifact;resolution:=optional,
org.xml.sax
</Import-Package>
- <Private-Package></Private-Package>
+ <Private-Package/>
<Export-Package>
org.jbpm.runtime.manager.api*,
org.jbpm.runtime.manager.impl*
@@ -0,0 +1,2 @@
+bitronix.tm.journal.disk.logPart1Filename=${project.build.directory}/btm1.tlog
+bitronix.tm.journal.disk.logPart2Filename=${project.build.directory}/btm2.tlog
@@ -1,5 +1,5 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.jbpm</groupId>
@@ -9,11 +9,11 @@
<artifactId>jbpm-executor-ejb</artifactId>
<name>jBPM :: Executor Service EJB add-ons</name>
- <!-- skip tests from maven build for now as they require server installation -->
+ <!-- skip tests from maven build for now as they require server installation -->
<properties>
- <skipTests>true</skipTests>
+ <skipTests>true</skipTests>
</properties>
-
+
<dependencies>
<dependency>
<groupId>org.kie</groupId>
@@ -93,7 +93,7 @@
<artifactId>jboss-jms-api_2.0_spec</artifactId>
<scope>provided</scope>
</dependency>
-
+
<!-- test -->
<dependency>
<groupId>org.jboss.weld.se</groupId>
@@ -195,26 +195,42 @@
<filtering>true</filtering>
</testResource>
</testResources>
-
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <finalName>executor-war</finalName>
- <descriptors>
- <descriptor>src/main/assembly/assembly-ejb-war.xml</descriptor>
- </descriptors>
- </configuration>
- </plugin>
- </plugins>
+
</build>
+
+ <profiles>
+ <!-- Create the test WAR only in case we actually need it - when the tests are enabled -->
+ <profile>
+ <id>ejb-war</id>
+ <activation>
+ <property>
+ <name>skipTests</name>
+ <value>false</value>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <finalName>executor-war</finalName>
+ <descriptors>
+ <descriptor>src/main/assembly/assembly-ejb-war.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
</project>
Oops, something went wrong.

0 comments on commit 382f8f0

Please sign in to comment.