JBoss JBPM SVN: r6313 - projects/jsf-console/branches/jsf-console-3.2-soa and 1 other directory.
by do-not-reply＠jboss.org
Author: alex.guizar(a)jboss.com
Date: 2010-05-11 22:54:34 -0400 (Tue, 11 May 2010)
New Revision: 6313
Modified:
jbpm3/branches/jbpm-3.2-soa/pom.xml
projects/jsf-console/branches/jsf-console-3.2-soa/pom.xml
Log:
move taglib plugin from jbpm-parent to jsf-console-parent
Modified: jbpm3/branches/jbpm-3.2-soa/pom.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/pom.xml 2010-05-12 01:57:22 UTC (rev 6312)
+++ jbpm3/branches/jbpm-3.2-soa/pom.xml 2010-05-12 02:54:34 UTC (rev 6313)
@@ -167,14 +167,14 @@
<artifactId>drools-compiler</artifactId>
<version>${drools.version}</version>
<exclusions>
- <exclusion>
- <artifactId>xercesImpl</artifactId>
- <groupId>xerces</groupId>
- </exclusion>
- <exclusion>
- <artifactId>xml-apis</artifactId>
- <groupId>xml-apis</groupId>
- </exclusion>
+ <exclusion>
+ <artifactId>xercesImpl</artifactId>
+ <groupId>xerces</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>xml-apis</artifactId>
+ <groupId>xml-apis</groupId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -378,6 +378,13 @@
</systemProperties>
</configuration>
</plugin>
+
+ <plugin>
+ <artifactId>maven-release-plugin</artifactId>
+ <configuration>
+ <tagBase>https://svn.jboss.org/repos/jbpm/jbpm3/tags</tagBase>
+ </configuration>
+ </plugin>
</plugins>
<pluginManagement>
Modified: projects/jsf-console/branches/jsf-console-3.2-soa/pom.xml
===================================================================
--- projects/jsf-console/branches/jsf-console-3.2-soa/pom.xml 2010-05-12 01:57:22 UTC (rev 6312)
+++ projects/jsf-console/branches/jsf-console-3.2-soa/pom.xml 2010-05-12 02:54:34 UTC (rev 6313)
@@ -121,6 +121,16 @@
</configuration>
</plugin>
</plugins>
+
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>net.sourceforge.maven-taglib</groupId>
+ <artifactId>maven-taglib-plugin</artifactId>
+ <version>2.4</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
</build>
<!-- Repositories -->
13 years, 12 months
JBoss JBPM SVN: r6312 - in jbpm3/branches/jbpm-3.2-soa/modules: userguide/src/main/docbook and 1 other directory.
by do-not-reply＠jboss.org
Author: alex.guizar(a)jboss.com
Date: 2010-05-11 21:57:22 -0400 (Tue, 11 May 2010)
New Revision: 6312
Removed:
jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/newuserguide.html
Modified:
jbpm3/branches/jbpm-3.2-soa/modules/simulation/pom.xml
Log:
exclude unused jdtcore dependency in simulation module
remove new user guide reference
Modified: jbpm3/branches/jbpm-3.2-soa/modules/simulation/pom.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/simulation/pom.xml 2010-05-11 19:30:47 UTC (rev 6311)
+++ jbpm3/branches/jbpm-3.2-soa/modules/simulation/pom.xml 2010-05-12 01:57:22 UTC (rev 6312)
@@ -80,6 +80,12 @@
<dependency>
<groupId>jasperreports</groupId>
<artifactId>jasperreports</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>eclipse</groupId>
+ <artifactId>jdtcore</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- Test Dependencies -->
Deleted: jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/newuserguide.html
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/newuserguide.html 2010-05-11 19:30:47 UTC (rev 6311)
+++ jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/newuserguide.html 2010-05-12 01:57:22 UTC (rev 6312)
@@ -1,9 +0,0 @@
-<html>
-<body>
-<a href="http://wiki.jboss.org/wiki/Wiki.jsp?page=JbpmNewUserGuide">
-
-http://wiki.jboss.org/wiki/Wiki.jsp?page=JbpmNewUserGuide
-
-</a>
-</body>
-</html>
\ No newline at end of file
13 years, 12 months
JBoss JBPM SVN: r6311 - in jbpm4/trunk/modules: pvm/src/main/java/org/jbpm/pvm/internal/type/converter and 3 other directories.
by do-not-reply＠jboss.org
Author: swiderski.maciej
Date: 2010-05-11 15:30:47 -0400 (Tue, 11 May 2010)
New Revision: 6311
Added:
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/DeploymentObjectInputStream.java
jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/variables/DeserializeVariableTest.java
jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/test/variables/
jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/test/variables/DeserializeTaskTest.jpdl.xml
Modified:
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/type/converter/SerializableToBytesConverter.java
Log:
JBPM-2703: Deserialization fails to work using custom Classloader
Added: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/DeploymentObjectInputStream.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/DeploymentObjectInputStream.java (rev 0)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/DeploymentObjectInputStream.java 2010-05-11 19:30:47 UTC (rev 6311)
@@ -0,0 +1,59 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jbpm.pvm.internal.repository;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.ObjectInputStream;
+import java.io.ObjectStreamClass;
+
+/**
+ * Helper class responsible for providing classes while deserializing variables.
+ *
+ * @author Maciej Swiderski swiderski.maciej(a)gmail.com
+ *
+ */
+public class DeploymentObjectInputStream extends ObjectInputStream {
+
+ private String deploymentId;
+
+ public DeploymentObjectInputStream(InputStream stream, String deploymentId) throws IOException {
+ super(stream);
+ this.deploymentId = deploymentId;
+ }
+
+ @Override
+ protected Class< ? > resolveClass(ObjectStreamClass desc) throws IOException, ClassNotFoundException {
+
+ try {
+ Class< ? > clazz = Class.forName(desc.getName(), true, Thread.currentThread().getContextClassLoader());
+ return clazz;
+ } catch (ClassNotFoundException e) {
+ //trying to get it from deployment
+ DeploymentClassLoader cl = new DeploymentClassLoader(Thread.currentThread().getContextClassLoader(), deploymentId);
+ return Class.forName(desc.getName(), true, cl);
+ }
+ }
+
+
+
+}
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/type/converter/SerializableToBytesConverter.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/type/converter/SerializableToBytesConverter.java 2010-05-11 00:43:15 UTC (rev 6310)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/type/converter/SerializableToBytesConverter.java 2010-05-11 19:30:47 UTC (rev 6311)
@@ -30,7 +30,9 @@
import org.jbpm.api.JbpmException;
import org.jbpm.pvm.internal.env.EnvironmentImpl;
+import org.jbpm.pvm.internal.model.ExecutionImpl;
import org.jbpm.pvm.internal.model.ScopeInstanceImpl;
+import org.jbpm.pvm.internal.repository.DeploymentObjectInputStream;
import org.jbpm.pvm.internal.tx.DeserializedObject;
import org.jbpm.pvm.internal.tx.Transaction;
import org.jbpm.pvm.internal.type.Converter;
@@ -71,7 +73,11 @@
byte[] bytes = (byte[]) o;
try {
ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
- ObjectInputStream ois = new ObjectInputStream(bais);
+
+ ObjectInputStream ois = null;
+
+ ois = new DeploymentObjectInputStream(bais, scopeInstance.getExecution().getProcessDefinition().getDeploymentId());
+
Object object = ois.readObject();
Transaction transaction = EnvironmentImpl.getFromCurrent(Transaction.class, false);
Added: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/variables/DeserializeVariableTest.java
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/variables/DeserializeVariableTest.java (rev 0)
+++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/variables/DeserializeVariableTest.java 2010-05-11 19:30:47 UTC (rev 6311)
@@ -0,0 +1,118 @@
+package org.jbpm.test.variables;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileWriter;
+import java.util.List;
+
+import org.codehaus.janino.DebuggingInformation;
+import org.codehaus.janino.util.StringPattern;
+import org.codehaus.janino.util.enumerator.EnumeratorSet;
+import org.jbpm.api.ProcessInstance;
+import org.jbpm.api.task.Task;
+import org.jbpm.test.JbpmTestCase;
+
+
+public class DeserializeVariableTest extends JbpmTestCase {
+
+ String deploymentId;
+
+ protected void setUp() throws Exception {
+
+ super.setUp();
+
+ generateBeanClass();
+
+ deploymentId = repositoryService.createDeployment()
+ .addResourceFromClasspath("org/jbpm/test/variables/DeserializeTaskTest.jpdl.xml")
+ .addResourceFromInputStream("org/jbpm/test/variables/Bean.class", new FileInputStream(new File("target/generated/org/jbpm/test/variables/Bean.class")))
+ .deploy();
+
+ }
+
+ protected void tearDown() throws Exception {
+ repositoryService.deleteDeploymentCascade(deploymentId);
+ super.tearDown();
+ }
+
+
+ public void testDeserializeVariable() {
+ ProcessInstance processInstance = executionService.startProcessInstanceByKey("DeserializeTaskTest");
+ String processInstanceId = processInstance.getId();
+
+ List<Task> tasks = taskService.findPersonalTasks("alex");
+
+ assertTrue(tasks.size() == 1);
+
+ Task task = tasks.get(0);
+
+ assertNotNull(taskService.getVariable(task.getId(), "bean"));
+
+ assertNotNull(executionService.getVariable(processInstanceId, "bean"));
+
+ taskService.completeTask(task.getId());
+ }
+
+ /**
+ * This method is used to generate source class that will be used within a process but should not be
+ * on class path while executing process but retrieved from db.
+ *
+ * Uses Janinio to compile the source.
+ */
+ public void generateBeanClass() {
+
+ log.debug("Inside generateBeanClass method");
+ File directory = new File("target/generated/org/jbpm/test/variables");
+
+ if (!directory.exists()) {
+ log.debug("No generated class directory, about to create source file");
+ try {
+ directory.mkdirs();
+ File sourceFile = new File(directory, "Bean.java");
+ FileWriter writer = new FileWriter(sourceFile);
+
+ StringBuffer source = new StringBuffer();
+
+ source.append("package org.jbpm.test.variables;\n");
+ source.append("import java.io.Serializable;\n");
+ source.append("public class Bean implements Serializable {\n");
+ source.append("private static final long serialVersionUID = -5510563444135221777L;\n");
+ source.append(" private String value;\n");
+ source.append(" public Bean getResult() {\n");
+ source.append(" this.value = \"test\";\n");
+ source.append(" return this;\n");
+ source.append(" }\n");
+ source.append("}\n");
+
+ writer.write(source.toString());
+
+ writer.close();
+ log.debug("Source file create in " + directory.getAbsolutePath());
+
+ File destinationDirectory = org.codehaus.janino.Compiler.NO_DESTINATION_DIRECTORY;
+ File[] optionalSourcePath = null;
+ File[] classPath = { new File(".") };
+ File[] optionalExtDirs = null;
+ File[] optionalBootClassPath = null;
+ String optionalCharacterEncoding = null;
+ boolean verbose = false;
+ EnumeratorSet debuggingInformation = DebuggingInformation.DEFAULT_DEBUGGING_INFORMATION;
+ StringPattern[] warningHandlePatterns = org.codehaus.janino.Compiler.DEFAULT_WARNING_HANDLE_PATTERNS;
+ boolean rebuild = false;
+
+ log.debug("About to run Janinio compiler");
+
+ org.codehaus.janino.Compiler javac = new org.codehaus.janino.Compiler(optionalSourcePath, classPath, optionalExtDirs, optionalBootClassPath,
+ destinationDirectory, optionalCharacterEncoding, verbose, debuggingInformation, warningHandlePatterns, rebuild);
+ javac.compile(new File[] { sourceFile });
+
+ log.debug("Class compiled successfully");
+ } catch (Exception e) {
+
+ log.error("Error while creating additional resources", e);
+ }
+ }
+
+ }
+
+}
Added: jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/test/variables/DeserializeTaskTest.jpdl.xml
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/test/variables/DeserializeTaskTest.jpdl.xml (rev 0)
+++ jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/test/variables/DeserializeTaskTest.jpdl.xml 2010-05-11 19:30:47 UTC (rev 6311)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<process name="DeserializeTaskTest" xmlns="http://jbpm.org/4.3/jpdl">
+
+ <start g="13,137,48,48" name="start1">
+ <transition g="-23,-17" name="to java1" to="java1"/>
+ </start>
+ <task g="256,133,92,52" name="task1" assignee="alex">
+ <transition g="-27,-17" name="to end1" to="end1"/>
+ </task>
+ <end g="416,137,48,48" name="end1"/>
+ <java class="org.jbpm.test.variables.Bean" g="116,134,92,52" method="getResult" name="java1" var="bean">
+ <transition g="-23,-17" name="to task1" to="task1"/>
+ </java>
+</process>
\ No newline at end of file
13 years, 12 months
JBoss JBPM SVN: r6310 - in projects/jsf-console/branches/jsf-console-3.2-soa: gpd-deployer and 2 other directories.
by do-not-reply＠jboss.org
Author: alex.guizar(a)jboss.com
Date: 2010-05-10 20:43:15 -0400 (Mon, 10 May 2010)
New Revision: 6310
Added:
projects/jsf-console/branches/jsf-console-3.2-soa/soa/.classpath
Modified:
projects/jsf-console/branches/jsf-console-3.2-soa/console/.classpath
projects/jsf-console/branches/jsf-console-3.2-soa/console/.project
projects/jsf-console/branches/jsf-console-3.2-soa/gpd-deployer/.classpath
projects/jsf-console/branches/jsf-console-3.2-soa/gpd-deployer/.project
projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/.classpath
projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/.project
projects/jsf-console/branches/jsf-console-3.2-soa/soa/.project
Log:
incorporate m2eclipse support for wst into eclipse project files
Modified: projects/jsf-console/branches/jsf-console-3.2-soa/console/.classpath
===================================================================
--- projects/jsf-console/branches/jsf-console-3.2-soa/console/.classpath 2010-05-10 06:22:19 UTC (rev 6309)
+++ projects/jsf-console/branches/jsf-console-3.2-soa/console/.classpath 2010-05-11 00:43:15 UTC (rev 6310)
@@ -3,5 +3,7 @@
<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+ <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
+ <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
Modified: projects/jsf-console/branches/jsf-console-3.2-soa/console/.project
===================================================================
--- projects/jsf-console/branches/jsf-console-3.2-soa/console/.project 2010-05-10 06:22:19 UTC (rev 6309)
+++ projects/jsf-console/branches/jsf-console-3.2-soa/console/.project 2010-05-11 00:43:15 UTC (rev 6310)
@@ -1,23 +1,36 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>jbpm-console</name>
+ <name>jsf-console</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
+ <name>org.eclipse.wst.common.project.facet.core.builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
+ <name>org.eclipse.wst.validation.validationbuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
<name>org.maven.ide.eclipse.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
+ <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+ <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.maven.ide.eclipse.maven2Nature</nature>
+ <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
</natures>
</projectDescription>
Modified: projects/jsf-console/branches/jsf-console-3.2-soa/gpd-deployer/.classpath
===================================================================
--- projects/jsf-console/branches/jsf-console-3.2-soa/gpd-deployer/.classpath 2010-05-10 06:22:19 UTC (rev 6309)
+++ projects/jsf-console/branches/jsf-console-3.2-soa/gpd-deployer/.classpath 2010-05-11 00:43:15 UTC (rev 6310)
@@ -3,5 +3,7 @@
<classpathentry kind="src" output="target/classes" path="src/main/java"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+ <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
+ <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
Modified: projects/jsf-console/branches/jsf-console-3.2-soa/gpd-deployer/.project
===================================================================
--- projects/jsf-console/branches/jsf-console-3.2-soa/gpd-deployer/.project 2010-05-10 06:22:19 UTC (rev 6309)
+++ projects/jsf-console/branches/jsf-console-3.2-soa/gpd-deployer/.project 2010-05-11 00:43:15 UTC (rev 6310)
@@ -6,18 +6,31 @@
</projects>
<buildSpec>
<buildCommand>
+ <name>org.eclipse.wst.common.project.facet.core.builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
+ <name>org.eclipse.wst.validation.validationbuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
<name>org.maven.ide.eclipse.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
+ <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+ <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.maven.ide.eclipse.maven2Nature</nature>
+ <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
</natures>
</projectDescription>
Modified: projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/.classpath
===================================================================
--- projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/.classpath 2010-05-10 06:22:19 UTC (rev 6309)
+++ projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/.classpath 2010-05-11 00:43:15 UTC (rev 6310)
@@ -4,5 +4,6 @@
<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+ <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
Modified: projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/.project
===================================================================
--- projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/.project 2010-05-10 06:22:19 UTC (rev 6309)
+++ projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/.project 2010-05-11 00:43:15 UTC (rev 6310)
@@ -1,11 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>jbpm-jbpm4jsf</name>
+ <name>jsf-console-jbpm4jsf</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
+ <name>org.eclipse.wst.common.project.facet.core.builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
@@ -15,9 +20,17 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.eclipse.wst.validation.validationbuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
+ <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+ <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.maven.ide.eclipse.maven2Nature</nature>
+ <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
</natures>
</projectDescription>
Added: projects/jsf-console/branches/jsf-console-3.2-soa/soa/.classpath
===================================================================
--- projects/jsf-console/branches/jsf-console-3.2-soa/soa/.classpath (rev 0)
+++ projects/jsf-console/branches/jsf-console-3.2-soa/soa/.classpath 2010-05-11 00:43:15 UTC (rev 6310)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
+ <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+ <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
+ <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
Modified: projects/jsf-console/branches/jsf-console-3.2-soa/soa/.project
===================================================================
--- projects/jsf-console/branches/jsf-console-3.2-soa/soa/.project 2010-05-10 06:22:19 UTC (rev 6309)
+++ projects/jsf-console/branches/jsf-console-3.2-soa/soa/.project 2010-05-11 00:43:15 UTC (rev 6310)
@@ -6,12 +6,31 @@
</projects>
<buildSpec>
<buildCommand>
+ <name>org.eclipse.wst.common.project.facet.core.builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.wst.validation.validationbuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
<name>org.maven.ide.eclipse.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
+ <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+ <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.maven.ide.eclipse.maven2Nature</nature>
+ <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
</natures>
</projectDescription>
13 years, 12 months
JBoss JBPM SVN: r6309 - jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/activity/mail.
by do-not-reply＠jboss.org
Author: alex.guizar(a)jboss.com
Date: 2010-05-10 02:22:19 -0400 (Mon, 10 May 2010)
New Revision: 6309
Added:
jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/activity/mail/MailTestSetup.java
Modified:
jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/activity/mail/AttachmentTest.java
Log:
introduce mail test setup to prevent bind exceptions
Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/activity/mail/AttachmentTest.java
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/activity/mail/AttachmentTest.java 2010-05-08 02:36:35 UTC (rev 6308)
+++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/activity/mail/AttachmentTest.java 2010-05-10 06:22:19 UTC (rev 6309)
@@ -34,6 +34,8 @@
import javax.mail.Multipart;
import javax.mail.internet.MimeMessage;
+import junit.framework.Test;
+
import org.jbpm.api.ProcessInstance;
import org.jbpm.pvm.internal.util.IoUtil;
import org.jbpm.test.JbpmTestCase;
@@ -45,21 +47,18 @@
*/
public class AttachmentTest extends JbpmTestCase {
- private Wiser wiser = new Wiser();
+ private static Wiser wiser = new Wiser();
- protected void setUp() throws Exception {
- super.setUp();
- // start mail server
- wiser.setPort(2525);
- wiser.start();
- }
-
+ @Override
protected void tearDown() throws Exception {
- // stop mail server
- wiser.stop();
+ wiser.getMessages().clear();
super.tearDown();
}
+ public static Test suite() {
+ return new MailTestSetup(AttachmentTest.class, wiser);
+ }
+
public void testVariableAttachment() throws MessagingException, IOException {
// deploy process definition
deployJpdlXmlString("<process name='varattachment'>"
Added: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/activity/mail/MailTestSetup.java
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/activity/mail/MailTestSetup.java (rev 0)
+++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/activity/mail/MailTestSetup.java 2010-05-10 06:22:19 UTC (rev 6309)
@@ -0,0 +1,56 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jbpm.test.activity.mail;
+
+import org.subethamail.wiser.Wiser;
+
+import junit.extensions.TestSetup;
+import junit.framework.TestSuite;
+
+/**
+ * @author Alejandro Guizar
+ */
+public class MailTestSetup extends TestSetup {
+
+ private final Wiser wiser;
+
+ public MailTestSetup(Class<?> testClass, Wiser wiser) {
+ super(new TestSuite(testClass));
+ this.wiser = wiser;
+ }
+
+ public Wiser getWiser() {
+ return wiser;
+ }
+
+ @Override
+ protected void setUp() throws Exception {
+ wiser.setPort(2525);
+ wiser.start();
+ }
+
+ @Override
+ protected void tearDown() throws Exception {
+ wiser.stop();
+ }
+
+}
Property changes on: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/activity/mail/MailTestSetup.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ native
13 years, 12 months
JBoss JBPM SVN: r6308 - jbpm3/branches/jbpm-3.2-soa/modules/enterprise/src/test/java/org/jbpm/enterprise/ejbtimer.
by do-not-reply＠jboss.org
Author: alex.guizar(a)jboss.com
Date: 2010-05-07 22:36:35 -0400 (Fri, 07 May 2010)
New Revision: 6308
Modified:
jbpm3/branches/jbpm-3.2-soa/modules/enterprise/src/test/java/org/jbpm/enterprise/ejbtimer/EjbSchedulerTest.java
Log:
excuse mysql from EjbSchedulerTest.testScheduleFork
Modified: jbpm3/branches/jbpm-3.2-soa/modules/enterprise/src/test/java/org/jbpm/enterprise/ejbtimer/EjbSchedulerTest.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/enterprise/src/test/java/org/jbpm/enterprise/ejbtimer/EjbSchedulerTest.java 2010-05-08 01:27:47 UTC (rev 6307)
+++ jbpm3/branches/jbpm-3.2-soa/modules/enterprise/src/test/java/org/jbpm/enterprise/ejbtimer/EjbSchedulerTest.java 2010-05-08 02:36:35 UTC (rev 6308)
@@ -211,7 +211,9 @@
}
public void testScheduleFork() throws Exception {
- if (getHibernateDialect().indexOf("HSQL") != -1) return;
+ // this test fails intermittently with mysql
+ String dialect = getHibernateDialect();
+ if (dialect.indexOf("HSQL") != -1 || dialect.indexOf("MySQL") != -1) return;
deployProcessDefinition("<process-definition name='fork'>"
+ " <event type='process-end'>"
14 years
JBoss JBPM SVN: r6307 - jbpm3/branches/jbpm-3.2-soa/modules/enterprise.
by do-not-reply＠jboss.org
Author: alex.guizar(a)jboss.com
Date: 2010-05-07 21:27:47 -0400 (Fri, 07 May 2010)
New Revision: 6307
Modified:
jbpm3/branches/jbpm-3.2-soa/modules/enterprise/pom.xml
Log:
fix mysql profile name
Modified: jbpm3/branches/jbpm-3.2-soa/modules/enterprise/pom.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/enterprise/pom.xml 2010-05-08 00:47:28 UTC (rev 6306)
+++ jbpm3/branches/jbpm-3.2-soa/modules/enterprise/pom.xml 2010-05-08 01:27:47 UTC (rev 6307)
@@ -258,7 +258,7 @@
Desc: MySQL test exclusions
-->
<profile>
- <id>db2</id>
+ <id>mysql</id>
<activation>
<property>
<name>database</name>
14 years
JBoss JBPM SVN: r6306 - jbpm3/branches/jbpm-3.2-soa/modules/enterprise.
by do-not-reply＠jboss.org
Author: alex.guizar(a)jboss.com
Date: 2010-05-07 20:47:28 -0400 (Fri, 07 May 2010)
New Revision: 6306
Modified:
jbpm3/branches/jbpm-3.2-soa/modules/enterprise/pom.xml
Log:
exclude jbpm-1952 test with mysql and all enterprise tests with db2
Modified: jbpm3/branches/jbpm-3.2-soa/modules/enterprise/pom.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/enterprise/pom.xml 2010-05-07 18:21:56 UTC (rev 6305)
+++ jbpm3/branches/jbpm-3.2-soa/modules/enterprise/pom.xml 2010-05-08 00:47:28 UTC (rev 6306)
@@ -245,8 +245,33 @@
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
+ <!-- all enterprise tests fail with db2 under jboss 5.x -->
+ <skipTests>true</skipTests>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <!--
+ Name: mysql
+ Desc: MySQL test exclusions
+ -->
+ <profile>
+ <id>db2</id>
+ <activation>
+ <property>
+ <name>database</name>
+ <value>mysql</value>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
<excludes>
- <!-- [JBPM-1952] test times out under DB2 -->
+ <!-- [JBPM-1952] test times out with mysql -->
<exclude>org/jbpm/enterprise/jbpm1952/JBPM1952Test.java</exclude>
</excludes>
</configuration>
14 years
JBoss JBPM SVN: r6304 - in jbpm3/branches/jbpm-3.2-soa: modules/core/src/main/java/org/jbpm/job/executor and 1 other directory.
by do-not-reply＠jboss.org
Author: alex.guizar(a)jboss.com
Date: 2010-05-07 04:52:24 -0400 (Fri, 07 May 2010)
New Revision: 6304
Modified:
jbpm3/branches/jbpm-3.2-soa/eclipse/jbpm.code.style.xml
jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/job/executor/LockMonitorThread.java
Log:
log lock monitor thread interruption at debug level instead of info
update eclipse code style file
Modified: jbpm3/branches/jbpm-3.2-soa/eclipse/jbpm.code.style.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/eclipse/jbpm.code.style.xml 2010-05-06 18:16:25 UTC (rev 6303)
+++ jbpm3/branches/jbpm-3.2-soa/eclipse/jbpm.code.style.xml 2010-05-07 08:52:24 UTC (rev 6304)
@@ -10,7 +10,7 @@
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_field" value="0"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while" value="do not insert"/>
@@ -24,7 +24,7 @@
<setting id="org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_multiple_fields" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer" value="80"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_conditional_expression" value="80"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_binary_operator" value="insert"/>
@@ -37,7 +37,7 @@
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_package" value="1"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.continuation_indentation" value="2"/>
+<setting id="org.eclipse.jdt.core.formatter.continuation_indentation" value="1"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation" value="0"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments" value="do not insert"/>
@@ -71,7 +71,7 @@
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.lineSplit" value="80"/>
+<setting id="org.eclipse.jdt.core.formatter.lineSplit" value="96"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression" value="do not insert"/>
@@ -132,7 +132,7 @@
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.tabulation.size" value="2"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant" value="insert"/>
@@ -156,12 +156,12 @@
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression" value="0"/>
<setting id="org.eclipse.jdt.core.compiler.compliance" value="1.5"/>
-<setting id="org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer" value="2"/>
+<setting id="org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer" value="1"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression" value="0"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_unary_operator" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
@@ -187,7 +187,7 @@
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.comment.format_javadoc_comments" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="80"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="96"/>
<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_import_groups" value="1"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon" value="do not insert"/>
Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/job/executor/LockMonitorThread.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/job/executor/LockMonitorThread.java 2010-05-06 18:16:25 UTC (rev 6303)
+++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/job/executor/LockMonitorThread.java 2010-05-07 08:52:24 UTC (rev 6304)
@@ -51,7 +51,7 @@
sleep(jobExecutor.getLockMonitorInterval());
}
catch (InterruptedException e) {
- log.info(getName() + " got interrupted");
+ if (log.isDebugEnabled()) log.debug(getName() + " got interrupted");
}
}
}
14 years
JBoss JBPM SVN: r6303 - jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home.
by do-not-reply＠jboss.org
Author: alex.guizar(a)jboss.com
Date: 2010-05-06 14:16:25 -0400 (Thu, 06 May 2010)
New Revision: 6303
Modified:
jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/command.sh
Log:
prevent serializability test from failing when code source location is not a file
synchronize initialization of jndi resources in service factories
Modified: jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/command.sh
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/command.sh 2010-05-06 05:31:48 UTC (rev 6302)
+++ jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/command.sh 2010-05-06 18:16:25 UTC (rev 6303)
@@ -169,7 +169,8 @@
TOTAL_MEM=`free -mo | grep Mem | awk '{ print $2 }'`
echo "Total memory: $TOTAL_MEM"
MAX_MEM=`expr $TOTAL_MEM / 4`
-[ $MAX_MEM -lt 256 ] && MVN_OPTS="$MVN_OPTS -Dsurefire.jvm.args=-Xmx256m"
+[ $MAX_MEM -lt 256 ] && MAX_MEM=256
+MVN_OPTS="$MVN_OPTS -Dsurefire.jvm.args=-Xmx$MAX_MEM"m
#
# Execute tests
14 years