diff --git a/modules/activiti-cactus/pom.xml b/modules/activiti-cactus/pom.xml
deleted file mode 100644
index 67c3f7d78961b4f455f4e928ff654a379df1379e..0000000000000000000000000000000000000000
--- a/modules/activiti-cactus/pom.xml
+++ /dev/null
@@ -1,222 +0,0 @@
-
-
- 4.0.0
-
- Activiti - Cactus
- org.activiti
- activiti-cactus
- war
-
-
- org.activiti
- activiti-root
- ../..
- 5.15.1-SNAPSHOT
-
-
-
-
-
- org.activiti
- activiti-engine
-
-
-
- org.activiti
- activiti-engine
- tests
- ${version}
-
-
-
- org.apache.cactus
- cactus.core.framework.uberjar.javaEE.15
- 1.8.1
-
-
-
-
- jaxen
- jaxen
- 1.1.1
-
-
-
-
-
- org.apache.cactus
- cactus.integration.ant
- 1.8.1
-
-
-
- org.codehaus.groovy
- groovy-all
-
-
- org.drools
- drools-core
-
-
- org.drools
- drools-compiler
-
-
- javax.persistence
- persistence-api
-
-
- org.apache.geronimo.specs
- geronimo-jta_1.1_spec
-
-
-
- com.h2database
- h2
-
-
- org.mockito
- mockito-core
-
-
- org.apache.openjpa
- openjpa
- runtime
-
-
- org.subethamail
- subethasmtp-wiser
- runtime
-
-
- mysql
- mysql-connector-java
-
-
- postgresql
- postgresql
-
-
- net.sourceforge.jtds
- jtds
-
-
-
- javax.servlet
- servlet-api
- provided
-
-
-
-
-
-
-
- org.codehaus.mojo
- exec-maven-plugin
- 1.1
-
-
- process-classes
-
- java
-
-
-
-
- org.activiti.test.cactus.ListTests
-
-
-
- maven-dependency-plugin
-
-
- copy
- package
-
- copy-dependencies
-
-
- ../../qa/server/target/cactus/lib
- test
-
-
-
-
-
- maven-antrun-plugin
-
- 1.4
-
-
- process-classes
-
- run
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- jboss
-
-
- server
- jboss
-
-
-
-
- org.apache.cactus
- cactus.integration.ant
- 1.8.1
-
-
- xerces
- xercesImpl
-
-
- xml-apis
- xml-apis
-
-
-
-
- jaxen
- jaxen
- 1.1.1
-
-
- xerces
- xercesImpl
-
-
- xml-apis
- xml-apis
-
-
-
-
-
-
-
-
diff --git a/modules/activiti-cactus/src/main/cfg/server.jboss.cfg.activiti.tx.jta.xml b/modules/activiti-cactus/src/main/cfg/server.jboss.cfg.activiti.tx.jta.xml
deleted file mode 100644
index 6773a32a8c8d33bbfb869a6b536de60ea08663ef..0000000000000000000000000000000000000000
--- a/modules/activiti-cactus/src/main/cfg/server.jboss.cfg.activiti.tx.jta.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/modules/activiti-cactus/src/main/cfg/server.jboss.cfg.activiti.tx.standalone.xml b/modules/activiti-cactus/src/main/cfg/server.jboss.cfg.activiti.tx.standalone.xml
deleted file mode 100644
index 7ef149d25da55dafe6d58fe22e7b68ab0c9617be..0000000000000000000000000000000000000000
--- a/modules/activiti-cactus/src/main/cfg/server.jboss.cfg.activiti.tx.standalone.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/modules/activiti-cactus/src/main/cfg/server.jboss.cfg.spring.tx.standalone.xml b/modules/activiti-cactus/src/main/cfg/server.jboss.cfg.spring.tx.standalone.xml
deleted file mode 100644
index 2a94c46362ff6ebc35426abdcaa4d7d48c433cd7..0000000000000000000000000000000000000000
--- a/modules/activiti-cactus/src/main/cfg/server.jboss.cfg.spring.tx.standalone.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/modules/activiti-cactus/src/main/cfg/server.tomcat.cfg.activiti.tx.standalone.xml b/modules/activiti-cactus/src/main/cfg/server.tomcat.cfg.activiti.tx.standalone.xml
deleted file mode 100644
index 7ef149d25da55dafe6d58fe22e7b68ab0c9617be..0000000000000000000000000000000000000000
--- a/modules/activiti-cactus/src/main/cfg/server.tomcat.cfg.activiti.tx.standalone.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/modules/activiti-cactus/src/main/cfg/server.tomcat.cfg.spring.tx.standalone.xml b/modules/activiti-cactus/src/main/cfg/server.tomcat.cfg.spring.tx.standalone.xml
deleted file mode 100644
index 2a94c46362ff6ebc35426abdcaa4d7d48c433cd7..0000000000000000000000000000000000000000
--- a/modules/activiti-cactus/src/main/cfg/server.tomcat.cfg.spring.tx.standalone.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/modules/activiti-cactus/src/main/java/org/activiti/test/cactus/ActivitiServletTestCase.java b/modules/activiti-cactus/src/main/java/org/activiti/test/cactus/ActivitiServletTestCase.java
deleted file mode 100644
index 811fa8ad8887b3588b20a03eeb141d58078af781..0000000000000000000000000000000000000000
--- a/modules/activiti-cactus/src/main/java/org/activiti/test/cactus/ActivitiServletTestCase.java
+++ /dev/null
@@ -1,112 +0,0 @@
-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 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 readLines(InputStream inputStream) throws IOException {
- List lines = new ArrayList();
-
- 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");
- }
-
- }
-}
diff --git a/modules/activiti-cactus/src/main/java/org/activiti/test/cactus/ListTests.java b/modules/activiti-cactus/src/main/java/org/activiti/test/cactus/ListTests.java
deleted file mode 100644
index 74c919d4e355d3e3c147af043b5216cc299a46fc..0000000000000000000000000000000000000000
--- a/modules/activiti-cactus/src/main/java/org/activiti/test/cactus/ListTests.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/* 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);
- }
- }
- }
- }
-}
diff --git a/modules/activiti-cactus/src/main/resources/cactus.properties b/modules/activiti-cactus/src/main/resources/cactus.properties
deleted file mode 100644
index 42076e6e9c5fbc43cf2d3b1ce4bd408cd25780bb..0000000000000000000000000000000000000000
--- a/modules/activiti-cactus/src/main/resources/cactus.properties
+++ /dev/null
@@ -1 +0,0 @@
-cactus.contextURL=http://localhost:8080/activiti-server-testing
diff --git a/modules/activiti-cactus/src/main/webapp/WEB-INF/web.xml b/modules/activiti-cactus/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index e7975fbcb8fb23194cf0dd2f1060cc416ce79dbf..0000000000000000000000000000000000000000
--- a/modules/activiti-cactus/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
- ServletRedirector
- org.apache.cactus.server.ServletTestRedirector
-
-
- JspRedirector
- /jspRedirector.jsp
-
-
- ServletRedirector
- /ServletRedirector
-
-
- JspRedirector
- /JspRedirector
-
-
-
diff --git a/modules/activiti-cactus/src/main/webapp/jspRedirector.jsp b/modules/activiti-cactus/src/main/webapp/jspRedirector.jsp
deleted file mode 100644
index 82e822c7e783d08549b44bb31d65d0c2fa730fc6..0000000000000000000000000000000000000000
--- a/modules/activiti-cactus/src/main/webapp/jspRedirector.jsp
+++ /dev/null
@@ -1,45 +0,0 @@
-<%--
- - 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
diff --git a/modules/activiti-osgi/pom.xml b/modules/activiti-osgi/pom.xml
index 266a8ab4f1c8f2d7cfc80ce93c617fc6da0645fd..e9398768ff45ce0ad8689a3f70b370b8d0141ed3 100644
--- a/modules/activiti-osgi/pom.xml
+++ b/modules/activiti-osgi/pom.xml
@@ -73,6 +73,10 @@
org.apache.felix.fileinstall
true
+
+ org.slf4j
+ slf4j-api
+
org.ops4j.pax.exam
pax-exam-junit4
@@ -117,6 +121,11 @@
h2
test
+
+ org.slf4j
+ slf4j-log4j12
+ test
+
diff --git a/modules/activiti-osgi/src/test/java/org/activiti/osgi/blueprint/BlueprintBasicTest.java b/modules/activiti-osgi/src/test/java/org/activiti/osgi/blueprint/BlueprintBasicTest.java
index 35904fa69ba3a10bac37d2870f6a9f2dbc5e4e38..2c3914c02e1bc80850519496c1af7c8fdd6fe958 100755
--- a/modules/activiti-osgi/src/test/java/org/activiti/osgi/blueprint/BlueprintBasicTest.java
+++ b/modules/activiti-osgi/src/test/java/org/activiti/osgi/blueprint/BlueprintBasicTest.java
@@ -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;
}
}
diff --git a/modules/activiti-process-validation/src/main/java/org/activiti/validation/ProcessValidatorImpl.java b/modules/activiti-process-validation/src/main/java/org/activiti/validation/ProcessValidatorImpl.java
index 053d49bec9a84836ff7253bc53bf8067ef1b9597..fbd0ed903d61f6ca9ffb2cd60323e0bfa4624724 100644
--- a/modules/activiti-process-validation/src/main/java/org/activiti/validation/ProcessValidatorImpl.java
+++ b/modules/activiti-process-validation/src/main/java/org/activiti/validation/ProcessValidatorImpl.java
@@ -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 validatorErrors = new ArrayList();
+ validator.validate(bpmnModel, validatorErrors);
+ if (validatorErrors.size() > 0) {
+ for (ValidationError error : validatorErrors) {
error.setValidatorSetName(validatorSet.getName());
}
+ allErrors.addAll(validatorErrors);
}
}
}
diff --git a/modules/activiti-webapp-rest2/pom.xml b/modules/activiti-webapp-rest2/pom.xml
index 3f3cc285f45122ed9d36307d35ad5a362dfebf27..efc82d9c3152e0092d509e82690122646e005d54 100644
--- a/modules/activiti-webapp-rest2/pom.xml
+++ b/modules/activiti-webapp-rest2/pom.xml
@@ -12,7 +12,7 @@
../..
5.15.1-SNAPSHOT
-
+
@@ -103,6 +103,34 @@
+
+
+ buildExecutableWar
+
+
+
+ org.apache.tomcat.maven
+ tomcat7-maven-plugin
+ 2.1
+
+ /
+ org.apache.coyote.http11.Http11NioProtocol
+
+
+
+ tomcat-run
+
+ exec-war-only
+
+ package
+
+
+
+
+
+
+
+
org.activiti
diff --git a/modules/activiti-webapp-rest2/src/main/resources/activiti-context.xml b/modules/activiti-webapp-rest2/src/main/resources/activiti-context.xml
index 266664fc007bcd47c46f1f7e1d452dd3f40ca034..3ac376c146ae12e9fdb39417a951627102ab3aac 100644
--- a/modules/activiti-webapp-rest2/src/main/resources/activiti-context.xml
+++ b/modules/activiti-webapp-rest2/src/main/resources/activiti-context.xml
@@ -14,13 +14,17 @@ http://www.springframework.org/schema/tx http://www.springframework.org/schema/t
-
-
-
+
+
+
+ classpath:db.properties
+ file:activiti-rest.properties
+
+
+
-
+
diff --git a/qa/server/build.xml b/qa/server/build.xml
deleted file mode 100644
index 21352eab28fb7653e6361caec28c51b65f1443be..0000000000000000000000000000000000000000
--- a/qa/server/build.xml
+++ /dev/null
@@ -1,248 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/qa/server/cactus.conf/cactus.properties b/qa/server/cactus.conf/cactus.properties
deleted file mode 100644
index 3c440f1db4a568d01010296e3a2b0a27f0859688..0000000000000000000000000000000000000000
--- a/qa/server/cactus.conf/cactus.properties
+++ /dev/null
@@ -1 +0,0 @@
-cactus.contextURL = http://localhost:8080/activiti-server-testing
diff --git a/qa/server/cactus.conf/logging_client.properties b/qa/server/cactus.conf/logging_client.properties
deleted file mode 100644
index 80b1b3cbde34a12c3517576bb69d5be84b585c72..0000000000000000000000000000000000000000
--- a/qa/server/cactus.conf/logging_client.properties
+++ /dev/null
@@ -1,38 +0,0 @@
-# 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
diff --git a/qa/server/jboss.conf/jboss-log4j.xml b/qa/server/jboss.conf/jboss-log4j.xml
deleted file mode 100644
index f1d3a5e658494954e9f12176c163678ff5439293..0000000000000000000000000000000000000000
--- a/qa/server/jboss.conf/jboss-log4j.xml
+++ /dev/null
@@ -1,376 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/qa/server/jboss.datasources/activiti-db2-ds.xml b/qa/server/jboss.datasources/activiti-db2-ds.xml
deleted file mode 100644
index 4dd9829a5439130b5acba8ef6df908d8b4747aff..0000000000000000000000000000000000000000
--- a/qa/server/jboss.datasources/activiti-db2-ds.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
- ActivitiDS
- @jdbc.url@
- @jdbc.driver@
- @jdbc.username@
- @jdbc.password@
- 0
-
- DB2
-
-
-
diff --git a/qa/server/jboss.datasources/activiti-h2-ds.xml b/qa/server/jboss.datasources/activiti-h2-ds.xml
deleted file mode 100644
index 1e05d7f581da747b4a5f4a0a982d1722caafe2d4..0000000000000000000000000000000000000000
--- a/qa/server/jboss.datasources/activiti-h2-ds.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-
- ActivitiDS
- @jdbc.url@
- @jdbc.driver@
- @jdbc.username@
- @jdbc.password@
- 5
- 20
- 0
-
- HsqlDbRealm
- 32
-
- Hypersonic SQL
-
- jboss:service=Hypersonic,database=localDB
-
-
diff --git a/qa/server/jboss.datasources/activiti-mssql-ds.xml b/qa/server/jboss.datasources/activiti-mssql-ds.xml
deleted file mode 100644
index 65e763bd5725b9cd52edf2d5a0b83f163bcb27b8..0000000000000000000000000000000000000000
--- a/qa/server/jboss.datasources/activiti-mssql-ds.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
- ActivitiDS
- @jdbc.url@
- @jdbc.driver@
- @jdbc.username@
- @jdbc.password@
-
- MS SQLSERVER2000
-
-
-
diff --git a/qa/server/jboss.datasources/activiti-mysql-ds.xml b/qa/server/jboss.datasources/activiti-mysql-ds.xml
deleted file mode 100644
index d7201a86055f2087aac8bc7cdcc0bb0d3ff71b70..0000000000000000000000000000000000000000
--- a/qa/server/jboss.datasources/activiti-mysql-ds.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-
- ActivitiDS
- @jdbc.url@
- @jdbc.driver@
- @jdbc.username@
- @jdbc.password@
- org.jboss.resource.adapter.jdbc.vendor.MySQLExceptionSorter
-
- mySQL
-
-
-
-
diff --git a/qa/server/jboss.datasources/activiti-oracle-ds.xml b/qa/server/jboss.datasources/activiti-oracle-ds.xml
deleted file mode 100644
index 1ba9e979aebc55901403a42e637ded57b2273c5a..0000000000000000000000000000000000000000
--- a/qa/server/jboss.datasources/activiti-oracle-ds.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
- ActivitiDS
- @jdbc.url@
- @jdbc.driver@
- @jdbc.username@
- @jdbc.password@
- org.jboss.resource.adapter.jdbc.vendor.OracleExceptionSorter
-
- Oracle9i
-
-
-
diff --git a/qa/server/jboss.datasources/activiti-postgres-ds.xml b/qa/server/jboss.datasources/activiti-postgres-ds.xml
deleted file mode 100644
index f28dfede67a4c0952eaff77a7eb9757692a2764e..0000000000000000000000000000000000000000
--- a/qa/server/jboss.datasources/activiti-postgres-ds.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
- ActivitiDS
- @jdbc.url@
- @jdbc.driver@
- @jdbc.username@
- @jdbc.password@
-
- PostgreSQL 7.2
-
-
-
diff --git a/qa/server/tomcat.conf/logging.properties b/qa/server/tomcat.conf/logging.properties
deleted file mode 100644
index ee47d098e01a768cb9ada93897ed1245872086bb..0000000000000000000000000000000000000000
--- a/qa/server/tomcat.conf/logging.properties
+++ /dev/null
@@ -1,67 +0,0 @@
-# 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
-
-