Skip to content

F
Flowable Engine

开发团队 / Flowable Engine

通知 9
Star 0
Fork 0
F
Flowable Engine

体验新版 GitCode，发现更多精彩内容 >>

提交 6605c818 编写于 作者: M martin.grofcik
浏览文件
操作

Merge branch 'master' of https://github.com/Activiti/Activiti into xsd

上级 754d6903 48eb5c2c
隐藏空白更改
内联 并排
Showing with 57 addition and 1454 deletion
modules/activiti-cactus/pom.xml 已删除 100644 → 0
浏览文件 @ 754d6903
<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">
<modelVersion>4.0.0</modelVersion>
<name>Activiti - Cactus</name>
<groupId>org.activiti</groupId>
<artifactId>activiti-cactus</artifactId>
<packaging>war</packaging>
<parent>
<groupId>org.activiti</groupId>
<artifactId>activiti-root</artifactId>
<relativePath>../..</relativePath>
<version>5.15.1-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
<groupId>org.activiti</groupId>
<artifactId>activiti-engine</artifactId>
</dependency>
<dependency>
<groupId>org.activiti</groupId>
<artifactId>activiti-engine</artifactId>
<classifier>tests</classifier>
<version>${version}</version>
</dependency>
<dependency>
<groupId>org.apache.cactus</groupId>
<artifactId>cactus.core.framework.uberjar.javaEE.15</artifactId>
<version>1.8.1</version>
</dependency>
<dependency>
<!-- necessary for deploying cactus on tomcat. excluded for jboss below -->
<groupId>jaxen</groupId>
<artifactId>jaxen</artifactId>
<version>1.1.1</version>
</dependency>
<!-- Jar containing cactus targets to use in ant -->
<dependency>
<groupId>org.apache.cactus</groupId>
<artifactId>cactus.integration.ant</artifactId>
<version>1.8.1</version>
</dependency>
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-all</artifactId>
</dependency>
<dependency>
<groupId>org.drools</groupId>
<artifactId>drools-core</artifactId>
</dependency>
<dependency>
<groupId>org.drools</groupId>
<artifactId>drools-compiler</artifactId>
</dependency>
<dependency>
<groupId>javax.persistence</groupId>
<artifactId>persistence-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jta_1.1_spec</artifactId>
</dependency>
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
</dependency>
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.subethamail</groupId>
<artifactId>subethasmtp-wiser</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
</dependency>
<dependency>
<groupId>postgresql</groupId>
<artifactId>postgresql</artifactId>
</dependency>
<dependency>
<groupId>net.sourceforge.jtds</groupId>
<artifactId>jtds</artifactId>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>1.1</version>
<executions>
<execution>
<phase>process-classes</phase>
<goals>
<goal>java</goal>
</goals>
</execution>
</executions>
<configuration>
<mainClass>org.activiti.test.cactus.ListTests</mainClass>
</configuration>
</plugin>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<id>copy</id>
<phase>package</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
<configuration>
<outputDirectory>../../qa/server/target/cactus/lib</outputDirectory>
<includeScope>test</includeScope>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<!--
only worked with this version, there might be a bug with antrun
see http://jira.codehaus.org/browse/MANTRUN-109
-->
<version>1.4</version>
<executions>
<execution>
<phase>process-classes</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<tasks>
<condition property="cfg.file.name" value="activiti-context.xml" else="activiti.cfg.xml">
<equals arg1="${cfg}" arg2="spring" />
</condition>
<echo message="using configuration src/main/cfg/server.${server}.cfg.${cfg}.tx.${tx}.xml as ${cfg.file.name}" />
<echo message="using database properties ${user.home}/.activiti/server/build.${database}.properties" />
<copy tofile="target/classes/${cfg.file.name}" file="src/main/cfg/server.${server}.cfg.${cfg}.tx.${tx}.xml">
<filterset filtersfile="${user.home}/.activiti/server/build.${database}.properties" />
</copy>
</tasks>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
<profiles>
<profile>
<id>jboss</id>
<activation>
<property>
<name>server</name>
<value>jboss</value>
</property>
</activation>
<dependencies>
<dependency>
<groupId>org.apache.cactus</groupId>
<artifactId>cactus.integration.ant</artifactId>
<version>1.8.1</version>
<exclusions>
<exclusion>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
</exclusion>
<exclusion>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>jaxen</groupId>
<artifactId>jaxen</artifactId>
<version>1.1.1</version>
<exclusions>
<exclusion>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
</exclusion>
<exclusion>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
</profile>
</profiles>
</project>
modules/activiti-cactus/src/main/cfg/server.jboss.cfg.activiti.tx.jta.xml 已删除 100644 → 0
浏览文件 @ 754d6903
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
<bean id="processEngineConfiguration" class="org.activiti.engine.impl.cfg.JtaProcessEngineConfiguration">
<!-- Database configurations -->
<property name="dataSourceJndi" value="java:/ActivitiDS" />
<!-- Database configurations -->
<property name="databaseSchemaUpdate" value="true" />
<!-- job executor configurations -->
<property name="jobExecutorActivate" value="false" />
<!-- mail server configurations -->
<property name="mailServerPort" value="5025" />
</bean>
</beans>
modules/activiti-cactus/src/main/cfg/server.jboss.cfg.activiti.tx.standalone.xml 已删除 100644 → 0
浏览文件 @ 754d6903
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
<bean id="processEngineConfiguration" class="org.activiti.engine.impl.cfg.StandaloneProcessEngineConfiguration">
<!-- Database configurations -->
<property name="jdbcUrl" value="@jdbc.url@" />
<property name="jdbcDriver" value="@jdbc.driver@" />
<property name="jdbcUsername" value="@jdbc.username@" />
<property name="jdbcPassword" value="@jdbc.password@" />
<!-- Database configurations -->
<property name="databaseSchemaUpdate" value="true" />
<!-- job executor configurations -->
<property name="jobExecutorActivate" value="false" />
<!-- mail server configurations -->
<property name="mailServerPort" value="5025" />
</bean>
</beans>
modules/activiti-cactus/src/main/cfg/server.jboss.cfg.spring.tx.standalone.xml 已删除 100644 → 0
浏览文件 @ 754d6903
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
<bean id="dataSource" class="org.springframework.jdbc.datasource.TransactionAwareDataSourceProxy">
<property name="targetDataSource">
<bean class="org.springframework.jdbc.datasource.SimpleDriverDataSource">
<property name="driverClass" value="@jdbc.driver@" />
<property name="url" value="@jdbc.url@" />
<property name="username" value="@jdbc.username@" />
<property name="password" value="@jdbc.password@" />
</bean>
</property>
</bean>
<bean id="transactionManager" class="org.springframework.jdbc.datasource.DataSourceTransactionManager">
<property name="dataSource" ref="dataSource" />
</bean>
<bean id="processEngineConfiguration" class="org.activiti.spring.SpringProcessEngineConfiguration">
<property name="dataSource" ref="dataSource" />
<property name="transactionManager" ref="transactionManager" />
<property name="databaseSchemaUpdate" value="true" />
<property name="jobExecutorActivate" value="false" />
</bean>
<bean id="processEngine" class="org.activiti.spring.ProcessEngineFactoryBean">
<property name="processEngineConfiguration" ref="processEngineConfiguration" />
</bean>
<bean id="repositoryService" factory-bean="processEngine" factory-method="getRepositoryService" />
<bean id="runtimeService" factory-bean="processEngine" factory-method="getRuntimeService" />
<bean id="taskService" factory-bean="processEngine" factory-method="getTaskService" />
<bean id="historyService" factory-bean="processEngine" factory-method="getHistoryService" />
<bean id="managementService" factory-bean="processEngine" factory-method="getManagementService" />
</beans>
modules/activiti-cactus/src/main/cfg/server.tomcat.cfg.activiti.tx.standalone.xml 已删除 100644 → 0
浏览文件 @ 754d6903
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
<bean id="processEngineConfiguration" class="org.activiti.engine.impl.cfg.StandaloneProcessEngineConfiguration">
<!-- Database configurations -->
<property name="jdbcUrl" value="@jdbc.url@" />
<property name="jdbcDriver" value="@jdbc.driver@" />
<property name="jdbcUsername" value="@jdbc.username@" />
<property name="jdbcPassword" value="@jdbc.password@" />
<!-- Database configurations -->
<property name="databaseSchemaUpdate" value="true" />
<!-- job executor configurations -->
<property name="jobExecutorActivate" value="false" />
<!-- mail server configurations -->
<property name="mailServerPort" value="5025" />
</bean>
</beans>
modules/activiti-cactus/src/main/cfg/server.tomcat.cfg.spring.tx.standalone.xml 已删除 100644 → 0
浏览文件 @ 754d6903
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
<bean id="dataSource" class="org.springframework.jdbc.datasource.TransactionAwareDataSourceProxy">
<property name="targetDataSource">
<bean class="org.springframework.jdbc.datasource.SimpleDriverDataSource">
<property name="driverClass" value="@jdbc.driver@" />
<property name="url" value="@jdbc.url@" />
<property name="username" value="@jdbc.username@" />
<property name="password" value="@jdbc.password@" />
</bean>
</property>
</bean>
<bean id="transactionManager" class="org.springframework.jdbc.datasource.DataSourceTransactionManager">
<property name="dataSource" ref="dataSource" />
</bean>
<bean id="processEngineConfiguration" class="org.activiti.spring.SpringProcessEngineConfiguration">
<property name="dataSource" ref="dataSource" />
<property name="transactionManager" ref="transactionManager" />
<property name="databaseSchemaUpdate" value="true" />
<property name="jobExecutorActivate" value="false" />
</bean>
<bean id="processEngine" class="org.activiti.spring.ProcessEngineFactoryBean">
<property name="processEngineConfiguration" ref="processEngineConfiguration" />
</bean>
<bean id="repositoryService" factory-bean="processEngine" factory-method="getRepositoryService" />
<bean id="runtimeService" factory-bean="processEngine" factory-method="getRuntimeService" />
<bean id="taskService" factory-bean="processEngine" factory-method="getTaskService" />
<bean id="historyService" factory-bean="processEngine" factory-method="getHistoryService" />
<bean id="managementService" factory-bean="processEngine" factory-method="getManagementService" />
</beans>
modules/activiti-cactus/src/main/java/org/activiti/test/cactus/ActivitiServletTestCase.java 已删除 100644 → 0
浏览文件 @ 754d6903
package org.activiti.test.cactus;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.util.ArrayList;
import java.util.List;
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
import org.apache.cactus.ServletTestSuite;
/* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
/**
* A TestCase that returns a {@link ServletTestSuite} that can be run with
* cactus inside a containe. This testsuite will run all tests that are
* configured in the file 'activiti.cactus.tests.txt' on the classpath.
*
* The configured tests can be {@link TestSuite}s or {@link TestCase}s, they
* will be handled accordingly.
*
* @author Frederik Heremans
*/
public class ActivitiServletTestCase extends TestCase {
public static Test suite() {
ServletTestSuite suite = new ServletTestSuite();
// Add all test class-names that are present in a file on the classpath
InputStream is = null;
try {
is = Thread.currentThread().getContextClassLoader().getResourceAsStream("activiti.cactus.tests.txt");
if (is == null) {
throw new RuntimeException("File activiti.cactus.tests.txt is not found on classpath!");
}
List<String> testsToRun = readLines(is);
for (String testName : testsToRun) {
addTestToSuite(testName, suite);
}
} catch (IOException ioe) {
throw new RuntimeException("Cannot read activiti cactus test configuration", ioe);
} finally {
closeSilently(is);
}
return suite;
}
private static List<String> readLines(InputStream inputStream) throws IOException {
List<String> lines = new ArrayList<String>();
BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream));
String line = reader.readLine();
while (line != null) {
lines.add(line);
line = reader.readLine();
}
return lines;
}
private static void closeSilently(InputStream inputStream) {
if (inputStream != null) {
try {
inputStream.close();
} catch (IOException ioe) {
// Ignore
}
}
}
private static Class< ? > forName(String classname) {
try {
return Class.forName(classname);
} catch (ClassNotFoundException e) {
throw new RuntimeException("A test with name '" + classname + "' is configured, but is not found on the classpath", e);
}
}
private static void addTestToSuite(String classname, ServletTestSuite suite) {
Class< ? > testClass = forName(classname);
if (TestSuite.class.isAssignableFrom(testClass)) {
// Add the test-suite
suite.addTestSuite(testClass);
} else if (Test.class.isAssignableFrom(testClass)) {
// Test case, should be wrapped in TestSuite to have all
// test-methods turned into a single Test
ServletTestSuite testSuite = new ServletTestSuite(testClass);
suite.addTest(testSuite);
} else {
throw new RuntimeException("Class " + classname + " is not a TestCase nor a TestSuite");
}
}
}
modules/activiti-cactus/src/main/java/org/activiti/test/cactus/ListTests.java 已删除 100644 → 0
浏览文件 @ 754d6903
/* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.activiti.test.cactus;
import java.io.File;
import java.io.PrintWriter;
/**
* @author Tom Baeyens
*/
public class ListTests {
public static void main(String[] args) {
try {
File rootPath = new File("../activiti-engine/src/test/java");
System.out.println("Listing tests in dir "+rootPath.getCanonicalPath()+" in target/classes/activiti.cactus.tests.txt");
PrintWriter writer = new PrintWriter("target/classes/activiti.cactus.tests.txt");
try {
scan(rootPath, null, writer);
} finally {
writer.flush();
writer.close();
}
} catch (Exception e) {
e.printStackTrace();
}
}
public static void scan(File directory, String packageName, PrintWriter writer) {
for (File file: directory.listFiles()) {
if (file.isFile()) {
String fileName = file.getName();
if (fileName.endsWith("Test.java")) {
String className = packageName+"."+fileName.substring(0, fileName.length()-5);
writer.println(className);
}
} else if (file.isDirectory()) {
String fileName = file.getName();
String newPackageName = (packageName==null ? fileName : packageName+"."+fileName);
if (!newPackageName.startsWith("org.activiti.standalone")) {
scan(file, newPackageName, writer);
}
}
}
}
}
modules/activiti-cactus/src/main/resources/cactus.properties 已删除 100644 → 0
浏览文件 @ 754d6903
cactus.contextURL=http://localhost:8080/activiti-server-testing
modules/activiti-cactus/src/main/webapp/WEB-INF/web.xml 已删除 100644 → 0
浏览文件 @ 754d6903
<?xml version="1.0" encoding="UTF-8"?>
<web-app>
<servlet>
<servlet-name>ServletRedirector</servlet-name>
<servlet-class>org.apache.cactus.server.ServletTestRedirector</servlet-class>
</servlet>
<servlet>
<servlet-name>JspRedirector</servlet-name>
<jsp-file>/jspRedirector.jsp</jsp-file>
</servlet>
<servlet-mapping>
<servlet-name>ServletRedirector</servlet-name>
<url-pattern>/ServletRedirector</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>JspRedirector</servlet-name>
<url-pattern>/JspRedirector</url-pattern>
</servlet-mapping>
</web-app>
modules/activiti-cactus/src/main/webapp/jspRedirector.jsp 已删除 100644 → 0
浏览文件 @ 754d6903
<%--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--%><%@page import="org.apache.cactus.server.*,org.apache.cactus.internal.server.*" session="true" %><%
/**
* Note:
* It is very important not to put any character between the end
* of the page tag and the beginning of the java code expression, otherwise,
* the generated servlet containss a 'out.println("\r\n");' and this breaks
* our mechanism !
*/
/**
* This JSP is used as a proxy to call your server-side unit tests. We use
* a JSP rather than a servlet because for testing custom JSP tags for
* example we need access to JSP implicit objects (PageContext and
* JspWriter).
*/
JspImplicitObjects objects = new JspImplicitObjects();
objects.setHttpServletRequest(request);
objects.setHttpServletResponse(response);
objects.setServletConfig(config);
objects.setServletContext(application);
objects.setJspWriter(out);
objects.setPageContext(pageContext);
JspTestRedirector redirector = new JspTestRedirector();
redirector.doGet(objects);
%>
\ No newline at end of file
modules/activiti-osgi/pom.xml
浏览文件 @ 6605c818
......@@ -73,6 +73,10 @@
<artifactId>org.apache.felix.fileinstall</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-junit4</artifactId>
......@@ -117,6 +121,11 @@
<artifactId>h2</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
<properties>
......
modules/activiti-osgi/src/test/java/org/activiti/osgi/blueprint/BlueprintBasicTest.java
浏览文件 @ 6605c818
......@@ -96,10 +96,11 @@ public class BlueprintBasicTest {
mavenBundle().groupId("org.apache.aries.proxy").artifactId("org.apache.aries.proxy").version("1.0.0"),
mavenBundle().groupId("org.apache.aries").artifactId("org.apache.aries.util").version("1.0.0"),
bundle("reference:file:target/classes"));
return OptionUtils.combine(coreBundles, CoreOptions.junitBundles(),
Option[] optionArray = OptionUtils.combine(coreBundles, CoreOptions.junitBundles(),
provision(createTestBundleWithProcessEngineConfiguration(),
createTestBundleWithProcessDefinition(),
createTestBundleWithTask()));
return optionArray;
}
......@@ -112,7 +113,7 @@ public class BlueprintBasicTest {
.set(Constants.DYNAMICIMPORT_PACKAGE, "*")
.build();
} catch (FileNotFoundException fnfe) {
fail(fnfe.toString());
fail("Failure in createTestBundleWithProcessEngineConfiguration " + fnfe.toString());
return null;
}
}
......@@ -124,7 +125,7 @@ public class BlueprintBasicTest {
.add("OSGI-INF/activiti/example.bpmn20.xml", new FileInputStream(new File("src/test/resources/processes/example.bpmn20.xml")))
.set(Constants.BUNDLE_SYMBOLICNAME, "org.activiti.osgi.example").build();
} catch (FileNotFoundException fnfe) {
fail(fnfe.toString());
fail("Failure in createTestBundleWithProcessDefinition " + fnfe.toString());
return null;
}
}
......@@ -139,7 +140,7 @@ public class BlueprintBasicTest {
.set(Constants.DYNAMICIMPORT_PACKAGE, "*")
.build();
} catch (FileNotFoundException fnfe) {
fail(fnfe.toString());
fail("Failure in createTestBundleWithTask " + fnfe.toString());
return null;
}
}
......
modules/activiti-process-validation/src/main/java/org/activiti/validation/ProcessValidatorImpl.java
浏览文件 @ 6605c818
......@@ -21,11 +21,13 @@ public class ProcessValidatorImpl implements ProcessValidator {
for (ValidatorSet validatorSet : validatorSets) {
for (Validator validator : validatorSet.getValidators()) {
validator.validate(bpmnModel, allErrors);
if (allErrors.size() > 0) {
for (ValidationError error : allErrors) {
List<ValidationError> validatorErrors = new ArrayList<ValidationError>();
validator.validate(bpmnModel, validatorErrors);
if (validatorErrors.size() > 0) {
for (ValidationError error : validatorErrors) {
error.setValidatorSetName(validatorSet.getName());
}
allErrors.addAll(validatorErrors);
}
}
}
......
modules/activiti-webapp-rest2/pom.xml
浏览文件 @ 6605c818
......@@ -12,7 +12,7 @@
<relativePath>../..</relativePath>
<version>5.15.1-SNAPSHOT</version>
</parent>
<build>
<plugins>
<plugin>
......@@ -103,6 +103,34 @@
</pluginManagement>
</build>
<profiles>
<profile>
<id>buildExecutableWar</id>
<build>
<plugins>
<plugin>
<groupId>org.apache.tomcat.maven</groupId>
<artifactId>tomcat7-maven-plugin</artifactId>
<version>2.1</version>
<configuration>
<path>/</path>
<protocol>org.apache.coyote.http11.Http11NioProtocol</protocol>
</configuration>
<executions>
<execution>
<id>tomcat-run</id>
<goals>
<goal>exec-war-only</goal>
</goals>
<phase>package</phase>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>
<dependencies>
<dependency>
<groupId>org.activiti</groupId>
......
modules/activiti-webapp-rest2/src/main/resources/activiti-context.xml
浏览文件 @ 6605c818
......@@ -14,13 +14,17 @@ http://www.springframework.org/schema/tx http://www.springframework.org/schema/t
<property name="createDemoModels" value="true" />
</bean>
<bean id="dbProperties"
class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
<property name="location" value="classpath:db.properties" />
<!-- Allow other PropertyPlaceholderConfigurer to run as well -->
<bean id="dbProperties" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
<property name="locations">
<list>
<value>classpath:db.properties</value>
<value>file:activiti-rest.properties</value>
</list>
</property>
<property name="ignoreUnresolvablePlaceholders" value="true" />
<property name="ignoreResourceNotFound" value="true" />
</bean>
<bean id="dataSource"
class="org.springframework.jdbc.datasource.SimpleDriverDataSource">
<property name="driverClass" value="${jdbc.driver}" />
......
qa/server/build.xml 已删除 100644 → 0
浏览文件 @ 754d6903
<?xml version="1.0" encoding="UTF-8"?>
<project name="activiti.qa.server">
<property file="${user.home}/.activiti/build.properties" />
<property name="activiti.version" value="5.10" />
<property name="activiti.home" value="../../distro/target/activiti-${activiti.version}" />
<property name="database" value="h2" />
<property name="server" value="tomcat6x" />
<property name="cfg" value="activiti" />
<!-- {activiti|spring} -->
<property name="tx" value="standalone" />
<!-- {standalone|jta} -->
<property name="downloads.dir" value="${user.home}/.activiti/downloads" />
<property name="tomcat.version" value="6.0.32" />
<property name="tomcat.home" value="${activiti.home}/apps/apache-tomcat-${tomcat.version}" />
<property name="jboss.version" value="5.1.0.GA" />
<property name="jboss.home" value="${activiti.home}/apps/jboss-${jboss.version}" />
<property name="jboss.distro" value="${downloads.dir}/jboss-${jboss.version}.zip" />
<property name="jboss.download.url" value="http://downloads.sourceforge.net/project/jboss/JBoss/JBoss-${jboss.version}/jboss-${jboss.version}.zip" />
<condition property="is.database.h2">
<equals arg1="${database}" arg2="h2" />
</condition>
<condition property="mvn.executable" value="mvn.bat" else="mvn">
<os family="windows" />
</condition>
<condition property="server.home" value="${activiti.home}/apps/apache-tomcat-6.0.32">
<equals arg1="${server}" arg2="tomcat6x" />
</condition>
<condition property="server.home" value="${jboss.home}">
<equals arg1="${server}" arg2="jboss5x" />
</condition>
<target name="clean">
<delete dir="target" />
</target>
<target name="help">
<echo message="Following commands are supported:" />
<echo message=" ant -Dserver=tomcat clean test" />
<echo message=" ant -Dserver=jboss clean test" />
</target>
<target name="test" depends="build.distribution, build.testing.war">
<delete dir="${activiti.home}/apps" />
<delete dir="${activiti.home}/setup/build" />
<available property="is.jboss.available" file="${jboss.distro}" />
<antcall target="${server}.install" />
<antcall target="${server}.deploy.testing.war" />
<antcall target="h2.start" />
<antcall target="${server}.start" />
<echo message="Running server tests..." />
<mkdir dir="target/junit-reports" />
<taskdef resource="cactus.tasks">
<classpath>
<fileset dir="target/cactus/lib">
<include name="*.jar"/>
</fileset>
</classpath>
</taskdef>
<cactustests fork="yes" haltonerror="false" haltonfailure="false"
servletport="8080" warfile="target/activiti-server-testing.war"
todir="target/junit-reports"
logs="cactus.conf/logging_client.properties">
<jvmarg value="-Xms1024m" />
<jvmarg value="-Xmx1024m" />
<classpath>
<pathelement location="../../modules/activiti-cactus/target/classes" />
<pathelement location="cactus.conf" />
<fileset dir="target/cactus/lib" />
</classpath>
<formatter type="xml" />
<test name="org.activiti.test.cactus.ActivitiServletTestCase" todir="target/junit-reports" />
</cactustests>
<antcall target="${server}.stop" />
<antcall target="h2.stop" />
</target>
<target name="build.distribution" unless="skipdistro">
<echo message="Building distribution..." />
<ant antfile="../../distro/build.xml" inheritall="false">
<target name="clean" />
<target name="distro" />
<property name="nodocs" value="true" />
</ant>
</target>
<target name="build.testing.war">
<echo message="Building the activiti-engine tests..." />
<exec executable="${mvn.executable}" dir="../../modules/activiti-engine/">
<arg line="-DskipTests -Pcreate-test-jar install" />
</exec>
<echo message="Building the activiti-cactus module..." />
<exec executable="${mvn.executable}" dir="../../modules/activiti-cactus/">
<arg line="-Ddatabase=${database} -Dcfg=${cfg} -Dtx=${tx} -Dserver=${server} clean install" />
</exec>
<delete>
<fileset dir="target/cactus/lib">
<include name="ant-*" />
</fileset>
</delete>
<!-- taskdef resource="cactus.tasks">
<classpath>
<fileset dir="target/cactus/lib">
<include name="*.jar"/>
</fileset>
</classpath>
</taskdef -->
<copy file="../../modules/activiti-cactus/target/activiti-cactus-${activiti.version}.war"
tofile="target/activiti-server-testing.war"
overwrite="true" />
</target>
<!-- ### H2 DATABASE ##################################################### -->
<target name="h2.install">
<ant antfile="${activiti.home}/setup/build.xml" inheritall="false">
<target name="h2.install" />
<property name="db" value="${database}" />
</ant>
</target>
<target name="h2.start"
description="Starts the H2 server"
depends="h2.install, internal.taskdef.launch"
if="is.database.h2">
<launch dir="${activiti.home}/apps/h2"
script="h2.start"
msg="TCP server running on"/>
</target>
<target name="h2.stop"
description="Stops the H2 server"
depends="internal.taskdef.launch"
if="is.database.h2">
<launch dir="${activiti.home}/apps/h2"
script="h2.stop"/>
</target>
<!-- ### TOMCAT ##################################################### -->
<target name="tomcat.install">
<ant antfile="${activiti.home}/setup/build.xml" inheritall="false">
<target name="tomcat.install" />
</ant>
<copy todir="${tomcat.home}/conf" overwrite="true">
<fileset dir="tomcat.conf" />
</copy>
</target>
<target name="tomcat.start"
description="Starts the tomcat server"
depends="internal.taskdef.launch">
<launch dir="${tomcat.home}/bin"
script="startup"
msg="Using CLASSPATH:" />
</target>
<target name="tomcat.stop"
description="Stops the tomcat server"
depends="internal.taskdef.launch">
<launch dir="${tomcat.home}/bin"
script="shutdown"
msg="Using CLASSPATH:"/>
</target>
<target name="tomcat.deploy.testing.war">
<copy file="target/activiti-server-testing.war" todir="${tomcat.home}/webapps" />
</target>
<!-- ### JBOSS ##################################################### -->
<target name="jboss.install" depends="jboss.download, jboss.unzip">
<chmod perm="a+x">
<fileset dir="${jboss.home}/bin">
<include name="*.sh"/>
<include name="*.bat"/>
</fileset>
</chmod>
<condition property="is.datasource.required">
<equals arg1="${tx}" arg2="jta"/>
</condition>
<antcall target="jboss.deploy.datasource" />
<copy todir="${jboss.home}/server/default/conf" overwrite="true">
<fileset dir="jboss.conf" />
</copy>
</target>
<target name="jboss.deploy.datasource" if="is.datasource.required">
<copy todir="${jboss.home}/server/default/deploy" file="jboss.datasources/activiti-${database}-ds.xml" overwrite="true">
<filterset filtersfile="${user.home}/.activiti/server/build.${database}.properties" />
</copy>
</target>
<target name="jboss.download" unless="is.jboss.available">
<mkdir dir="${downloads.dir}" />
<get src="${jboss.download.url}" dest="${jboss.distro}" />
</target>
<target name="jboss.unzip">
<mkdir dir="${activiti.home}/apps" />
<unzip src="${jboss.distro}" dest="${activiti.home}/apps"/>
</target>
<target name="jboss.start"
description="Starts the JBoss server"
depends="internal.taskdef.launch">
<launch dir="${jboss.home}/bin"
script="run"
msg="Started" />
</target>
<target name="jboss.stop"
description="Stops the JBoss server"
depends="internal.taskdef.launch">
<launch dir="${jboss.home}/bin"
script="shutdown"
args="-S" />
</target>
<target name="jboss.deploy.testing.war">
<copy file="target/activiti-server-testing.war" todir="${jboss.home}/server/default/deploy" />
</target>
<!-- ### INTERNAL TARGETS ##################################################### -->
<target name="internal.taskdef.launch">
<taskdef name="launch" classname="org.activiti.engine.impl.ant.LaunchTask">
<classpath>
<fileset dir="../../modules/activiti-engine/target">
<include name="*.jar"/>
</fileset>
</classpath>
</taskdef>
</target>
</project>
\ No newline at end of file
qa/server/cactus.conf/cactus.properties 已删除 100644 → 0
浏览文件 @ 754d6903
cactus.contextURL = http://localhost:8080/activiti-server-testing
qa/server/cactus.conf/logging_client.properties 已删除 100644 → 0
浏览文件 @ 754d6903
# Properties for configuring Log4j
# This is the configuring for logging on the JUnit side (i.e. the client side)
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership.
# The ASF licenses this file to You under the Apache License, Version 2.0
# (the "License"); you may not use this file except in compliance with
# the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
log4j.appender.cactus = org.apache.log4j.FileAppender
log4j.appender.cactus.File = cactus_client.log
log4j.appender.cactus.Append = false
log4j.appender.cactus.layout = org.apache.log4j.PatternLayout
log4j.appender.cactus.layout.ConversionPattern = %d{ABSOLUTE} [%t] %-5p %-30.30c{2} %x - %m %n
# Any application log which uses Log4J will be logged to the Cactus log file
log4j.rootCategory=DEBUG, cactus
# By default we don't log at the DEBUG level for Cactus log, in order not to generate too
# many logs. However, should a problem arise and logs need to be sent to the Cactus dev team,
# then we will ask you to change this to DEBUG.
log4j.category.org.apache.cactus = WARN, cactus
log4j.additivity.org.apache.cactus=false
# Don't show debug logs for HttpClient
log4j.category.org.apache.commons.httpclient = WARN, cactus
log4j.additivity.org.apache.commons.httpclient=false
log4j.category.httpclient = WARN, cactus
log4j.additivity.httpclient=false
\ No newline at end of file
qa/server/jboss.conf/jboss-log4j.xml 已删除 100644 → 0
浏览文件 @ 754d6903
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
<!-- ===================================================================== -->
<!-- -->
<!-- Log4j Configuration -->
<!-- -->
<!-- ===================================================================== -->
<!-- $Id: jboss-log4j.xml 87678 2009-04-22 16:47:08Z bstansberry@jboss.com $ -->
<!--
| For more configuration information and examples see the Jakarta Log4j
| owebsite: http://jakarta.apache.org/log4j
-->
<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
<!-- ================================= -->
<!-- Preserve messages in a local file -->
<!-- ================================= -->
<!-- A time/date based rolling appender -->
<appender name="FILE" class="org.jboss.logging.appender.DailyRollingFileAppender">
<errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
<param name="File" value="${jboss.server.log.dir}/server.log"/>
<param name="Append" value="true"/>
<!-- In AS 5.0.x the server log threshold was set by a system
property. In 5.1 and later we are instead using the system
property to set the priority on the root logger (see <root/> below)
<param name="Threshold" value="${jboss.server.log.threshold}"/>
-->
<!-- Rollover at midnight each day -->
<param name="DatePattern" value="'.'yyyy-MM-dd"/>
<!-- Rollover at the top of each hour
<param name="DatePattern" value="'.'yyyy-MM-dd-HH"/>
-->
<layout class="org.apache.log4j.PatternLayout">
<!-- The default pattern: Date Priority [Category] (Thread) Message\n -->
<param name="ConversionPattern" value="%d %-5p [%c] (%t) %m%n"/>
<!-- The full pattern: Date MS Priority [Category] (Thread:NDC) Message\n
<param name="ConversionPattern" value="%d %-5r %-5p [%c] (%t:%x) %m%n"/>
-->
</layout>
</appender>
<!-- A size based file rolling appender
<appender name="FILE" class="org.jboss.logging.appender.RollingFileAppender">
<errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
<param name="File" value="${jboss.server.log.dir}/server.log"/>
<param name="Append" value="false"/>
<param name="MaxFileSize" value="500KB"/>
<param name="MaxBackupIndex" value="1"/>
<layout class="org.apache.log4j.PatternLayout">
<param name="ConversionPattern" value="%d %-5p [%c] %m%n"/>
</layout>
</appender>
-->
<!-- ============================== -->
<!-- Append messages to the console -->
<!-- ============================== -->
<appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
<errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
<param name="Target" value="System.out"/>
<param name="Threshold" value="DEBUG"/>
<layout class="org.apache.log4j.PatternLayout">
<!-- The default pattern: Date Priority [Category] Message\n -->
<param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
</layout>
</appender>
<!-- ====================== -->
<!-- More Appender examples -->
<!-- ====================== -->
<!-- Buffer events and log them asynchronously
<appender name="ASYNC" class="org.apache.log4j.AsyncAppender">
<errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
<appender-ref ref="FILE"/>
<appender-ref ref="CONSOLE"/>
<appender-ref ref="SMTP"/>
</appender>
-->
<!-- EMail events to an administrator
<appender name="SMTP" class="org.apache.log4j.net.SMTPAppender">
<errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
<param name="Threshold" value="ERROR"/>
<param name="To" value="admin@myhost.domain.com"/>
<param name="From" value="nobody@myhost.domain.com"/>
<param name="Subject" value="JBoss Sever Errors"/>
<param name="SMTPHost" value="localhost"/>
<param name="BufferSize" value="10"/>
<layout class="org.apache.log4j.PatternLayout">
<param name="ConversionPattern" value="[%d{ABSOLUTE},%c{1}] %m%n"/>
</layout>
</appender>
-->
<!-- Syslog events
<appender name="SYSLOG" class="org.apache.log4j.net.SyslogAppender">
<errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
<param name="Facility" value="LOCAL7"/>
<param name="FacilityPrinting" value="true"/>
<param name="SyslogHost" value="localhost"/>
<layout class="org.apache.log4j.PatternLayout">
<param name="ConversionPattern" value="[%d{ABSOLUTE},%c{1}] %m%n"/>
</layout>
</appender>
-->
<!-- Log events to JMS (requires a topic to be created)
<appender name="JMS" class="org.apache.log4j.net.JMSAppender">
<errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
<param name="Threshold" value="ERROR"/>
<param name="TopicConnectionFactoryBindingName" value="java:/ConnectionFactory"/>
<param name="TopicBindingName" value="topic/MyErrorsTopic"/>
</appender>
-->
<!-- Log events through SNMP
<appender name="TRAP_LOG" class="org.apache.log4j.ext.SNMPTrapAppender">
<errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
<param name="ImplementationClassName" value="org.apache.log4j.ext.JoeSNMPTrapSender"/>
<param name="ManagementHost" value="127.0.0.1"/>
<param name="ManagementHostTrapListenPort" value="162"/>
<param name="EnterpriseOID" value="1.3.6.1.4.1.24.0"/>
<param name="LocalIPAddress" value="127.0.0.1"/>
<param name="LocalTrapSendPort" value="161"/>
<param name="GenericTrapType" value="6"/>
<param name="SpecificTrapType" value="12345678"/>
<param name="CommunityString" value="public"/>
<param name="ForwardStackTraceWithTrap" value="true"/>
<param name="Threshold" value="DEBUG"/>
<param name="ApplicationTrapOID" value="1.3.6.1.4.1.24.12.10.22.64"/>
<layout class="org.apache.log4j.PatternLayout">
<param name="ConversionPattern" value="%d,%p,[%t],[%c],%m%n"/>
</layout>
</appender>
-->
<!-- Emit events as JMX notifications
<appender name="JMX" class="org.jboss.monitor.services.JMXNotificationAppender">
<errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
<param name="Threshold" value="WARN"/>
<param name="ObjectName" value="jboss.system:service=Logging,type=JMXNotificationAppender"/>
<layout class="org.apache.log4j.PatternLayout">
<param name="ConversionPattern" value="%d %-5p [%c] %m"/>
</layout>
</appender>
-->
<!-- Security AUDIT Appender
<appender name="AUDIT" class="org.jboss.logging.appender.DailyRollingFileAppender">
<errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
<param name="File" value="${jboss.server.log.dir}/audit.log"/>
<param name="Append" value="true"/>
<param name="DatePattern" value="'.'yyyy-MM-dd"/>
<layout class="org.apache.log4j.PatternLayout">
<param name="ConversionPattern" value="%d %-5p [%c] (%t:%x) %m%n"/>
</layout>
</appender>
-->
<!-- ================ -->
<!-- Limit categories -->
<!-- ================ -->
<!-- Limit the org.apache category to INFO as its DEBUG is verbose -->
<category name="org.apache">
<priority value="INFO"/>
</category>
<!-- Limit the jacorb category to WARN as its INFO is verbose -->
<category name="jacorb">
<priority value="WARN"/>
</category>
<!-- Set the logging level of the JSF implementation that uses
| java.util.logging. The jdk logging levels can be controlled
| through the org.jboss.logging.log4j.JDKLevel class that
| in addition to the standard log4j levels it adds support for
| SEVERE, WARNING, CONFIG, FINE, FINER, FINEST
-->
<category name="javax.enterprise.resource.webcontainer.jsf">
<priority value="INFO" class="org.jboss.logging.log4j.JDKLevel"/>
</category>
<!-- Limit the org.jgroups category to WARN as its INFO is verbose -->
<category name="org.jgroups">
<priority value="WARN"/>
</category>
<!-- Limit the org.quartz category to INFO as its DEBUG is verbose -->
<category name="org.quartz">
<priority value="INFO"/>
</category>
<!-- Limit the com.sun category to INFO as its FINE is verbose -->
<category name="com.sun">
<priority value="INFO"/>
</category>
<!-- Limit the sun category to INFO as its FINE is verbose -->
<category name="sun">
<priority value="INFO"/>
</category>
<!-- Limit the javax.xml.bind category to INFO as its FINE is verbose -->
<category name="javax.xml.bind">
<priority value="INFO"/>
</category>
<!-- Limit JBoss categories
<category name="org.jboss">
<priority value="INFO"/>
</category>
-->
<!-- Limit the JSR77 categories -->
<category name="org.jboss.management">
<priority value="INFO"/>
</category>
<!-- Limit the verbose facelets compiler -->
<category name="facelets.compiler">
<priority value="WARN"/>
</category>
<!-- Limit the verbose ajax4jsf cache initialization -->
<category name="org.ajax4jsf.cache">
<priority value="WARN"/>
</category>
<!-- Limit the verbose embedded jopr categories -->
<category name="org.rhq">
<priority value="WARN"/>
</category>
<!-- Limit the verbose seam categories -->
<category name="org.jboss.seam">
<priority value="WARN"/>
</category>
<!-- Show the evolution of the DataSource pool in the logs [inUse/Available/Max]
<category name="org.jboss.resource.connectionmanager.JBossManagedConnectionPool">
<priority value="TRACE"/>
</category>
-->
<!-- Category specifically for Security Audit Provider
<category name="org.jboss.security.audit.providers.LogAuditProvider" additivity="false">
<priority value="TRACE"/>
<appender-ref ref="AUDIT"/>
</category>
-->
<!-- Limit the org.jboss.serial (jboss-serialization) to INFO as its DEBUG is verbose -->
<category name="org.jboss.serial">
<priority value="INFO"/>
</category>
<!-- Decrease the priority threshold for the org.jboss.varia category
<category name="org.jboss.varia">
<priority value="DEBUG"/>
</category>
-->
<!-- Enable JBossWS message tracing
<category name="org.jboss.ws.core.MessageTrace">
<priority value="TRACE"/>
</category>
-->
<!--
| An example of enabling the custom TRACE level priority that is used
| by the JBoss internals to diagnose low level details. This example
| turns on TRACE level msgs for the org.jboss.ejb.plugins package and its
| subpackages. This will produce A LOT of logging output.
|
| Note: since jboss AS 4.2.x, the trace level is supported natively by
| log4j, so although the custom org.jboss.logging.XLevel priority will
| still work, there is no need to use it. The two examples that follow
| will both enable trace logging.
<category name="org.jboss.system">
<priority value="TRACE" class="org.jboss.logging.XLevel"/>
</category>
<category name="org.jboss.ejb.plugins">
<priority value="TRACE"/>
</category>
-->
<!--
| Logs these events to SNMP:
- server starts/stops
- cluster evolution (node death/startup)
- When an EJB archive is deployed (and associated verified messages)
- When an EAR archive is deployed
<category name="org.jboss.system.server.Server">
<priority value="INFO" />
<appender-ref ref="TRAP_LOG"/>
</category>
<category name="org.jboss.ha.framework.interfaces.HAPartition.lifecycle">
<priority value="INFO" />
<appender-ref ref="TRAP_LOG"/>
</category>
<category name="org.jboss.deployment.MainDeployer">
<priority value="ERROR" />
<appender-ref ref="TRAP_LOG"/>
</category>
<category name="org.jboss.ejb.EJBDeployer">
<priority value="INFO" />
<appender-ref ref="TRAP_LOG"/>
</category>
<category name="org.jboss.deployment.EARDeployer">
<priority value="INFO" />
<appender-ref ref="TRAP_LOG"/>
</category>
-->
<!-- Clustering logging -->
<!-- Uncomment the following to redirect the org.jgroups and
org.jboss.ha categories to a cluster.log file.
<appender name="CLUSTER" class="org.jboss.logging.appender.RollingFileAppender">
<errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
<param name="File" value="${jboss.server.log.dir}/cluster.log"/>
<param name="Append" value="false"/>
<param name="MaxFileSize" value="500KB"/>
<param name="MaxBackupIndex" value="1"/>
<layout class="org.apache.log4j.PatternLayout">
<param name="ConversionPattern" value="%d %-5p [%c] %m%n"/>
</layout>
</appender>
<category name="org.jgroups">
<priority value="DEBUG" />
<appender-ref ref="CLUSTER"/>
</category>
<category name="org.jboss.ha">
<priority value="DEBUG" />
<appender-ref ref="CLUSTER"/>
</category>
-->
<!-- ======================= -->
<!-- Setup the Root category -->
<!-- ======================= -->
<root>
<!--
Set the root logger priority via a system property. Note this is parsed by log4j,
so the full JBoss system property format is not supported; e.g.
setting a default via ${jboss.server.log.threshold:WARN} will not work.
-->
<priority value="${jboss.server.log.threshold}"/>
<appender-ref ref="CONSOLE"/>
<appender-ref ref="FILE"/>
</root>
</log4j:configuration>
qa/server/jboss.datasources/activiti-db2-ds.xml 已删除 100644 → 0
浏览文件 @ 754d6903
<?xml version="1.0" encoding="UTF-8"?>
<datasources>
<local-tx-datasource>
<jndi-name>ActivitiDS</jndi-name>
<connection-url>@jdbc.url@</connection-url>
<driver-class>@jdbc.driver@</driver-class>
<user-name>@jdbc.username@</user-name>
<password>@jdbc.password@</password>
<min-pool-size>0</min-pool-size>
<metadata>
<type-mapping>DB2</type-mapping>
</metadata>
</local-tx-datasource>
</datasources>
qa/server/jboss.datasources/activiti-h2-ds.xml 已删除 100644 → 0
浏览文件 @ 754d6903
<?xml version="1.0" encoding="UTF-8"?>
<datasources>
<local-tx-datasource>
<jndi-name>ActivitiDS</jndi-name>
<connection-url>@jdbc.url@</connection-url>
<driver-class>@jdbc.driver@</driver-class>
<user-name>@jdbc.username@</user-name>
<password>@jdbc.password@</password>
<min-pool-size>5</min-pool-size>
<max-pool-size>20</max-pool-size>
<idle-timeout-minutes>0</idle-timeout-minutes>
<track-statements/>
<security-domain>HsqlDbRealm</security-domain>
<prepared-statement-cache-size>32</prepared-statement-cache-size>
<metadata>
<type-mapping>Hypersonic SQL</type-mapping>
</metadata>
<depends>jboss:service=Hypersonic,database=localDB</depends>
</local-tx-datasource>
</datasources>
qa/server/jboss.datasources/activiti-mssql-ds.xml 已删除 100644 → 0
浏览文件 @ 754d6903
<?xml version="1.0" encoding="UTF-8"?>
<datasources>
<local-tx-datasource>
<jndi-name>ActivitiDS</jndi-name>
<connection-url>@jdbc.url@</connection-url>
<driver-class>@jdbc.driver@</driver-class>
<user-name>@jdbc.username@</user-name>
<password>@jdbc.password@</password>
<metadata>
<type-mapping>MS SQLSERVER2000</type-mapping>
</metadata>
</local-tx-datasource>
</datasources>
qa/server/jboss.datasources/activiti-mysql-ds.xml 已删除 100644 → 0
浏览文件 @ 754d6903
<?xml version="1.0" encoding="UTF-8"?>
<datasources>
<local-tx-datasource>
<jndi-name>ActivitiDS</jndi-name>
<connection-url>@jdbc.url@</connection-url>
<driver-class>@jdbc.driver@</driver-class>
<user-name>@jdbc.username@</user-name>
<password>@jdbc.password@</password>
<exception-sorter-class-name>org.jboss.resource.adapter.jdbc.vendor.MySQLExceptionSorter</exception-sorter-class-name>
<metadata>
<type-mapping>mySQL</type-mapping>
</metadata>
</local-tx-datasource>
</datasources>
qa/server/jboss.datasources/activiti-oracle-ds.xml 已删除 100644 → 0
浏览文件 @ 754d6903
<?xml version="1.0" encoding="UTF-8"?>
<datasources>
<local-tx-datasource>
<jndi-name>ActivitiDS</jndi-name>
<connection-url>@jdbc.url@</connection-url>
<driver-class>@jdbc.driver@</driver-class>
<user-name>@jdbc.username@</user-name>
<password>@jdbc.password@</password>
<exception-sorter-class-name>org.jboss.resource.adapter.jdbc.vendor.OracleExceptionSorter</exception-sorter-class-name>
<metadata>
<type-mapping>Oracle9i</type-mapping>
</metadata>
</local-tx-datasource>
</datasources>
qa/server/jboss.datasources/activiti-postgres-ds.xml 已删除 100644 → 0
浏览文件 @ 754d6903
<?xml version="1.0" encoding="UTF-8"?>
<datasources>
<local-tx-datasource>
<jndi-name>ActivitiDS</jndi-name>
<connection-url>@jdbc.url@</connection-url>
<driver-class>@jdbc.driver@</driver-class>
<user-name>@jdbc.username@</user-name>
<password>@jdbc.password@</password>
<metadata>
<type-mapping>PostgreSQL 7.2</type-mapping>
</metadata>
</local-tx-datasource>
</datasources>
qa/server/tomcat.conf/logging.properties 已删除 100644 → 0
浏览文件 @ 754d6903
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership.
# The ASF licenses this file to You under the Apache License, Version 2.0
# (the "License"); you may not use this file except in compliance with
# the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
handlers = 1catalina.org.apache.juli.FileHandler, 2localhost.org.apache.juli.FileHandler, 3manager.org.apache.juli.FileHandler, 4host-manager.org.apache.juli.FileHandler, 5activiti.org.apache.juli.FileHandler, java.util.logging.ConsoleHandler
.handlers = 1catalina.org.apache.juli.FileHandler, java.util.logging.ConsoleHandler
# Activiti classes log level set to FINEST to see test-output fine logging
org.activiti.level = ALL
org.activiti.handlers = 5activiti.org.apache.juli.FileHandler
############################################################
# Handler specific properties.
# Describes specific configuration info for Handlers.
############################################################
1catalina.org.apache.juli.FileHandler.level = FINE
1catalina.org.apache.juli.FileHandler.directory = ${catalina.base}/logs
1catalina.org.apache.juli.FileHandler.prefix = catalina.
2localhost.org.apache.juli.FileHandler.level = FINE
2localhost.org.apache.juli.FileHandler.directory = ${catalina.base}/logs
2localhost.org.apache.juli.FileHandler.prefix = localhost.
3manager.org.apache.juli.FileHandler.level = FINE
3manager.org.apache.juli.FileHandler.directory = ${catalina.base}/logs
3manager.org.apache.juli.FileHandler.prefix = manager.
4host-manager.org.apache.juli.FileHandler.level = FINE
4host-manager.org.apache.juli.FileHandler.directory = ${catalina.base}/logs
4host-manager.org.apache.juli.FileHandler.prefix = host-manager.
5activiti.org.apache.juli.FileHandler.level = ALL
5activiti.org.apache.juli.FileHandler.directory = ${catalina.base}/logs
5activiti.org.apache.juli.FileHandler.prefix = activiti.
java.util.logging.ConsoleHandler.level = FINE
java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter
############################################################
# Facility specific properties.
# Provides extra control for each logger.
############################################################
org.apache.catalina.core.ContainerBase.[Catalina].[localhost].level = INFO
org.apache.catalina.core.ContainerBase.[Catalina].[localhost].handlers = 2localhost.org.apache.juli.FileHandler
org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].level = INFO
org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].handlers = 3manager.org.apache.juli.FileHandler
org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].level = INFO
org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].handlers = 4host-manager.org.apache.juli.FileHandler
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或