JBoss JBPM SVN: r4574 - jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire.
by do-not-reply@jboss.org
Author: tom.baeyens(a)jboss.com
Date: 2009-04-17 05:21:43 -0400 (Fri, 17 Apr 2009)
New Revision: 4574
Modified:
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/MailTemplateWireTest.java
Log:
JBPM-2058 fix newline in email test
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/MailTemplateWireTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/MailTemplateWireTest.java 2009-04-16 22:39:50 UTC (rev 4573)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/MailTemplateWireTest.java 2009-04-17 09:21:43 UTC (rev 4574)
@@ -137,7 +137,7 @@
MailTemplate template = wireContext.get(MailTemplate.class);
System.out.println(template.getHtml());
- assertEquals("<html>\n<strong>rich</strong> content</html>\n", template.getHtml());
+ assertTextPresent("<strong>rich</strong> content</html>", template.getHtml());
}
public void testAttachments() {
17 years
JBoss JBPM SVN: r4573 - in jbpm4/trunk: .settings and 30 other directories.
by do-not-reply@jboss.org
Author: alex.guizar(a)jboss.com
Date: 2009-04-16 18:39:50 -0400 (Thu, 16 Apr 2009)
New Revision: 4573
Added:
jbpm4/trunk/modules/pvm/.settings/org.eclipse.jdt.core.prefs
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/AddressFilter.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/AttachmentTemplate.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/GivenSpaceFamilyNameBuilder.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/MailProducerImpl.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/MailServer.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/MailSessionImpl.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/MailTemplate.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/RecipientTemplate.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/producer/
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/producer/MailContext.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/producer/MailProducer.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/producer/impl/
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/producer/impl/HtmlScriptMailProducer.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/producer/impl/ScriptMailProducer.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/producer/impl/SimpleMailProducer.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/producer/impl/TemplateMailProducer.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/resolver/
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/resolver/AddressResolver.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/resolver/IdentityAddressResolver.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/spi/
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/spi/MailProducer.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/spi/MailSession.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/spi/RecipientNameBuilder.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/MailSessionBinding.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/MailTemplateBinding.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/PatternDescriptor.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/email/
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/email/impl/
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/email/impl/AddressFilterTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/MailSessionWireTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/MailTemplateWireTest.java
jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch10-Emails.xml
Removed:
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/deploy/
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/AddressFilter.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/AttachmentTemplate.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/GivenSpaceFamilyNameBuilder.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/MailProducerImpl.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/MailServer.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/MailSessionImpl.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/MailTemplate.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/RecipientTemplate.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/producer/
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/producer/MailContext.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/producer/MailProducer.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/producer/impl/
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/producer/impl/HtmlScriptMailProducer.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/producer/impl/ScriptMailProducer.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/producer/impl/SimpleMailProducer.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/producer/impl/TemplateMailProducer.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/resolver/
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/resolver/AddressResolver.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/resolver/IdentityAddressResolver.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/spi/
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/spi/MailProducer.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/spi/MailSession.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/spi/RecipientNameBuilder.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/api/
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/model/
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/email/impl/
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/email/impl/AddressFilterTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/execution/
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/spring/
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/variables/
Modified:
jbpm4/trunk/.project
jbpm4/trunk/.settings/org.maven.ide.eclipse.prefs
jbpm4/trunk/hudson/hudson-home/jobs/jBPM4-Container-Matrix/config.xml
jbpm4/trunk/modules/api/.project
jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/identity/User.java
jbpm4/trunk/modules/integration/
jbpm4/trunk/modules/pvm/.project
jbpm4/trunk/modules/pvm/pom.xml
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/IdentitySessionImpl.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/JBossIdmIdentitySessionImpl.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/UserImpl.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/spi/IdentitySession.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/XmlUtil.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/WireContext.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/DomBuilder.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/Parse.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/Parser.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/ProblemList.java
jbpm4/trunk/modules/pvm/src/test/resources/jbpm.wire.bindings.xml
jbpm4/trunk/modules/userguide/src/main/docbook/en/master.xml
jbpm4/trunk/pom.xml
Log:
merge r4409:4572 from email branch
Modified: jbpm4/trunk/.project
===================================================================
--- jbpm4/trunk/.project 2009-04-16 21:39:27 UTC (rev 4572)
+++ jbpm4/trunk/.project 2009-04-16 22:39:50 UTC (rev 4573)
@@ -1,12 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>jbpm4</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- </buildSpec>
- <natures>
- <nature>org.maven.ide.eclipse.maven2Nature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>jbpm4</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.maven.ide.eclipse.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.maven.ide.eclipse.maven2Nature</nature>
+ </natures>
+</projectDescription>
Modified: jbpm4/trunk/.settings/org.maven.ide.eclipse.prefs
===================================================================
--- jbpm4/trunk/.settings/org.maven.ide.eclipse.prefs 2009-04-16 21:39:27 UTC (rev 4572)
+++ jbpm4/trunk/.settings/org.maven.ide.eclipse.prefs 2009-04-16 22:39:50 UTC (rev 4573)
@@ -1,8 +1,9 @@
-#Wed Mar 25 11:07:34 CET 2009
-activeProfiles=
-eclipse.preferences.version=1
-fullBuildGoals=
-includeModules=false
-resolveWorkspaceProjects=true
-resourceFilterGoals=
-version=1
+#Thu Apr 16 16:21:44 CDT 2009
+activeProfiles=
+eclipse.preferences.version=1
+fullBuildGoals=process-test-resources
+includeModules=false
+resolveWorkspaceProjects=true
+resourceFilterGoals=process-resources resources\:testResources
+skipCompilerPlugin=true
+version=1
Modified: jbpm4/trunk/hudson/hudson-home/jobs/jBPM4-Container-Matrix/config.xml
===================================================================
--- jbpm4/trunk/hudson/hudson-home/jobs/jBPM4-Container-Matrix/config.xml 2009-04-16 21:39:27 UTC (rev 4572)
+++ jbpm4/trunk/hudson/hudson-home/jobs/jBPM4-Container-Matrix/config.xml 2009-04-16 22:39:50 UTC (rev 4573)
@@ -30,13 +30,11 @@
<values>
<string>jboss422</string>
<string>jboss423</string>
- <string>jboss500</string>
</values>
</axis>
<axis>
<name>DATABASE</name>
<values>
- <string>hsqldb</string>
<string>mysql</string>
<string>oracle</string>
</values>
Modified: jbpm4/trunk/modules/api/.project
===================================================================
--- jbpm4/trunk/modules/api/.project 2009-04-16 21:39:27 UTC (rev 4572)
+++ jbpm4/trunk/modules/api/.project 2009-04-16 22:39:50 UTC (rev 4573)
@@ -1,18 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>api</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.maven.ide.eclipse.maven2Nature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>jbpm-api</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.maven.ide.eclipse.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.maven.ide.eclipse.maven2Nature</nature>
+ </natures>
+</projectDescription>
Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/identity/User.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/identity/User.java 2009-04-16 21:39:27 UTC (rev 4572)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/identity/User.java 2009-04-16 22:39:50 UTC (rev 4573)
@@ -31,4 +31,6 @@
String getGivenName();
String getFamilyName();
+
+ String getEmailAddress();
}
Property changes on: jbpm4/trunk/modules/integration
___________________________________________________________________
Name: svn:ignore
+ target
Modified: jbpm4/trunk/modules/pvm/.project
===================================================================
--- jbpm4/trunk/modules/pvm/.project 2009-04-16 21:39:27 UTC (rev 4572)
+++ jbpm4/trunk/modules/pvm/.project 2009-04-16 22:39:50 UTC (rev 4573)
@@ -1,18 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>pvm</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.maven.ide.eclipse.maven2Nature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>jbpm-pvm</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.maven.ide.eclipse.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.maven.ide.eclipse.maven2Nature</nature>
+ </natures>
+</projectDescription>
Copied: jbpm4/trunk/modules/pvm/.settings/org.eclipse.jdt.core.prefs (from rev 4572, jbpm4/branches/email/modules/pvm/.settings/org.eclipse.jdt.core.prefs)
===================================================================
--- jbpm4/trunk/modules/pvm/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ jbpm4/trunk/modules/pvm/.settings/org.eclipse.jdt.core.prefs 2009-04-16 22:39:50 UTC (rev 4573)
@@ -0,0 +1,5 @@
+#Tue Apr 14 00:52:21 CDT 2009
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.source=1.5
Modified: jbpm4/trunk/modules/pvm/pom.xml
===================================================================
--- jbpm4/trunk/modules/pvm/pom.xml 2009-04-16 21:39:27 UTC (rev 4572)
+++ jbpm4/trunk/modules/pvm/pom.xml 2009-04-16 22:39:50 UTC (rev 4573)
@@ -33,6 +33,13 @@
<table.prefix>JBPM_</table.prefix>
<!--test.resources.directory>${project.build.directory}/test-resources</test.resources.directory-->
</properties>
+ <repositories>
+ <repository>
+ <id>Snapshot</id>
+ <name>JBoss Snapshot</name>
+ <url>http://snapshots.jboss.org/maven2/</url>
+ </repository>
+ </repositories>
<!-- Dependencies -->
<dependencies>
@@ -50,6 +57,10 @@
</dependency>
<dependency>
+ <groupId>commons-email</groupId>
+ <artifactId>commons-email</artifactId>
+ </dependency>
+ <dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</dependency>
Copied: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email (from rev 4572, jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email)
Copied: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl (from rev 4572, jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl)
Deleted: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/AddressFilter.java
===================================================================
--- jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/AddressFilter.java 2009-04-16 21:39:27 UTC (rev 4572)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/AddressFilter.java 2009-04-16 22:39:50 UTC (rev 4573)
@@ -1,102 +0,0 @@
-package org.jbpm.pvm.internal.email.impl;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
-import java.util.regex.Pattern;
-
-import javax.mail.internet.InternetAddress;
-
-/**
- * Allows filtering of to/cc/bcc recipient lists based on regular expressions for include and
- * exclude patterns.
- *
- * @author Brad Davis
- */
-public class AddressFilter {
-
- /**
- * patterns of addresses to be included. all addresses are included when omitted.
- */
- private List<Pattern> includePatterns;
- /**
- * patterns of addresses to be excluded. no addresses are excluded when omitted.
- */
- private List<Pattern> excludePatterns;
-
- public Collection<InternetAddress> filter(final Collection<InternetAddress> addresses) {
- Collection<InternetAddress> filteredAddresses = new HashSet<InternetAddress>();
- if (addresses != null) {
- // Loop over for addresses to decide what to keep.
- for (InternetAddress address : addresses) {
- if (includeAddress(address) && !excludeAddress(address)) {
- filteredAddresses.add(address);
- }
- }
- }
- return filteredAddresses;
- }
-
- /**
- * Determines whether the given address is included, based on regular expressions.
- *
- * @param address email address to match against regex
- * @return <code>false</code> if include patterns are present and the address does not match any
- * pattern, <code>true</code> otherwise
- */
- protected boolean includeAddress(InternetAddress address) {
- if (includePatterns == null || includePatterns.isEmpty()) return true;
- for (Pattern pattern : includePatterns) {
- if (pattern.matcher(address.toString()).matches()) return true;
- }
- return false;
- }
-
- /**
- * Determines whether the given address is excluded, based on regular expressions.
- *
- * @param address email address to match against regex
- * @return <code>true</code> if exclude patterns are present and the address matches a pattern,
- * <code>false</code> otherwise
- */
- protected boolean excludeAddress(InternetAddress address) {
- if (excludePatterns == null) return false;
- for (Pattern pattern : excludePatterns) {
- if (pattern.matcher(address.toString()).matches()) return true;
- }
- return false;
- }
-
- /**
- * Gets the patterns of addresses to be included. All addresses are included when omitted.
- */
- public List<Pattern> getIncludePatterns() {
- return includePatterns;
- }
-
- public void addIncludePattern(Pattern includePattern) {
- if (includePatterns == null) includePatterns = new ArrayList<Pattern>();
- includePatterns.add(includePattern);
- }
-
- protected void setIncludePatterns(List<Pattern> includePatterns) {
- this.includePatterns = includePatterns;
- }
-
- /**
- * Gets the patterns of addresses to be excluded. No addresses are excluded when omitted.
- */
- public List<Pattern> getExcludePatterns() {
- return excludePatterns;
- }
-
- public void addExcludePattern(Pattern excludePattern) {
- if (excludePatterns == null) excludePatterns = new ArrayList<Pattern>();
- excludePatterns.add(excludePattern);
- }
-
- protected void setExcludePatterns(List<Pattern> excludePatterns) {
- this.excludePatterns = excludePatterns;
- }
-}
Copied: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/AddressFilter.java (from rev 4572, jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/AddressFilter.java)
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/AddressFilter.java (rev 0)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/AddressFilter.java 2009-04-16 22:39:50 UTC (rev 4573)
@@ -0,0 +1,102 @@
+package org.jbpm.pvm.internal.email.impl;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.List;
+import java.util.regex.Pattern;
+
+import javax.mail.internet.InternetAddress;
+
+/**
+ * Allows filtering of to/cc/bcc recipient lists based on regular expressions for include and
+ * exclude patterns.
+ *
+ * @author Brad Davis
+ */
+public class AddressFilter {
+
+ /**
+ * patterns of addresses to be included. all addresses are included when omitted.
+ */
+ private List<Pattern> includePatterns;
+ /**
+ * patterns of addresses to be excluded. no addresses are excluded when omitted.
+ */
+ private List<Pattern> excludePatterns;
+
+ public Collection<InternetAddress> filter(final Collection<InternetAddress> addresses) {
+ Collection<InternetAddress> filteredAddresses = new HashSet<InternetAddress>();
+ if (addresses != null) {
+ // Loop over for addresses to decide what to keep.
+ for (InternetAddress address : addresses) {
+ if (includeAddress(address) && !excludeAddress(address)) {
+ filteredAddresses.add(address);
+ }
+ }
+ }
+ return filteredAddresses;
+ }
+
+ /**
+ * Determines whether the given address is included, based on regular expressions.
+ *
+ * @param address email address to match against regex
+ * @return <code>false</code> if include patterns are present and the address does not match any
+ * pattern, <code>true</code> otherwise
+ */
+ protected boolean includeAddress(InternetAddress address) {
+ if (includePatterns == null || includePatterns.isEmpty()) return true;
+ for (Pattern pattern : includePatterns) {
+ if (pattern.matcher(address.toString()).matches()) return true;
+ }
+ return false;
+ }
+
+ /**
+ * Determines whether the given address is excluded, based on regular expressions.
+ *
+ * @param address email address to match against regex
+ * @return <code>true</code> if exclude patterns are present and the address matches a pattern,
+ * <code>false</code> otherwise
+ */
+ protected boolean excludeAddress(InternetAddress address) {
+ if (excludePatterns == null) return false;
+ for (Pattern pattern : excludePatterns) {
+ if (pattern.matcher(address.toString()).matches()) return true;
+ }
+ return false;
+ }
+
+ /**
+ * Gets the patterns of addresses to be included. All addresses are included when omitted.
+ */
+ public List<Pattern> getIncludePatterns() {
+ return includePatterns;
+ }
+
+ public void addIncludePattern(Pattern includePattern) {
+ if (includePatterns == null) includePatterns = new ArrayList<Pattern>();
+ includePatterns.add(includePattern);
+ }
+
+ protected void setIncludePatterns(List<Pattern> includePatterns) {
+ this.includePatterns = includePatterns;
+ }
+
+ /**
+ * Gets the patterns of addresses to be excluded. No addresses are excluded when omitted.
+ */
+ public List<Pattern> getExcludePatterns() {
+ return excludePatterns;
+ }
+
+ public void addExcludePattern(Pattern excludePattern) {
+ if (excludePatterns == null) excludePatterns = new ArrayList<Pattern>();
+ excludePatterns.add(excludePattern);
+ }
+
+ protected void setExcludePatterns(List<Pattern> excludePatterns) {
+ this.excludePatterns = excludePatterns;
+ }
+}
Deleted: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/AttachmentTemplate.java
===================================================================
--- jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/AttachmentTemplate.java 2009-04-16 21:39:27 UTC (rev 4572)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/AttachmentTemplate.java 2009-04-16 22:39:50 UTC (rev 4573)
@@ -1,77 +0,0 @@
-/*
- * 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.email.impl;
-
-import java.net.URL;
-
-/**
- * @author Alejandro Guizar
- */
-public class AttachmentTemplate {
-
- private String name;
- private String description;
- private String url;
- private String resource;
- private String file;
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getDescription() {
- return description;
- }
-
- public void setDescription(String description) {
- this.description = description;
- }
-
- public String getUrl() {
- return url;
- }
-
- public void setUrl(String url) {
- this.url = url;
- }
-
- public String getResource() {
- return resource;
- }
-
- public void setResource(String resource) {
- this.resource = resource;
- }
-
- public String getFile() {
- return file;
- }
-
- public void setFile(String file) {
- this.file = file;
- }
-
-}
Copied: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/AttachmentTemplate.java (from rev 4572, jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/AttachmentTemplate.java)
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/AttachmentTemplate.java (rev 0)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/AttachmentTemplate.java 2009-04-16 22:39:50 UTC (rev 4573)
@@ -0,0 +1,77 @@
+/*
+ * 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.email.impl;
+
+import java.net.URL;
+
+/**
+ * @author Alejandro Guizar
+ */
+public class AttachmentTemplate {
+
+ private String name;
+ private String description;
+ private String url;
+ private String resource;
+ private String file;
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+
+ public void setDescription(String description) {
+ this.description = description;
+ }
+
+ public String getUrl() {
+ return url;
+ }
+
+ public void setUrl(String url) {
+ this.url = url;
+ }
+
+ public String getResource() {
+ return resource;
+ }
+
+ public void setResource(String resource) {
+ this.resource = resource;
+ }
+
+ public String getFile() {
+ return file;
+ }
+
+ public void setFile(String file) {
+ this.file = file;
+ }
+
+}
Deleted: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/GivenSpaceFamilyNameBuilder.java
===================================================================
--- jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/GivenSpaceFamilyNameBuilder.java 2009-04-16 21:39:27 UTC (rev 4572)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/GivenSpaceFamilyNameBuilder.java 2009-04-16 22:39:50 UTC (rev 4573)
@@ -1,40 +0,0 @@
-/*
- * 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.email.impl;
-
-import org.jbpm.identity.User;
-import org.jbpm.pvm.internal.email.spi.RecipientNameBuilder;
-
-/**
- * @author Alejandro Guizar
- */
-public class GivenSpaceFamilyNameBuilder implements RecipientNameBuilder {
-
- public String buildName(User user) {
- String givenName = user.getGivenName();
- String familyName = user.getFamilyName();
-
- return givenName != null ? familyName != null ? givenName + ' ' + familyName : givenName
- : familyName;
- }
-
-}
Copied: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/GivenSpaceFamilyNameBuilder.java (from rev 4572, jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/GivenSpaceFamilyNameBuilder.java)
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/GivenSpaceFamilyNameBuilder.java (rev 0)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/GivenSpaceFamilyNameBuilder.java 2009-04-16 22:39:50 UTC (rev 4573)
@@ -0,0 +1,40 @@
+/*
+ * 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.email.impl;
+
+import org.jbpm.api.identity.User;
+import org.jbpm.pvm.internal.email.spi.RecipientNameBuilder;
+
+/**
+ * @author Alejandro Guizar
+ */
+public class GivenSpaceFamilyNameBuilder implements RecipientNameBuilder {
+
+ public String buildName(User user) {
+ String givenName = user.getGivenName();
+ String familyName = user.getFamilyName();
+
+ return givenName != null ? familyName != null ? givenName + ' ' + familyName : givenName
+ : familyName;
+ }
+
+}
Deleted: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/MailProducerImpl.java
===================================================================
--- jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/MailProducerImpl.java 2009-04-16 21:39:27 UTC (rev 4572)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/MailProducerImpl.java 2009-04-16 22:39:50 UTC (rev 4573)
@@ -1,242 +0,0 @@
-/*
- * 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.email.impl;
-
-import java.io.File;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-
-import org.apache.commons.mail.Email;
-import org.apache.commons.mail.EmailAttachment;
-import org.apache.commons.mail.EmailException;
-import org.apache.commons.mail.HtmlEmail;
-import org.apache.commons.mail.MultiPartEmail;
-import org.apache.commons.mail.SimpleEmail;
-import org.jbpm.JbpmException;
-import org.jbpm.env.Environment;
-import org.jbpm.identity.Group;
-import org.jbpm.identity.User;
-import org.jbpm.model.OpenExecution;
-import org.jbpm.pvm.internal.email.spi.MailProducer;
-import org.jbpm.pvm.internal.email.spi.RecipientNameBuilder;
-import org.jbpm.pvm.internal.identity.spi.IdentitySession;
-import org.jbpm.pvm.internal.script.ScriptManager;
-
-/**
- * Default mail producer.
- *
- * @author Alejandro Guizar
- */
-public class MailProducerImpl implements MailProducer {
-
- private MailTemplate template;
-
- public MailTemplate getTemplate() {
- return template;
- }
-
- public void setTemplate(MailTemplate template) {
- this.template = template;
- }
-
- public Collection<Email> produce(OpenExecution execution) {
- try {
- Email email = instantiateEmail(template);
- fillRecipients(template, execution, email);
- fillSubject(execution, email);
- fillBody(execution, email);
- return Collections.singleton(email);
- }
- catch (EmailException e) {
- throw new JbpmException("could not produce email", e);
- }
- }
-
- protected Email instantiateEmail(MailTemplate template) {
- return template.getHtml() != null ? new HtmlEmail() : template.getAttachmentTemplates()
- .isEmpty() ? new MultiPartEmail() : new SimpleEmail();
- }
-
- protected void fillRecipients(MailTemplate template, OpenExecution execution, Email email)
- throws EmailException {
- Environment environment = Environment.getCurrent();
- IdentitySession identitySession = environment.get(IdentitySession.class);
- RecipientNameBuilder recipientNameBuilder = environment.get(RecipientNameBuilder.class);
-
- // to
- RecipientTemplate to = template.getTo();
- if (to != null) {
- for (String address : evaluateRecipients(to.getAddresses(), execution)) {
- email.addTo(address);
- }
- for (String actorId : evaluateRecipients(to.getActors(), execution)) {
- Collection<User> users = resolveUsers(identitySession, actorId);
- for (User user : users) {
- email.addTo(user.getEmailAddress(), recipientNameBuilder.buildName(user));
- }
- }
- }
-
- // cc
- RecipientTemplate cc = template.getCc();
- if (cc != null) {
- for (String address : evaluateRecipients(cc.getAddresses(), execution)) {
- email.addCc(address);
- }
- for (String actorId : evaluateRecipients(cc.getActors(), execution)) {
- Collection<User> users = resolveUsers(identitySession, actorId);
- for (User user : users) {
- email.addCc(user.getEmailAddress(), recipientNameBuilder.buildName(user));
- }
- }
- }
-
- // bcc
- RecipientTemplate bcc = template.getBcc();
- if (bcc != null) {
- for (String address : evaluateRecipients(bcc.getAddresses(), execution)) {
- email.addBcc(address);
- }
- for (String actorId : evaluateRecipients(bcc.getActors(), execution)) {
- Collection<User> users = resolveUsers(identitySession, actorId);
- for (User user : users) {
- email.addBcc(user.getEmailAddress(), recipientNameBuilder.buildName(user));
- }
- }
- }
- }
-
- private String evaluateExpression(String expression, OpenExecution execution) {
- ScriptManager scriptManager = Environment.getFromCurrent(ScriptManager.class);
- return scriptManager.evaluateExpression(expression, execution, template.getLanguage())
- .toString();
- }
-
- private String[] evaluateRecipients(String recipients, OpenExecution execution) {
- return evaluateExpression(recipients, execution).split("[,|\\s]+");
- }
-
- private static Collection<User> resolveUsers(IdentitySession identitySession, String actorId) {
- // first, try to resolve actorId as user
- User user = identitySession.findUserById(actorId);
- if (user != null) return Collections.singleton(user);
-
- // next, try to resolve as group
- Group group = identitySession.findGroupById(actorId);
- if (group != null) return identitySession.findUsersByGroup(actorId);
-
- // give up
- return Collections.emptySet();
- }
-
- protected void fillSubject(OpenExecution execution, Email email) {
- email.setSubject(evaluateExpression(template.getSubject(), execution));
- }
-
- protected void fillBody(OpenExecution execution, Email email) throws EmailException {
- if (template.getHtml() == null) {
- email.setMsg(evaluateExpression(template.getText(), execution));
- }
- else {
- HtmlEmail htmlEmail = (HtmlEmail) email;
- htmlEmail.setHtmlMsg(evaluateExpression(template.getHtml(), execution));
- htmlEmail.setTextMsg(evaluateExpression(template.getText(), execution));
- }
- }
-
- protected void addAttachments(OpenExecution execution, Email email) throws EmailException {
- List<AttachmentTemplate> attachmentTemplates = template.getAttachmentTemplates();
- if (attachmentTemplates.isEmpty()) return;
-
- MultiPartEmail multiPartEmail = (MultiPartEmail) email;
- for (AttachmentTemplate attachmentTemplate : attachmentTemplates) {
- EmailAttachment attachment = new EmailAttachment();
- attachment.setDisposition(EmailAttachment.ATTACHMENT);
-
- // name
- String name = attachmentTemplate.getName();
- if (name != null) attachment.setName(evaluateExpression(name, execution));
-
- // description
- String description = attachmentTemplate.getDescription();
- if (description != null)
- attachment.setDescription(evaluateExpression(description, execution));
-
- // file
- String file = attachmentTemplate.getFile();
- if (file != null) {
- File targetFile = new File(evaluateExpression(file, execution));
- if (!targetFile.isFile()) {
- throw new EmailException("could not fetch attachment from " + targetFile);
- }
- attachment.setPath(targetFile.getPath());
- // extract attachment name from file
- if (name == null) attachment.setName(targetFile.getName());
- }
- else {
- URL targetUrl;
- // url
- String url = attachmentTemplate.getUrl();
- if (url != null) {
- try {
- targetUrl = new URL(evaluateExpression(url, execution));
- }
- catch (MalformedURLException e) {
- throw new EmailException("could not fetch attachment from " + url, e);
- }
- }
- // resource
- else {
- String resource = attachmentTemplate.getResource();
- targetUrl =
- Environment.getCurrent().getClassLoader().getResource(
- evaluateExpression(resource, execution));
- if (targetUrl == null) {
- throw new EmailException("could not fetch attachment from " + resource);
- }
- }
- attachment.setURL(targetUrl);
- // extract attachment name from url
- if (name == null) {
- String resourceName = extractResourceName(targetUrl);
- attachment.setName(resourceName);
- }
- }
-
- multiPartEmail.attach(attachment);
- }
- }
-
- private static String extractResourceName(URL url) {
- String path = url.getPath();
- if (path == null || path.length() == 0) return null;
-
- // skip trailing slash
- int sepIndex = path.lastIndexOf('/', path.length() - 1);
- if (sepIndex == -1) return null;
-
- return path.substring(sepIndex);
- }
-}
Copied: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/MailProducerImpl.java (from rev 4572, jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/MailProducerImpl.java)
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/MailProducerImpl.java (rev 0)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/MailProducerImpl.java 2009-04-16 22:39:50 UTC (rev 4573)
@@ -0,0 +1,242 @@
+/*
+ * 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.email.impl;
+
+import java.io.File;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+
+import org.apache.commons.mail.Email;
+import org.apache.commons.mail.EmailAttachment;
+import org.apache.commons.mail.EmailException;
+import org.apache.commons.mail.HtmlEmail;
+import org.apache.commons.mail.MultiPartEmail;
+import org.apache.commons.mail.SimpleEmail;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.identity.Group;
+import org.jbpm.api.identity.User;
+import org.jbpm.api.model.OpenExecution;
+import org.jbpm.pvm.internal.email.spi.MailProducer;
+import org.jbpm.pvm.internal.email.spi.RecipientNameBuilder;
+import org.jbpm.pvm.internal.identity.spi.IdentitySession;
+import org.jbpm.pvm.internal.script.ScriptManager;
+
+/**
+ * Default mail producer.
+ *
+ * @author Alejandro Guizar
+ */
+public class MailProducerImpl implements MailProducer {
+
+ private MailTemplate template;
+
+ public MailTemplate getTemplate() {
+ return template;
+ }
+
+ public void setTemplate(MailTemplate template) {
+ this.template = template;
+ }
+
+ public Collection<Email> produce(OpenExecution execution) {
+ try {
+ Email email = instantiateEmail(template);
+ fillRecipients(template, execution, email);
+ fillSubject(execution, email);
+ fillBody(execution, email);
+ return Collections.singleton(email);
+ }
+ catch (EmailException e) {
+ throw new JbpmException("could not produce email", e);
+ }
+ }
+
+ protected Email instantiateEmail(MailTemplate template) {
+ return template.getHtml() != null ? new HtmlEmail() : template.getAttachmentTemplates()
+ .isEmpty() ? new MultiPartEmail() : new SimpleEmail();
+ }
+
+ protected void fillRecipients(MailTemplate template, OpenExecution execution, Email email)
+ throws EmailException {
+ Environment environment = Environment.getCurrent();
+ IdentitySession identitySession = environment.get(IdentitySession.class);
+ RecipientNameBuilder recipientNameBuilder = environment.get(RecipientNameBuilder.class);
+
+ // to
+ RecipientTemplate to = template.getTo();
+ if (to != null) {
+ for (String address : evaluateRecipients(to.getAddresses(), execution)) {
+ email.addTo(address);
+ }
+ for (String actorId : evaluateRecipients(to.getActors(), execution)) {
+ Collection<User> users = resolveUsers(identitySession, actorId);
+ for (User user : users) {
+ email.addTo(user.getEmailAddress(), recipientNameBuilder.buildName(user));
+ }
+ }
+ }
+
+ // cc
+ RecipientTemplate cc = template.getCc();
+ if (cc != null) {
+ for (String address : evaluateRecipients(cc.getAddresses(), execution)) {
+ email.addCc(address);
+ }
+ for (String actorId : evaluateRecipients(cc.getActors(), execution)) {
+ Collection<User> users = resolveUsers(identitySession, actorId);
+ for (User user : users) {
+ email.addCc(user.getEmailAddress(), recipientNameBuilder.buildName(user));
+ }
+ }
+ }
+
+ // bcc
+ RecipientTemplate bcc = template.getBcc();
+ if (bcc != null) {
+ for (String address : evaluateRecipients(bcc.getAddresses(), execution)) {
+ email.addBcc(address);
+ }
+ for (String actorId : evaluateRecipients(bcc.getActors(), execution)) {
+ Collection<User> users = resolveUsers(identitySession, actorId);
+ for (User user : users) {
+ email.addBcc(user.getEmailAddress(), recipientNameBuilder.buildName(user));
+ }
+ }
+ }
+ }
+
+ private String evaluateExpression(String expression, OpenExecution execution) {
+ ScriptManager scriptManager = Environment.getFromCurrent(ScriptManager.class);
+ return scriptManager.evaluateExpression(expression, execution, template.getLanguage())
+ .toString();
+ }
+
+ private String[] evaluateRecipients(String recipients, OpenExecution execution) {
+ return evaluateExpression(recipients, execution).split("[,|\\s]+");
+ }
+
+ private static Collection<User> resolveUsers(IdentitySession identitySession, String actorId) {
+ // first, try to resolve actorId as user
+ User user = identitySession.findUserById(actorId);
+ if (user != null) return Collections.singleton(user);
+
+ // next, try to resolve as group
+ Group group = identitySession.findGroupById(actorId);
+ if (group != null) return identitySession.findUsersByGroup(actorId);
+
+ // give up
+ return Collections.emptySet();
+ }
+
+ protected void fillSubject(OpenExecution execution, Email email) {
+ email.setSubject(evaluateExpression(template.getSubject(), execution));
+ }
+
+ protected void fillBody(OpenExecution execution, Email email) throws EmailException {
+ if (template.getHtml() == null) {
+ email.setMsg(evaluateExpression(template.getText(), execution));
+ }
+ else {
+ HtmlEmail htmlEmail = (HtmlEmail) email;
+ htmlEmail.setHtmlMsg(evaluateExpression(template.getHtml(), execution));
+ htmlEmail.setTextMsg(evaluateExpression(template.getText(), execution));
+ }
+ }
+
+ protected void addAttachments(OpenExecution execution, Email email) throws EmailException {
+ List<AttachmentTemplate> attachmentTemplates = template.getAttachmentTemplates();
+ if (attachmentTemplates.isEmpty()) return;
+
+ MultiPartEmail multiPartEmail = (MultiPartEmail) email;
+ for (AttachmentTemplate attachmentTemplate : attachmentTemplates) {
+ EmailAttachment attachment = new EmailAttachment();
+ attachment.setDisposition(EmailAttachment.ATTACHMENT);
+
+ // name
+ String name = attachmentTemplate.getName();
+ if (name != null) attachment.setName(evaluateExpression(name, execution));
+
+ // description
+ String description = attachmentTemplate.getDescription();
+ if (description != null)
+ attachment.setDescription(evaluateExpression(description, execution));
+
+ // file
+ String file = attachmentTemplate.getFile();
+ if (file != null) {
+ File targetFile = new File(evaluateExpression(file, execution));
+ if (!targetFile.isFile()) {
+ throw new EmailException("could not fetch attachment from " + targetFile);
+ }
+ attachment.setPath(targetFile.getPath());
+ // extract attachment name from file
+ if (name == null) attachment.setName(targetFile.getName());
+ }
+ else {
+ URL targetUrl;
+ // url
+ String url = attachmentTemplate.getUrl();
+ if (url != null) {
+ try {
+ targetUrl = new URL(evaluateExpression(url, execution));
+ }
+ catch (MalformedURLException e) {
+ throw new EmailException("could not fetch attachment from " + url, e);
+ }
+ }
+ // resource
+ else {
+ String resource = attachmentTemplate.getResource();
+ targetUrl =
+ Environment.getCurrent().getClassLoader().getResource(
+ evaluateExpression(resource, execution));
+ if (targetUrl == null) {
+ throw new EmailException("could not fetch attachment from " + resource);
+ }
+ }
+ attachment.setURL(targetUrl);
+ // extract attachment name from url
+ if (name == null) {
+ String resourceName = extractResourceName(targetUrl);
+ attachment.setName(resourceName);
+ }
+ }
+
+ multiPartEmail.attach(attachment);
+ }
+ }
+
+ private static String extractResourceName(URL url) {
+ String path = url.getPath();
+ if (path == null || path.length() == 0) return null;
+
+ // skip trailing slash
+ int sepIndex = path.lastIndexOf('/', path.length() - 1);
+ if (sepIndex == -1) return null;
+
+ return path.substring(sepIndex);
+ }
+}
Deleted: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/MailServer.java
===================================================================
--- jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/MailServer.java 2009-04-16 21:39:27 UTC (rev 4572)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/MailServer.java 2009-04-16 22:39:50 UTC (rev 4573)
@@ -1,46 +0,0 @@
-package org.jbpm.pvm.internal.email.impl;
-
-import java.util.Properties;
-
-import javax.mail.Authenticator;
-import javax.mail.Session;
-
-/**
- * Settings for establishing a session with a mail server.
- *
- * @author Brad Davis
- */
-public class MailServer {
-
- private AddressFilter addressFilter;
- private Properties sessionProperties;
- private Authenticator authenticator;
-
- public AddressFilter getAddressFilter() {
- return addressFilter;
- }
-
- protected void setAddressFilter(AddressFilter filter) {
- this.addressFilter = filter;
- }
-
- public Properties getSessionProperties() {
- return sessionProperties;
- }
-
- protected void setSessionProperties(Properties sessionProperties) {
- this.sessionProperties = sessionProperties;
- }
-
- public Authenticator getAuthenticator() {
- return authenticator;
- }
-
- protected void setAuthenticator(Authenticator authenticator) {
- this.authenticator = authenticator;
- }
-
- public Session createMailSession() {
- return Session.getDefaultInstance(sessionProperties, authenticator);
- }
-}
Copied: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/MailServer.java (from rev 4572, jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/MailServer.java)
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/MailServer.java (rev 0)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/MailServer.java 2009-04-16 22:39:50 UTC (rev 4573)
@@ -0,0 +1,46 @@
+package org.jbpm.pvm.internal.email.impl;
+
+import java.util.Properties;
+
+import javax.mail.Authenticator;
+import javax.mail.Session;
+
+/**
+ * Settings for establishing a session with a mail server.
+ *
+ * @author Brad Davis
+ */
+public class MailServer {
+
+ private AddressFilter addressFilter;
+ private Properties sessionProperties;
+ private Authenticator authenticator;
+
+ public AddressFilter getAddressFilter() {
+ return addressFilter;
+ }
+
+ protected void setAddressFilter(AddressFilter filter) {
+ this.addressFilter = filter;
+ }
+
+ public Properties getSessionProperties() {
+ return sessionProperties;
+ }
+
+ protected void setSessionProperties(Properties sessionProperties) {
+ this.sessionProperties = sessionProperties;
+ }
+
+ public Authenticator getAuthenticator() {
+ return authenticator;
+ }
+
+ protected void setAuthenticator(Authenticator authenticator) {
+ this.authenticator = authenticator;
+ }
+
+ public Session createMailSession() {
+ return Session.getDefaultInstance(sessionProperties, authenticator);
+ }
+}
Deleted: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/MailSessionImpl.java
===================================================================
--- jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/MailSessionImpl.java 2009-04-16 21:39:27 UTC (rev 4572)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/MailSessionImpl.java 2009-04-16 22:39:50 UTC (rev 4573)
@@ -1,71 +0,0 @@
-package org.jbpm.pvm.internal.email.impl;
-
-import java.util.Collection;
-import java.util.List;
-
-import javax.mail.Session;
-import javax.mail.internet.InternetAddress;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.commons.mail.Email;
-import org.apache.commons.mail.EmailException;
-import org.jbpm.pvm.internal.email.spi.MailSession;
-
-public class MailSessionImpl implements MailSession {
-
- private List<MailServer> mailServers;
-
- private static final Log log = LogFactory.getLog(MailSessionImpl.class);
-
- public void send(Collection<Email> emails) {
- // Emails need to have the sessions populated.
- for (Email email : emails) {
- Collection<InternetAddress> to = email.getToAddresses();
- Collection<InternetAddress> cc = email.getCcAddresses();
- Collection<InternetAddress> bcc = email.getBccAddresses();
-
- for (MailServer mailServer : mailServers) {
- AddressFilter addressFilter = mailServer.getAddressFilter();
- Session mailSession = mailServer.createMailSession();
- email.setMailSession(mailSession);
-
- // Need to apply filter.
- try {
- if(addressFilter!=null) {
- Collection<InternetAddress> toFiltered = addressFilter.filter(to);
- Collection<InternetAddress> ccFiltered = addressFilter.filter(cc);
- Collection<InternetAddress> bccFiltered = addressFilter.filter(bcc);
-
- // Set the email with the new filtered addresses.
- email.setTo(toFiltered);
- email.setCc(ccFiltered);
- email.setBcc(bccFiltered);
-
- // If there is someone to send it to, then send it.
- if (!(toFiltered.isEmpty() && ccFiltered.isEmpty() && bccFiltered.isEmpty())) {
- email.send();
- }
- }
- else {
- //If no filter is set, then accept all.
- email.send();
- }
- }
- catch (EmailException e) {
- log.error("An exception occurred while sending email.", e);
- // TODO: Does anything else need to occur here?
- }
- }
- }
- }
-
- public List<MailServer> getMailServers() {
- return mailServers;
- }
-
- protected void setMailServers(List<MailServer> mailServers) {
- this.mailServers = mailServers;
- }
-
-}
Copied: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/MailSessionImpl.java (from rev 4572, jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/MailSessionImpl.java)
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/MailSessionImpl.java (rev 0)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/MailSessionImpl.java 2009-04-16 22:39:50 UTC (rev 4573)
@@ -0,0 +1,71 @@
+package org.jbpm.pvm.internal.email.impl;
+
+import java.util.Collection;
+import java.util.List;
+
+import javax.mail.Session;
+import javax.mail.internet.InternetAddress;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.commons.mail.Email;
+import org.apache.commons.mail.EmailException;
+import org.jbpm.pvm.internal.email.spi.MailSession;
+
+public class MailSessionImpl implements MailSession {
+
+ private List<MailServer> mailServers;
+
+ private static final Log log = LogFactory.getLog(MailSessionImpl.class);
+
+ public void send(Collection<Email> emails) {
+ // Emails need to have the sessions populated.
+ for (Email email : emails) {
+ Collection<InternetAddress> to = email.getToAddresses();
+ Collection<InternetAddress> cc = email.getCcAddresses();
+ Collection<InternetAddress> bcc = email.getBccAddresses();
+
+ for (MailServer mailServer : mailServers) {
+ AddressFilter addressFilter = mailServer.getAddressFilter();
+ Session mailSession = mailServer.createMailSession();
+ email.setMailSession(mailSession);
+
+ // Need to apply filter.
+ try {
+ if(addressFilter!=null) {
+ Collection<InternetAddress> toFiltered = addressFilter.filter(to);
+ Collection<InternetAddress> ccFiltered = addressFilter.filter(cc);
+ Collection<InternetAddress> bccFiltered = addressFilter.filter(bcc);
+
+ // Set the email with the new filtered addresses.
+ email.setTo(toFiltered);
+ email.setCc(ccFiltered);
+ email.setBcc(bccFiltered);
+
+ // If there is someone to send it to, then send it.
+ if (!(toFiltered.isEmpty() && ccFiltered.isEmpty() && bccFiltered.isEmpty())) {
+ email.send();
+ }
+ }
+ else {
+ //If no filter is set, then accept all.
+ email.send();
+ }
+ }
+ catch (EmailException e) {
+ log.error("An exception occurred while sending email.", e);
+ // TODO: Does anything else need to occur here?
+ }
+ }
+ }
+ }
+
+ public List<MailServer> getMailServers() {
+ return mailServers;
+ }
+
+ protected void setMailServers(List<MailServer> mailServers) {
+ this.mailServers = mailServers;
+ }
+
+}
Deleted: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/MailTemplate.java
===================================================================
--- jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/MailTemplate.java 2009-04-16 21:39:27 UTC (rev 4572)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/MailTemplate.java 2009-04-16 22:39:50 UTC (rev 4573)
@@ -1,131 +0,0 @@
-/*
- * 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.email.impl;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.mail.Message.RecipientType;
-
-/**
- * Template for electronic mail, complete with recipients, subject, content and attachments.
- *
- * @author Alejandro Guizar
- */
-public class MailTemplate {
-
- private String name;
- private String language;
- private Map<RecipientType, RecipientTemplate> recipientTemplates = new HashMap<RecipientType, RecipientTemplate>();
- private String subject;
- private String text;
- private String html;
- private List<AttachmentTemplate> attachmentTemplates = new ArrayList<AttachmentTemplate>();
-
- /**
- * Name of this template, useful for referencing it from mail activities.
- */
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- /**
- * Templating engine meant to produce dynamic content.
- */
- public String getLanguage() {
- return language;
- }
-
- public void setLanguage(String language) {
- this.language = language;
- }
-
- public RecipientTemplate getRecipientTemplate(RecipientType recipientType) {
- return recipientTemplates.get(recipientType);
- }
-
- public void setRecipientTemplate(RecipientType recipientType, RecipientTemplate recipientTemplate) {
- recipientTemplates.put(recipientType, recipientTemplate);
- }
-
- public RecipientTemplate getTo() {
- return getRecipientTemplate(RecipientType.TO);
- }
-
- public void setTo(RecipientTemplate to) {
- setRecipientTemplate(RecipientType.TO, to);
- }
-
- public RecipientTemplate getCc() {
- return getRecipientTemplate(RecipientType.CC);
- }
-
- public void setCc(RecipientTemplate cc) {
- setRecipientTemplate(RecipientType.CC, cc);
- }
-
- public RecipientTemplate getBcc() {
- return getRecipientTemplate(RecipientType.BCC);
- }
-
- public void setBcc(RecipientTemplate bcc) {
- setRecipientTemplate(RecipientType.BCC, bcc);
- }
-
- public String getSubject() {
- return subject;
- }
-
- public void setSubject(String subject) {
- this.subject = subject;
- }
-
- public String getText() {
- return text;
- }
-
- public void setText(String text) {
- this.text = text;
- }
-
- public String getHtml() {
- return html;
- }
-
- public void setHtml(String html) {
- this.html = html;
- }
-
- public List<AttachmentTemplate> getAttachmentTemplates() {
- return attachmentTemplates;
- }
-
- public void addAttachmentTemplate(AttachmentTemplate attachmentTemplate) {
- attachmentTemplates.add(attachmentTemplate);
- }
-}
Copied: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/MailTemplate.java (from rev 4572, jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/MailTemplate.java)
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/MailTemplate.java (rev 0)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/MailTemplate.java 2009-04-16 22:39:50 UTC (rev 4573)
@@ -0,0 +1,131 @@
+/*
+ * 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.email.impl;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.mail.Message.RecipientType;
+
+/**
+ * Template for electronic mail, complete with recipients, subject, content and attachments.
+ *
+ * @author Alejandro Guizar
+ */
+public class MailTemplate {
+
+ private String name;
+ private String language;
+ private Map<RecipientType, RecipientTemplate> recipientTemplates = new HashMap<RecipientType, RecipientTemplate>();
+ private String subject;
+ private String text;
+ private String html;
+ private List<AttachmentTemplate> attachmentTemplates = new ArrayList<AttachmentTemplate>();
+
+ /**
+ * Name of this template, useful for referencing it from mail activities.
+ */
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ /**
+ * Templating engine meant to produce dynamic content.
+ */
+ public String getLanguage() {
+ return language;
+ }
+
+ public void setLanguage(String language) {
+ this.language = language;
+ }
+
+ public RecipientTemplate getRecipientTemplate(RecipientType recipientType) {
+ return recipientTemplates.get(recipientType);
+ }
+
+ public void setRecipientTemplate(RecipientType recipientType, RecipientTemplate recipientTemplate) {
+ recipientTemplates.put(recipientType, recipientTemplate);
+ }
+
+ public RecipientTemplate getTo() {
+ return getRecipientTemplate(RecipientType.TO);
+ }
+
+ public void setTo(RecipientTemplate to) {
+ setRecipientTemplate(RecipientType.TO, to);
+ }
+
+ public RecipientTemplate getCc() {
+ return getRecipientTemplate(RecipientType.CC);
+ }
+
+ public void setCc(RecipientTemplate cc) {
+ setRecipientTemplate(RecipientType.CC, cc);
+ }
+
+ public RecipientTemplate getBcc() {
+ return getRecipientTemplate(RecipientType.BCC);
+ }
+
+ public void setBcc(RecipientTemplate bcc) {
+ setRecipientTemplate(RecipientType.BCC, bcc);
+ }
+
+ public String getSubject() {
+ return subject;
+ }
+
+ public void setSubject(String subject) {
+ this.subject = subject;
+ }
+
+ public String getText() {
+ return text;
+ }
+
+ public void setText(String text) {
+ this.text = text;
+ }
+
+ public String getHtml() {
+ return html;
+ }
+
+ public void setHtml(String html) {
+ this.html = html;
+ }
+
+ public List<AttachmentTemplate> getAttachmentTemplates() {
+ return attachmentTemplates;
+ }
+
+ public void addAttachmentTemplate(AttachmentTemplate attachmentTemplate) {
+ attachmentTemplates.add(attachmentTemplate);
+ }
+}
Deleted: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/RecipientTemplate.java
===================================================================
--- jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/RecipientTemplate.java 2009-04-16 21:39:27 UTC (rev 4572)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/RecipientTemplate.java 2009-04-16 22:39:50 UTC (rev 4573)
@@ -1,50 +0,0 @@
-/*
- * 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.email.impl;
-
-/**
- * Template for email recipients, either addresses or actors.
- *
- * @author Alejandro Guizar
- */
-public class RecipientTemplate {
-
- private String addresses;
- private String actors;
-
- public String getAddresses() {
- return addresses;
- }
-
- public void setAddresses(String addresses) {
- this.addresses = addresses;
- }
-
- public String getActors() {
- return actors;
- }
-
- public void setActors(String actors) {
- this.actors = actors;
- }
-
-}
Copied: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/RecipientTemplate.java (from rev 4572, jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/RecipientTemplate.java)
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/RecipientTemplate.java (rev 0)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/RecipientTemplate.java 2009-04-16 22:39:50 UTC (rev 4573)
@@ -0,0 +1,50 @@
+/*
+ * 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.email.impl;
+
+/**
+ * Template for email recipients, either addresses or actors.
+ *
+ * @author Alejandro Guizar
+ */
+public class RecipientTemplate {
+
+ private String addresses;
+ private String actors;
+
+ public String getAddresses() {
+ return addresses;
+ }
+
+ public void setAddresses(String addresses) {
+ this.addresses = addresses;
+ }
+
+ public String getActors() {
+ return actors;
+ }
+
+ public void setActors(String actors) {
+ this.actors = actors;
+ }
+
+}
Copied: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/producer (from rev 4572, jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/producer)
Deleted: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/producer/MailContext.java
===================================================================
--- jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/producer/MailContext.java 2009-04-16 21:39:27 UTC (rev 4572)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/producer/MailContext.java 2009-04-16 22:39:50 UTC (rev 4573)
@@ -1,46 +0,0 @@
-package org.jbpm.pvm.internal.email.producer;
-
-import java.util.Collection;
-
-import org.jbpm.identity.Group;
-import org.jbpm.identity.User;
-
-public class MailContext {
-
- private Collection<User> actors;
- private Collection<Group> groups;
- private Collection<String> toAddresses;
- private Collection<String> ccAddresses;
- private Collection<String> bccAddresses;
- public Collection<User> getActors() {
- return actors;
- }
- public void setActors(Collection<User> actors) {
- this.actors = actors;
- }
- public Collection<Group> getGroups() {
- return groups;
- }
- public void setGroups(Collection<Group> groups) {
- this.groups = groups;
- }
- public Collection<String> getToAddresses() {
- return toAddresses;
- }
- public void setToAddresses(Collection<String> toAddresses) {
- this.toAddresses = toAddresses;
- }
- public Collection<String> getCcAddresses() {
- return ccAddresses;
- }
- public void setCcAddresses(Collection<String> ccAddresses) {
- this.ccAddresses = ccAddresses;
- }
- public Collection<String> getBccAddresses() {
- return bccAddresses;
- }
- public void setBccAddresses(Collection<String> bccAddresses) {
- this.bccAddresses = bccAddresses;
- }
-
-}
Copied: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/producer/MailContext.java (from rev 4572, jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/producer/MailContext.java)
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/producer/MailContext.java (rev 0)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/producer/MailContext.java 2009-04-16 22:39:50 UTC (rev 4573)
@@ -0,0 +1,46 @@
+package org.jbpm.pvm.internal.email.producer;
+
+import java.util.Collection;
+
+import org.jbpm.api.identity.Group;
+import org.jbpm.api.identity.User;
+
+public class MailContext {
+
+ private Collection<User> actors;
+ private Collection<Group> groups;
+ private Collection<String> toAddresses;
+ private Collection<String> ccAddresses;
+ private Collection<String> bccAddresses;
+ public Collection<User> getActors() {
+ return actors;
+ }
+ public void setActors(Collection<User> actors) {
+ this.actors = actors;
+ }
+ public Collection<Group> getGroups() {
+ return groups;
+ }
+ public void setGroups(Collection<Group> groups) {
+ this.groups = groups;
+ }
+ public Collection<String> getToAddresses() {
+ return toAddresses;
+ }
+ public void setToAddresses(Collection<String> toAddresses) {
+ this.toAddresses = toAddresses;
+ }
+ public Collection<String> getCcAddresses() {
+ return ccAddresses;
+ }
+ public void setCcAddresses(Collection<String> ccAddresses) {
+ this.ccAddresses = ccAddresses;
+ }
+ public Collection<String> getBccAddresses() {
+ return bccAddresses;
+ }
+ public void setBccAddresses(Collection<String> bccAddresses) {
+ this.bccAddresses = bccAddresses;
+ }
+
+}
Deleted: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/producer/MailProducer.java
===================================================================
--- jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/producer/MailProducer.java 2009-04-16 21:39:27 UTC (rev 4572)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/producer/MailProducer.java 2009-04-16 22:39:50 UTC (rev 4573)
@@ -1,12 +0,0 @@
-package org.jbpm.pvm.internal.email.producer;
-
-import java.util.Collection;
-
-import org.apache.commons.mail.Email;
-import org.jbpm.Execution;
-
-public interface MailProducer {
-
- public Collection<Email> produce(final Execution exe, final MailContext mailContext) throws Exception;
-
-}
\ No newline at end of file
Copied: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/producer/MailProducer.java (from rev 4572, jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/producer/MailProducer.java)
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/producer/MailProducer.java (rev 0)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/producer/MailProducer.java 2009-04-16 22:39:50 UTC (rev 4573)
@@ -0,0 +1,12 @@
+package org.jbpm.pvm.internal.email.producer;
+
+import java.util.Collection;
+
+import org.apache.commons.mail.Email;
+import org.jbpm.api.Execution;
+
+public interface MailProducer {
+
+ public Collection<Email> produce(final Execution exe, final MailContext mailContext) throws Exception;
+
+}
\ No newline at end of file
Copied: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/producer/impl (from rev 4572, jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/producer/impl)
Deleted: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/producer/impl/HtmlScriptMailProducer.java
===================================================================
--- jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/producer/impl/HtmlScriptMailProducer.java 2009-04-16 21:39:27 UTC (rev 4572)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/producer/impl/HtmlScriptMailProducer.java 2009-04-16 22:39:50 UTC (rev 4573)
@@ -1,149 +0,0 @@
-package org.jbpm.pvm.internal.email.producer.impl;
-
-import java.util.Collection;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.commons.mail.Email;
-import org.apache.commons.mail.HtmlEmail;
-import org.apache.commons.mail.MultiPartEmail;
-import org.jbpm.Execution;
-import org.jbpm.env.Environment;
-import org.jbpm.pvm.internal.email.producer.MailContext;
-import org.jbpm.pvm.internal.script.ScriptManager;
-
-/**
- * Create an HTML email message using JBPM script manager. Provide HTML to embed with image.
- * Body becomes the text alternative, subject, and html are rendered using the script manager.
- * Images need to be hosted to be embedded within the message.
- *
- * @author Brad Davis
- *
- */
-public class HtmlScriptMailProducer extends ScriptMailProducer {
-
- private static final Pattern imgSrcPattern = Pattern.compile("<img[^>]*(src=['\"](\\S+)['\"])[^>]*",Pattern.CASE_INSENSITIVE);
- private static final Log log = LogFactory.getLog(HtmlScriptMailProducer.class);
-
- protected String html;
-
- public Collection<Email> produce(Execution exe, MailContext mailContext) throws Exception {
-
- if(log.isTraceEnabled())
- {
- log.trace("Starting: "+(new Date()));
- }
- ScriptManager scriptManager = Environment.getFromCurrent(ScriptManager.class);
-
- //Apply the scripting language to the process.
- this.text = (String)scriptManager.evaluateScript(this.text, exe, language);
- this.subject = (String)scriptManager.evaluateScript(this.subject, exe, language);
- this.html = (String)scriptManager.evaluate(this.html, exe, language);
- this.resolveUrlAttachments(scriptManager, exe);
-
- //Create an HTML message.
- HtmlEmail email = new HtmlEmail();
- //Populate recipients.
- this.populateAddresses(mailContext, email);
- this.populateUrlAttachments((MultiPartEmail)email);
-
- //Set the regular body [non-html] and subject.
- email.setTextMsg(this.text);
- email.setSubject(this.subject);
-
- //Keep track of the CIDs that have replaced SRCs to reduce
- //calls to replace. Should improve efficiency.
- Set<String> cidSet = new HashSet<String>();
- //Create a matcher based on our regex.
- Matcher imgMatcher = imgSrcPattern.matcher(html);
-
- //While there are matches, loop through them.
- while(imgMatcher.find())
- {
- //Embed the SRC image, and get a reference to the embedded CID.
- String replace = embedImage(email,imgMatcher.group(2));
- if(replace==null)
- {
- log.warn("The image source is not provided. Skipping: "+imgMatcher.group());
- continue;
- }
- //If this CID has not replaced a URL in the past, replace it now.
- if(cidSet.add(replace))
- {
- //Replace the original SRC URL with the CID SRC URL.
- this.html=this.html.replace(imgMatcher.group(2), replace);
- }
- else
- {
- if(log.isDebugEnabled())
- {
- log.debug("Skipped replace as the image has been handled before: "+imgMatcher.group(2));
- }
- }
-
- }
-
- if(log.isDebugEnabled())
- {
- log.debug("Embedded HTML: "+this.html);
- }
- try {
- //Set the embedded HTML to the Email Message.
- email.setHtmlMsg(this.html);
- }
- catch(Exception e)
- {
- //TODO: what do we do here?
- }
- if(log.isTraceEnabled())
- {
- log.trace("Complete: "+(new Date()));
- }
-
- //Return the rendered message.
- Collection<Email> collection = new HashSet<Email>();
- collection.add(email);
- return collection;
- }
-
-
-
- public String embedImage(HtmlEmail email, String imageSrc)
- {
- if(imageSrc==null||imageSrc.length()==0)
- {
- return null;
- }
- if(imageSrc.startsWith("cid:"))
- {
- return imageSrc;
- }
-
- //If the image hasn't been embedded yet, embed it.
- String src = imageSrc;
- String hashName = Integer.toString(src.hashCode());
- String cid = null;
- try{
- cid = email.embed(src, hashName);
- }
- catch(Exception e)
- {
- log.error("Error fetching image.",e);
- return imageSrc;
- }
- //Return the embedded name to replace the src.
- return "cid:"+cid;
-
- }
-
-
- public void setHtml(String html) {
- this.html = html;
- }
-
-}
Copied: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/producer/impl/HtmlScriptMailProducer.java (from rev 4572, jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/producer/impl/HtmlScriptMailProducer.java)
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/producer/impl/HtmlScriptMailProducer.java (rev 0)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/producer/impl/HtmlScriptMailProducer.java 2009-04-16 22:39:50 UTC (rev 4573)
@@ -0,0 +1,149 @@
+package org.jbpm.pvm.internal.email.producer.impl;
+
+import java.util.Collection;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.commons.mail.Email;
+import org.apache.commons.mail.HtmlEmail;
+import org.apache.commons.mail.MultiPartEmail;
+import org.jbpm.api.Execution;
+import org.jbpm.api.env.Environment;
+import org.jbpm.pvm.internal.email.producer.MailContext;
+import org.jbpm.pvm.internal.script.ScriptManager;
+
+/**
+ * Create an HTML email message using JBPM script manager. Provide HTML to embed with image.
+ * Body becomes the text alternative, subject, and html are rendered using the script manager.
+ * Images need to be hosted to be embedded within the message.
+ *
+ * @author Brad Davis
+ *
+ */
+public class HtmlScriptMailProducer extends ScriptMailProducer {
+
+ private static final Pattern imgSrcPattern = Pattern.compile("<img[^>]*(src=['\"](\\S+)['\"])[^>]*",Pattern.CASE_INSENSITIVE);
+ private static final Log log = LogFactory.getLog(HtmlScriptMailProducer.class);
+
+ protected String html;
+
+ public Collection<Email> produce(Execution exe, MailContext mailContext) throws Exception {
+
+ if(log.isTraceEnabled())
+ {
+ log.trace("Starting: "+(new Date()));
+ }
+ ScriptManager scriptManager = Environment.getFromCurrent(ScriptManager.class);
+
+ //Apply the scripting language to the process.
+ this.text = (String)scriptManager.evaluateScript(this.text, exe, language);
+ this.subject = (String)scriptManager.evaluateScript(this.subject, exe, language);
+ this.html = (String)scriptManager.evaluate(this.html, exe, language);
+ this.resolveUrlAttachments(scriptManager, exe);
+
+ //Create an HTML message.
+ HtmlEmail email = new HtmlEmail();
+ //Populate recipients.
+ this.populateAddresses(mailContext, email);
+ this.populateUrlAttachments((MultiPartEmail)email);
+
+ //Set the regular body [non-html] and subject.
+ email.setTextMsg(this.text);
+ email.setSubject(this.subject);
+
+ //Keep track of the CIDs that have replaced SRCs to reduce
+ //calls to replace. Should improve efficiency.
+ Set<String> cidSet = new HashSet<String>();
+ //Create a matcher based on our regex.
+ Matcher imgMatcher = imgSrcPattern.matcher(html);
+
+ //While there are matches, loop through them.
+ while(imgMatcher.find())
+ {
+ //Embed the SRC image, and get a reference to the embedded CID.
+ String replace = embedImage(email,imgMatcher.group(2));
+ if(replace==null)
+ {
+ log.warn("The image source is not provided. Skipping: "+imgMatcher.group());
+ continue;
+ }
+ //If this CID has not replaced a URL in the past, replace it now.
+ if(cidSet.add(replace))
+ {
+ //Replace the original SRC URL with the CID SRC URL.
+ this.html=this.html.replace(imgMatcher.group(2), replace);
+ }
+ else
+ {
+ if(log.isDebugEnabled())
+ {
+ log.debug("Skipped replace as the image has been handled before: "+imgMatcher.group(2));
+ }
+ }
+
+ }
+
+ if(log.isDebugEnabled())
+ {
+ log.debug("Embedded HTML: "+this.html);
+ }
+ try {
+ //Set the embedded HTML to the Email Message.
+ email.setHtmlMsg(this.html);
+ }
+ catch(Exception e)
+ {
+ //TODO: what do we do here?
+ }
+ if(log.isTraceEnabled())
+ {
+ log.trace("Complete: "+(new Date()));
+ }
+
+ //Return the rendered message.
+ Collection<Email> collection = new HashSet<Email>();
+ collection.add(email);
+ return collection;
+ }
+
+
+
+ public String embedImage(HtmlEmail email, String imageSrc)
+ {
+ if(imageSrc==null||imageSrc.length()==0)
+ {
+ return null;
+ }
+ if(imageSrc.startsWith("cid:"))
+ {
+ return imageSrc;
+ }
+
+ //If the image hasn't been embedded yet, embed it.
+ String src = imageSrc;
+ String hashName = Integer.toString(src.hashCode());
+ String cid = null;
+ try{
+ cid = email.embed(src, hashName);
+ }
+ catch(Exception e)
+ {
+ log.error("Error fetching image.",e);
+ return imageSrc;
+ }
+ //Return the embedded name to replace the src.
+ return "cid:"+cid;
+
+ }
+
+
+ public void setHtml(String html) {
+ this.html = html;
+ }
+
+}
Deleted: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/producer/impl/ScriptMailProducer.java
===================================================================
--- jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/producer/impl/ScriptMailProducer.java 2009-04-16 21:39:27 UTC (rev 4572)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/producer/impl/ScriptMailProducer.java 2009-04-16 22:39:50 UTC (rev 4573)
@@ -1,55 +0,0 @@
-package org.jbpm.pvm.internal.email.producer.impl;
-
-import java.util.Collection;
-
-import org.apache.commons.mail.Email;
-import org.jbpm.Execution;
-import org.jbpm.env.Environment;
-import org.jbpm.pvm.internal.email.producer.MailContext;
-import org.jbpm.pvm.internal.script.ScriptManager;
-
-/**
- * Created to produce simple text emails using the JBPM script manager.
- * Provide the script language to transform the subject and body.
- * @author Brad Davis
- *
- */
-public class ScriptMailProducer extends SimpleMailProducer {
-
- protected String language;
-
- @Override
- public Collection<Email> produce(final Execution exe, final MailContext mailContext)
- throws Exception {
-
- ScriptManager scriptManager = Environment.getFromCurrent(ScriptManager.class);
-
- //Here, you just need to populate the subject and body of the message
- //as evaluated by the JBPM script manager.
- this.text = (String)scriptManager.evaluateScript(this.text, exe, language);
- this.subject = (String)scriptManager.evaluateScript(this.subject, exe, language);
- this.resolveUrlAttachments(scriptManager,exe);
-
- //Populate and produce email based on SimpleMailProducer logic now that fields
- //have been resolved using the JBPM script manager.
- return super.produce(exe, mailContext);
- }
-
- public void setLanguage(String language) {
- this.language = language;
- }
-
- protected void resolveUrlAttachments(final ScriptManager scriptManager, final Execution exe) {
- //Resolve attachments from script to URL.
- if(urlAttachments!=null&&!urlAttachments.isEmpty())
- {
- for(String urlKey : urlAttachments.keySet())
- {
- String url = urlAttachments.get(urlKey);
- url = (String)scriptManager.evaluateScript(url, exe, language);
- urlAttachments.put(urlKey, url);
- }
- }
- }
-
-}
Copied: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/producer/impl/ScriptMailProducer.java (from rev 4572, jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/producer/impl/ScriptMailProducer.java)
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/producer/impl/ScriptMailProducer.java (rev 0)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/producer/impl/ScriptMailProducer.java 2009-04-16 22:39:50 UTC (rev 4573)
@@ -0,0 +1,55 @@
+package org.jbpm.pvm.internal.email.producer.impl;
+
+import java.util.Collection;
+
+import org.apache.commons.mail.Email;
+import org.jbpm.api.Execution;
+import org.jbpm.api.env.Environment;
+import org.jbpm.pvm.internal.email.producer.MailContext;
+import org.jbpm.pvm.internal.script.ScriptManager;
+
+/**
+ * Created to produce simple text emails using the JBPM script manager.
+ * Provide the script language to transform the subject and body.
+ * @author Brad Davis
+ *
+ */
+public class ScriptMailProducer extends SimpleMailProducer {
+
+ protected String language;
+
+ @Override
+ public Collection<Email> produce(final Execution exe, final MailContext mailContext)
+ throws Exception {
+
+ ScriptManager scriptManager = Environment.getFromCurrent(ScriptManager.class);
+
+ //Here, you just need to populate the subject and body of the message
+ //as evaluated by the JBPM script manager.
+ this.text = (String)scriptManager.evaluateScript(this.text, exe, language);
+ this.subject = (String)scriptManager.evaluateScript(this.subject, exe, language);
+ this.resolveUrlAttachments(scriptManager,exe);
+
+ //Populate and produce email based on SimpleMailProducer logic now that fields
+ //have been resolved using the JBPM script manager.
+ return super.produce(exe, mailContext);
+ }
+
+ public void setLanguage(String language) {
+ this.language = language;
+ }
+
+ protected void resolveUrlAttachments(final ScriptManager scriptManager, final Execution exe) {
+ //Resolve attachments from script to URL.
+ if(urlAttachments!=null&&!urlAttachments.isEmpty())
+ {
+ for(String urlKey : urlAttachments.keySet())
+ {
+ String url = urlAttachments.get(urlKey);
+ url = (String)scriptManager.evaluateScript(url, exe, language);
+ urlAttachments.put(urlKey, url);
+ }
+ }
+ }
+
+}
Deleted: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/producer/impl/SimpleMailProducer.java
===================================================================
--- jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/producer/impl/SimpleMailProducer.java 2009-04-16 21:39:27 UTC (rev 4572)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/producer/impl/SimpleMailProducer.java 2009-04-16 22:39:50 UTC (rev 4573)
@@ -1,167 +0,0 @@
-package org.jbpm.pvm.internal.email.producer.impl;
-
-import java.net.URL;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Map;
-
-import javax.mail.internet.InternetAddress;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.commons.mail.Email;
-import org.apache.commons.mail.EmailException;
-import org.apache.commons.mail.MultiPartEmail;
-import org.apache.commons.mail.SimpleEmail;
-import org.jbpm.Execution;
-import org.jbpm.env.Environment;
-import org.jbpm.identity.Group;
-import org.jbpm.identity.User;
-import org.jbpm.pvm.internal.email.producer.MailContext;
-import org.jbpm.pvm.internal.email.producer.MailProducer;
-import org.jbpm.pvm.internal.email.resolver.AddressResolver;
-
-/**
- * Creates a simple email, with subject, body, and recipients.
- * @author Brad Davis
- *
- */
-public class SimpleMailProducer implements MailProducer {
-
- private final static Log log = LogFactory.getLog(SimpleMailProducer.class);
-
- protected String text;
- protected String subject;
- protected Map<String,String> urlAttachments;
-
- public Collection<Email> produce(final Execution exe, final MailContext mailContext) throws Exception {
- //Create a simple email with the body set.
- Email email;
-
- //If there are attachments, must be multipart message.
- if(urlAttachments!=null&&!urlAttachments.isEmpty())
- {
- email = new MultiPartEmail();
- }
- else
- {
- //Otherwise, it is simple.
- email = new SimpleEmail();
- }
-
- //Resolve and populate to, cc, bcc addresses.
- populateAddresses(mailContext, email);
-
- //If there are attachments, add them to the email.
- if(urlAttachments!=null&&!urlAttachments.isEmpty())
- {
- populateUrlAttachments((MultiPartEmail)email);
- }
-
- //Set subject and message.
- email.setSubject(subject);
- email.setMsg(text);
-
- Collection<Email> emails = new HashSet<Email>();
- emails.add(email);
-
- return emails;
- }
-
- protected void populateAddresses(MailContext mailContext, Email email) throws EmailException
- {
- //Add the addresses.
- if(mailContext.getToAddresses()!=null)
- {
- for(String a : mailContext.getToAddresses())
- {
- email.addTo(a);
- }
- }
- if(mailContext.getCcAddresses()!=null)
- {
- for(String a : mailContext.getCcAddresses())
- {
- email.addCc(a);
- }
- }
- if(mailContext.getBccAddresses()!=null)
- {
- for(String a : mailContext.getBccAddresses())
- {
- email.addBcc(a);
- }
- }
-
- //Get address resolver.
- AddressResolver resolver = Environment.getFromCurrent(AddressResolver.class);;
-
- //Resolve actors and groups.
- if(mailContext.getActors()!=null)
- {
- for(User user : mailContext.getActors())
- {
- InternetAddress address = resolver.resolveUserAddress(user);
- email.addTo(address.getAddress(), this.constructName(user));
- }
- }
- if(mailContext.getGroups()!=null)
- {
- for(Group group : mailContext.getGroups())
- {
- Collection<InternetAddress> addresses = resolver.resolveGroupAddresses(group);
- for(InternetAddress address : addresses)
- {
- email.addTo(address.getAddress());
- }
- }
- }
- }
-
- protected String constructName(User user)
- {
- String name = null;
- if(user.getGivenName()!=null&&user.getGivenName().length()>0)
- {
- name = user.getGivenName();
- }
- if(user.getFamilyName()!=null&&user.getFamilyName().length()>0)
- {
- if(name==null)
- {
- name = user.getFamilyName();
- }
- else
- {
- name += " "+user.getFamilyName();
- }
- }
-
- return name;
- }
-
- protected void populateUrlAttachments(MultiPartEmail email) throws Exception
- {
- if(urlAttachments!=null&&!urlAttachments.isEmpty())
- {
- for(String urlKey : urlAttachments.keySet())
- {
- URL url = new URL(urlAttachments.get(urlKey));
- ((MultiPartEmail)email).attach(url,urlKey,urlKey);
- }
- }
- }
-
-
- public void setText(String text) {
- this.text = text;
- }
-
- public void setSubject(String subject) {
- this.subject = subject;
- }
-
- public void setUrlAttachments(Map<String, String> urlAttachments) {
- this.urlAttachments = urlAttachments;
- }
-}
Copied: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/producer/impl/SimpleMailProducer.java (from rev 4572, jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/producer/impl/SimpleMailProducer.java)
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/producer/impl/SimpleMailProducer.java (rev 0)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/producer/impl/SimpleMailProducer.java 2009-04-16 22:39:50 UTC (rev 4573)
@@ -0,0 +1,167 @@
+package org.jbpm.pvm.internal.email.producer.impl;
+
+import java.net.URL;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Map;
+
+import javax.mail.internet.InternetAddress;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.commons.mail.Email;
+import org.apache.commons.mail.EmailException;
+import org.apache.commons.mail.MultiPartEmail;
+import org.apache.commons.mail.SimpleEmail;
+import org.jbpm.api.Execution;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.identity.Group;
+import org.jbpm.api.identity.User;
+import org.jbpm.pvm.internal.email.producer.MailContext;
+import org.jbpm.pvm.internal.email.producer.MailProducer;
+import org.jbpm.pvm.internal.email.resolver.AddressResolver;
+
+/**
+ * Creates a simple email, with subject, body, and recipients.
+ * @author Brad Davis
+ *
+ */
+public class SimpleMailProducer implements MailProducer {
+
+ private final static Log log = LogFactory.getLog(SimpleMailProducer.class);
+
+ protected String text;
+ protected String subject;
+ protected Map<String,String> urlAttachments;
+
+ public Collection<Email> produce(final Execution exe, final MailContext mailContext) throws Exception {
+ //Create a simple email with the body set.
+ Email email;
+
+ //If there are attachments, must be multipart message.
+ if(urlAttachments!=null&&!urlAttachments.isEmpty())
+ {
+ email = new MultiPartEmail();
+ }
+ else
+ {
+ //Otherwise, it is simple.
+ email = new SimpleEmail();
+ }
+
+ //Resolve and populate to, cc, bcc addresses.
+ populateAddresses(mailContext, email);
+
+ //If there are attachments, add them to the email.
+ if(urlAttachments!=null&&!urlAttachments.isEmpty())
+ {
+ populateUrlAttachments((MultiPartEmail)email);
+ }
+
+ //Set subject and message.
+ email.setSubject(subject);
+ email.setMsg(text);
+
+ Collection<Email> emails = new HashSet<Email>();
+ emails.add(email);
+
+ return emails;
+ }
+
+ protected void populateAddresses(MailContext mailContext, Email email) throws EmailException
+ {
+ //Add the addresses.
+ if(mailContext.getToAddresses()!=null)
+ {
+ for(String a : mailContext.getToAddresses())
+ {
+ email.addTo(a);
+ }
+ }
+ if(mailContext.getCcAddresses()!=null)
+ {
+ for(String a : mailContext.getCcAddresses())
+ {
+ email.addCc(a);
+ }
+ }
+ if(mailContext.getBccAddresses()!=null)
+ {
+ for(String a : mailContext.getBccAddresses())
+ {
+ email.addBcc(a);
+ }
+ }
+
+ //Get address resolver.
+ AddressResolver resolver = Environment.getFromCurrent(AddressResolver.class);;
+
+ //Resolve actors and groups.
+ if(mailContext.getActors()!=null)
+ {
+ for(User user : mailContext.getActors())
+ {
+ InternetAddress address = resolver.resolveUserAddress(user);
+ email.addTo(address.getAddress(), this.constructName(user));
+ }
+ }
+ if(mailContext.getGroups()!=null)
+ {
+ for(Group group : mailContext.getGroups())
+ {
+ Collection<InternetAddress> addresses = resolver.resolveGroupAddresses(group);
+ for(InternetAddress address : addresses)
+ {
+ email.addTo(address.getAddress());
+ }
+ }
+ }
+ }
+
+ protected String constructName(User user)
+ {
+ String name = null;
+ if(user.getGivenName()!=null&&user.getGivenName().length()>0)
+ {
+ name = user.getGivenName();
+ }
+ if(user.getFamilyName()!=null&&user.getFamilyName().length()>0)
+ {
+ if(name==null)
+ {
+ name = user.getFamilyName();
+ }
+ else
+ {
+ name += " "+user.getFamilyName();
+ }
+ }
+
+ return name;
+ }
+
+ protected void populateUrlAttachments(MultiPartEmail email) throws Exception
+ {
+ if(urlAttachments!=null&&!urlAttachments.isEmpty())
+ {
+ for(String urlKey : urlAttachments.keySet())
+ {
+ URL url = new URL(urlAttachments.get(urlKey));
+ ((MultiPartEmail)email).attach(url,urlKey,urlKey);
+ }
+ }
+ }
+
+
+ public void setText(String text) {
+ this.text = text;
+ }
+
+ public void setSubject(String subject) {
+ this.subject = subject;
+ }
+
+ public void setUrlAttachments(Map<String, String> urlAttachments) {
+ this.urlAttachments = urlAttachments;
+ }
+}
Deleted: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/producer/impl/TemplateMailProducer.java
===================================================================
--- jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/producer/impl/TemplateMailProducer.java 2009-04-16 21:39:27 UTC (rev 4572)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/producer/impl/TemplateMailProducer.java 2009-04-16 22:39:50 UTC (rev 4573)
@@ -1,25 +0,0 @@
-package org.jbpm.pvm.internal.email.producer.impl;
-
-import java.util.Collection;
-
-import org.apache.commons.mail.Email;
-import org.jbpm.Execution;
-import org.jbpm.pvm.internal.email.producer.MailContext;
-import org.jbpm.pvm.internal.email.producer.MailProducer;
-
-public class TemplateMailProducer implements MailProducer {
-
- protected String templateName;
-
- public Collection<Email> produce(Execution exe, MailContext mailContext) throws Exception {
- //Find out which producer is being used in the template.
- MailProducer templatedProducer = readTemplate(templateName);
-
- return templatedProducer.produce(exe, mailContext);
- }
-
- protected MailProducer readTemplate(String templateName)
- {
- return null; //Actually do the reading and create the appropriate producer.
- }
-}
Copied: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/producer/impl/TemplateMailProducer.java (from rev 4572, jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/producer/impl/TemplateMailProducer.java)
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/producer/impl/TemplateMailProducer.java (rev 0)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/producer/impl/TemplateMailProducer.java 2009-04-16 22:39:50 UTC (rev 4573)
@@ -0,0 +1,25 @@
+package org.jbpm.pvm.internal.email.producer.impl;
+
+import java.util.Collection;
+
+import org.apache.commons.mail.Email;
+import org.jbpm.api.Execution;
+import org.jbpm.pvm.internal.email.producer.MailContext;
+import org.jbpm.pvm.internal.email.producer.MailProducer;
+
+public class TemplateMailProducer implements MailProducer {
+
+ protected String templateName;
+
+ public Collection<Email> produce(Execution exe, MailContext mailContext) throws Exception {
+ //Find out which producer is being used in the template.
+ MailProducer templatedProducer = readTemplate(templateName);
+
+ return templatedProducer.produce(exe, mailContext);
+ }
+
+ protected MailProducer readTemplate(String templateName)
+ {
+ return null; //Actually do the reading and create the appropriate producer.
+ }
+}
Copied: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/resolver (from rev 4572, jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/resolver)
Deleted: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/resolver/AddressResolver.java
===================================================================
--- jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/resolver/AddressResolver.java 2009-04-16 21:39:27 UTC (rev 4572)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/resolver/AddressResolver.java 2009-04-16 22:39:50 UTC (rev 4573)
@@ -1,15 +0,0 @@
-package org.jbpm.pvm.internal.email.resolver;
-
-import java.util.Collection;
-
-import javax.mail.internet.InternetAddress;
-
-import org.jbpm.identity.Group;
-import org.jbpm.identity.User;
-
-public interface AddressResolver {
-
- public InternetAddress resolveUserAddress(User user);
- public Collection<InternetAddress> resolveGroupAddresses(Group group);
-
-}
Copied: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/resolver/AddressResolver.java (from rev 4572, jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/resolver/AddressResolver.java)
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/resolver/AddressResolver.java (rev 0)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/resolver/AddressResolver.java 2009-04-16 22:39:50 UTC (rev 4573)
@@ -0,0 +1,15 @@
+package org.jbpm.pvm.internal.email.resolver;
+
+import java.util.Collection;
+
+import javax.mail.internet.InternetAddress;
+
+import org.jbpm.api.identity.Group;
+import org.jbpm.api.identity.User;
+
+public interface AddressResolver {
+
+ public InternetAddress resolveUserAddress(User user);
+ public Collection<InternetAddress> resolveGroupAddresses(Group group);
+
+}
Deleted: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/resolver/IdentityAddressResolver.java
===================================================================
--- jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/resolver/IdentityAddressResolver.java 2009-04-16 21:39:27 UTC (rev 4572)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/resolver/IdentityAddressResolver.java 2009-04-16 22:39:50 UTC (rev 4573)
@@ -1,31 +0,0 @@
-package org.jbpm.pvm.internal.email.resolver;
-
-import java.util.Collection;
-import java.util.HashSet;
-
-import javax.mail.internet.InternetAddress;
-
-import org.jbpm.identity.Group;
-import org.jbpm.identity.User;
-
-public class IdentityAddressResolver implements AddressResolver {
-
- public Collection<InternetAddress> resolveGroupAddresses(Group group) {
- Collection<InternetAddress> addresses = new HashSet<InternetAddress>();
-
- org.jbpm.pvm.internal.identity.spi.IdentitySession session = null;
- //TODO: Optimize this, or it could be a N+1 select.
- Collection<User> users = session.findUsersByGroup(group.getId());
- for(User u : users)
- {
- addresses.add(resolveUserAddress(u));
- }
- return addresses;
- }
-
- public InternetAddress resolveUserAddress(User user) {
- // TODO Auto-generated method stub
- return null;
- }
-
-}
Copied: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/resolver/IdentityAddressResolver.java (from rev 4572, jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/resolver/IdentityAddressResolver.java)
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/resolver/IdentityAddressResolver.java (rev 0)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/resolver/IdentityAddressResolver.java 2009-04-16 22:39:50 UTC (rev 4573)
@@ -0,0 +1,31 @@
+package org.jbpm.pvm.internal.email.resolver;
+
+import java.util.Collection;
+import java.util.HashSet;
+
+import javax.mail.internet.InternetAddress;
+
+import org.jbpm.api.identity.Group;
+import org.jbpm.api.identity.User;
+
+public class IdentityAddressResolver implements AddressResolver {
+
+ public Collection<InternetAddress> resolveGroupAddresses(Group group) {
+ Collection<InternetAddress> addresses = new HashSet<InternetAddress>();
+
+ org.jbpm.pvm.internal.identity.spi.IdentitySession session = null;
+ //TODO: Optimize this, or it could be a N+1 select.
+ Collection<User> users = session.findUsersByGroup(group.getId());
+ for(User u : users)
+ {
+ addresses.add(resolveUserAddress(u));
+ }
+ return addresses;
+ }
+
+ public InternetAddress resolveUserAddress(User user) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+}
Copied: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/spi (from rev 4572, jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/spi)
Deleted: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/spi/MailProducer.java
===================================================================
--- jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/spi/MailProducer.java 2009-04-16 21:39:27 UTC (rev 4572)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/spi/MailProducer.java 2009-04-16 22:39:50 UTC (rev 4573)
@@ -1,39 +0,0 @@
-/*
- * 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.email.spi;
-
-import java.util.Collection;
-
-import org.apache.commons.mail.Email;
-import org.jbpm.model.OpenExecution;
-
-/**
- * Pluggable control object for creating emails from templates.
- *
- * @author Brad Davis
- * @author Alejandro Guizar
- */
-public interface MailProducer {
-
- Collection<Email> produce(OpenExecution execution);
-
-}
Copied: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/spi/MailProducer.java (from rev 4572, jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/spi/MailProducer.java)
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/spi/MailProducer.java (rev 0)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/spi/MailProducer.java 2009-04-16 22:39:50 UTC (rev 4573)
@@ -0,0 +1,39 @@
+/*
+ * 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.email.spi;
+
+import java.util.Collection;
+
+import org.apache.commons.mail.Email;
+import org.jbpm.api.model.OpenExecution;
+
+/**
+ * Pluggable control object for creating emails from templates.
+ *
+ * @author Brad Davis
+ * @author Alejandro Guizar
+ */
+public interface MailProducer {
+
+ Collection<Email> produce(OpenExecution execution);
+
+}
Deleted: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/spi/MailSession.java
===================================================================
--- jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/spi/MailSession.java 2009-04-16 21:39:27 UTC (rev 4572)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/spi/MailSession.java 2009-04-16 22:39:50 UTC (rev 4573)
@@ -1,16 +0,0 @@
-package org.jbpm.pvm.internal.email.spi;
-
-import java.util.Collection;
-
-import org.apache.commons.mail.Email;
-
-/**
- * Pluggable control object for sending emails.
- *
- * @author Brad Davis
- */
-public interface MailSession {
-
- void send(Collection<Email> emails);
-
-}
Copied: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/spi/MailSession.java (from rev 4572, jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/spi/MailSession.java)
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/spi/MailSession.java (rev 0)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/spi/MailSession.java 2009-04-16 22:39:50 UTC (rev 4573)
@@ -0,0 +1,16 @@
+package org.jbpm.pvm.internal.email.spi;
+
+import java.util.Collection;
+
+import org.apache.commons.mail.Email;
+
+/**
+ * Pluggable control object for sending emails.
+ *
+ * @author Brad Davis
+ */
+public interface MailSession {
+
+ void send(Collection<Email> emails);
+
+}
Deleted: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/spi/RecipientNameBuilder.java
===================================================================
--- jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/spi/RecipientNameBuilder.java 2009-04-16 21:39:27 UTC (rev 4572)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/spi/RecipientNameBuilder.java 2009-04-16 22:39:50 UTC (rev 4573)
@@ -1,40 +0,0 @@
-/*
- * 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.email.spi;
-
-import org.jbpm.identity.User;
-
-/**
- * Function to create email recipient names from {@linkplain User user} entities. The following two
- * strategies are representative.
- * <ul>
- * <li>Albert Einstein (given name + ' ' + family name)</li>
- * <li>Einstein, Albert (family name + ", " + given name)</li>
- * </ul>
- *
- * @author Alejandro Guizar
- */
-public interface RecipientNameBuilder {
-
- String buildName(User user);
-
-}
Copied: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/spi/RecipientNameBuilder.java (from rev 4572, jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/spi/RecipientNameBuilder.java)
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/spi/RecipientNameBuilder.java (rev 0)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/spi/RecipientNameBuilder.java 2009-04-16 22:39:50 UTC (rev 4573)
@@ -0,0 +1,40 @@
+/*
+ * 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.email.spi;
+
+import org.jbpm.api.identity.User;
+
+/**
+ * Function to create email recipient names from {@linkplain User user} entities. The following two
+ * strategies are representative.
+ * <ul>
+ * <li>Albert Einstein (given name + ' ' + family name)</li>
+ * <li>Einstein, Albert (family name + ", " + given name)</li>
+ * </ul>
+ *
+ * @author Alejandro Guizar
+ */
+public interface RecipientNameBuilder {
+
+ String buildName(User user);
+
+}
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/IdentitySessionImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/IdentitySessionImpl.java 2009-04-16 21:39:27 UTC (rev 4572)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/IdentitySessionImpl.java 2009-04-16 22:39:50 UTC (rev 4573)
@@ -21,6 +21,7 @@
*/
package org.jbpm.pvm.internal.identity.impl;
+import java.util.Collection;
import java.util.List;
import org.hibernate.Query;
@@ -86,6 +87,12 @@
return group.getId();
}
+
+ public Collection<User> findUsersByGroup(String groupId) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
public GroupImpl findGroupById(String groupId) {
GroupImpl group = (GroupImpl) session.createQuery(
"select group " +
@@ -151,4 +158,5 @@
this.session = session;
}
+
}
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/JBossIdmIdentitySessionImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/JBossIdmIdentitySessionImpl.java 2009-04-16 21:39:27 UTC (rev 4572)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/JBossIdmIdentitySessionImpl.java 2009-04-16 22:39:50 UTC (rev 4573)
@@ -80,7 +80,13 @@
throw new RuntimeException("Not yet implemented");
// TODO: create and return user
}
+
+ public Collection<User> findUsersByGroup(String groupId) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
public List<User> findUsers() {
try {
Collection<Identity> identities = identitySession
@@ -306,4 +312,5 @@
}
+
}
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/UserImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/UserImpl.java 2009-04-16 21:39:27 UTC (rev 4572)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/UserImpl.java 2009-04-16 22:39:50 UTC (rev 4573)
@@ -37,9 +37,10 @@
protected int dbversion;
protected String id;
- protected String password;
protected String givenName;
protected String familyName;
+ protected String emailAddress;
+ protected String password;
public UserImpl() {
}
@@ -59,8 +60,11 @@
public String getFamilyName() {
return familyName;
}
-
- public String toString() {
+ public String getEmailAddress() {
+ return emailAddress;
+ }
+
+ public String toString() {
if ( (givenName!=null)
&& (familyName!=null)
) {
@@ -78,7 +82,10 @@
public void setFamilyName(String familyName) {
this.familyName = familyName;
}
- public String getPassword() {
+ public void setEmailAddress(String emailAddress) {
+ this.emailAddress = emailAddress;
+ }
+ public String getPassword() {
return password;
}
public void setPassword(String password) {
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/spi/IdentitySession.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/spi/IdentitySession.java 2009-04-16 21:39:27 UTC (rev 4572)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/spi/IdentitySession.java 2009-04-16 22:39:50 UTC (rev 4573)
@@ -21,6 +21,7 @@
*/
package org.jbpm.pvm.internal.identity.spi;
+import java.util.Collection;
import java.util.List;
import org.jbpm.api.identity.Group;
@@ -30,7 +31,7 @@
/**
* @author Tom Baeyens
*/
-public interface IdentitySession {
+public interface IdentitySession{
/** create a new user */
String createUser(String userId, String password, String givenName, String familyName);
@@ -51,6 +52,11 @@
* @return the generated id for this group. */
String createGroup(String groupName, String groupType, String parentGroupId);
+ /**
+ * lookup users with membership in group.
+ * @return the users or null if no users exist */
+ Collection<User> findUsersByGroup(String groupId);
+
/** lookup a group.
* @return the user or null if no such user exists */
Group findGroupById(String groupId);
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/XmlUtil.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/XmlUtil.java 2009-04-16 21:39:27 UTC (rev 4572)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/XmlUtil.java 2009-04-16 22:39:50 UTC (rev 4573)
@@ -21,7 +21,6 @@
*/
package org.jbpm.pvm.internal.util;
-import java.io.PrintWriter;
import java.io.StringWriter;
import java.util.ArrayList;
import java.util.Collections;
@@ -34,8 +33,6 @@
import org.jbpm.pvm.internal.xml.Parse;
import javax.xml.namespace.QName;
-import javax.xml.transform.Result;
-import javax.xml.transform.Source;
import javax.xml.transform.Transformer;
import javax.xml.transform.TransformerFactory;
import javax.xml.transform.dom.DOMSource;
@@ -225,23 +222,15 @@
return "null";
}
- Source source = new DOMSource(element);
-
StringWriter stringWriter = new StringWriter();
- PrintWriter printWriter = new PrintWriter(stringWriter);
- Result result = new StreamResult(printWriter);
-
try {
TransformerFactory transformerFactory = TransformerFactory.newInstance();
Transformer transformer = transformerFactory.newTransformer();
- transformer.transform(source, result);
+ transformer.transform(new DOMSource(element), new StreamResult(stringWriter));
} catch (Exception e) {
log.error("couldn't transform dom element into string representation");
return "<" + element.getTagName() + " ... >...</" + element.getTagName() + ">";
}
-
- printWriter.close();
-
return stringWriter.toString();
}
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/WireContext.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/WireContext.java 2009-04-16 21:39:27 UTC (rev 4572)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/WireContext.java 2009-04-16 22:39:50 UTC (rev 4573)
@@ -703,7 +703,7 @@
if (wireDefinition!=null) {
String name = wireDefinition.getDescriptorName(type);
if (name!=null) {
- return (T) get(name);
+ return type.cast(get(name));
}
}
return null;
Copied: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/MailSessionBinding.java (from rev 4572, jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/MailSessionBinding.java)
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/MailSessionBinding.java (rev 0)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/MailSessionBinding.java 2009-04-16 22:39:50 UTC (rev 4573)
@@ -0,0 +1,137 @@
+/*
+ * 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.wire.binding;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.jbpm.pvm.internal.email.impl.MailServer;
+import org.jbpm.pvm.internal.email.impl.MailSessionImpl;
+import org.jbpm.pvm.internal.email.impl.AddressFilter;
+import org.jbpm.pvm.internal.email.spi.MailSession;
+import org.jbpm.pvm.internal.util.XmlUtil;
+import org.jbpm.pvm.internal.wire.Descriptor;
+import org.jbpm.pvm.internal.wire.descriptor.ListDescriptor;
+import org.jbpm.pvm.internal.wire.descriptor.ObjectDescriptor;
+import org.jbpm.pvm.internal.wire.descriptor.PatternDescriptor;
+import org.jbpm.pvm.internal.xml.Parse;
+import org.jbpm.pvm.internal.xml.Parser;
+import org.w3c.dom.Element;
+
+/**
+ * Parses a descriptor for creating a {@link MailSession}.
+ *
+ * @author Alejandro Guizar
+ */
+public class MailSessionBinding extends WireDescriptorBinding {
+
+ private static final PropertiesBinding propertiesBinding = new PropertiesBinding();
+ private static final ObjectBinding objectBinding = new ObjectBinding();
+
+ public MailSessionBinding() {
+ super("mail-session");
+ }
+
+ public Object parse(Element element, Parse parse, Parser parser) {
+ // mail servers
+ List<Descriptor> serverDescriptors = new ArrayList<Descriptor>();
+ for (Element serverElement : XmlUtil.elements(element, "mail-server")) {
+ // mail server
+ ObjectDescriptor serverDescriptor = new ObjectDescriptor(MailServer.class);
+ serverDescriptors.add(serverDescriptor);
+
+ // address filter
+ Element filterElement = XmlUtil.element(serverElement, "address-filter");
+ if (filterElement != null) {
+ // includes
+ List<Descriptor> includeDescriptors = new ArrayList<Descriptor>();
+ for (Element includeElement : XmlUtil.elements(filterElement, "include")) {
+ includeDescriptors.add(parsePattern(includeElement, parse, parser));
+ }
+ ListDescriptor includesDescriptor = new ListDescriptor();
+ includesDescriptor.setValueDescriptors(includeDescriptors);
+
+ // excludes
+ List<Descriptor> excludeDescriptors = new ArrayList<Descriptor>();
+ for (Element excludeElement : XmlUtil.elements(filterElement, "exclude")) {
+ excludeDescriptors.add(parsePattern(excludeElement, parse, parser));
+ }
+ ListDescriptor excludesDescriptor = new ListDescriptor();
+ excludesDescriptor.setValueDescriptors(excludeDescriptors);
+
+ // address filter
+ ObjectDescriptor filterDescriptor = new ObjectDescriptor(AddressFilter.class);
+ filterDescriptor.addInjection("includePatterns", includesDescriptor);
+ filterDescriptor.addInjection("excludePatterns", excludesDescriptor);
+
+ serverDescriptor.addInjection("addressFilter", filterDescriptor);
+ }
+
+ // mail session properties
+ Element propertiesElement = XmlUtil.element(serverElement, "session-properties");
+ if (propertiesElement != null) {
+ Descriptor propertiesDescriptor =
+ (Descriptor) propertiesBinding.parse(propertiesElement, parse, parser);
+ serverDescriptor.addInjection("sessionProperties", propertiesDescriptor);
+ }
+ else {
+ parse.addProblem("missing mail session properties");
+ }
+
+ // authenticator
+ Element authenticatorElement = XmlUtil.element(serverElement, "authenticator");
+ if (authenticatorElement != null) {
+ Descriptor authenticatorDescriptor =
+ (Descriptor) objectBinding.parse(authenticatorElement, parse, parser);
+ serverDescriptor.addInjection("authenticator", authenticatorDescriptor);
+ }
+ }
+
+ // mail servers
+ ListDescriptor serversDescriptor = new ListDescriptor();
+ serversDescriptor.setValueDescriptors(serverDescriptors);
+
+ // mail session
+ ObjectDescriptor sessionDescriptor = new ObjectDescriptor(MailSessionImpl.class);
+ sessionDescriptor.addInjection("mailServers", serversDescriptor);
+ return sessionDescriptor;
+ }
+
+ protected Descriptor parsePattern(Element patternElement, Parse parse, Parser parser) {
+ PatternDescriptor patternDescriptor =
+ new PatternDescriptor(XmlUtil.getContentText(patternElement));
+ // literal
+ String literalAttr = XmlUtil.attribute(patternElement, "literal");
+ if (literalAttr != null) {
+ Boolean literal = XmlUtil.parseBooleanValue(literalAttr);
+ if (literal != null) patternDescriptor.setLiteral(literal);
+ }
+ // canonEq
+ String canonEqAttr = XmlUtil.attribute(patternElement, "canonEq");
+ if (canonEqAttr != null) {
+ Boolean canonEq = XmlUtil.parseBooleanValue(canonEqAttr);
+ if (canonEq != null) patternDescriptor.setCanonEq(canonEq);
+ }
+ return patternDescriptor;
+ }
+
+}
Copied: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/MailTemplateBinding.java (from rev 4572, jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/MailTemplateBinding.java)
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/MailTemplateBinding.java (rev 0)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/MailTemplateBinding.java 2009-04-16 22:39:50 UTC (rev 4573)
@@ -0,0 +1,153 @@
+/*
+ * 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.wire.binding;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.jbpm.pvm.internal.email.impl.AttachmentTemplate;
+import org.jbpm.pvm.internal.email.impl.MailTemplate;
+import org.jbpm.pvm.internal.email.impl.RecipientTemplate;
+import org.jbpm.pvm.internal.util.XmlUtil;
+import org.jbpm.pvm.internal.wire.Descriptor;
+import org.jbpm.pvm.internal.wire.descriptor.ListDescriptor;
+import org.jbpm.pvm.internal.wire.descriptor.ObjectDescriptor;
+import org.jbpm.pvm.internal.wire.descriptor.StringDescriptor;
+import org.jbpm.pvm.internal.wire.operation.PropertyOperation;
+import org.jbpm.pvm.internal.xml.Parse;
+import org.jbpm.pvm.internal.xml.Parser;
+import org.w3c.dom.Element;
+
+/**
+ * @author Alejandro Guizar
+ */
+public class MailTemplateBinding extends WireDescriptorBinding {
+
+ public MailTemplateBinding() {
+ super("mail-template");
+ }
+
+ public Object parse(Element element, Parse parse, Parser parser) {
+ ObjectDescriptor templateDescriptor = new ObjectDescriptor(MailTemplate.class);
+ // name
+ String name = element.getAttribute("name");
+ if (name != null) {
+ templateDescriptor.addInjection("name", new StringDescriptor(name));
+ }
+ else {
+ parse.addProblem("template has no name");
+ }
+ // language
+ String language = XmlUtil.attribute(element, "language");
+ if (language != null) {
+ templateDescriptor.addInjection("language", new StringDescriptor(language));
+ }
+ // to
+ Element toElement = XmlUtil.element(element, "to");
+ if (toElement != null) {
+ Descriptor toDescriptor = parseRecipientTemplate(toElement, parse, parser);
+ addPropertyInjection(templateDescriptor, "to", toDescriptor);
+ }
+ else {
+ parse.addProblem("template '" + name + "' has no 'to' recipients");
+ }
+ // cc
+ Element ccElement = XmlUtil.element(element, "cc");
+ if (ccElement != null) {
+ Descriptor ccDescriptor = parseRecipientTemplate(ccElement, parse, parser);
+ addPropertyInjection(templateDescriptor, "cc", ccDescriptor);
+ }
+ // bcc
+ Element bccElement = XmlUtil.element(element, "bcc");
+ if (bccElement != null) {
+ Descriptor bccDescriptor = parseRecipientTemplate(bccElement, parse, parser);
+ addPropertyInjection(templateDescriptor, "bcc", bccDescriptor);
+ }
+ // subject
+ Element subjectElement = XmlUtil.element(element, "subject");
+ if (subjectElement != null) {
+ StringDescriptor subjectDescriptor =
+ new StringDescriptor(XmlUtil.getContentText(subjectElement));
+ templateDescriptor.addInjection("subject", subjectDescriptor);
+ }
+ else {
+ parse.addProblem("template '" + name + "' has no subject");
+ }
+ // text
+ Element textElement = XmlUtil.element(element, "text");
+ if (textElement != null) {
+ StringDescriptor textDescriptor = new StringDescriptor(XmlUtil.getContentText(textElement));
+ templateDescriptor.addInjection("text", textDescriptor);
+ }
+ // html
+ Element htmlElement = XmlUtil.element(element, "html");
+ if (htmlElement != null) {
+ StringDescriptor htmlDescriptor = new StringDescriptor(XmlUtil.toString(htmlElement));
+ templateDescriptor.addInjection("html", htmlDescriptor);
+ }
+ // attachments
+ Element attachmentsElement = XmlUtil.element(element, "attachments");
+ if (attachmentsElement != null) {
+ List<Descriptor> attachmentDescriptors = new ArrayList<Descriptor>();
+ for (Element attachmentElement : XmlUtil.elements(attachmentsElement, "attachment")) {
+ ObjectDescriptor attachmentDescriptor = new ObjectDescriptor(AttachmentTemplate.class);
+ attachmentDescriptors.add(attachmentDescriptor);
+ // url
+ String url = XmlUtil.attribute(attachmentElement, "url");
+ if (url != null) attachmentDescriptor.addInjection("url", new StringDescriptor(url));
+ // resource
+ String resource = XmlUtil.attribute(attachmentElement, "resource");
+ if (resource != null)
+ attachmentDescriptor.addInjection("resource", new StringDescriptor(resource));
+ // file
+ String file = XmlUtil.attribute(attachmentElement, "file");
+ if (file != null) attachmentDescriptor.addInjection("file", new StringDescriptor(file));
+ }
+
+ ListDescriptor attachmentsDescriptor = new ListDescriptor();
+ attachmentsDescriptor.setValueDescriptors(attachmentDescriptors);
+ templateDescriptor.addInjection("attachmentTemplates", attachmentsDescriptor);
+ }
+ return templateDescriptor;
+ }
+
+ private static void addPropertyInjection(ObjectDescriptor objectDescriptor, String propertyName,
+ Descriptor valueDescriptor) {
+ PropertyOperation operation = new PropertyOperation();
+ operation.setPropertyName(propertyName);
+ operation.setDescriptor(valueDescriptor);
+ objectDescriptor.addOperation(operation);
+ }
+
+ protected Descriptor parseRecipientTemplate(Element element, Parse parse, Parser parser) {
+ ObjectDescriptor recipientDescriptor = new ObjectDescriptor(RecipientTemplate.class);
+
+ String addresses = XmlUtil.attribute(element, "addresses");
+ if (addresses != null) recipientDescriptor.addInjection("addresses", new StringDescriptor(addresses));
+
+ String actors = XmlUtil.attribute(element, "actors");
+ if (actors != null) recipientDescriptor.addInjection("actors", new StringDescriptor(actors));
+
+ return recipientDescriptor;
+ }
+
+}
Copied: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/PatternDescriptor.java (from rev 4572, jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/PatternDescriptor.java)
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/PatternDescriptor.java (rev 0)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/PatternDescriptor.java 2009-04-16 22:39:50 UTC (rev 4573)
@@ -0,0 +1,69 @@
+/*
+ * 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.wire.descriptor;
+
+import java.util.regex.Pattern;
+
+import org.jbpm.pvm.internal.wire.WireContext;
+
+/**
+ * @author Alejandro Guizar
+ */
+public class PatternDescriptor extends AbstractDescriptor {
+
+ private static final long serialVersionUID = 1L;
+
+ protected String regex;
+ protected boolean literal;
+ protected boolean canonEq;
+
+ public PatternDescriptor() {
+ }
+
+ public PatternDescriptor(String regex) {
+ this.regex = regex;
+ }
+
+ public boolean isLiteral() {
+ return literal;
+ }
+
+ public void setLiteral(boolean literal) {
+ this.literal = literal;
+ }
+
+ public boolean isCanonEq() {
+ return canonEq;
+ }
+
+ public void setCanonEq(boolean canonEq) {
+ this.canonEq = canonEq;
+ }
+
+ public Object construct(WireContext wireContext) {
+ int flags = 0;
+ if (literal) flags |= Pattern.LITERAL;
+ if (canonEq) flags |= Pattern.CANON_EQ;
+ return Pattern.compile(regex, flags);
+ }
+
+}
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/DomBuilder.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/DomBuilder.java 2009-04-16 21:39:27 UTC (rev 4572)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/DomBuilder.java 2009-04-16 22:39:50 UTC (rev 4573)
@@ -29,6 +29,7 @@
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.Text;
+import org.w3c.dom.UserDataHandler;
import org.xml.sax.Attributes;
import org.xml.sax.ContentHandler;
import org.xml.sax.Locator;
@@ -41,7 +42,6 @@
public Document document;
- protected String debugNamespace = null;
protected String lineAttributeName = "line";
protected String columnAttributeName = null;
@@ -315,23 +315,12 @@
int lineNumber = locator.getLineNumber();
int columnNumber = locator.getColumnNumber();
- if (debugNamespace==null) {
- if (lineAttributeName!=null) {
- elem.setAttribute(lineAttributeName, Integer.toString(lineNumber));
- }
- if (columnAttributeName!=null) {
- elem.setAttribute(columnAttributeName, Integer.toString(columnNumber));
- }
-
- } else {
- if (lineAttributeName!=null) {
- elem.setAttributeNS(debugNamespace, lineAttributeName, Integer.toString(lineNumber));
- }
- if (columnAttributeName!=null) {
- elem.setAttributeNS(debugNamespace, columnAttributeName, Integer.toString(columnNumber));
- }
-
+ if (lineAttributeName!=null) {
+ elem.setUserData(lineAttributeName, lineNumber, null);
}
+ if (columnAttributeName!=null) {
+ elem.setUserData(columnAttributeName, columnNumber, null);
+ }
}
@@ -824,18 +813,12 @@
return true;
}
- public void setDebugNamespace(String debugNamespace) {
- this.debugNamespace = debugNamespace;
- }
public void setLineAttributeName(String lineAttributeName) {
this.lineAttributeName = lineAttributeName;
}
public void setColumnAttributeName(String columnAttributeName) {
this.columnAttributeName = columnAttributeName;
}
- public String getDebugNamespace() {
- return debugNamespace;
- }
public String getLineAttributeName() {
return lineAttributeName;
}
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/Parse.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/Parse.java 2009-04-16 21:39:27 UTC (rev 4572)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/Parse.java 2009-04-16 22:39:50 UTC (rev 4573)
@@ -24,15 +24,12 @@
import java.io.File;
import java.io.InputStream;
-import java.io.Serializable;
import java.net.URL;
import java.util.ListIterator;
import java.util.Stack;
import javax.xml.parsers.DocumentBuilder;
-import org.jbpm.api.JbpmException;
-import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.stream.FileStreamInput;
import org.jbpm.pvm.internal.stream.InputStreamInput;
import org.jbpm.pvm.internal.stream.ResourceStreamInput;
@@ -49,9 +46,8 @@
*
* @author Tom Baeyens
*/
-public class Parse extends ProblemList implements Serializable, ErrorHandler {
+public class Parse extends ProblemList implements ErrorHandler {
- private static Log log = Log.getLog(Parse.class.getName());
private static final long serialVersionUID = 1L;
protected Parser parser;
@@ -190,9 +186,7 @@
* 'warning'. */
public Parse checkProblems(String description) {
if (hasProblems()) {
- JbpmException jbpmException = getJbpmException();
- log.info("problems during parse of "+description+": "+jbpmException.getMessage());
- throw jbpmException;
+ throw getJbpmException();
}
return this;
}
@@ -232,13 +226,10 @@
ListIterator<Object> listIter = objectStack.listIterator(objectStack.size());
while (listIter.hasPrevious()) {
Object object = listIter.previous();
- if (object!=null) {
- if (clazz.isAssignableFrom(object.getClass())) {
- return (T) object;
- }
+ if (clazz.isInstance(object)) {
+ return clazz.cast(object);
}
}
- return null;
}
return null;
}
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/Parser.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/Parser.java 2009-04-16 21:39:27 UTC (rev 4572)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/Parser.java 2009-04-16 22:39:50 UTC (rev 4573)
@@ -394,6 +394,7 @@
parseDocument(parse.document, parse);
} catch (Exception e) {
+ e.printStackTrace();
parse.addProblem("couldn't interpret the dom model: "+e.getMessage(), e);
}
}
@@ -437,7 +438,7 @@
}
DocumentBuilder documentBuilder = createDocumentBuilder(parse);
- document = documentBuilder.newDocument();
+ document = documentBuilder.getDOMImplementation().createDocument(null, null, null);
parse.setDocument(document);
DomBuilder domBuilder = new DomBuilder();
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/ProblemList.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/ProblemList.java 2009-04-16 21:39:27 UTC (rev 4572)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/ProblemList.java 2009-04-16 22:39:50 UTC (rev 4573)
@@ -28,10 +28,8 @@
import org.jbpm.api.JbpmException;
import org.jbpm.api.Problem;
-import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.repository.DeploymentImpl;
-
/** list of problems. Base class for {@link Parse}
* and {@link DeploymentImpl}.
*
@@ -41,16 +39,14 @@
private static final long serialVersionUID = 1L;
- private static final String NEWLINE = System.getProperty("line.separator");
+ static final String NEWLINE = System.getProperty("line.separator");
- private static final Log log = Log.getLog(ProblemList.class.getName());
-
protected List<ProblemImpl> problems;
/** all problems encountered */
public List<Problem> getProblems() {
if (problems==null) {
- return Collections.EMPTY_LIST;
+ return Collections.emptyList();
}
return (List) problems;
}
Copied: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/email (from rev 4572, jbpm4/branches/email/modules/pvm/src/test/java/org/jbpm/pvm/internal/email)
Copied: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/email/impl (from rev 4572, jbpm4/branches/email/modules/pvm/src/test/java/org/jbpm/pvm/internal/email/impl)
Deleted: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/email/impl/AddressFilterTest.java
===================================================================
--- jbpm4/branches/email/modules/pvm/src/test/java/org/jbpm/pvm/internal/email/impl/AddressFilterTest.java 2009-04-16 21:39:27 UTC (rev 4572)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/email/impl/AddressFilterTest.java 2009-04-16 22:39:50 UTC (rev 4573)
@@ -1,90 +0,0 @@
-package org.jbpm.pvm.internal.email.impl;
-
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.regex.Pattern;
-
-import javax.mail.internet.InternetAddress;
-
-import junit.framework.TestCase;
-
-public class AddressFilterTest extends TestCase{
-
- /**
- * When no filter is provided, all addresses should be contained in the filtered list.
- */
- public void testWildCardIncludesNoFilters() throws Exception
- {
- AddressFilter filter = new AddressFilter();
-
- Collection<InternetAddress> addresses = new HashSet<InternetAddress>();
- addresses.add(new InternetAddress("test(a)jboss.org"));
-
- Collection<InternetAddress> filteredAddresses = filter.filter(addresses);
- assertTrue(filteredAddresses.contains(new InternetAddress("test(a)jboss.org")));
- }
-
- /**
- * If the includes is provided, no other addresses except those explicitly listed should
- * be included in the filtered list.
- */
- public void testWildCardIncludes() throws Exception
- {
- AddressFilter filter = new AddressFilter();
-
- Collection<InternetAddress> addresses = new HashSet<InternetAddress>();
- addresses.add(new InternetAddress("test(a)jboss.org"));
- addresses.add(new InternetAddress("test(a)amentra.com"));
-
- filter.addIncludePattern(Pattern.compile(".+(a)jboss.org"));
-
- Collection<InternetAddress> filteredAddresses = filter.filter(addresses);
- assertTrue(filteredAddresses.contains(new InternetAddress("test(a)jboss.org")));
- assertTrue(!filteredAddresses.contains(new InternetAddress("test(a)amentra.com")));
- }
-
- /**
- * The includes should always override the excludes.
- */
- public void testWildCardIncludesOverridesExcludes() throws Exception
- {
- AddressFilter filter = new AddressFilter();
-
- Collection<InternetAddress> addresses = new HashSet<InternetAddress>();
- addresses.add(new InternetAddress("test(a)jboss.org"));
- addresses.add(new InternetAddress("test(a)amentra.com"));
-
- filter.addIncludePattern(Pattern.compile(".+(a)jboss.org"));
- filter.addExcludePattern(Pattern.compile(".+(a)amentra.com"));
-
- Collection<InternetAddress> filteredAddresses = filter.filter(addresses);
- //Includes jboss
- assertTrue(filteredAddresses.contains(new InternetAddress("test(a)jboss.org")));
- //Does not include amentra.
- assertTrue(!filteredAddresses.contains(new InternetAddress("test(a)amentra.com")));
- }
-
- /**
- * When the excludes is specified but no includes, all addresses except those explicitly stated
- * should be contained in the filtered set.
- */
- public void testWildCardExcludes() throws Exception
- {
- AddressFilter filter = new AddressFilter();
-
- Collection<InternetAddress> addresses = new HashSet<InternetAddress>();
- addresses.add(new InternetAddress("test(a)jboss.org"));
- addresses.add(new InternetAddress("test(a)amentra.com"));
- addresses.add(new InternetAddress("test(a)redhat.com"));
-
- filter.addExcludePattern(Pattern.compile(".+(a)jboss.org"));
-
- Collection<InternetAddress> filteredAddresses = filter.filter(addresses);
- //Does not include jboss
- assertTrue(!filteredAddresses.contains(new InternetAddress("test(a)jboss.org")));
- //Does include amentra
- assertTrue(filteredAddresses.contains(new InternetAddress("test(a)amentra.com")));
- //Does include redhat
- assertTrue(filteredAddresses.contains(new InternetAddress("test(a)redhat.com")));
- }
-}
Copied: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/email/impl/AddressFilterTest.java (from rev 4572, jbpm4/branches/email/modules/pvm/src/test/java/org/jbpm/pvm/internal/email/impl/AddressFilterTest.java)
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/email/impl/AddressFilterTest.java (rev 0)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/email/impl/AddressFilterTest.java 2009-04-16 22:39:50 UTC (rev 4573)
@@ -0,0 +1,90 @@
+package org.jbpm.pvm.internal.email.impl;
+
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.regex.Pattern;
+
+import javax.mail.internet.InternetAddress;
+
+import junit.framework.TestCase;
+
+public class AddressFilterTest extends TestCase{
+
+ /**
+ * When no filter is provided, all addresses should be contained in the filtered list.
+ */
+ public void testWildCardIncludesNoFilters() throws Exception
+ {
+ AddressFilter filter = new AddressFilter();
+
+ Collection<InternetAddress> addresses = new HashSet<InternetAddress>();
+ addresses.add(new InternetAddress("test(a)jboss.org"));
+
+ Collection<InternetAddress> filteredAddresses = filter.filter(addresses);
+ assertTrue(filteredAddresses.contains(new InternetAddress("test(a)jboss.org")));
+ }
+
+ /**
+ * If the includes is provided, no other addresses except those explicitly listed should
+ * be included in the filtered list.
+ */
+ public void testWildCardIncludes() throws Exception
+ {
+ AddressFilter filter = new AddressFilter();
+
+ Collection<InternetAddress> addresses = new HashSet<InternetAddress>();
+ addresses.add(new InternetAddress("test(a)jboss.org"));
+ addresses.add(new InternetAddress("test(a)amentra.com"));
+
+ filter.addIncludePattern(Pattern.compile(".+(a)jboss.org"));
+
+ Collection<InternetAddress> filteredAddresses = filter.filter(addresses);
+ assertTrue(filteredAddresses.contains(new InternetAddress("test(a)jboss.org")));
+ assertTrue(!filteredAddresses.contains(new InternetAddress("test(a)amentra.com")));
+ }
+
+ /**
+ * The includes should always override the excludes.
+ */
+ public void testWildCardIncludesOverridesExcludes() throws Exception
+ {
+ AddressFilter filter = new AddressFilter();
+
+ Collection<InternetAddress> addresses = new HashSet<InternetAddress>();
+ addresses.add(new InternetAddress("test(a)jboss.org"));
+ addresses.add(new InternetAddress("test(a)amentra.com"));
+
+ filter.addIncludePattern(Pattern.compile(".+(a)jboss.org"));
+ filter.addExcludePattern(Pattern.compile(".+(a)amentra.com"));
+
+ Collection<InternetAddress> filteredAddresses = filter.filter(addresses);
+ //Includes jboss
+ assertTrue(filteredAddresses.contains(new InternetAddress("test(a)jboss.org")));
+ //Does not include amentra.
+ assertTrue(!filteredAddresses.contains(new InternetAddress("test(a)amentra.com")));
+ }
+
+ /**
+ * When the excludes is specified but no includes, all addresses except those explicitly stated
+ * should be contained in the filtered set.
+ */
+ public void testWildCardExcludes() throws Exception
+ {
+ AddressFilter filter = new AddressFilter();
+
+ Collection<InternetAddress> addresses = new HashSet<InternetAddress>();
+ addresses.add(new InternetAddress("test(a)jboss.org"));
+ addresses.add(new InternetAddress("test(a)amentra.com"));
+ addresses.add(new InternetAddress("test(a)redhat.com"));
+
+ filter.addExcludePattern(Pattern.compile(".+(a)jboss.org"));
+
+ Collection<InternetAddress> filteredAddresses = filter.filter(addresses);
+ //Does not include jboss
+ assertTrue(!filteredAddresses.contains(new InternetAddress("test(a)jboss.org")));
+ //Does include amentra
+ assertTrue(filteredAddresses.contains(new InternetAddress("test(a)amentra.com")));
+ //Does include redhat
+ assertTrue(filteredAddresses.contains(new InternetAddress("test(a)redhat.com")));
+ }
+}
Copied: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/MailSessionWireTest.java (from rev 4572, jbpm4/branches/email/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/MailSessionWireTest.java)
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/MailSessionWireTest.java (rev 0)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/MailSessionWireTest.java 2009-04-16 22:39:50 UTC (rev 4573)
@@ -0,0 +1,182 @@
+/*
+ * 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.wire;
+
+import java.util.List;
+import java.util.Properties;
+import java.util.regex.Pattern;
+
+import javax.mail.Authenticator;
+import javax.mail.PasswordAuthentication;
+
+import org.jbpm.api.JbpmException;
+import org.jbpm.pvm.internal.email.impl.AddressFilter;
+import org.jbpm.pvm.internal.email.impl.MailServer;
+import org.jbpm.pvm.internal.email.impl.MailSessionImpl;
+
+/**
+ * @author Alejandro Guizar
+ */
+public class MailSessionWireTest extends WireTestCase {
+
+ public void testSessionProperties() {
+ WireContext wireContext =
+ createWireContext("<objects>"
+ + " <mail-session>"
+ + " <mail-server>"
+ + " <session-properties>"
+ + " <property name='mail.host' value='localhost' />"
+ + " <property name='mail.user' value='aguizar' />"
+ + " <property name='mail.from' value='noreply(a)jbpm.org' />"
+ + " </session-properties>"
+ + " </mail-server>"
+ + " </mail-session>"
+ + "</objects>");
+
+ MailSessionImpl mailSession = wireContext.get(MailSessionImpl.class);
+ List<MailServer> mailServers = mailSession.getMailServers();
+ assertEquals(1, mailServers.size());
+
+ MailServer mailServer = mailServers.get(0);
+ Properties properties = mailServer.getSessionProperties();
+ assertEquals(3, properties.size());
+ assertEquals("localhost", properties.getProperty("mail.host"));
+ assertEquals("aguizar", properties.getProperty("mail.user"));
+ assertEquals("noreply(a)jbpm.org", properties.getProperty("mail.from"));
+ }
+
+ public void testNoSessionProperties() {
+ try {
+ createWireContext("<objects>"
+ + " <mail-session>"
+ + " <mail-server />"
+ + " </mail-session>"
+ + "</objects>");
+ fail("expected wire context creation to puke");
+ }
+ catch (JbpmException e) {
+ // session properties are mandatory
+ }
+ }
+
+ public static class MyAuthenticator extends Authenticator {
+ @Override
+ protected PasswordAuthentication getPasswordAuthentication() {
+ return new PasswordAuthentication("aguizar", "wontsay");
+ }
+ }
+
+ public void testAuthenticator() {
+ WireContext wireContext =
+ createWireContext("<objects>" +
+ " <mail-session>" +
+ " <mail-server>" +
+ " <session-properties />" +
+ " <authenticator class='" +
+ MyAuthenticator.class.getName() +
+ "' />" +
+ " </mail-server>" +
+ " </mail-session>" +
+ "</objects>");
+
+ MailSessionImpl mailSession = wireContext.get(MailSessionImpl.class);
+ List<MailServer> mailServers = mailSession.getMailServers();
+ assertEquals(1, mailServers.size());
+
+ MailServer mailServer = mailServers.get(0);
+ assertSame(MyAuthenticator.class, mailServer.getAuthenticator().getClass());
+ }
+
+ public void testAddressFilter() {
+ WireContext wireContext =
+ createWireContext("<objects>"
+ + " <mail-session>"
+ + " <mail-server>"
+ + " <address-filter>"
+ + " <include>.+(a)jbpm.org</include>"
+ + " <exclude>.+(a)jboss.com</exclude>"
+ + " <exclude>.+(a)redhat.com</exclude>"
+ + " </address-filter>"
+ + " <session-properties />"
+ + " </mail-server>"
+ + " </mail-session>"
+ + "</objects>");
+
+ MailSessionImpl mailSession = wireContext.get(MailSessionImpl.class);
+ List<MailServer> mailServers = mailSession.getMailServers();
+ assertEquals(1, mailServers.size());
+
+ MailServer mailServer = mailServers.get(0);
+ AddressFilter addressFilter = mailServer.getAddressFilter();
+
+ List<Pattern> includePatterns = addressFilter.getIncludePatterns();
+ assertEquals(1, includePatterns.size());
+ assertEquals(".+(a)jbpm.org", includePatterns.get(0).toString());
+
+ List<Pattern> excludePatterns = addressFilter.getExcludePatterns();
+ assertEquals(2, excludePatterns.size());
+ assertEquals(".+(a)jboss.com", excludePatterns.get(0).toString());
+ assertEquals(".+(a)redhat.com", excludePatterns.get(1).toString());
+
+ assertEquals(0, mailServer.getSessionProperties().size());
+ }
+
+ public void testNoAddressFilter() {
+ WireContext wireContext =
+ createWireContext("<objects>"
+ + " <mail-session>"
+ + " <mail-server>"
+ + " <session-properties />"
+ + " </mail-server>"
+ + " </mail-session>"
+ + "</objects>");
+
+ MailSessionImpl mailSession = wireContext.get(MailSessionImpl.class);
+ List<MailServer> mailServers = mailSession.getMailServers();
+ assertEquals(1, mailServers.size());
+
+ MailServer mailServer = mailServers.get(0);
+ assertNull("expected no address filter", mailServer.getAddressFilter());
+ assertEquals(0, mailServer.getSessionProperties().size());
+ }
+
+ public void testMultipleMailServers() {
+ WireContext wireContext =
+ createWireContext("<objects>"
+ + " <mail-session>"
+ + " <mail-server>"
+ + " <session-properties />"
+ + " </mail-server>"
+ + " <mail-server>"
+ + " <session-properties />"
+ + " </mail-server>"
+ + " <mail-server>"
+ + " <session-properties />"
+ + " </mail-server>"
+ + " </mail-session>"
+ + "</objects>");
+
+ MailSessionImpl mailSession = wireContext.get(MailSessionImpl.class);
+ List<MailServer> mailServers = mailSession.getMailServers();
+ assertEquals(3, mailServers.size());
+ }
+}
Copied: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/MailTemplateWireTest.java (from rev 4572, jbpm4/branches/email/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/MailTemplateWireTest.java)
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/MailTemplateWireTest.java (rev 0)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/MailTemplateWireTest.java 2009-04-16 22:39:50 UTC (rev 4573)
@@ -0,0 +1,171 @@
+/*
+ * 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.wire;
+
+import java.util.List;
+
+import org.jbpm.pvm.internal.email.impl.AttachmentTemplate;
+import org.jbpm.pvm.internal.email.impl.MailTemplate;
+
+/**
+ * @author Alejandro Guizar
+ */
+public class MailTemplateWireTest extends WireTestCase {
+
+ public void testName() {
+ WireContext wireContext =
+ createWireContext("<objects>"
+ + "<mail-template name='plate'>"
+ + " <to addresses='dilbert@office, alice@work, dogbert@house'/>"
+ + " <subject>bureaucracy</subject>"
+ + "</mail-template>"
+ + "</objects>");
+
+ MailTemplate template = wireContext.get(MailTemplate.class);
+ assertEquals("plate", template.getName());
+ }
+
+ public void testLanguage() {
+ WireContext wireContext =
+ createWireContext("<objects>"
+ + "<mail-template name='plate' language='juel'>"
+ + " <to addresses='dilbert@office, alice@work, dogbert@house'/>"
+ + " <subject>bureaucracy</subject>"
+ + "</mail-template>"
+ + "</objects>");
+
+ MailTemplate template = wireContext.get(MailTemplate.class);
+ assertEquals("juel", template.getLanguage());
+ }
+
+ public void testTo() {
+ WireContext wireContext =
+ createWireContext("<objects>"
+ + "<mail-template name='plate'>"
+ + " <to addresses='dilbert@office, alice@work, dogbert@house'/>"
+ + " <subject>bureaucracy</subject>"
+ + "</mail-template>"
+ + "</objects>");
+
+ MailTemplate template = wireContext.get(MailTemplate.class);
+ assertEquals("dilbert@office, alice@work, dogbert@house", template.getTo().getAddresses());
+ }
+
+ public void testCc() {
+ WireContext wireContext =
+ createWireContext("<objects>"
+ + "<mail-template name='plate'>"
+ + " <to addresses='dilbert@office, alice@work, dogbert@house'/>"
+ + " <cc actors='theboss, hrpolicymaker'/>"
+ + " <subject>bureaucracy</subject>"
+ + "</mail-template>"
+ + "</objects>");
+
+ MailTemplate template = wireContext.get(MailTemplate.class);
+ assertEquals("theboss, hrpolicymaker", template.getCc().getActors());
+ }
+
+ public void testBcc() {
+ WireContext wireContext =
+ createWireContext("<objects>"
+ + "<mail-template name='plate'>"
+ + " <to addresses='dilbert@office, alice@work, dogbert@house'/>"
+ + " <bcc actors='thoughtpolice'/>"
+ + " <subject>bureaucracy</subject>"
+ + "</mail-template>"
+ + "</objects>");
+
+ MailTemplate template = wireContext.get(MailTemplate.class);
+ assertEquals("thoughtpolice", template.getBcc().getActors());
+ }
+
+ public void testSubject() {
+ WireContext wireContext =
+ createWireContext("<objects>"
+ + "<mail-template name='plate'>"
+ + " <to addresses='dilbert@office, alice@work, dogbert@house'/>"
+ + " <subject>bureaucracy</subject>"
+ + "</mail-template>"
+ + "</objects>");
+
+ MailTemplate template = wireContext.get(MailTemplate.class);
+ assertEquals("bureaucracy", template.getSubject());
+ }
+
+ public void testText() {
+ WireContext wireContext =
+ createWireContext("<objects>"
+ + "<mail-template name='plate'>"
+ + " <to addresses='dilbert@office, alice@work, dogbert@house'/>"
+ + " <subject>bureaucracy</subject>"
+ + " <text>plain text content</text>"
+ + "</mail-template>"
+ + "</objects>");
+
+ MailTemplate template = wireContext.get(MailTemplate.class);
+ assertEquals("plain text content", template.getText());
+ }
+
+ public void testHtml() {
+ WireContext wireContext =
+ createWireContext("<objects>"
+ + "<mail-template name='plate'>"
+ + " <to addresses='dilbert@office, alice@work, dogbert@house'/>"
+ + " <subject>bureaucracy</subject>"
+ + " <html><strong>rich</strong> content</html>"
+ + "</mail-template>"
+ + "</objects>");
+
+ MailTemplate template = wireContext.get(MailTemplate.class);
+ System.out.println(template.getHtml());
+ assertEquals("<html>\n<strong>rich</strong> content</html>\n", template.getHtml());
+ }
+
+ public void testAttachments() {
+ WireContext wireContext =
+ createWireContext("<objects>"
+ + "<mail-template name='plate'>"
+ + " <to addresses='dilbert@office, alice@work, dogbert@house'/>"
+ + " <subject>bureaucracy</subject>"
+ + " <attachments>"
+ + " <attachment url='http://en.wikipedia.org/wiki/File:Dilbert-20050910.png'/>"
+ + " <attachment resource='org/example/pic.jpg'/>"
+ + " <attachment file='${user.home}/.face'/>"
+ + " </attachments>"
+ + "</mail-template>"
+ + "</objects>");
+
+ MailTemplate template = wireContext.get(MailTemplate.class);
+ List<AttachmentTemplate> attachmentTemplates = template.getAttachmentTemplates();
+ assertEquals(3, attachmentTemplates.size());
+ // url
+ AttachmentTemplate attachmentTemplate = attachmentTemplates.get(0);
+ assertEquals("http://en.wikipedia.org/wiki/File:Dilbert-20050910.png", attachmentTemplate
+ .getUrl());
+ // resource
+ attachmentTemplate = attachmentTemplates.get(1);
+ assertEquals("org/example/pic.jpg", attachmentTemplate.getResource());
+ // file
+ attachmentTemplate = attachmentTemplates.get(2);
+ assertEquals("${user.home}/.face", attachmentTemplate.getFile());
+ }
+}
Modified: jbpm4/trunk/modules/pvm/src/test/resources/jbpm.wire.bindings.xml
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/resources/jbpm.wire.bindings.xml 2009-04-16 21:39:27 UTC (rev 4572)
+++ jbpm4/trunk/modules/pvm/src/test/resources/jbpm.wire.bindings.xml 2009-04-16 22:39:50 UTC (rev 4573)
@@ -39,6 +39,7 @@
<binding class="org.jbpm.pvm.internal.wire.binding.BusinessCalendarBinding" />
<binding class="org.jbpm.pvm.internal.wire.binding.IdGeneratorBinding" />
<binding class="org.jbpm.pvm.internal.wire.binding.AuthenticationBinding" />
+ <binding class="org.jbpm.pvm.internal.wire.binding.MailTemplateBinding" />
<!-- hibernate bindings -->
<binding class="org.jbpm.pvm.internal.wire.binding.HibernateConfigurationBinding" />
<binding class="org.jbpm.pvm.internal.wire.binding.SeamHibernateSessionBinding" />
@@ -52,6 +53,7 @@
<binding class="org.jbpm.pvm.internal.wire.binding.JbossIdmIdentitySessionFactoryBinding" />
<binding class="org.jbpm.pvm.internal.wire.binding.JbossIdmIdentitySessionBinding" />
<binding class="org.jbpm.pvm.internal.wire.binding.RepositorySessionBinding" />
+ <binding class="org.jbpm.pvm.internal.wire.binding.MailSessionBinding" />
<!-- db sessions -->
<binding class="org.jbpm.pvm.internal.wire.binding.PvmDbSessionBinding" />
Modified: jbpm4/trunk/modules/userguide/src/main/docbook/en/master.xml
===================================================================
--- jbpm4/trunk/modules/userguide/src/main/docbook/en/master.xml 2009-04-16 21:39:27 UTC (rev 4572)
+++ jbpm4/trunk/modules/userguide/src/main/docbook/en/master.xml 2009-04-16 22:39:50 UTC (rev 4573)
@@ -9,7 +9,8 @@
<!ENTITY ch06-Variables SYSTEM "modules/ch06-Variables.xml">
<!ENTITY ch07-Scripting SYSTEM "modules/ch07-Scripting.xml">
<!ENTITY ch08-Identity SYSTEM "modules/ch08-Identity.xml">
- <!ENTITY ch08-JBossIntegration SYSTEM "modules/ch09-JBossIntegration.xml">
+ <!ENTITY ch09-JBossIntegration SYSTEM "modules/ch09-JBossIntegration.xml">
+ <!ENTITY ch10-Emails SYSTEM "modules/ch10-Emails.xml">
]>
<book lang="en">
@@ -28,6 +29,7 @@
&ch06-Variables;
&ch07-Scripting;
&ch08-Identity;
- &ch08-JBossIntegration;
+ &ch09-JBossIntegration;
+ &ch10-Emails;
</book>
\ No newline at end of file
Copied: jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch10-Emails.xml (from rev 4572, jbpm4/branches/email/modules/userguide/src/main/docbook/en/modules/ch09-Emails.xml)
===================================================================
--- jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch10-Emails.xml (rev 0)
+++ jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch10-Emails.xml 2009-04-16 22:39:50 UTC (rev 4573)
@@ -0,0 +1,259 @@
+<chapter id="emails">
+ <title>Email Support</title>
+ <para>
+ This chapter explains Email Support provided within jBPM 4.
+ </para>
+
+
+ <section id="mailinjpdl">
+ <title>Mail in jPDL</title>
+ </section>
+ <section id="scriptableemails">
+ <title>Producers</title>
+ <para>Producers are responsible for creating emails within jBPM. All mail producers implement the <literal>org.jbpm.pvm.internal.email.producer.MailProducer</literal> interface.
+ Several out-of-the-box implementations have been created to address simple email needs.</para>
+
+ <section id="standardemailformat">
+ <title>Standard</title>
+ <para>Used to send non-scripted text emails.</para>
+ <table><title>Standard Email</title>
+ <tgroup cols="2" rowsep="1" colsep="1">
+ <thead>
+ <row>
+ <entry>Property</entry>
+ <entry>Description</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry><literal>subject</literal></entry>
+ <entry>Email subject.</entry>
+ </row>
+ <row>
+ <entry><literal>text</literal></entry>
+ <entry>The textual body of the email.</entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </table>
+ </section>
+ <section id="scriptedemailformat">
+ <title>Scriptable Standard</title>
+ <para>Used to send scripted text emails for the subject and/or text.</para>
+ <table><title>Scriptable Email</title>
+ <tgroup cols="2" rowsep="1" colsep="1">
+ <thead>
+ <row>
+ <entry>Property</entry>
+ <entry>Description</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry><literal>language</literal></entry>
+ <entry>The scripting language used to resolve properties within the subject and textual body. If not provided, the default script language is applied.</entry>
+ </row>
+ <row>
+ <entry><literal>subject</literal></entry>
+ <entry>Email subject.</entry>
+ </row>
+ <row>
+ <entry><literal>text</literal></entry>
+ <entry>The textual body of the email.</entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </table>
+ </section>
+ <section id="htmlemailformat">
+ <title>Scriptable HTML</title>
+ <para>Used to send scripted HTML formatted emails for the subject, text, and html.</para>
+ </section>
+ <table><title>Scriptable HTML Email</title>
+ <tgroup cols="2" rowsep="1" colsep="1">
+ <thead>
+ <row>
+ <entry>Property</entry>
+ <entry>Description</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry><literal>language</literal></entry>
+ <entry>The scripting language used to resolve properties within the subject, textual body, and HTML body. If not provided, the default script language is applied.</entry>
+ </row>
+ <row>
+ <entry><literal>subject</literal></entry>
+ <entry>Email subject.</entry>
+ </row>
+ <row>
+ <entry><literal>text</literal></entry>
+ <entry>The textual body of the email.</entry>
+ </row>
+ <row>
+ <entry><literal>html</literal></entry>
+ <entry>The HTML formatted body of the email.</entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </table>
+ <para>For complex emails or custom generation of attachments, see: <link linkend="customemails">Extension Points: Custom Emails</link>.</para>
+ </section>
+ <section id="emailtemplates">
+ <title>Templates</title>
+ <para>Templates are available to externalize commonly used messages from jPDL definitions. In jBPM 4, templates can produce either standard or HTML message; also, templates
+ can support any scripting language supported by the jBPM Script Manager. As you will see, any <literal>MailProducer</literal> implementation available to jPDL is also available to be templated.
+ </para>
+ <para>The following is an example of a scriptable Email Template.</para>
+ <programlisting>TODO</programlisting>
+ <para>The following is an example of a scriptable HTML Email Template.</para>
+ <programlisting>TODO</programlisting>
+ </section>
+ <section id="emailserverconfiguration">
+ <title>Server Configuration</title>
+ <para>Mail Server configuration is provided within jbpm.cfg.xml The <literal>mail-server</literal> tag describes an SMTP mail server capable of sending email messages.
+ Because jBPM uses JavaMail to send mail, all properties supported by JavaMail are also exposed to jBPM. Within the <literal>session-properties</literal>
+ subtag of <literal>mail-server</literal>, the SMTP properties must be provided as described in the example below.</para>
+ <para>
+ See the Sun JavaMail API for more information on supported properties: <ulink url="http://java.sun.com/products/javamail/javadocs/com/sun/mail/smtp/package-...">Sun SMTP Properties</ulink>.
+ </para>
+ <programlisting><objects>
+ <mail-session>
+ <mail-server><emphasis role="bold">
+ <session-properties>
+ <property name='mail.host' value='localhost' />
+ ...
+ </session-properties></emphasis>
+ </mail-server>
+ </mail-session>
+</objects></programlisting>
+ <section id="serverconfigurationmultipl">
+ <title>Multiple Mail Servers</title>
+ <para>Multiple SMTP server support has been added to jBPM 4 to support many organizational server structures.
+ This is useful for organizations who have both internal and external SMTP servers, for example.</para>
+ <para>
+ To setup multiple SMTP mail servers, provide multiple mail servers within the jBPM configuration, as described below.
+
+ Note that the tag <literal>address-filter</literal> has been added to filter which domains are serviced by each mail server.
+ The mail filter accepts regular expressions to determine if an address is to be sent by a given server.
+ </para>
+ <para>See the Sun Pattern API for more information on supported RegEx expressions: <ulink url="http://java.sun.com/j2se/1.5.0/docs/api/java/util/regex/Pattern.html">Sun Regex Patterns</ulink>.
+ </para>
+ <programlisting><objects>
+ <mail-session>
+ <mail-server><emphasis role="bold">
+ <address-filter>
+ <include>.+(a)jbpm.org</include>
+ </address-filter></emphasis>
+ <session-properties>
+ <property name='mail.host' value='internal.host.url' />
+ ...
+ </session-properties>
+ </mail-server>
+ <mail-server><emphasis role="bold">
+ <address-filter>
+ <exclude>.+(a)jbpm.org</exclude>
+ </address-filter></emphasis>
+ <session-properties>
+ <property name='mail.host' value='external.host.url' />
+ ...
+ </session-properties>
+ </mail-server>
+ </mail-session>
+</objects></programlisting>
+ <para>
+ The include/excude logic includes an address if it is <emphasis role="bold">included and not explicitly excluded.</emphasis>
+
+ The include/exclude logic within the address filter is described below.
+
+ <table><title>Address Filter</title>
+ <tgroup cols="3" rowsep="1" colsep="1">
+ <thead>
+ <row>
+ <entry>Property</entry>
+ <entry>Multiple</entry>
+ <entry>Description</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry><literal>include</literal></entry>
+ <entry>0</entry>
+ <entry>If no includes are present, the address filter will include all email addresses.</entry>
+ </row>
+ <row>
+ <entry><literal>include</literal></entry>
+ <entry>1..Many</entry>
+ <entry>If one or more includes are present, the address filter will include only email addresses matching the include patterns provided.</entry>
+ </row>
+ <row>
+ <entry><literal>exclude</literal></entry>
+ <entry>0</entry>
+ <entry>If no excludes are present, no addresses are explicitly excluded.</entry>
+ </row>
+ <row>
+ <entry><literal>exclude</literal></entry>
+ <entry>1..Many</entry>
+ <entry>If one or more excludes are present, the address filter will explicitly exclude only email addresses matching the exclude patterns provided.</entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </table>
+ </para>
+ </section>
+ </section>
+ <section id="extensibility">
+ <title>Extension Points</title>
+ <section id="addressresolvers">
+ <title>Address Resolvers</title>
+ <para>When implementing a different Identity Management in jBPM [such as LDAP], an Address Resolver is required to resolve Actor and Group email addresses from the Identity Management system.</para>
+ <para>Address Resolvers must implement the <literal>org.jbpm.pvm.internal.email.resolver.AddressResolver</literal> interface. Provided with a User or Group Identifier, the should return valid JavaMail <literal>javax.mail.internet.InternetAddress</literal>es for the given identifier.</para>
+ <para>Plugging in a custom Address Resolver to jBPM is handled within the jBPM Configuration. The following is an example of providing a custom Address Resolver within <literal>jbpm.cfg.xml</literal>.</para>
+ <programlisting>TODO</programlisting>
+
+ </section>
+ <section id="customemails">
+ <title>Custom Emails</title>
+ <para>jBPM 4 allows the creation of your own Email Producers to address an organization's specific email needs.
+ To do so, users must implement the <literal>org.jbpm.pvm.internal.email.producer.MailProducer</literal> interface. The method produce will return one or more Email objects, which jBPM will then send using the jBPM MailSession.
+ <para>Apache Commons Email was choosen to simplify the email interface for jBPM. All emails returned by the MailProducer implementation must extend the base <literal>org.apache.commons.mail.Email</literal>.</para>
+ <para>See the Apache Commons for more information on supported <literal>Email</literal> types:
+ <ulink url="http://commons.apache.org/email/">Apache Commons Email</ulink>.</para>
+ </para>
+
+ <section id="generatedemailattachments">
+ <title>Attachments</title>
+ <para>
+ Generation of custom attachments at runtime can be easily implemented in jBPM 4. By extending out-of-the-box mail producers, or implementing your own with the <literal>MailProducer</literal> interface, attachments can be generated, attachments can be generated and added to
+ emails at runtime.
+ </para>
+ <para>The following is an example of how to extend <literal>HtmlScriptMailProducer</literal> to produce HTML emails with custom attachments.</para>
+ <programlisting>public class CustomAttachmentHtmlScriptMailProducer extends HtmlScriptMailProducer{
+
+ @Override
+ public Collection<Email> produce(Execution exe, MailContext mailContext)
+ throws Exception {
+ //Use the HTML producer to create the body, subject, text.
+ Collection<Email> emails = super.produce(exe, mailContext);
+
+ //Add custom code to generate attachments here.
+ EmailAttachment attachment = null;
+
+ for(Email email : emails)
+ {
+ //We know it's a collection of HTML email.
+ HtmlEmail html = (HtmlEmail)email;
+ //Add your custom attachment.
+ html.attach(attachment);
+ }
+
+ return emails;
+
+ }
+}</programlisting>
+ </section>
+ </section>
+
+ </section>
+
+</chapter>
\ No newline at end of file
Modified: jbpm4/trunk/pom.xml
===================================================================
--- jbpm4/trunk/pom.xml 2009-04-16 21:39:27 UTC (rev 4572)
+++ jbpm4/trunk/pom.xml 2009-04-16 22:39:50 UTC (rev 4573)
@@ -47,6 +47,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<apache.ant.version>1.7.0</apache.ant.version>
<cactus.version>13-1.7.1</cactus.version>
+ <commons.email.version>1.2-SNAPSHOT</commons.email.version>
<gwt.console.version>1.0.0-SNAPSHOT</gwt.console.version>
<hibernate.version>3.2.6.ga</hibernate.version>
<hibernate.annotations.version>3.3.1.GA</hibernate.annotations.version>
@@ -315,6 +316,11 @@
<artifactId>jtds</artifactId>
<version>${jtds.version}</version>
</dependency>
+ <dependency>
+ <groupId>commons-email</groupId>
+ <artifactId>commons-email</artifactId>
+ <version>${commons.email.version}</version>
+ </dependency>
</dependencies>
</dependencyManagement>
17 years
JBoss JBPM SVN: r4572 - in jbpm4/branches/email: .settings and 2 other directories.
by do-not-reply@jboss.org
Author: alex.guizar(a)jboss.com
Date: 2009-04-16 17:39:27 -0400 (Thu, 16 Apr 2009)
New Revision: 4572
Modified:
jbpm4/branches/email/.project
jbpm4/branches/email/.settings/org.maven.ide.eclipse.prefs
jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/MailProducerImpl.java
jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/spi/MailProducer.java
Log:
change mail producer to return collection
Modified: jbpm4/branches/email/.project
===================================================================
--- jbpm4/branches/email/.project 2009-04-16 19:32:12 UTC (rev 4571)
+++ jbpm4/branches/email/.project 2009-04-16 21:39:27 UTC (rev 4572)
@@ -1,12 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>jbpm4</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- </buildSpec>
- <natures>
- <nature>org.maven.ide.eclipse.maven2Nature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>jbpm4</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.maven.ide.eclipse.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.maven.ide.eclipse.maven2Nature</nature>
+ </natures>
+</projectDescription>
Modified: jbpm4/branches/email/.settings/org.maven.ide.eclipse.prefs
===================================================================
--- jbpm4/branches/email/.settings/org.maven.ide.eclipse.prefs 2009-04-16 19:32:12 UTC (rev 4571)
+++ jbpm4/branches/email/.settings/org.maven.ide.eclipse.prefs 2009-04-16 21:39:27 UTC (rev 4572)
@@ -1,8 +1,9 @@
-#Wed Mar 25 11:07:34 CET 2009
-activeProfiles=
-eclipse.preferences.version=1
-fullBuildGoals=
-includeModules=false
-resolveWorkspaceProjects=true
-resourceFilterGoals=
-version=1
+#Thu Apr 16 16:21:44 CDT 2009
+activeProfiles=
+eclipse.preferences.version=1
+fullBuildGoals=process-test-resources
+includeModules=false
+resolveWorkspaceProjects=true
+resourceFilterGoals=process-resources resources\:testResources
+skipCompilerPlugin=true
+version=1
Modified: jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/MailProducerImpl.java
===================================================================
--- jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/MailProducerImpl.java 2009-04-16 19:32:12 UTC (rev 4571)
+++ jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/MailProducerImpl.java 2009-04-16 21:39:27 UTC (rev 4572)
@@ -51,201 +51,192 @@
*/
public class MailProducerImpl implements MailProducer {
- private MailTemplate template;
+ private MailTemplate template;
- public MailTemplate getTemplate() {
- return template;
- }
+ public MailTemplate getTemplate() {
+ return template;
+ }
- public void setTemplate(MailTemplate template) {
- this.template = template;
- }
+ public void setTemplate(MailTemplate template) {
+ this.template = template;
+ }
- public Email produce(OpenExecution execution) {
- try {
- Email email = instantiateEmail(template);
- fillRecipients(template, execution, email);
- fillSubject(execution, email);
- fillBody(execution, email);
- return email;
- }
- catch (EmailException e) {
- throw new JbpmException("could not produce email", e);
- }
- }
+ public Collection<Email> produce(OpenExecution execution) {
+ try {
+ Email email = instantiateEmail(template);
+ fillRecipients(template, execution, email);
+ fillSubject(execution, email);
+ fillBody(execution, email);
+ return Collections.singleton(email);
+ }
+ catch (EmailException e) {
+ throw new JbpmException("could not produce email", e);
+ }
+ }
- protected Email instantiateEmail(MailTemplate template) {
- return template.getHtml() != null ? new HtmlEmail() : template
- .getAttachmentTemplates()
- .isEmpty() ? new MultiPartEmail() : new SimpleEmail();
- }
+ protected Email instantiateEmail(MailTemplate template) {
+ return template.getHtml() != null ? new HtmlEmail() : template.getAttachmentTemplates()
+ .isEmpty() ? new MultiPartEmail() : new SimpleEmail();
+ }
- protected void fillRecipients(MailTemplate template, OpenExecution execution, Email email)
- throws EmailException {
- Environment environment = Environment.getCurrent();
- IdentitySession identitySession = environment.get(IdentitySession.class);
- RecipientNameBuilder recipientNameBuilder = environment.get(RecipientNameBuilder.class);
+ protected void fillRecipients(MailTemplate template, OpenExecution execution, Email email)
+ throws EmailException {
+ Environment environment = Environment.getCurrent();
+ IdentitySession identitySession = environment.get(IdentitySession.class);
+ RecipientNameBuilder recipientNameBuilder = environment.get(RecipientNameBuilder.class);
- // to
- RecipientTemplate to = template.getTo();
- if (to != null) {
- for (String address : evaluateRecipients(to.getAddresses(), execution)) {
- email.addTo(address);
- }
- for (String actorId : evaluateRecipients(to.getActors(), execution)) {
- Collection<User> users = resolveUsers(identitySession, actorId);
- for (User user : users) {
- email.addTo(user.getEmailAddress(), recipientNameBuilder.buildName(user));
- }
- }
- }
+ // to
+ RecipientTemplate to = template.getTo();
+ if (to != null) {
+ for (String address : evaluateRecipients(to.getAddresses(), execution)) {
+ email.addTo(address);
+ }
+ for (String actorId : evaluateRecipients(to.getActors(), execution)) {
+ Collection<User> users = resolveUsers(identitySession, actorId);
+ for (User user : users) {
+ email.addTo(user.getEmailAddress(), recipientNameBuilder.buildName(user));
+ }
+ }
+ }
- // cc
- RecipientTemplate cc = template.getCc();
- if (cc != null) {
- for (String address : evaluateRecipients(cc.getAddresses(), execution)) {
- email.addCc(address);
- }
- for (String actorId : evaluateRecipients(cc.getActors(), execution)) {
- Collection<User> users = resolveUsers(identitySession, actorId);
- for (User user : users) {
- email.addCc(user.getEmailAddress(), recipientNameBuilder.buildName(user));
- }
- }
- }
+ // cc
+ RecipientTemplate cc = template.getCc();
+ if (cc != null) {
+ for (String address : evaluateRecipients(cc.getAddresses(), execution)) {
+ email.addCc(address);
+ }
+ for (String actorId : evaluateRecipients(cc.getActors(), execution)) {
+ Collection<User> users = resolveUsers(identitySession, actorId);
+ for (User user : users) {
+ email.addCc(user.getEmailAddress(), recipientNameBuilder.buildName(user));
+ }
+ }
+ }
- // bcc
- RecipientTemplate bcc = template.getBcc();
- if (bcc != null) {
- for (String address : evaluateRecipients(bcc.getAddresses(), execution)) {
- email.addBcc(address);
- }
- for (String actorId : evaluateRecipients(bcc.getActors(), execution)) {
- Collection<User> users = resolveUsers(identitySession, actorId);
- for (User user : users) {
- email.addBcc(user.getEmailAddress(), recipientNameBuilder.buildName(user));
- }
- }
- }
- }
+ // bcc
+ RecipientTemplate bcc = template.getBcc();
+ if (bcc != null) {
+ for (String address : evaluateRecipients(bcc.getAddresses(), execution)) {
+ email.addBcc(address);
+ }
+ for (String actorId : evaluateRecipients(bcc.getActors(), execution)) {
+ Collection<User> users = resolveUsers(identitySession, actorId);
+ for (User user : users) {
+ email.addBcc(user.getEmailAddress(), recipientNameBuilder.buildName(user));
+ }
+ }
+ }
+ }
- private String evaluateExpression(String expression, OpenExecution execution) {
- ScriptManager scriptManager = Environment.getFromCurrent(ScriptManager.class);
- return scriptManager
- .evaluateExpression(expression, execution, template.getLanguage())
- .toString();
- }
+ private String evaluateExpression(String expression, OpenExecution execution) {
+ ScriptManager scriptManager = Environment.getFromCurrent(ScriptManager.class);
+ return scriptManager.evaluateExpression(expression, execution, template.getLanguage())
+ .toString();
+ }
- private String[] evaluateRecipients(String recipients, OpenExecution execution) {
- return evaluateExpression(recipients, execution).split("[,|\\s]+");
- }
+ private String[] evaluateRecipients(String recipients, OpenExecution execution) {
+ return evaluateExpression(recipients, execution).split("[,|\\s]+");
+ }
- private static Collection<User> resolveUsers(IdentitySession identitySession, String actorId) {
- // first, try to resolve actorId as user
- User user = identitySession.findUserById(actorId);
- if (user != null)
- return Collections.singleton(user);
+ private static Collection<User> resolveUsers(IdentitySession identitySession, String actorId) {
+ // first, try to resolve actorId as user
+ User user = identitySession.findUserById(actorId);
+ if (user != null) return Collections.singleton(user);
- // next, try to resolve as group
- Group group = identitySession.findGroupById(actorId);
- if (group != null)
- return identitySession.findUsersByGroup(actorId);
+ // next, try to resolve as group
+ Group group = identitySession.findGroupById(actorId);
+ if (group != null) return identitySession.findUsersByGroup(actorId);
- // give up
- return Collections.emptySet();
- }
+ // give up
+ return Collections.emptySet();
+ }
- protected void fillSubject(OpenExecution execution, Email email) {
- email.setSubject(evaluateExpression(template.getSubject(), execution));
- }
+ protected void fillSubject(OpenExecution execution, Email email) {
+ email.setSubject(evaluateExpression(template.getSubject(), execution));
+ }
- protected void fillBody(OpenExecution execution, Email email) throws EmailException {
- if (template.getHtml() == null) {
- email.setMsg(evaluateExpression(template.getText(), execution));
- }
- else {
- HtmlEmail htmlEmail = (HtmlEmail) email;
- htmlEmail.setHtmlMsg(evaluateExpression(template.getHtml(), execution));
- htmlEmail.setTextMsg(evaluateExpression(template.getText(), execution));
- }
- }
+ protected void fillBody(OpenExecution execution, Email email) throws EmailException {
+ if (template.getHtml() == null) {
+ email.setMsg(evaluateExpression(template.getText(), execution));
+ }
+ else {
+ HtmlEmail htmlEmail = (HtmlEmail) email;
+ htmlEmail.setHtmlMsg(evaluateExpression(template.getHtml(), execution));
+ htmlEmail.setTextMsg(evaluateExpression(template.getText(), execution));
+ }
+ }
- protected void addAttachments(OpenExecution execution, Email email) throws EmailException {
- List<AttachmentTemplate> attachmentTemplates = template.getAttachmentTemplates();
- if (attachmentTemplates.isEmpty())
- return;
+ protected void addAttachments(OpenExecution execution, Email email) throws EmailException {
+ List<AttachmentTemplate> attachmentTemplates = template.getAttachmentTemplates();
+ if (attachmentTemplates.isEmpty()) return;
- MultiPartEmail multiPartEmail = (MultiPartEmail) email;
- for (AttachmentTemplate attachmentTemplate : attachmentTemplates) {
- EmailAttachment attachment = new EmailAttachment();
- attachment.setDisposition(EmailAttachment.ATTACHMENT);
+ MultiPartEmail multiPartEmail = (MultiPartEmail) email;
+ for (AttachmentTemplate attachmentTemplate : attachmentTemplates) {
+ EmailAttachment attachment = new EmailAttachment();
+ attachment.setDisposition(EmailAttachment.ATTACHMENT);
- // name
- String name = attachmentTemplate.getName();
- if (name != null)
- attachment.setName(evaluateExpression(name, execution));
+ // name
+ String name = attachmentTemplate.getName();
+ if (name != null) attachment.setName(evaluateExpression(name, execution));
- // description
- String description = attachmentTemplate.getDescription();
- if (description != null)
- attachment.setDescription(evaluateExpression(description, execution));
+ // description
+ String description = attachmentTemplate.getDescription();
+ if (description != null)
+ attachment.setDescription(evaluateExpression(description, execution));
- // file
- String file = attachmentTemplate.getFile();
- if (file != null) {
- File targetFile = new File(evaluateExpression(file, execution));
- if (!targetFile.isFile()) {
- throw new EmailException("could not fetch attachment from " + targetFile);
- }
- attachment.setPath(targetFile.getPath());
- // extract attachment name from file
- if (name == null)
- attachment.setName(targetFile.getName());
- }
- else {
- URL targetUrl;
- // url
- String url = attachmentTemplate.getUrl();
- if (url != null) {
- try {
- targetUrl = new URL(evaluateExpression(url, execution));
- }
- catch (MalformedURLException e) {
- throw new EmailException("could not fetch attachment from " + url, e);
- }
- }
- // resource
- else {
- String resource = attachmentTemplate.getResource();
- targetUrl =
- Environment.getCurrent().getClassLoader().getResource(
- evaluateExpression(resource, execution));
- if (targetUrl == null) {
- throw new EmailException("could not fetch attachment from " + resource);
- }
- }
- attachment.setURL(targetUrl);
- // extract attachment name from url
- if (name == null) {
- String resourceName = extractResourceName(targetUrl);
- attachment.setName(resourceName);
- }
- }
+ // file
+ String file = attachmentTemplate.getFile();
+ if (file != null) {
+ File targetFile = new File(evaluateExpression(file, execution));
+ if (!targetFile.isFile()) {
+ throw new EmailException("could not fetch attachment from " + targetFile);
+ }
+ attachment.setPath(targetFile.getPath());
+ // extract attachment name from file
+ if (name == null) attachment.setName(targetFile.getName());
+ }
+ else {
+ URL targetUrl;
+ // url
+ String url = attachmentTemplate.getUrl();
+ if (url != null) {
+ try {
+ targetUrl = new URL(evaluateExpression(url, execution));
+ }
+ catch (MalformedURLException e) {
+ throw new EmailException("could not fetch attachment from " + url, e);
+ }
+ }
+ // resource
+ else {
+ String resource = attachmentTemplate.getResource();
+ targetUrl =
+ Environment.getCurrent().getClassLoader().getResource(
+ evaluateExpression(resource, execution));
+ if (targetUrl == null) {
+ throw new EmailException("could not fetch attachment from " + resource);
+ }
+ }
+ attachment.setURL(targetUrl);
+ // extract attachment name from url
+ if (name == null) {
+ String resourceName = extractResourceName(targetUrl);
+ attachment.setName(resourceName);
+ }
+ }
- multiPartEmail.attach(attachment);
- }
- }
+ multiPartEmail.attach(attachment);
+ }
+ }
- private static String extractResourceName(URL url) {
- String path = url.getPath();
- if (path == null || path.length() == 0)
- return null;
+ private static String extractResourceName(URL url) {
+ String path = url.getPath();
+ if (path == null || path.length() == 0) return null;
- // skip trailing slash
- int sepIndex = path.lastIndexOf('/', path.length() - 1);
- if (sepIndex == -1)
- return null;
+ // skip trailing slash
+ int sepIndex = path.lastIndexOf('/', path.length() - 1);
+ if (sepIndex == -1) return null;
- return path.substring(sepIndex);
- }
+ return path.substring(sepIndex);
+ }
}
Modified: jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/spi/MailProducer.java
===================================================================
--- jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/spi/MailProducer.java 2009-04-16 19:32:12 UTC (rev 4571)
+++ jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/spi/MailProducer.java 2009-04-16 21:39:27 UTC (rev 4572)
@@ -21,6 +21,8 @@
*/
package org.jbpm.pvm.internal.email.spi;
+import java.util.Collection;
+
import org.apache.commons.mail.Email;
import org.jbpm.model.OpenExecution;
@@ -32,6 +34,6 @@
*/
public interface MailProducer {
- Email produce(OpenExecution execution);
+ Collection<Email> produce(OpenExecution execution);
}
17 years
JBoss JBPM SVN: r4571 - in projects/gwt-console/branches/hbraun: plugin-api/src/main/java/org/jboss/bpm/console/client/model and 3 other directories.
by do-not-reply@jboss.org
Author: heiko.braun(a)jboss.com
Date: 2009-04-16 15:32:12 -0400 (Thu, 16 Apr 2009)
New Revision: 4571
Added:
projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/v2/process/InstanceListView.java
projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/v2/process/LoadInstancesAction.java
Removed:
projects/gwt-console/branches/hbraun/war/src/test/java/org/jboss/bpm/console/client/GwtTestProcessManagement.java
Modified:
projects/gwt-console/branches/hbraun/plugin-api/src/main/java/org/jboss/bpm/console/client/Editor.java
projects/gwt-console/branches/hbraun/plugin-api/src/main/java/org/jboss/bpm/console/client/model/DTOParser.java
projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/v2/MainLayout.java
projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/v2/process/DefinitionListView.java
projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/v2/process/ProcessEditor.java
Log:
First cut of the instance list view
Modified: projects/gwt-console/branches/hbraun/plugin-api/src/main/java/org/jboss/bpm/console/client/Editor.java
===================================================================
--- projects/gwt-console/branches/hbraun/plugin-api/src/main/java/org/jboss/bpm/console/client/Editor.java 2009-04-16 19:28:20 UTC (rev 4570)
+++ projects/gwt-console/branches/hbraun/plugin-api/src/main/java/org/jboss/bpm/console/client/Editor.java 2009-04-16 19:32:12 UTC (rev 4571)
@@ -50,7 +50,7 @@
// hmvc controller chain.
this.controller = new Controller();
- this.controller.setParent(appContext.getController());
+ this.controller.setParent(appContext.getController());
}
public abstract String getEditorId();
Modified: projects/gwt-console/branches/hbraun/plugin-api/src/main/java/org/jboss/bpm/console/client/model/DTOParser.java
===================================================================
--- projects/gwt-console/branches/hbraun/plugin-api/src/main/java/org/jboss/bpm/console/client/model/DTOParser.java 2009-04-16 19:28:20 UTC (rev 4570)
+++ projects/gwt-console/branches/hbraun/plugin-api/src/main/java/org/jboss/bpm/console/client/model/DTOParser.java 2009-04-16 19:32:12 UTC (rev 4571)
@@ -178,8 +178,20 @@
return p;
}
- public static ProcessInstanceRef parseProcessInstance(JSONObject root)
+ public static List<ProcessInstanceRef> parseProcessInstances(JavaScriptObject jso)
{
+ List<ProcessInstanceRef> results = new ArrayList<ProcessInstanceRef>();
+
+ JSONArray arr = JSONWalk.on( new JSONObject(jso)).next("instances").asArray();
+ for(int i=0; i<arr.size(); i++)
+ {
+ results.add(parseProcessInstance(arr.get(i)));
+ }
+ return results;
+ }
+
+ public static ProcessInstanceRef parseProcessInstance(JSONValue root)
+ {
ConsoleLog.debug("parse " + root);
// {"id":"StateSequence/8", "definitionId":"StateSequence:1",
@@ -268,4 +280,5 @@
return result;
}
+
}
Modified: projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/v2/MainLayout.java
===================================================================
--- projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/v2/MainLayout.java 2009-04-16 19:28:20 UTC (rev 4570)
+++ projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/v2/MainLayout.java 2009-04-16 19:32:12 UTC (rev 4571)
@@ -34,6 +34,7 @@
import org.gwt.mosaic.ui.client.layout.BorderLayoutData;
import org.gwt.mosaic.ui.client.layout.LayoutPanel;
import org.jboss.bpm.console.client.*;
+import org.jboss.bpm.console.client.v2.process.ProcessEditor;
/**
* The main composite that assembles the gwt console application.
@@ -73,7 +74,7 @@
LayoutPanel layout = createLayout();
viewport.add(layout);
-
+
RootPanel.get().add(viewport);
}
Modified: projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/v2/process/DefinitionListView.java
===================================================================
--- projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/v2/process/DefinitionListView.java 2009-04-16 19:28:20 UTC (rev 4570)
+++ projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/v2/process/DefinitionListView.java 2009-04-16 19:32:12 UTC (rev 4571)
@@ -23,15 +23,13 @@
import com.google.gwt.user.client.ui.ClickListener;
import com.google.gwt.user.client.ui.Widget;
-import com.google.gwt.user.client.ui.Button;
import com.mvc4g.client.Controller;
import com.mvc4g.client.Event;
import com.mvc4g.client.ViewInterface;
import org.gwt.mosaic.ui.client.ListBox;
+import org.gwt.mosaic.ui.client.MessageBox;
import org.gwt.mosaic.ui.client.ToolBar;
import org.gwt.mosaic.ui.client.ToolButton;
-import org.gwt.mosaic.ui.client.MessageBox;
-import org.gwt.mosaic.ui.client.util.ButtonHelper;
import org.gwt.mosaic.ui.client.layout.BoxLayout;
import org.gwt.mosaic.ui.client.layout.BoxLayoutData;
import org.gwt.mosaic.ui.client.layout.LayoutPanel;
@@ -45,36 +43,30 @@
*/
public class DefinitionListView extends LayoutPanel implements ViewInterface
{
+ public final static String ID = DefinitionListView.class.getName();
+
private Controller controller;
- private LayoutPanel table = null;
+ private LayoutPanel definitionList = null;
- public final static String ID = DefinitionListView.class.getName();
+ private ListBox<ProcessDefinitionRef> listBox;
public DefinitionListView()
{
super();
setTitle("Process Definitions");
- }
- public void setController(Controller controller)
- {
- this.controller = controller;
- }
+ definitionList = new LayoutPanel( new BoxLayout(BoxLayout.Orientation.VERTICAL));
+ definitionList.setPadding(0);
+ definitionList.setWidgetSpacing(0);
- private LayoutPanel createTable(List<ProcessDefinitionRef> definitions)
- {
- final LayoutPanel vBox = new LayoutPanel( new BoxLayout(BoxLayout.Orientation.VERTICAL));
- vBox.setPadding(0);
- vBox.setWidgetSpacing(0);
-
- final ListBox<ProcessDefinitionRef> listBox =
+ listBox =
new ListBox<ProcessDefinitionRef>(
new String[] {
"Process ID", "Name", "Key", "Version"}
);
-
+
listBox.setCellRenderer(new ListBox.CellRenderer<ProcessDefinitionRef>() {
public void renderCell(ListBox<ProcessDefinitionRef> listBox, int row, int column,
ProcessDefinitionRef item) {
@@ -100,18 +92,13 @@
final DefaultListModel<ProcessDefinitionRef> model =
(DefaultListModel<ProcessDefinitionRef>) listBox.getModel();
- for(ProcessDefinitionRef def : definitions)
- {
- model.add(def);
- }
-
// toolbar
final LayoutPanel toolBox = new LayoutPanel();
toolBox.setPadding(0);
toolBox.setWidgetSpacing(5);
//toolBox.setLayout(new BoxLayout(BoxLayout.Orientation.VERTICAL));
-
+
final ToolBar toolBar = new ToolBar();
toolBar.add(
new ToolButton("Refresh", new ClickListener() {
@@ -134,7 +121,12 @@
if(index==-1)
MessageBox.alert("Missing selection", "Please select a process");
else
- System.out.println(index);
+ controller.handleEvent(
+ new Event(
+ LoadInstancesAction.ID,
+ listBox.getItem( listBox.getSelectedIndex())
+ )
+ );
}
}
)
@@ -142,19 +134,28 @@
toolBox.add(toolBar, new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL));
- vBox.add(toolBox, new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL));
- vBox.add(listBox, new BoxLayoutData(BoxLayoutData.FillStyle.BOTH));
+ this.definitionList.add(toolBox, new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL));
+ this.definitionList.add(listBox, new BoxLayoutData(BoxLayoutData.FillStyle.BOTH));
- return vBox;
+ this.add(definitionList);
}
+ public void setController(Controller controller)
+ {
+ this.controller = controller;
+ }
+
public void update(List<ProcessDefinitionRef> definitions)
{
- if(this.table!=null)
- this.remove(table);
+ final DefaultListModel<ProcessDefinitionRef> model =
+ (DefaultListModel<ProcessDefinitionRef>) listBox.getModel();
- this.table = createTable(definitions);
- this.add(table);
+ model.clear();
+
+ for(ProcessDefinitionRef def : definitions)
+ {
+ model.add(def);
+ }
// layout again
this.invalidate();
Added: projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/v2/process/InstanceListView.java
===================================================================
--- projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/v2/process/InstanceListView.java (rev 0)
+++ projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/v2/process/InstanceListView.java 2009-04-16 19:32:12 UTC (rev 4571)
@@ -0,0 +1,148 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.jboss.bpm.console.client.v2.process;
+
+import com.google.gwt.user.client.ui.ClickListener;
+import com.google.gwt.user.client.ui.Widget;
+import com.mvc4g.client.Controller;
+import com.mvc4g.client.ViewInterface;
+import com.mvc4g.client.Event;
+import org.gwt.mosaic.ui.client.ListBox;
+import org.gwt.mosaic.ui.client.ToolBar;
+import org.gwt.mosaic.ui.client.ToolButton;
+import org.gwt.mosaic.ui.client.layout.BoxLayout;
+import org.gwt.mosaic.ui.client.layout.BoxLayoutData;
+import org.gwt.mosaic.ui.client.layout.LayoutPanel;
+import org.gwt.mosaic.ui.client.list.DefaultListModel;
+import org.jboss.bpm.console.client.model.ProcessDefinitionRef;
+import org.jboss.bpm.console.client.model.ProcessInstanceRef;
+
+import java.util.List;
+
+/**
+ * @author Heiko.Braun <heiko.braun(a)jboss.com>
+ */
+public class InstanceListView extends LayoutPanel implements ViewInterface
+{
+ public final static String ID = InstanceListView.class.getName();
+
+ private Controller controller;
+
+ private LayoutPanel instanceList = null;
+
+ private ListBox<ProcessInstanceRef> listBox;
+
+ private ProcessDefinitionRef currentDefinition;
+
+ public InstanceListView()
+ {
+ super();
+ setTitle("Process Instances");
+
+ instanceList = new LayoutPanel( new BoxLayout(BoxLayout.Orientation.VERTICAL));
+ instanceList.setPadding(0);
+ instanceList.setWidgetSpacing(0);
+
+ listBox =
+ new ListBox<ProcessInstanceRef>(
+ new String[] {
+ "Instance ID", "State", "Start Date"}
+ );
+
+
+ listBox.setCellRenderer(new ListBox.CellRenderer<ProcessInstanceRef>() {
+ public void renderCell(ListBox<ProcessInstanceRef> listBox, int row, int column,
+ ProcessInstanceRef item) {
+ switch (column) {
+ case 0:
+ listBox.setText(row, column, item.getId());
+ break;
+ case 1:
+ listBox.setText(row, column, item.getState().toString());
+ break;
+ case 2:
+ listBox.setText(row, column, item.getStartDate().toString());
+ break;
+ default:
+ throw new RuntimeException("Unexpected column size");
+ }
+ }
+ });
+
+ // toolbar
+
+ final LayoutPanel toolBox = new LayoutPanel();
+ toolBox.setPadding(0);
+ toolBox.setWidgetSpacing(5);
+ //toolBox.setLayout(new BoxLayout(BoxLayout.Orientation.VERTICAL));
+
+ final ToolBar toolBar = new ToolBar();
+ toolBar.add(
+ new ToolButton("Refresh", new ClickListener() {
+ public void onClick(Widget sender) {
+ controller.handleEvent(
+ new Event(
+ LoadInstancesAction.ID,
+ getCurrentDefinition()
+ )
+ );
+ }
+ }
+ )
+ );
+
+ toolBox.add(toolBar, new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL));
+
+ instanceList.add(toolBox, new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL));
+ instanceList.add(listBox, new BoxLayoutData(BoxLayoutData.FillStyle.BOTH));
+
+ this.add(instanceList);
+ }
+
+ private ProcessDefinitionRef getCurrentDefinition()
+ {
+ return this.currentDefinition;
+ }
+
+ public void setController(Controller controller)
+ {
+ this.controller = controller;
+ }
+
+
+ public void update(final ProcessDefinitionRef def, List<ProcessInstanceRef> instances)
+ {
+ this.currentDefinition = def;
+
+ final DefaultListModel<ProcessInstanceRef> model =
+ (DefaultListModel<ProcessInstanceRef>) listBox.getModel();
+ model.clear();
+
+ for(ProcessInstanceRef inst : instances)
+ {
+ model.add(inst);
+ }
+
+ // layout again
+ this.invalidate();
+ }
+}
Added: projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/v2/process/LoadInstancesAction.java
===================================================================
--- projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/v2/process/LoadInstancesAction.java (rev 0)
+++ projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/v2/process/LoadInstancesAction.java 2009-04-16 19:32:12 UTC (rev 4571)
@@ -0,0 +1,87 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.jboss.bpm.console.client.v2.process;
+
+import com.mvc4g.client.ActionInterface;
+import com.mvc4g.client.Controller;
+import com.google.gwt.core.client.JavaScriptObject;
+import org.jboss.bpm.console.client.ApplicationContext;
+import org.jboss.bpm.console.client.model.ProcessInstanceRef;
+import org.jboss.bpm.console.client.model.ProcessDefinitionRef;
+import org.jboss.bpm.console.client.model.DTOParser;
+import org.jboss.bpm.console.client.util.JSONRequest;
+import org.jboss.bpm.console.client.util.JSONRequestHandler;
+
+import java.util.List;
+
+/**
+ * @author Heiko.Braun <heiko.braun(a)jboss.com>
+ */
+public class LoadInstancesAction implements ActionInterface
+{
+
+ public final static String ID = LoadInstancesAction.class.getName();
+
+ private ApplicationContext appContext;
+
+ public LoadInstancesAction(ApplicationContext appContext)
+ {
+ this.appContext = appContext;
+ }
+
+ public void execute(final Controller controller, Object object)
+ {
+ final ProcessDefinitionRef def = (ProcessDefinitionRef)object;
+
+ String url = appContext.getUrlBuilder().getProcessInstancesURL(def.getId());
+
+ JSONRequest.get(
+ url, new JSONRequestHandler()
+ {
+ public void onRequestComplete(JavaScriptObject json)
+ {
+ if (json == null) {
+ appContext.displayMessage("Couldn't retrieve process instance data", true);
+ return;
+ }
+
+ List<ProcessInstanceRef> instances = null;
+ try
+ {
+ instances = DTOParser.parseProcessInstances(json);
+ }
+ catch (Throwable e)
+ {
+ e.printStackTrace();
+ appContext.displayMessage(e.getMessage(), true);
+ }
+
+
+ InstanceListView view = (InstanceListView) controller.getView(InstanceListView.ID);
+ view.update(def, instances);
+
+ appContext.displayMessage("Loaded " + instances.size() + " process instances", false);
+ }
+ }
+ );
+ }
+}
Modified: projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/v2/process/ProcessEditor.java
===================================================================
--- projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/v2/process/ProcessEditor.java 2009-04-16 19:28:20 UTC (rev 4570)
+++ projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/v2/process/ProcessEditor.java 2009-04-16 19:32:12 UTC (rev 4571)
@@ -53,9 +53,11 @@
// create and register views
addView(DefinitionListView.ID, new DefinitionListView());
-
+ addView(InstanceListView.ID, new InstanceListView());
+
// create and register actions
addAction(LoadDefinitionsAction.ID, new LoadDefinitionsAction(appContext));
+ addAction(LoadInstancesAction.ID, new LoadInstancesAction(appContext));
// force loading
super.controller.handleEvent(
@@ -63,6 +65,7 @@
);
tabPanel.selectTab(0);
+
}
private void addView(String id, Widget view)
Deleted: projects/gwt-console/branches/hbraun/war/src/test/java/org/jboss/bpm/console/client/GwtTestProcessManagement.java
===================================================================
--- projects/gwt-console/branches/hbraun/war/src/test/java/org/jboss/bpm/console/client/GwtTestProcessManagement.java 2009-04-16 19:28:20 UTC (rev 4570)
+++ projects/gwt-console/branches/hbraun/war/src/test/java/org/jboss/bpm/console/client/GwtTestProcessManagement.java 2009-04-16 19:32:12 UTC (rev 4571)
@@ -1,278 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file 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.jboss.bpm.console.client;
-
-import com.google.gwt.http.client.Request;
-import com.google.gwt.http.client.RequestBuilder;
-import com.google.gwt.http.client.RequestCallback;
-import com.google.gwt.http.client.Response;
-import com.gwtext.client.widgets.ComponentMgr;
-import org.jboss.bpm.console.client.model.ProcessDefinitionRef;
-import org.jboss.bpm.console.client.process.ProcessDefinitionList;
-import org.jboss.bpm.console.client.process.ProcessEditor;
-import org.jboss.bpm.console.client.process.ProcessInstanceListView;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author Heiko.Braun <heiko.braun(a)jboss.com>
- */
-public class GwtTestProcessManagement extends AbstractConsoleTC
-{
- public void testProcessManagement()
- {
- System.out.println("=== testProcessInstanceEditor ===");
-
- final ProcessEditor editor = (ProcessEditor)
- ComponentMgr.getComponent(ProcessEditor.ID);
-
- Map<String, Object> context = new HashMap<String, Object>();
- context.put("editor", editor);
-
- DeployTestHarnessTimer deployTimer = new DeployTestHarnessTimer(context);
- AuthenticationTimer authTimer = new AuthenticationTimer(context,"admin", "admin");
- LoadTestHarnessTimer loadingTimer = new LoadTestHarnessTimer(context);
- InstanceEditorTimer instanceTimer = new InstanceEditorTimer(context);
- UndeployTimer undeployTimer = new UndeployTimer(context);
-
- context.put("deployFollow", authTimer);
- context.put("authFollow", loadingTimer);
- context.put("loadFollow", instanceTimer);
- context.put("instanceFollow", undeployTimer);
-
- // trigger first timer
- deployTimer.schedule(1000);
- delayTestFinish(2000);
-
- }
-
- class DeployTestHarnessTimer extends ChainedTimer
- {
-
- protected DeployTestHarnessTimer(Map<String, Object> context)
- {
- super(context);
- }
-
- public void run()
- {
- String url = urlBuilder.getDeployTestHarnessUrl();
- RequestBuilder rb = new RequestBuilder(RequestBuilder.POST, url);
- try
- {
- rb.sendRequest("",
- new RequestCallback()
- {
-
- public void onResponseReceived(Request request, Response response)
- {
- if(response.getStatusCode()!=200)
- throw new RuntimeException("HTTP status " + response.getStatusCode());
-
- proceedOrFinish();
- }
-
- public void onError(Request request, Throwable t)
- {
- throw new RuntimeException("Connection problem", t);
- }
- }
- );
- }
- catch (Throwable e)
- {
- throw new RuntimeException("Failed to remove process definition", e);
- }
- }
-
- public ChainedTimer getNext()
- {
- return (ChainedTimer)context.get("deployFollow");
- }
- }
- class LoadTestHarnessTimer extends ChainedTimer
- {
-
- public LoadTestHarnessTimer(Map<String, Object> context)
- {
- super(context);
- }
-
- public ChainedTimer getNext()
- {
- return (ChainedTimer)context.get("loadFollow");
- }
-
- public void run()
- {
- ProcessEditor editor = (ProcessEditor) context.get("editor");
- editor.resetEditor();
- ProcessDefinitionList list = editor.getProcessDefinitionList();
- proceedOrFinish();
- }
- }
-
- class InstanceEditorTimer extends ChainedTimer
- {
- public InstanceEditorTimer(Map<String, Object> context)
- {
- super(context);
- }
-
-
- public ChainedTimer getNext()
- {
- return (ChainedTimer)context.get("instanceFollow");
- }
-
- public void run()
- {
- ProcessEditor editor = (ProcessEditor)context.get("editor");
- ProcessDefinitionList list = editor.getProcessDefinitionList();
-
- List<ProcessDefinitionRef> processDefinitions = list.getAvailableProcessDefinitions();
- ProcessDefinitionRef testPd = getTestProcessDefinition(processDefinitions);
- assertNotNull("No test definition given: " +processDefinitions, testPd);
-
- list.launchInstanceView(testPd); // will create an instance editor
-
- // lookup instance editor
- String editorId = ProcessInstanceListView.createWidgetID(testPd);
- ProcessInstanceListView instanceView = (ProcessInstanceListView)
- ComponentMgr.getComponent(editorId);
- assertNotNull("Failed to create instance editor for process", instanceView);
-
- // todo: start new instance
- System.out.println("FIXME: Implement instance creation test");
-
- List<ProcessDefinitionRef> defs = list.getAvailableProcessDefinitions();
- assertFalse(defs.isEmpty());
-
- proceedOrFinish();
- }
- }
-
- private ProcessDefinitionRef getTestProcessDefinition(List<ProcessDefinitionRef> list)
- {
- ProcessDefinitionRef def =null;
- for(ProcessDefinitionRef pd : list)
- {
- if(pd.getName().equals(GWT_TEST_HARNESS))
- {
- def=pd;
- break;
- }
- }
- return def;
- }
-
- class UndeployTimer extends ChainedTimer
- {
- public UndeployTimer(Map<String, Object> context)
- {
- super(context);
- }
-
- public ChainedTimer getNext()
- {
- return (ChainedTimer)context.get("undeployFollow");
- }
-
- public void run()
- {
- String deleteUrl = urlBuilder.getUndeployTestHarnessUrl();
- RequestBuilder rb = new RequestBuilder(RequestBuilder.POST, deleteUrl);
- try
- {
-
- rb.sendRequest("",
- new RequestCallback()
- {
-
- public void onResponseReceived(Request request, Response response)
- {
- if(response.getStatusCode()!=200)
- throw new RuntimeException("HTTP status " + response.getStatusCode());
- }
-
- public void onError(Request request, Throwable t)
- {
- throw new RuntimeException("Connection problem", t);
- }
- }
- );
- }
- catch (Throwable e)
- {
- throw new RuntimeException("Failed to remove process definition", e);
- }
-
- proceedOrFinish();
- }
- }
-
- class AuthenticationTimer extends ChainedTimer
- {
- String user;
- String pass;
-
- public AuthenticationTimer(Map<String,Object> context, String user, String pass)
- {
- super(context);
-
- this.user = user;
- this.pass = pass;
- }
-
-
- public ChainedTimer getNext()
- {
- return (ChainedTimer)context.get("authFollow");
- }
-
- public void run()
- {
-
- String inRoleURL = urlBuilder.getUserInRoleURL(Application.KNOWN_ROLES);
- final Authentication auth = new Authentication(inRoleURL);
- auth.setCallback(
- new Authentication.AuthCallback() {
-
- public void onLoginSuccess(Request request, Response response) {
- System.out.println("Assigned roles: " + auth.getRolesAssigned() );
-
- // only proceed when authentication was successfull
- proceedOrFinish();
- }
-
- public void onLoginFailed(Request request, Throwable t) {
-
- throw new RuntimeException("Login failed", t);
- }
- }
- );
- auth.doLogin(user,pass);
- }
- }
-}
17 years
JBoss JBPM SVN: r4570 - in jbpm4/trunk/modules: api/src/main/java/org/jbpm/api and 114 other directories.
by do-not-reply@jboss.org
Author: tom.baeyens(a)jboss.com
Date: 2009-04-16 15:28:20 -0400 (Thu, 16 Apr 2009)
New Revision: 4570
Added:
jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/
jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/Configuration.java
jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/Deployment.java
jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/Execution.java
jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/ExecutionService.java
jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/HistoryService.java
jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/IdentityService.java
jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/JbpmException.java
jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/JobQuery.java
jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/ManagementService.java
jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/Problem.java
jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/ProcessDefinition.java
jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/ProcessDefinitionQuery.java
jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/ProcessEngine.java
jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/ProcessInstance.java
jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/ProcessInstanceQuery.java
jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/ProcessService.java
jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/RepositoryService.java
jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/TaskQuery.java
jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/TaskService.java
jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/activity/
jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/client/
jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/cmd/
jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/env/
jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/history/
jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/identity/
jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/job/
jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/jpdl/
jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/listener/
jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/model/
jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/package.html
jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/session/
jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/task/
Removed:
jbpm4/trunk/modules/api/src/main/java/org/jbpm/Configuration.java
jbpm4/trunk/modules/api/src/main/java/org/jbpm/Deployment.java
jbpm4/trunk/modules/api/src/main/java/org/jbpm/Execution.java
jbpm4/trunk/modules/api/src/main/java/org/jbpm/ExecutionService.java
jbpm4/trunk/modules/api/src/main/java/org/jbpm/HistoryService.java
jbpm4/trunk/modules/api/src/main/java/org/jbpm/IdentityService.java
jbpm4/trunk/modules/api/src/main/java/org/jbpm/JbpmException.java
jbpm4/trunk/modules/api/src/main/java/org/jbpm/JobQuery.java
jbpm4/trunk/modules/api/src/main/java/org/jbpm/ManagementService.java
jbpm4/trunk/modules/api/src/main/java/org/jbpm/Problem.java
jbpm4/trunk/modules/api/src/main/java/org/jbpm/ProcessDefinition.java
jbpm4/trunk/modules/api/src/main/java/org/jbpm/ProcessDefinitionQuery.java
jbpm4/trunk/modules/api/src/main/java/org/jbpm/ProcessEngine.java
jbpm4/trunk/modules/api/src/main/java/org/jbpm/ProcessInstance.java
jbpm4/trunk/modules/api/src/main/java/org/jbpm/ProcessInstanceQuery.java
jbpm4/trunk/modules/api/src/main/java/org/jbpm/ProcessService.java
jbpm4/trunk/modules/api/src/main/java/org/jbpm/RepositoryService.java
jbpm4/trunk/modules/api/src/main/java/org/jbpm/TaskQuery.java
jbpm4/trunk/modules/api/src/main/java/org/jbpm/TaskService.java
jbpm4/trunk/modules/api/src/main/java/org/jbpm/activity/
jbpm4/trunk/modules/api/src/main/java/org/jbpm/client/
jbpm4/trunk/modules/api/src/main/java/org/jbpm/cmd/
jbpm4/trunk/modules/api/src/main/java/org/jbpm/env/
jbpm4/trunk/modules/api/src/main/java/org/jbpm/history/
jbpm4/trunk/modules/api/src/main/java/org/jbpm/identity/
jbpm4/trunk/modules/api/src/main/java/org/jbpm/job/
jbpm4/trunk/modules/api/src/main/java/org/jbpm/jpdl/
jbpm4/trunk/modules/api/src/main/java/org/jbpm/listener/
jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/
jbpm4/trunk/modules/api/src/main/java/org/jbpm/package.html
jbpm4/trunk/modules/api/src/main/java/org/jbpm/session/
jbpm4/trunk/modules/api/src/main/java/org/jbpm/task/
jbpm4/trunk/modules/log/src/main/java/org/jbpm/log/
jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/MessageFinder.java
Modified:
jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/activity/ActivityBehaviour.java
jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/activity/ActivityExecution.java
jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/activity/ExternalActivityBehaviour.java
jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/client/ClientExecution.java
jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/client/ClientProcessDefinition.java
jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/client/ClientProcessInstance.java
jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/cmd/Command.java
jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/cmd/CommandService.java
jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/env/Context.java
jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/env/Environment.java
jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/env/EnvironmentFactory.java
jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/env/Transaction.java
jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/env/WireObject.java
jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/history/HistoryActivityInstance.java
jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/history/HistoryActivityInstanceQuery.java
jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/history/HistoryProcessInstance.java
jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/history/HistoryProcessInstanceQuery.java
jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/identity/Group.java
jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/identity/User.java
jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/job/Job.java
jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/job/Message.java
jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/job/Timer.java
jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/jpdl/DecisionHandler.java
jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/listener/EventListener.java
jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/listener/EventListenerExecution.java
jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/model/Activity.java
jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/model/Comment.java
jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/model/CompositeElement.java
jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/model/Condition.java
jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/model/Discussable.java
jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/model/Event.java
jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/model/ObservableElement.java
jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/model/OpenExecution.java
jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/model/OpenProcessDefinition.java
jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/model/OpenProcessInstance.java
jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/model/Transition.java
jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/session/DbSession.java
jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/session/MessageSession.java
jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/session/PvmDbSession.java
jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/session/RepositorySession.java
jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/session/TaskDbSession.java
jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/session/TimerSession.java
jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/task/Assignable.java
jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/task/AssignmentHandler.java
jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/task/GroupRef.java
jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/task/IdentityRef.java
jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/task/OpenTask.java
jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/task/Participation.java
jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/task/Swimlane.java
jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/task/Task.java
jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/task/TaskDefinition.java
jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/task/TaskHandler.java
jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/task/UserRef.java
jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/CommandExecutorSLSB.java
jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/CommandReceiverMDB.java
jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/EjbLocalCommandService.java
jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/EjbRemoteCommandService.java
jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/EjbTimerSession.java
jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/ExecuteTimerCmd.java
jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/LocalCommandExecutor.java
jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/RemoteCommandExecutor.java
jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/custom/HappyListener.java
jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/custom/InsertCommentCmd.java
jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/custom/NoisyListener.java
jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/custom/RemoveCommentCmd.java
jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/custom/WaitState.java
jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/CommandReceiverTest.java
jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/EjbTimerSessionTest.java
jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/TimerTest.java
jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/test/deployer/DeployerTestServlet.java
jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/test/enterprise/EnvironmentServletTestCase.java
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/concurrency/graphbased/ConcurrencyGraphBasedTest.java
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/decision/conditions/DecisionConditionsTest.java
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/decision/expression/DecisionExpressionTest.java
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/decision/handler/ContentEvaluation.java
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/decision/handler/DecisionHandlerTest.java
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/end/multiple/EndMultipleTest.java
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/end/processinstance/EndProcessInstanceTest.java
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/end/state/EndStateTest.java
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/esb/EsbTest.java
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/eventlistener/EventListenerTest.java
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/eventlistener/LogListener.java
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/hql/HqlTest.java
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/java/JavaInstantiateTest.java
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/script/expression/ScriptExpressionTest.java
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/script/text/ScriptTextTest.java
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/services/ServicesTest.java
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/sql/SqlTest.java
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/state/choice/StateChoiceTest.java
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/state/sequence/StateSequenceTest.java
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/assignee/TaskAssigneeTest.java
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/assignmenthandler/AssignTask.java
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/assignmenthandler/TaskAssignmentHandlerTest.java
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/candidates/TaskCandidatesTest.java
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/swimlane/TaskSwimlaneTest.java
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/variables/TaskVariablesTest.java
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/timer/transition/TimerTransitionTest.java
jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/JBPMIntegration.java
jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/ModelAdaptor.java
jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/ProcessManagementImpl.java
jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/TaskManagementImpl.java
jbpm4/trunk/modules/integration/spi/src/main/java/org/jbpm/integration/spi/DeploymentAdaptor.java
jbpm4/trunk/modules/integration/spi/src/main/java/org/jbpm/integration/spi/JBPMService.java
jbpm4/trunk/modules/integration/spi/src/main/java/org/jbpm/integration/spi/ProcessEngineObjectFactory.java
jbpm4/trunk/modules/integration/spi/src/main/java/org/jbpm/integration/spi/ProcessEngineReference.java
jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/DecisionConditionActivity.java
jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/DecisionExpressionActivity.java
jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/DecisionHandlerActivity.java
jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/EndActivity.java
jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/EsbActivity.java
jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/EventListenerBinding.java
jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/ForkActivity.java
jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/HqlActivity.java
jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JavaActivity.java
jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JoinActivity.java
jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JpdlActivity.java
jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JpdlAutomaticActivity.java
jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JpdlBinding.java
jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JpdlExternalActivity.java
jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/ScriptActivity.java
jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/ScriptBinding.java
jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/StartActivity.java
jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/StateActivity.java
jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/TaskActivity.java
jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/model/JpdlExecution.java
jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/repository/JpdlDeployer.java
jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/xml/JpdlParser.java
jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/JpdlTestCase.java
jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/ActivityParsingTest.java
jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/JpdlParseTestCase.java
jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/JpdlSchemaTest.java
jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/ProcessParsingTest.java
jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/TransitionParsingTest.java
jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/test/xml/JpdlXmlTest.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/CompositeBuilder.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/CompositeExceptionHandlerBuilder.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/EventBuilder.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/EventExceptionHandlerBuilder.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/ExceptionHandlerBuilder.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/FlowBuilder.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/ObservableBuilder.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/TimerBuilder.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cal/Duration.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cfg/JbpmConfiguration.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cfg/SpringConfiguration.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/AbstractCommand.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/AddParticipationCmd.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/AddReplyCommentCmd.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/AddTaskCommentCmd.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/AssignTaskCmd.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CancelTaskCmd.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CommandException.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CompleteTaskCmd.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CompositeCmd.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/DeleteCommentCmd.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/DeleteDeploymentCmd.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/DeleteProcessDefinitionCmd.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/DeleteProcessInstance.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/DeployCmd.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/EndProcessInstance.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/ExecuteJobCmd.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/FindExecutionCmd.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/FindExecutionsCmd.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/FindLatestProcessDefinitionByKeyCmd.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/FindProcessDefinitionByIdCmd.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/FindProcessDefinitionKeysCmd.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/FindProcessDefinitionsByKeyCmd.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetParticipantsCmd.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetResourceAsStreamCmd.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetSubTasksCmd.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetTaskCmd.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetTaskCommentsCmd.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetVariableNamesCmd.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetVariablesCmd.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/NewTaskCmd.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/QueryCommand.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/RemoveParticipantCmd.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/SaveTaskCmd.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/SendMessageCmd.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/SetVariablesCmd.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/SignalCmd.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/StartProcessInstanceCmd.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/StartProcessInstanceInLatestCmd.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/VariablesCmd.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/BasicEnvironment.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/EnvironmentDefaults.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/ExecutionContext.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/ExecutionEnvironment.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/JbpmConfigurationParser.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/JobContext.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/PvmEnvironment.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/ConverterType.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/ExecutionType.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/HibernateDbSession.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/HibernateJobDbSession.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/HibernatePvmDbSession.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/HibernateTaskDbSession.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/ActivityEnd.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/ActivityStart.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/AutomaticEnd.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/DecisionEnd.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/ProcessInstanceEnd.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/ProcessInstanceStart.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/TaskStart.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/model/HistoryActivityInstanceImpl.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/model/HistoryAutomaticInstanceImpl.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/model/HistoryDecisionInstanceImpl.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/model/HistoryProcessInstanceImpl.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/model/HistoryTaskInstanceImpl.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/CreateGroup.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/CreateMembership.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/CreateUser.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/DeleteGroup.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/DeleteMembership.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/DeleteUser.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/FindGroup.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/FindGroups.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/FindUser.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/FindUsers.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/GroupImpl.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/IdentitySessionImpl.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/IdentitySessionResource.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/JBossIdmIdentitySessionImpl.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/JbpmIdentityStore.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/MembershipImpl.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/UserImpl.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/spi/IdentitySession.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jms/JmsMessageSession.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/job/CommandMessage.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/job/JobImpl.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/job/MessageImpl.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/job/TimerImpl.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/AcquireJobsCmd.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/DispatcherThread.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/GetNextDueDateCmd.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobDbSession.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExceptionHandler.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutor.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorMessageSession.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorServlet.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorThread.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorTimerSession.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/lob/BlobStrategyBlob.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/lob/ClobStrategyClob.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/lob/Lob.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ActivityImpl.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/CommentImpl.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/CompositeElementImpl.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/DefaultIdGenerator.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/EventImpl.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/EventListenerReference.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExceptionHandlerImpl.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExceptionHandlerSynchronization.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExecutionImpl.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExecutionKeyGenerator.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExpressionEvaluator.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/IdGenerator.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ObjectReference.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ObservableElementImpl.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ProcessDefinitionImpl.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ProcessInstanceEndedSynchronization.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ProcessModificationsImpl.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ScopeInstanceImpl.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/TransitionImpl.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/ExecuteActivity.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/ExecuteActivityMessage.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/ProceedToDestinationMessage.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/Signal.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/SignalMessage.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/TakeTransition.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/TakeTransitionMessage.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/AbstractQuery.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/AvgDurationPerActivityQueryCmd.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/ChoiceDistributionQueryCmd.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/HistoryActivityInstanceQueryImpl.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/HistoryProcessInstanceQueryImpl.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/JobQueryImpl.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/ProcessDefinitionQueryImpl.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/ProcessInstanceQueryImpl.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/DeploymentClassLoader.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/DeploymentImpl.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/DeploymentProperty.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/RepositoryServiceImpl.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/RepositorySessionImpl.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/script/EnvironmentBindings.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/script/ScriptManager.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/spring/CommandTransactionCallback.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/spring/SpringCommandService.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/spring/SpringEnvironment.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/spring/SpringEnvironmentContext.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/stream/ByteArrayStreamInput.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/stream/FileStreamInput.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/stream/InputStreamInput.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/stream/ResourceStreamInput.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/stream/UrlStreamInput.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/AbstractServiceImpl.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/AsyncCommandMessage.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/AsyncCommandService.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/AuthorizationInterceptor.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/AuthorizationSession.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/DefaultCommandService.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/EnvironmentInterceptor.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/ExecutionServiceImpl.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/FindGroupIds.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/HistoryServiceImpl.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/IdentityServiceImpl.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/Interceptor.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/ManagementServiceImpl.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/RetryInterceptor.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/SerializeInterceptor.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/TaskServiceImpl.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/LifeCycle.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/LifeCycleState.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/ParticipationImpl.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/SwimlaneImpl.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/TaskImpl.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/TaskQueryImpl.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/test/JobTestHelper.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/JtaTransaction.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/StandardTransaction.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/StandardTransactionInterceptor.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/TransactionException.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/type/Variable.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/type/converter/DateToStringConverter.java
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/matcher/HibernateIdMatcher.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/type/variable/BlobVariable.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/DefaultObservable.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/FilterListener.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/IoUtil.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/Priority.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/ReflectUtil.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/StringUtil.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/TagBinding.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/UrlEntity.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/XmlUtil.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/WireContext.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/WireDefinition.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/AbstractCollectionBinding.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/CommandServiceBinding.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/ContextRefBinding.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/EnvRefBinding.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/EnvironmentFactoryRefBinding.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/EnvironmentInterceptorBinding.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/ExecutionServiceBinding.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/HistoryServiceBinding.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/IdentityServiceBinding.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/JobExecutorBinding.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/JobTestHelperBinding.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/ManagementServiceBinding.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/MessageSessionBinding.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/TaskServiceBinding.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/TimerSessionBinding.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/TransactionBinding.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/TransactionRefBinding.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/VersionTimestampPolicy.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/ClassDescriptor.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/CommandServiceDescriptor.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/ContextRefDescriptor.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/EnvDescriptor.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/EnvironmentDescriptor.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/EnvironmentFactoryDescriptor.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/EnvironmentInterceptorDescriptor.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/HibernateConfigurationDescriptor.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/HibernateSessionDescriptor.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/JbossIdmIdentitySessionDescriptor.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/JbossIdmIdentitySessionFactoryDescriptor.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/JobExecutorDescriptor.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/ObjectDescriptor.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/TransactionRefDescriptor.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/operation/EnlistOperation.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/operation/SubscribeOperation.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/Parse.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/ProblemImpl.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/ProblemList.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/activities/AutomaticActivity.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/activities/DisplaySource.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/activities/PrintLn.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/activities/WaitState.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/builder/BuilderTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/builder/TestActivity.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/BasicEnvironmentTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/EnvironmentSearchOrderTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/EnvironmentTypeLookupTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/NestedEnvironmentTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/eventlistener/EventListenerTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/eventlistener/EventPropagationTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/executionmode/embedded/AutomaticActivity.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/executionmode/embedded/Loan.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/executionmode/embedded/WaitState.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/executionmode/object/ObjectExecutionModeTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/CommentDbTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/GroovyExpressionTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/JuelExpressionTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/identity/IdentityTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/EnlistTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/TransactionFailingCommitTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/TransactionResourcesCommitTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/TransactionResourcesSetRollbackOnlyTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/AutoWireTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/BasicTypeWireTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ClassWireTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ContextBlockSubscriptionTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ContextTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/EnvWireTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ListWireTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/MapWireTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/MethodSubscriptionTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ObjectSubscriptionTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ObjectWireTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/PropertiesWireTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/RefWireTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/SetWireTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/WireEventsSubscriptionTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/WireObservableTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/WireTestCase.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/println/PrintlnTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/test/EnvironmentDbTestCase.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/test/EnvironmentFactoryTestCase.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/test/EnvironmentTestCase.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/tx/BasicTransactionTest.java
jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/BaseJbpmTestCase.java
jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/Db.java
jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JbpmTestCase.java
jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/activities/DecisionTest.java
jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/activities/StateTest.java
jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/cfg/ConfigurationTest.java
jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/eventlistener/EventListenerTest.java
jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/eventlistener/HqlEventListenerTest.java
jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/execution/ExecutionEagerLoadingTest.java
jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/execution/FindExecutionTest.java
jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/execution/SignalExecutionTest.java
jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/execution/StartExecutionTest.java
jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/history/AvgDurationTest.java
jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/history/EndProcessInstanceTest.java
jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/history/ProcessInstanceHistoryTest.java
jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/mgmt/JobQueryTest.java
jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/process/DeploymentResourcesTest.java
jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/process/ProcessDefinitionQueryTest.java
jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/process/RepositoryServiceTest.java
jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/task/SubTaskTest.java
jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/task/TaskCandidatesTest.java
jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/task/TaskCommentsTest.java
jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/task/TaskCreateUpdateDeleteTest.java
jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/task/TaskHandlerTest.java
jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/task/TaskListTest.java
jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/task/TaskParticipationsTest.java
jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/task/TaskQueryTest.java
jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/LoadTestCase.java
jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/AutomaticActivity.java
jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/ContinuationTest.java
jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/ExclusiveMessagesTest.java
jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/ExclusiveTestCommand.java
jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/FailOnceMessageTest.java
jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/FailOnceTestCommand.java
jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/FailingMessageTest.java
jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/FailingTestCommand.java
jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/GenerateExceptionTestCommand.java
jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/JobExecutorTestCase.java
jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/NormalMessageCommand.java
jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/NormalMessageTest.java
jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/WaitState.java
jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/executions/ProcessExecutionTest.java
jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/messages/AddCommentCmd.java
jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/messages/MessageProcessingTest.java
jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/AutomaticActivity.java
jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/AutomaticDecisionTest.java
jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/BasicExecutionFlowTest.java
jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/EventPropagationTest.java
jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/EventTest.java
jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ExceptionHandlerTest.java
jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ExecutionStateTest.java
jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ExternalDecisionTest.java
jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/FunctionalActivityTest.java
jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/LoopingTest.java
jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ScopeStateTest.java
jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ScopeVariableDeclarationTest.java
jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ScopeVariableTest.java
jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/SubProcessTest.java
jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/TransitionBasedConcurrencyTest.java
jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/TransitionEventsTest.java
jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/VariableTest.java
jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/WaitState.java
Log:
JBPM-2173 add api to api packages
Deleted: jbpm4/trunk/modules/api/src/main/java/org/jbpm/Configuration.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/Configuration.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/Configuration.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -1,124 +0,0 @@
-/*
- * 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;
-
-import java.io.File;
-import java.io.InputStream;
-import java.net.URL;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.xml.sax.InputSource;
-
-/**
- * process engine configuration.
- *
- * @author Tom Baeyens
- */
-public class Configuration {
-
- static Map<String, String> implementationClassNames = null;
-
- Configuration impl;
-
- public Configuration() {
- this((String)null);
- }
-
- public Configuration(String type) {
- String implementationClassName = getImplementationClassName(type);
- if (implementationClassName==null) {
- throw new JbpmException("type is null");
- }
- impl = instantiate(implementationClassName);
- }
-
- protected Configuration(Configuration base){
- }
-
- private synchronized String getImplementationClassName(String type) {
- if (implementationClassNames==null) {
- implementationClassNames = new HashMap<String, String>();
- // null represents the default configuration (== the JbpmConfiguration)
- implementationClassNames.put(null, "org.jbpm.pvm.internal.cfg.JbpmConfiguration");
- // TODO
- // implementationClasses.put("spring", "org.jbpm.pvm.internal.cfg.SpringConfiguration");
- // implementationClasses.put("mc", "org.jbpm.pvm.internal.cfg.McConfiguration");
- // implementationClasses.put("programatic", "org.jbpm.pvm.internal.cfg.ProgramaticConfiguration");
- }
- String implementationClassName = implementationClassNames.get(type);
- if (implementationClassName==null) {
- implementationClassName = type;
- }
- return implementationClassName;
- }
-
- protected Configuration instantiate(String className) {
- ClassLoader classLoader = getClassLoader();
- Configuration implementation;
- try {
- Class<?> implementationClass = classLoader.loadClass(className);
- implementation = (Configuration) implementationClass.newInstance();
- } catch (Exception e) {
- throw new JbpmException("couldn't instantiate configuration of type "+className, e);
- }
- return implementation;
- }
-
- protected ClassLoader getClassLoader() {
- return Thread.currentThread().getContextClassLoader();
- }
-
- public Configuration setXmlString(String xmlString) {
- impl.setXmlString(xmlString);
- return impl;
- }
-
- public Configuration setResource(String resource) {
- impl.setResource(resource);
- return impl;
- }
-
- public Configuration setInputStream(InputStream inputStream) {
- impl.setInputStream(inputStream);
- return impl;
- }
-
- public Configuration setInputSource(InputSource inputSource) {
- impl.setInputSource(inputSource);
- return impl;
- }
-
- public Configuration setUrl(URL url) {
- impl.setUrl(url);
- return impl;
- }
-
- public Configuration setFile(File file) {
- impl.setFile(file);
- return impl;
- }
-
- public ProcessEngine buildProcessEngine() {
- return impl.buildProcessEngine();
- }
-}
Deleted: jbpm4/trunk/modules/api/src/main/java/org/jbpm/Deployment.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/Deployment.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/Deployment.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -1,51 +0,0 @@
-/*
- * 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;
-
-import java.io.InputStream;
-import java.net.URL;
-import java.util.zip.ZipInputStream;
-
-import org.jbpm.client.ClientProcessDefinition;
-
-/**
- * @author Tom Baeyens
- */
-public interface Deployment {
-
- String getName();
- Deployment setName(String name);
-
- long getTimestamp();
- Deployment setTimestamp(long timestamp);
-
- Deployment addResourceFromString(String resourceName, String string);
- Deployment addResourceFromInputStream(String resourceName, InputStream inputStream);
- Deployment addResourceFromClasspath(String resourceName);
- Deployment addResourceFromUrl(URL url);
- Deployment addResourcesFromZipInputStream(ZipInputStream zipInputStream);
-
- /** @return deploymentId */
- long deploy();
-
- Deployment addProcessDefinition(ClientProcessDefinition processDefinition);
-}
Deleted: jbpm4/trunk/modules/api/src/main/java/org/jbpm/Execution.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/Execution.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/Execution.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -1,199 +0,0 @@
-/*
- * 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;
-
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Map;
-
-import org.jbpm.client.ClientExecution;
-import org.jbpm.client.ClientProcessDefinition;
-import org.jbpm.model.ObservableElement;
-
-/** a runtime path of execution.
- *
- * <h3 id="state">State of an execution</h3>
- *
- * <p>The state of an execution is either active or locked. An active execution is either
- * executing or waiting for an external trigger. If an execution is not in {@link #STATE_ACTIVE},
- * then it is locked. A locked execution is read only.
- * </p>
- *
- * <p>When a new execution is created, it is in {@link #STATE_ACTIVE}. To change
- * the state to a locked state, use {@link #lock(String)}.
- * {@link #STATE_ACTIVE Some STATE_* constants} are provided that represent the
- * most commonly used locked states. But the state '...' in the picture indicates
- * that any string can be provided as the state in the lock method.
- * </p>
- *
- * <p>If an execution is locked, methods that change the execution will throw
- * a {@link JbpmException} and the message will reference the actual locking state.
- * {@link #fire(String, ObservableElement) Firing events},
- * {@link #setVariable(String, Object) updating variables},
- * {@link #setPriority(int) updating priority} and
- * {@link #createComment(String) adding comments} are not considered to change an
- * execution. Also {@link #createProcessInstance(String) creation} and
- * {@link #removeExecution(Execution) removal} of child executions are unchecked,
- * which means that those methods can be invoked by external API clients and
- * activity behaviour methods, even while the execution is in a locked state.
- * </p>
- *
- * <p>Make sure that comparisons between {@link #getState()} and the
- * {@link #STATE_ACTIVE STATE_* constants} are
- * done with .equals and not with '==' because if executions are
- * loaded from persistent storage, a new string is created instead
- * of the constants.
- * </p>
- *
- * <h3>Comments</h3>
- *
- * @author Tom Baeyens
- */
-public interface Execution extends Serializable {
-
- /** between {@link ClientProcessDefinition#createProcessInstance() creation of
- * a new process instance} and the {@link ClientExecution#start() start} of that
- * process instance. The motivation of this state is that variables can be
- * set programmatically on the process instance so that they can be used during
- * initializations of variables and timers */
- String STATE_CREATED = "created";
-
- /** either executing or in a wait state waiting for a signal.
- * This is the normal state of an execution and the initial state
- * when creating a new execution. Make sure that comparisons are
- * done with .equals and not with '==' because if executions are
- * loaded from persistent storage, a new string is created instead
- * of the constants. */
- String STATE_ACTIVE = "active";
-
- /** parents with concurrent child executions are inactive.
- * When an execution has concurrent child executions, it implies that
- * this execution can't be active. For example, at a fork, the parent
- * execution can wait inactively in the fork being till all the
- * child executions are joined. Only leaves of the
- * execution tree can be active. Make sure that comparisons are
- * done with .equals and not with '==' because if executions are
- * loaded from persistent storage, a new string is created instead
- * of the constants. */
- String STATE_INACTIVE = "inactive";
-
- /** this execution has ended. Make sure that comparisons are
- * done with .equals and not with '==' because if executions are
- * loaded from persistent storage, a new string is created instead
- * of the constants. */
- String STATE_ENDED = "ended";
-
- /** indicates that this execution is temporary suspended with the
- * {@link #suspend()} method. Human tasks of a suspended execution
- * shouldn't show up in people's task list and timers of suspended
- * executions shouldn't fire and the execution is locked. Make sure that comparisons are
- * done with .equals and not with '==' because if executions are
- * loaded from persistent storage, a new string is created instead
- * of the constants. */
- String STATE_SUSPENDED = "suspended";
-
- /** indicates that this execution is doing an asynchronous continuation. */
- String STATE_ASYNC = "async";
-
- /** this execution has been cancelled before it came to completion.
- * Only history executions might expose this state. This state can be
- * passed in {@link ExecutionService#endProcessInstance(String, String)}.
- * Make sure that comparisons are
- * done with .equals and not with '==' because if executions are
- * loaded from persistent storage, a new string is created instead
- * of the constants. */
- String STATE_CANCELLED = "cancelled";
-
- /** the externally given name or id of this execution. The id of a main
- * path of execution is null. Can be used to differentiate concurrent
- * paths of execution e.g. the shipping and billing paths. */
- String getName();
-
- /** the optional user provided business key that is unique within one
- * process definition. This could be for instance the order number.
- * It's a user defined identifier for one execution within the scope of
- * a single process definition. */
- String getKey();
-
- /** a globally unique identifier for this execution. */
- String getId();
-
- /** represents the current position in the process by indicating the
- * name of the current activity. */
- String getActivityName();
-
- /** the <a href="#state">state</a> of this execution. */
- String getState();
-
- /** is this a process instance */
- boolean isProcessInstance();
-
- /** is this execution active ? This is the inverse of {@link #isLocked()}. */
- boolean isActive();
-
- /** is this execution {@link #lock(String) locked} ? This is the inverse of {@link #isActive()}. */
- boolean isLocked();
-
- /** is this execution ended */
- boolean isEnded();
-
- /** is this execution suspended ? */
- boolean isSuspended();
-
- /** indicates low priorities with negative values and high priorities
- * with positive values. The default priority is 0, which means
- * NORMAL. Other recognized named priorities are HIGHEST (2), HIGH (1),
- * LOW (-1) and LOWEST (-2). For the rest, the user can set any other
- * priority integer value, but then, the UI will have to display it as
- * an integer and not the named value.*/
- int getPriority();
-
- // execution hierarchy access ///////////////////////////////////////////////
-
- /** the main path of execution in the <a href="package-summary.html#basicexecutionstructure">execution
- * structure</a>. Null will be returned in case this execution itself is the
- * main execution path. */
- Execution getProcessInstance();
-
- /** the parent execution in the <a href="package-summary.html#basicexecutionstructure">execution
- * structure</a>. Null will be returned in case this execution itself is the
- * main execution path. */
- Execution getParent();
-
- /** the child executions in the <a href="package-summary.html#basicexecutionstructure">execution
- * structure</a>. Can be null and can be an empty collection. */
- Collection<Execution> getExecutions();
-
- /** maps child execution names to execution objects. In case multiple executions
- * have the same name, the first one is taken. Can be null or can be an empty
- * map. The first execution without a name is also included with null as the key.
- */
- Map<String, Execution> getExecutionsMap();
-
- /** the child execution for the given name or null in case such execution doesn't exist. */
- Execution getExecution(String name);
-
- /** indicates if this execution has a child execution with the given executionName */
- boolean hasExecution(String executionName);
-
- Execution findActiveExecutionIn(String activityName);
-}
Deleted: jbpm4/trunk/modules/api/src/main/java/org/jbpm/ExecutionService.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/ExecutionService.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/ExecutionService.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -1,124 +0,0 @@
-/*
- * 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;
-
-import java.util.Map;
-import java.util.Set;
-
-
-/** manages runtime process executions.
- *
- * @author Tom Baeyens
- */
-public interface ExecutionService {
-
- /** starts a new process instance for the ProcessDefinition with the given processDefinitionDbid.
- * @param processDefinitionId the {@link ProcessDefinition#getId() unique id} of the process definition. */
- ProcessInstance startProcessInstanceById(String processDefinitionId);
-
- /** starts a new process instance for the ProcessDefinition with the given processDefinitionDbid.
- * @param processDefinitionId the {@link ProcessDefinition#getId() unique id} of the process definition.
- * @param processInstanceKey is a user provided reference for the new process instance that must be unique over all
- * process definition versions with the same name. */
- ProcessInstance startProcessInstanceById(String processDefinitionId, String processInstanceKey);
-
- /** starts a new process instance for the ProcessDefinition with the given processDefinitionDbid.
- * @param processDefinitionId the {@link ProcessDefinition#getId() unique id} of the process definition.
- * @param variables are the initial values of the process variables that will be set before the execution starts. */
- ProcessInstance startProcessInstanceById(String processDefinitionId, Map<String, Object> variables);
-
- /** starts a new process instance for the ProcessDefinition with the given processDefinitionDbid.
- * @param processDefinitionId the {@link ProcessDefinition#getId() unique id} of the process definition.
- * @param variables are the initial values of the process variables that will be set before the execution starts.
- * @param processInstanceKey is a user provided reference for the new process instance that must be unique over all
- * process versions with the same name. */
- ProcessInstance startProcessInstanceById(String processDefinitionId, Map<String, Object> variables, String processInstanceKey);
-
- /** starts a new process instance in the latest version of the given process definition.
- * @param processDefinitionKey is the key of the process definition for which the latest version will be taken. */
- ProcessInstance startProcessInstanceByKey(String processDefinitionKey);
-
- /** starts a new process instance in the latest version of the given processDefinitionName.
- * @param processDefinitionKey is the key of the process definition
- * for which the latest version will be taken.
- * @param processInstanceKey is a user provided reference for the new process instance
- * that must be unique over all process versions with the same name. */
- ProcessInstance startProcessInstanceByKey(String processDefinitionKey, String processInstanceKey);
-
- /** starts a new process instance in the latest version of the given processDefinitionName.
- * @param processDefinitionKey is the key of the process definition
- * for which the latest version will be taken.
- * @param variables are the initial values of the process variables that
- * will be set before the execution starts (read: before the initial
- * activity is executed). */
- ProcessInstance startProcessInstanceByKey(String processDefinitionKey, Map<String, Object> variables);
-
- /** starts a new process instance in the latest version of the given processDefinitionName.
- * @param processDefinitionKey is the key of the process definition for which the latest version will be taken.
- * @param variables are the initial values of the process variables that will be set before the execution starts.
- * @param processInstanceKey is a user provided reference for the new execution that must be unique over all
- * process versions with the same name. */
- ProcessInstance startProcessInstanceByKey(String processDefinitionKey, Map<String, Object> variables, String processInstanceKey);
-
- /** the path of execution that is uniquely defined by the execution id. */
- Execution findExecutionById(String executionId);
-
- /** the process instance that is uniquely defined by the process execution id. */
- ProcessInstance findProcessInstanceById(String processInstanceId);
-
- /** provides an external trigger to an execution. */
- ProcessInstance signalExecutionById(String executionId);
-
- /** provides a named external trigger to an execution. */
- ProcessInstance signalExecutionById(String executionId, String signalName);
-
- /** provides a named external trigger to an execution with parameters. */
- ProcessInstance signalExecutionById(String executionId, String signalName, Map<String, Object> parameters);
-
- /** provides a external trigger to an execution with parameters. */
- ProcessInstance signalExecutionById(String executionId, Map<String, Object> parameters);
-
-
- /** search for process instances with criteria */
- ProcessInstanceQuery createProcessInstanceQuery();
-
- /** creates or overwrites a variable value on the referenced execution */
- void setVariable(String executionId, String name, Object value);
-
- /** creates or overwrites the variable values on the referenced execution */
- void setVariables(String executionId, Map<String, Object> variables);
-
- /** retrieves a variable */
- Object getVariable(String executionId, String variableName);
-
- /** all the variables visible in the given execution scope */
- Set<String> getVariableNames(String executionId);
-
- /** retrieves a map of variables */
- Map<String, Object> getVariables(String executionId, Set<String> variableNames);
-
- /** end a process instance */
- void endProcessInstance(String processInstanceId, String state);
-
- /** delete a process instance */
- void deleteProcessInstance(String processInstanceId);
-}
Deleted: jbpm4/trunk/modules/api/src/main/java/org/jbpm/HistoryService.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/HistoryService.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/HistoryService.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -1,48 +0,0 @@
-/*
- * 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;
-
-import java.util.Map;
-
-import org.jbpm.history.HistoryActivityInstanceQuery;
-import org.jbpm.history.HistoryProcessInstanceQuery;
-
-
-/** exposes the history information for ongoing and past
- * process instances.
- *
- * @author Tom Baeyens
- */
-public interface HistoryService {
-
- /** search for process instances in the history */
- HistoryProcessInstanceQuery createHistoryProcessInstanceQuery();
-
- /** search in history activity instance information */
- HistoryActivityInstanceQuery createHistoryActivityInstanceQuery();
-
- /** returns the average duration in milliseconds for each activity in the given process definition */
- Map<String, Long> avgDurationPerActivity(String processDefinitionId);
-
- /** returns for each transitionName, the number of times that transition was taken */
- Map<String, Integer> choiceDistribution(String processDefinitionId, String activityName);
-}
Deleted: jbpm4/trunk/modules/api/src/main/java/org/jbpm/IdentityService.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/IdentityService.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/IdentityService.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -1,94 +0,0 @@
-/*
- * 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;
-
-import java.util.List;
-
-import org.jbpm.identity.Group;
-import org.jbpm.identity.User;
-
-
-/**
- * @author Tom Baeyens
- */
-public interface IdentityService {
-
- /** create a new user */
- void createUser(String userId, String password, String givenName, String familyName);
-
- /** lookup a user
- * @return the user or null if no such user exists */
- User findUserById(String userId);
-
- /** get all the users in the system.
- * Returns an empty list if no users exist. */
- List<User> findUsers();
-
- /** delete the given user.
- * No effect (no exception) if the user does not exist. */
- void deleteUser(String userId);
-
- /** create a group new group
- * @return the generated id for this group. */
- String createGroup(String string);
-
- /** create a group new group
- * @return the generated id for this group. */
- String createGroup(String string, String groupType);
-
- /** create a group new group
- * @return the generated id for this group. */
- String createGroup(String groupName, String groupType, String parentGroupId);
-
- /** lookup a group.
- * @return the user or null if no such user exists */
- Group findGroupById(String groupId);
-
- /** groups of the given groupType for which the given user is a member.
- * Returns an empty list if no such groups exist. */
- List<Group> findGroupsByUserAndGroupType(String userId, String groupType);
-
- /** all group ids (String) for which this user is a member.
- * Returns an empty list if no such groups exist. */
- List<Group> findGroupsByUser(String userId);
-
- /** all group ids (String) for which this user is a member.
- * Returns an empty list if no such groups exist. */
- List<String> findGroupIdsByUser(String userId);
-
- /** deletes the given group.
- * No effect (no exception) if the group does not exist. */
- void deleteGroup(String groupId);
-
- /** makes the given user a member of the given group with the given role.
- * Role can be null. */
- void createMembership(String string, String groupId);
-
- /** makes the given user a member of the given group with the given role.
- * Role can be null. */
- void createMembership(String userId, String groupId, String role);
-
- /** makes the given user a member of the given group with the given role.
- * Role can be null. If no such membership exists, this method will
- * not throw an exception and have no effect. */
- void deleteMembership(String userId, String groupId, String role);
-}
\ No newline at end of file
Deleted: jbpm4/trunk/modules/api/src/main/java/org/jbpm/JbpmException.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/JbpmException.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/JbpmException.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -1,42 +0,0 @@
-/*
- * 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;
-
-public class JbpmException extends RuntimeException {
-
- private static final long serialVersionUID = 1L;
-
- public JbpmException() {
- super();
- }
- public JbpmException(String msg, Throwable cause) {
- super(msg);
- super.initCause(cause);
- }
- public JbpmException(String msg) {
- super(msg);
- }
- public JbpmException(Throwable cause) {
- super();
- super.initCause(cause);
- }
-}
Deleted: jbpm4/trunk/modules/api/src/main/java/org/jbpm/JobQuery.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/JobQuery.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/JobQuery.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -1,48 +0,0 @@
-/*
- * 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;
-
-import java.util.List;
-
-import org.jbpm.job.Job;
-
-
-/**
- * @author Tom Baeyens
- */
-public interface JobQuery {
-
- JobQuery messages();
- JobQuery timers();
-
- JobQuery processInstanceId(String processInstanceId);
-
- JobQuery exception();
-
- JobQuery orderAsc(String property);
- JobQuery orderDesc(String property);
-
- JobQuery page(int firstResult, int maxResults);
-
- List<Job> list();
- Job uniqueResult();
-}
Deleted: jbpm4/trunk/modules/api/src/main/java/org/jbpm/ManagementService.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/ManagementService.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/ManagementService.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -1,44 +0,0 @@
-/*
- * 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;
-
-
-
-
-/** operations targeted to system operators that need to keep
- * the process engine up and running. This functionality is typically
- * exposed through a management web console.
- *
- * @author Tom Baeyens
- */
-public interface ManagementService {
-
- /** resets the retry count, clears the exception and executes the job.
- * An exception is thrown out of this method in case the execution
- * of the job fails. In case the async command executor is configured
- * for this service, failing job execution will not result into an
- * exception coming out of this method. */
- void executeJob(long jobDbid);
-
- /** search for jobs */
- JobQuery createJobQuery();
-}
Deleted: jbpm4/trunk/modules/api/src/main/java/org/jbpm/Problem.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/Problem.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/Problem.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -1,41 +0,0 @@
-/*
- * 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;
-
-/**
- * @author Tom Baeyens
- */
-public interface Problem {
-
- public abstract Throwable getCause();
-
- public abstract int getColumn();
-
- public abstract int getLine();
-
- public abstract String getMsg();
-
- public abstract String getResource();
-
- public abstract String getSeverity();
-
-}
\ No newline at end of file
Deleted: jbpm4/trunk/modules/api/src/main/java/org/jbpm/ProcessDefinition.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/ProcessDefinition.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/ProcessDefinition.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -1,54 +0,0 @@
-/*
- * 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;
-
-import java.io.Serializable;
-
-
-/** a graphical process which is deployed in the {@ ProcessService}.
- *
- * @author Tom Baeyens
- */
-public interface ProcessDefinition extends Serializable {
-
- /** the short display name given to this process definition.
- * Multiple process definitions can have the same as long
- * as they are given a different {@link #version}. */
- String getName();
-
- /** the user defined short representation of the name. Just
- * like the name, multiple versions of a process definition
- * can have the same key. */
- String getKey();
-
- /** the unique id for this process definition. */
- String getId();
-
- /** automatically assigned during deployment of a process that
- * represents the sequence number for process definitions with
- * the same {@link ObservableElement#getId() name}. */
- int getVersion();
-
- /** references the deployment in which this process definition is
- * deployed. */
- long getDeploymentDbid();
-}
Deleted: jbpm4/trunk/modules/api/src/main/java/org/jbpm/ProcessDefinitionQuery.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/ProcessDefinitionQuery.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/ProcessDefinitionQuery.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -1,50 +0,0 @@
-/*
- * 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;
-
-import java.util.List;
-
-/**
- * @author Tom Baeyens
- */
-public interface ProcessDefinitionQuery {
-
- String PROPERTY_ID = "idProperty.stringValue";
- String PROPERTY_KEY = "keyProperty.stringValue";
- String PROPERTY_NAME = "idProperty.objectName";
- String PROPERTY_VERSION = "versionProperty.longValue";
- String PROPERTY_DEPLOYMENT_TIMESTAMP = "deployment.timestamp";
-
- ProcessDefinitionQuery id(String id);
- ProcessDefinitionQuery key(String key);
- ProcessDefinitionQuery nameLike(String name);
- ProcessDefinitionQuery name(String name);
- ProcessDefinitionQuery deploymentDbid(long deploymentDbid);
-
- ProcessDefinitionQuery orderAsc(String property);
- ProcessDefinitionQuery orderDesc(String property);
-
- ProcessDefinitionQuery page(int firstResult, int maxResults);
-
- List<ProcessDefinition> list();
- ProcessDefinition uniqueResult();
-}
Deleted: jbpm4/trunk/modules/api/src/main/java/org/jbpm/ProcessEngine.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/ProcessEngine.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/ProcessEngine.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -1,65 +0,0 @@
-/*
- * 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;
-
-
-/** central starting point for all process engine API
- * interactions.
- *
- * @author Tom Baeyens
- */
-public interface ProcessEngine {
-
- /** the {@link RepositoryService repository service} that provides access
- * to the process repository. */
- RepositoryService getRepositoryService();
-
- /** the {@link ExecutionService execution service} that provides access
- * to the runtime executions repository. */
- ExecutionService getExecutionService();
-
- /** the {@link HistoryService history service} that provides access
- * to the history executions repository. */
- HistoryService getHistoryService();
-
- /** the {@link TaskService task service} that exposes the
- * runtime human task lists. */
- TaskService getTaskService();
-
- /** the {@link IdentityService identity service} that exposes the
- * user and group operations management operations. */
- IdentityService getIdentityService();
-
- /** the {@link ManagementService management service} that exposes the
- * management operations to operators that have to keep the jBPM system
- * up and running. */
- ManagementService getManagementService();
-
- /** retrieve and object defined in the process engine by type */
- <T> T get(Class<T> type);
-
- /** retrieve and object defined in the process engine by name */
- Object get(String name);
-
- /** programmatically provide a hibernate session factory */
- void setSessionFactory(Object sessionFactory);
-}
Deleted: jbpm4/trunk/modules/api/src/main/java/org/jbpm/ProcessInstance.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/ProcessInstance.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/ProcessInstance.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -1,33 +0,0 @@
-/*
- * 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;
-
-
-/** a process instance is one execution of a process definition.
- * One process instance can have many concurrent executions.
- * Executions are structured in a tree of which the ProcessInstance
- * is the root.
- *
- * @author Tom Baeyens
- */
-public interface ProcessInstance extends Execution {
-}
Deleted: jbpm4/trunk/modules/api/src/main/java/org/jbpm/ProcessInstanceQuery.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/ProcessInstanceQuery.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/ProcessInstanceQuery.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -1,45 +0,0 @@
-/*
- * 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;
-
-import java.util.List;
-
-
-/**
- * @author Tom Baeyens
- */
-public interface ProcessInstanceQuery {
-
- String PROPERTY_KEY = "key";
-
- ProcessInstanceQuery processDefinitionId(String processDefinitionId);
-
- ProcessInstanceQuery processInstanceId(String processInstanceId);
-
- ProcessInstanceQuery orderAsc(String property);
- ProcessInstanceQuery orderDesc(String property);
-
- ProcessInstanceQuery page(int firstResult, int maxResults);
-
- List<Execution> list();
- Execution uniqueResult();
-}
Deleted: jbpm4/trunk/modules/api/src/main/java/org/jbpm/ProcessService.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/ProcessService.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/ProcessService.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -1,59 +0,0 @@
-/*
- * 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;
-
-import java.util.List;
-
-
-/** a process definition repository.
- *
- * @author Tom Baeyens
- */
-public interface ProcessService {
-
- /** start a deployment */
- Deployment createDeployment();
-
- /** all deployed process definition keys. */
- List<String> findProcessDefinitionKeys();
-
- /** all versions of the given process.
- * @return the process definitions in descending version order. So you get the
- * highest version number as the first. */
- List<ProcessDefinition> findProcessDefinitionsByKey(String processDefinitionKey);
-
- /** latest version of the processDefinition with the given key. */
- ProcessDefinition findLatestProcessDefinitionByKey(String processDefinitionKey);
-
- /** specific version of a named processDefinition. */
- ProcessDefinition findProcessDefinitionById(String processDefinitionId);
-
- /** search for process definitions */
- ProcessDefinitionQuery createProcessDefinitionQuery();
-
- /** deletes process definition if there are no existing executions.
- * @throws JbpmException if there are existing executions or history. */
- void deleteProcessDefinition(String processDefinitionId);
-
- /** deletes process definition, the existing executions and the history. */
- void deleteProcessDefinitionCascade(String processDefinitionId);
-}
Deleted: jbpm4/trunk/modules/api/src/main/java/org/jbpm/RepositoryService.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/RepositoryService.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/RepositoryService.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -1,41 +0,0 @@
-/*
- * 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;
-
-import java.io.InputStream;
-
-
-/**
- * @author Tom Baeyens
- */
-public interface RepositoryService {
-
- Deployment createDeployment();
-
- void deleteDeployment(long deploymentDbid);
- void deleteDeploymentCascade(long deploymentDbid);
-
- InputStream getResourceAsStream(long deploymentDbid, String resourceName);
-
- ProcessDefinitionQuery createProcessDefinitionQuery();
-
-}
Deleted: jbpm4/trunk/modules/api/src/main/java/org/jbpm/TaskQuery.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/TaskQuery.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/TaskQuery.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -1,58 +0,0 @@
-/*
- * 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;
-
-import java.util.List;
-
-import org.jbpm.task.Task;
-
-
-/**
- * @author Tom Baeyens
- * @author Heiko Braun <heiko.braun(a)jboss.com>
- */
-public interface TaskQuery {
-
- public static final String PROPERTY_NAME = "name";
- public static final String PROPERTY_ASSIGNEE = "assignee";
- public static final String PROPERTY_CREATEDATE = "create";
- public static final String PROPERTY_DUEDATE = "dueDate";
- public static final String PROPERTY_PRIORITY = "priority";
- public static final String PROPERTY_PROGRESS = "progress";
-
- /** only find tasks for which the given user is the assignee */
- TaskQuery assignee(String userId);
-
- /** query for tasks that are unassigned.
- * These tasks can still potentially have candidates. */
- TaskQuery unassigned();
-
- /** only query for tasks that are takable by the given user. */
- TaskQuery takableBy(String userId);
-
- TaskQuery page(int firstResult, int maxResults);
- TaskQuery orderAsc(String property);
- TaskQuery orderDesc(String property);
-
- List<Task> list();
- Task uniqueResult();
-}
Deleted: jbpm4/trunk/modules/api/src/main/java/org/jbpm/TaskService.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/TaskService.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/TaskService.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -1,171 +0,0 @@
-/*
- * 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;
-
-import org.jbpm.model.Comment;
-import org.jbpm.task.Participation;
-import org.jbpm.task.Task;
-
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-/**
- * Human task management facility.
- * @author Alejandro Guizar
- * @author Heiko Braun <heiko.braun(a)jboss.com>
- */
-public interface TaskService {
-
- /** Creates a task.
- * The returned task will be transient.
- * Use {@link #saveTask(Task)} to persist the task. Only
- * after the invocation of {@link #saveTask(Task)}, the
- * {@link Task#getDbid()} property will be initialized. */
- Task newTask();
-
- /** Creates a new subtask for the given task.
- * Make sure that the parent task is saved before the
- * {@link Task#getDbid() dbid} is taken.
- * The returned task will be transient.
- * Use {@link #saveTask(Task)} to persist the task. */
- Task newTask(long parentTaskDbid);
-
- /** Saves the given task to persistent storage.
- * @return the taskDbid */
- long saveTask(Task task);
-
- /** Retrieves the task with the given identifier from persistent storage.
- * If no task with the given identifier exists,
- * the call returns <code>null</code>. */
- Task getTask(long taskDbid);
-
- /** assigns this task to the given assignee. */
- void assignTask(long taskDbid, String userId);
-
- /** taking this task will prevent all other candidates from
- * taking and working on this task.
- * @throws JbpmException if this task already has been taken. */
- void takeTask(long taskDbid, String userId);
-
- /** Deletes this task, marks the related history task as completed.
- * If the task was created in the context
- * of a process execution, this operation may result in a process instance
- * being triggered. */
- void completeTask(long taskDbid);
-
- /** Deletes this task, marks the related history task as completed
- * with the specified outcome. If the task was created in the context
- * of a process execution, this operation may result in a process instance
- * being triggered. The outcome in that case corresponds to an outgoing
- * transition in the process. */
- void completeTask(long taskDbid, String outcome);
-
- /** Deletes the task.
- * If this task was created in the context of a process execution, one
- * of three things might happen depending on configurations of the task
- * in the process definition:
- * a) process executions resumes
- * b) whole process execution is cancelled as well.
- * c) exception is thrown */
- void cancelTask(long taskDbid);
-
- /** Deletes the task providing an indication of the reason. Example reasons
- * could be: "failed", "error", "exited", "obsolete" or "deleted".
- * If this task was created in the context of a process execution, one
- * of three things might happen depending on configurations of the task
- * in the process definition:
- * a) process executions resumes
- * b) whole process execution is cancelled as well.
- * c) exception is thrown */
- void cancelTask(long taskDbid, String reason);
-
- /** add a role to a given task.
- * @param participation specifies the kind of involvement of the participatingUser
- * in this task. see {@link Participation} for default constants. */
- void addTaskParticipatingUser(long taskDbid, String userId, String participationType);
-
- /** add a role to a given task.
- * @param participation specifies the kind of involvement of the participatingUser
- * in this task. see {@link Participation} for default constants. */
- void addTaskParticipatingGroup(long taskDbid, String groupId, String participationType);
-
- /** get roles related to a given task. */
- List<Participation> getTaskParticipations(long taskDbid);
-
- /** removes a role to a given task. Nothing happens (no exception) if
- * the role does not exist.
- * @param participation specifies the kind of involvement of the participatingUser
- * in this task. see {@link Participation} for default constants. */
- void removeTaskParticipatingUser(long taskDbid, String userId, String participationType);
-
- /** removes a role to a given task. Nothing happens (no exception) if
- * the role does not exist.
- * @param participation specifies the kind of involvement of the participatingUser
- * in this task. see {@link Participation} for default constants. */
- void removeTaskParticipatingGroup(long taskDbid, String groupId, String participationType);
-
- /** create a new query for tasks */
- TaskQuery createTaskQuery();
-
- /** list of tasks that are assigned to the given user.
- * Returns an empty list in case no such tasks exist. */
- List<Task> findAssignedTasks(String userId);
-
- /** list of tasks that can be taken by the given user.
- * Returns an empty list in case no such tasks exist. */
- List<Task> findTakableTasks(String userId);
-
- /** get the subtasks for this task. Only goes one level deep at a time. */
- List<Task> getSubTasks(long taskDbid);
-
- /** add a comment to a task */
- Comment addTaskComment(long taskDbid, String message);
-
- /** get the list of comments made to a task. this will
- * fetch all the comments and recursively all replies to those
- * comments. */
- List<Comment> getTaskComments(long taskDbid);
-
- /** add a reply to another comment */
- Comment addReplyComment(long commentDbid, String message);
-
- /** delete a comment.
- * this will recursively delete all replies to this comment. */
- void deleteComment(long commentDbid);
-
- /** creates or overwrites a variable value on the given task */
- void setVariable(long taskDbid, String name, Object value);
-
- /** creates or overwrites the variable values on the given task */
- void setVariables(long taskDbid, Map<String, Object> variables);
-
- /** retrieves a variable */
- Object getVariable(long taskDbid, String variableName);
-
- /** all the variables visible in the given task */
- Set<String> getVariableNames(long taskDbid);
-
- /** retrieves a map of variables */
- Map<String, Object> getVariables(long taskDbid, Set<String> variableNames);
-
-}
Copied: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/Configuration.java (from rev 4568, jbpm4/trunk/modules/api/src/main/java/org/jbpm/Configuration.java)
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/Configuration.java (rev 0)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/Configuration.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -0,0 +1,124 @@
+/*
+ * 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.api;
+
+import java.io.File;
+import java.io.InputStream;
+import java.net.URL;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.xml.sax.InputSource;
+
+/**
+ * process engine configuration.
+ *
+ * @author Tom Baeyens
+ */
+public class Configuration {
+
+ static Map<String, String> implementationClassNames = null;
+
+ Configuration impl;
+
+ public Configuration() {
+ this((String)null);
+ }
+
+ public Configuration(String type) {
+ String implementationClassName = getImplementationClassName(type);
+ if (implementationClassName==null) {
+ throw new JbpmException("type is null");
+ }
+ impl = instantiate(implementationClassName);
+ }
+
+ protected Configuration(Configuration base){
+ }
+
+ private synchronized String getImplementationClassName(String type) {
+ if (implementationClassNames==null) {
+ implementationClassNames = new HashMap<String, String>();
+ // null represents the default configuration (== the JbpmConfiguration)
+ implementationClassNames.put(null, "org.jbpm.pvm.internal.cfg.JbpmConfiguration");
+ // TODO
+ // implementationClasses.put("spring", "org.jbpm.pvm.internal.cfg.SpringConfiguration");
+ // implementationClasses.put("mc", "org.jbpm.pvm.internal.cfg.McConfiguration");
+ // implementationClasses.put("programatic", "org.jbpm.pvm.internal.cfg.ProgramaticConfiguration");
+ }
+ String implementationClassName = implementationClassNames.get(type);
+ if (implementationClassName==null) {
+ implementationClassName = type;
+ }
+ return implementationClassName;
+ }
+
+ protected Configuration instantiate(String className) {
+ ClassLoader classLoader = getClassLoader();
+ Configuration implementation;
+ try {
+ Class<?> implementationClass = classLoader.loadClass(className);
+ implementation = (Configuration) implementationClass.newInstance();
+ } catch (Exception e) {
+ throw new JbpmException("couldn't instantiate configuration of type "+className, e);
+ }
+ return implementation;
+ }
+
+ protected ClassLoader getClassLoader() {
+ return Thread.currentThread().getContextClassLoader();
+ }
+
+ public Configuration setXmlString(String xmlString) {
+ impl.setXmlString(xmlString);
+ return impl;
+ }
+
+ public Configuration setResource(String resource) {
+ impl.setResource(resource);
+ return impl;
+ }
+
+ public Configuration setInputStream(InputStream inputStream) {
+ impl.setInputStream(inputStream);
+ return impl;
+ }
+
+ public Configuration setInputSource(InputSource inputSource) {
+ impl.setInputSource(inputSource);
+ return impl;
+ }
+
+ public Configuration setUrl(URL url) {
+ impl.setUrl(url);
+ return impl;
+ }
+
+ public Configuration setFile(File file) {
+ impl.setFile(file);
+ return impl;
+ }
+
+ public ProcessEngine buildProcessEngine() {
+ return impl.buildProcessEngine();
+ }
+}
Property changes on: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/Configuration.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:mergeinfo
+
Name: svn:eol-style
+ LF
Copied: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/Deployment.java (from rev 4568, jbpm4/trunk/modules/api/src/main/java/org/jbpm/Deployment.java)
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/Deployment.java (rev 0)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/Deployment.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -0,0 +1,51 @@
+/*
+ * 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.api;
+
+import java.io.InputStream;
+import java.net.URL;
+import java.util.zip.ZipInputStream;
+
+import org.jbpm.api.client.ClientProcessDefinition;
+
+/**
+ * @author Tom Baeyens
+ */
+public interface Deployment {
+
+ String getName();
+ Deployment setName(String name);
+
+ long getTimestamp();
+ Deployment setTimestamp(long timestamp);
+
+ Deployment addResourceFromString(String resourceName, String string);
+ Deployment addResourceFromInputStream(String resourceName, InputStream inputStream);
+ Deployment addResourceFromClasspath(String resourceName);
+ Deployment addResourceFromUrl(URL url);
+ Deployment addResourcesFromZipInputStream(ZipInputStream zipInputStream);
+
+ /** @return deploymentId */
+ long deploy();
+
+ Deployment addProcessDefinition(ClientProcessDefinition processDefinition);
+}
Property changes on: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/Deployment.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:mergeinfo
+
Name: svn:eol-style
+ LF
Copied: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/Execution.java (from rev 4568, jbpm4/trunk/modules/api/src/main/java/org/jbpm/Execution.java)
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/Execution.java (rev 0)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/Execution.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -0,0 +1,199 @@
+/*
+ * 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.api;
+
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.Map;
+
+import org.jbpm.api.client.ClientExecution;
+import org.jbpm.api.client.ClientProcessDefinition;
+import org.jbpm.api.model.ObservableElement;
+
+/** a runtime path of execution.
+ *
+ * <h3 id="state">State of an execution</h3>
+ *
+ * <p>The state of an execution is either active or locked. An active execution is either
+ * executing or waiting for an external trigger. If an execution is not in {@link #STATE_ACTIVE},
+ * then it is locked. A locked execution is read only.
+ * </p>
+ *
+ * <p>When a new execution is created, it is in {@link #STATE_ACTIVE}. To change
+ * the state to a locked state, use {@link #lock(String)}.
+ * {@link #STATE_ACTIVE Some STATE_* constants} are provided that represent the
+ * most commonly used locked states. But the state '...' in the picture indicates
+ * that any string can be provided as the state in the lock method.
+ * </p>
+ *
+ * <p>If an execution is locked, methods that change the execution will throw
+ * a {@link JbpmException} and the message will reference the actual locking state.
+ * {@link #fire(String, ObservableElement) Firing events},
+ * {@link #setVariable(String, Object) updating variables},
+ * {@link #setPriority(int) updating priority} and
+ * {@link #createComment(String) adding comments} are not considered to change an
+ * execution. Also {@link #createProcessInstance(String) creation} and
+ * {@link #removeExecution(Execution) removal} of child executions are unchecked,
+ * which means that those methods can be invoked by external API clients and
+ * activity behaviour methods, even while the execution is in a locked state.
+ * </p>
+ *
+ * <p>Make sure that comparisons between {@link #getState()} and the
+ * {@link #STATE_ACTIVE STATE_* constants} are
+ * done with .equals and not with '==' because if executions are
+ * loaded from persistent storage, a new string is created instead
+ * of the constants.
+ * </p>
+ *
+ * <h3>Comments</h3>
+ *
+ * @author Tom Baeyens
+ */
+public interface Execution extends Serializable {
+
+ /** between {@link ClientProcessDefinition#createProcessInstance() creation of
+ * a new process instance} and the {@link ClientExecution#start() start} of that
+ * process instance. The motivation of this state is that variables can be
+ * set programmatically on the process instance so that they can be used during
+ * initializations of variables and timers */
+ String STATE_CREATED = "created";
+
+ /** either executing or in a wait state waiting for a signal.
+ * This is the normal state of an execution and the initial state
+ * when creating a new execution. Make sure that comparisons are
+ * done with .equals and not with '==' because if executions are
+ * loaded from persistent storage, a new string is created instead
+ * of the constants. */
+ String STATE_ACTIVE = "active";
+
+ /** parents with concurrent child executions are inactive.
+ * When an execution has concurrent child executions, it implies that
+ * this execution can't be active. For example, at a fork, the parent
+ * execution can wait inactively in the fork being till all the
+ * child executions are joined. Only leaves of the
+ * execution tree can be active. Make sure that comparisons are
+ * done with .equals and not with '==' because if executions are
+ * loaded from persistent storage, a new string is created instead
+ * of the constants. */
+ String STATE_INACTIVE = "inactive";
+
+ /** this execution has ended. Make sure that comparisons are
+ * done with .equals and not with '==' because if executions are
+ * loaded from persistent storage, a new string is created instead
+ * of the constants. */
+ String STATE_ENDED = "ended";
+
+ /** indicates that this execution is temporary suspended with the
+ * {@link #suspend()} method. Human tasks of a suspended execution
+ * shouldn't show up in people's task list and timers of suspended
+ * executions shouldn't fire and the execution is locked. Make sure that comparisons are
+ * done with .equals and not with '==' because if executions are
+ * loaded from persistent storage, a new string is created instead
+ * of the constants. */
+ String STATE_SUSPENDED = "suspended";
+
+ /** indicates that this execution is doing an asynchronous continuation. */
+ String STATE_ASYNC = "async";
+
+ /** this execution has been cancelled before it came to completion.
+ * Only history executions might expose this state. This state can be
+ * passed in {@link ExecutionService#endProcessInstance(String, String)}.
+ * Make sure that comparisons are
+ * done with .equals and not with '==' because if executions are
+ * loaded from persistent storage, a new string is created instead
+ * of the constants. */
+ String STATE_CANCELLED = "cancelled";
+
+ /** the externally given name or id of this execution. The id of a main
+ * path of execution is null. Can be used to differentiate concurrent
+ * paths of execution e.g. the shipping and billing paths. */
+ String getName();
+
+ /** the optional user provided business key that is unique within one
+ * process definition. This could be for instance the order number.
+ * It's a user defined identifier for one execution within the scope of
+ * a single process definition. */
+ String getKey();
+
+ /** a globally unique identifier for this execution. */
+ String getId();
+
+ /** represents the current position in the process by indicating the
+ * name of the current activity. */
+ String getActivityName();
+
+ /** the <a href="#state">state</a> of this execution. */
+ String getState();
+
+ /** is this a process instance */
+ boolean isProcessInstance();
+
+ /** is this execution active ? This is the inverse of {@link #isLocked()}. */
+ boolean isActive();
+
+ /** is this execution {@link #lock(String) locked} ? This is the inverse of {@link #isActive()}. */
+ boolean isLocked();
+
+ /** is this execution ended */
+ boolean isEnded();
+
+ /** is this execution suspended ? */
+ boolean isSuspended();
+
+ /** indicates low priorities with negative values and high priorities
+ * with positive values. The default priority is 0, which means
+ * NORMAL. Other recognized named priorities are HIGHEST (2), HIGH (1),
+ * LOW (-1) and LOWEST (-2). For the rest, the user can set any other
+ * priority integer value, but then, the UI will have to display it as
+ * an integer and not the named value.*/
+ int getPriority();
+
+ // execution hierarchy access ///////////////////////////////////////////////
+
+ /** the main path of execution in the <a href="package-summary.html#basicexecutionstructure">execution
+ * structure</a>. Null will be returned in case this execution itself is the
+ * main execution path. */
+ Execution getProcessInstance();
+
+ /** the parent execution in the <a href="package-summary.html#basicexecutionstructure">execution
+ * structure</a>. Null will be returned in case this execution itself is the
+ * main execution path. */
+ Execution getParent();
+
+ /** the child executions in the <a href="package-summary.html#basicexecutionstructure">execution
+ * structure</a>. Can be null and can be an empty collection. */
+ Collection<Execution> getExecutions();
+
+ /** maps child execution names to execution objects. In case multiple executions
+ * have the same name, the first one is taken. Can be null or can be an empty
+ * map. The first execution without a name is also included with null as the key.
+ */
+ Map<String, Execution> getExecutionsMap();
+
+ /** the child execution for the given name or null in case such execution doesn't exist. */
+ Execution getExecution(String name);
+
+ /** indicates if this execution has a child execution with the given executionName */
+ boolean hasExecution(String executionName);
+
+ Execution findActiveExecutionIn(String activityName);
+}
Property changes on: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/Execution.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:mergeinfo
+
Name: svn:eol-style
+ LF
Copied: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/ExecutionService.java (from rev 4568, jbpm4/trunk/modules/api/src/main/java/org/jbpm/ExecutionService.java)
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/ExecutionService.java (rev 0)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/ExecutionService.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -0,0 +1,124 @@
+/*
+ * 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.api;
+
+import java.util.Map;
+import java.util.Set;
+
+
+/** manages runtime process executions.
+ *
+ * @author Tom Baeyens
+ */
+public interface ExecutionService {
+
+ /** starts a new process instance for the ProcessDefinition with the given processDefinitionDbid.
+ * @param processDefinitionId the {@link ProcessDefinition#getId() unique id} of the process definition. */
+ ProcessInstance startProcessInstanceById(String processDefinitionId);
+
+ /** starts a new process instance for the ProcessDefinition with the given processDefinitionDbid.
+ * @param processDefinitionId the {@link ProcessDefinition#getId() unique id} of the process definition.
+ * @param processInstanceKey is a user provided reference for the new process instance that must be unique over all
+ * process definition versions with the same name. */
+ ProcessInstance startProcessInstanceById(String processDefinitionId, String processInstanceKey);
+
+ /** starts a new process instance for the ProcessDefinition with the given processDefinitionDbid.
+ * @param processDefinitionId the {@link ProcessDefinition#getId() unique id} of the process definition.
+ * @param variables are the initial values of the process variables that will be set before the execution starts. */
+ ProcessInstance startProcessInstanceById(String processDefinitionId, Map<String, Object> variables);
+
+ /** starts a new process instance for the ProcessDefinition with the given processDefinitionDbid.
+ * @param processDefinitionId the {@link ProcessDefinition#getId() unique id} of the process definition.
+ * @param variables are the initial values of the process variables that will be set before the execution starts.
+ * @param processInstanceKey is a user provided reference for the new process instance that must be unique over all
+ * process versions with the same name. */
+ ProcessInstance startProcessInstanceById(String processDefinitionId, Map<String, Object> variables, String processInstanceKey);
+
+ /** starts a new process instance in the latest version of the given process definition.
+ * @param processDefinitionKey is the key of the process definition for which the latest version will be taken. */
+ ProcessInstance startProcessInstanceByKey(String processDefinitionKey);
+
+ /** starts a new process instance in the latest version of the given processDefinitionName.
+ * @param processDefinitionKey is the key of the process definition
+ * for which the latest version will be taken.
+ * @param processInstanceKey is a user provided reference for the new process instance
+ * that must be unique over all process versions with the same name. */
+ ProcessInstance startProcessInstanceByKey(String processDefinitionKey, String processInstanceKey);
+
+ /** starts a new process instance in the latest version of the given processDefinitionName.
+ * @param processDefinitionKey is the key of the process definition
+ * for which the latest version will be taken.
+ * @param variables are the initial values of the process variables that
+ * will be set before the execution starts (read: before the initial
+ * activity is executed). */
+ ProcessInstance startProcessInstanceByKey(String processDefinitionKey, Map<String, Object> variables);
+
+ /** starts a new process instance in the latest version of the given processDefinitionName.
+ * @param processDefinitionKey is the key of the process definition for which the latest version will be taken.
+ * @param variables are the initial values of the process variables that will be set before the execution starts.
+ * @param processInstanceKey is a user provided reference for the new execution that must be unique over all
+ * process versions with the same name. */
+ ProcessInstance startProcessInstanceByKey(String processDefinitionKey, Map<String, Object> variables, String processInstanceKey);
+
+ /** the path of execution that is uniquely defined by the execution id. */
+ Execution findExecutionById(String executionId);
+
+ /** the process instance that is uniquely defined by the process execution id. */
+ ProcessInstance findProcessInstanceById(String processInstanceId);
+
+ /** provides an external trigger to an execution. */
+ ProcessInstance signalExecutionById(String executionId);
+
+ /** provides a named external trigger to an execution. */
+ ProcessInstance signalExecutionById(String executionId, String signalName);
+
+ /** provides a named external trigger to an execution with parameters. */
+ ProcessInstance signalExecutionById(String executionId, String signalName, Map<String, Object> parameters);
+
+ /** provides a external trigger to an execution with parameters. */
+ ProcessInstance signalExecutionById(String executionId, Map<String, Object> parameters);
+
+
+ /** search for process instances with criteria */
+ ProcessInstanceQuery createProcessInstanceQuery();
+
+ /** creates or overwrites a variable value on the referenced execution */
+ void setVariable(String executionId, String name, Object value);
+
+ /** creates or overwrites the variable values on the referenced execution */
+ void setVariables(String executionId, Map<String, Object> variables);
+
+ /** retrieves a variable */
+ Object getVariable(String executionId, String variableName);
+
+ /** all the variables visible in the given execution scope */
+ Set<String> getVariableNames(String executionId);
+
+ /** retrieves a map of variables */
+ Map<String, Object> getVariables(String executionId, Set<String> variableNames);
+
+ /** end a process instance */
+ void endProcessInstance(String processInstanceId, String state);
+
+ /** delete a process instance */
+ void deleteProcessInstance(String processInstanceId);
+}
Property changes on: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/ExecutionService.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:mergeinfo
+
Name: svn:eol-style
+ LF
Copied: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/HistoryService.java (from rev 4568, jbpm4/trunk/modules/api/src/main/java/org/jbpm/HistoryService.java)
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/HistoryService.java (rev 0)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/HistoryService.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -0,0 +1,48 @@
+/*
+ * 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.api;
+
+import java.util.Map;
+
+import org.jbpm.api.history.HistoryActivityInstanceQuery;
+import org.jbpm.api.history.HistoryProcessInstanceQuery;
+
+
+/** exposes the history information for ongoing and past
+ * process instances.
+ *
+ * @author Tom Baeyens
+ */
+public interface HistoryService {
+
+ /** search for process instances in the history */
+ HistoryProcessInstanceQuery createHistoryProcessInstanceQuery();
+
+ /** search in history activity instance information */
+ HistoryActivityInstanceQuery createHistoryActivityInstanceQuery();
+
+ /** returns the average duration in milliseconds for each activity in the given process definition */
+ Map<String, Long> avgDurationPerActivity(String processDefinitionId);
+
+ /** returns for each transitionName, the number of times that transition was taken */
+ Map<String, Integer> choiceDistribution(String processDefinitionId, String activityName);
+}
Property changes on: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/HistoryService.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Copied: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/IdentityService.java (from rev 4568, jbpm4/trunk/modules/api/src/main/java/org/jbpm/IdentityService.java)
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/IdentityService.java (rev 0)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/IdentityService.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -0,0 +1,94 @@
+/*
+ * 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.api;
+
+import java.util.List;
+
+import org.jbpm.api.identity.Group;
+import org.jbpm.api.identity.User;
+
+
+/**
+ * @author Tom Baeyens
+ */
+public interface IdentityService {
+
+ /** create a new user */
+ void createUser(String userId, String password, String givenName, String familyName);
+
+ /** lookup a user
+ * @return the user or null if no such user exists */
+ User findUserById(String userId);
+
+ /** get all the users in the system.
+ * Returns an empty list if no users exist. */
+ List<User> findUsers();
+
+ /** delete the given user.
+ * No effect (no exception) if the user does not exist. */
+ void deleteUser(String userId);
+
+ /** create a group new group
+ * @return the generated id for this group. */
+ String createGroup(String string);
+
+ /** create a group new group
+ * @return the generated id for this group. */
+ String createGroup(String string, String groupType);
+
+ /** create a group new group
+ * @return the generated id for this group. */
+ String createGroup(String groupName, String groupType, String parentGroupId);
+
+ /** lookup a group.
+ * @return the user or null if no such user exists */
+ Group findGroupById(String groupId);
+
+ /** groups of the given groupType for which the given user is a member.
+ * Returns an empty list if no such groups exist. */
+ List<Group> findGroupsByUserAndGroupType(String userId, String groupType);
+
+ /** all group ids (String) for which this user is a member.
+ * Returns an empty list if no such groups exist. */
+ List<Group> findGroupsByUser(String userId);
+
+ /** all group ids (String) for which this user is a member.
+ * Returns an empty list if no such groups exist. */
+ List<String> findGroupIdsByUser(String userId);
+
+ /** deletes the given group.
+ * No effect (no exception) if the group does not exist. */
+ void deleteGroup(String groupId);
+
+ /** makes the given user a member of the given group with the given role.
+ * Role can be null. */
+ void createMembership(String string, String groupId);
+
+ /** makes the given user a member of the given group with the given role.
+ * Role can be null. */
+ void createMembership(String userId, String groupId, String role);
+
+ /** makes the given user a member of the given group with the given role.
+ * Role can be null. If no such membership exists, this method will
+ * not throw an exception and have no effect. */
+ void deleteMembership(String userId, String groupId, String role);
+}
\ No newline at end of file
Property changes on: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/IdentityService.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:mergeinfo
+
Name: svn:eol-style
+ LF
Copied: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/JbpmException.java (from rev 4568, jbpm4/trunk/modules/api/src/main/java/org/jbpm/JbpmException.java)
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/JbpmException.java (rev 0)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/JbpmException.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -0,0 +1,42 @@
+/*
+ * 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.api;
+
+public class JbpmException extends RuntimeException {
+
+ private static final long serialVersionUID = 1L;
+
+ public JbpmException() {
+ super();
+ }
+ public JbpmException(String msg, Throwable cause) {
+ super(msg);
+ super.initCause(cause);
+ }
+ public JbpmException(String msg) {
+ super(msg);
+ }
+ public JbpmException(Throwable cause) {
+ super();
+ super.initCause(cause);
+ }
+}
Property changes on: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/JbpmException.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:mergeinfo
+
Name: svn:eol-style
+ LF
Copied: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/JobQuery.java (from rev 4568, jbpm4/trunk/modules/api/src/main/java/org/jbpm/JobQuery.java)
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/JobQuery.java (rev 0)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/JobQuery.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -0,0 +1,48 @@
+/*
+ * 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.api;
+
+import java.util.List;
+
+import org.jbpm.api.job.Job;
+
+
+/**
+ * @author Tom Baeyens
+ */
+public interface JobQuery {
+
+ JobQuery messages();
+ JobQuery timers();
+
+ JobQuery processInstanceId(String processInstanceId);
+
+ JobQuery exception();
+
+ JobQuery orderAsc(String property);
+ JobQuery orderDesc(String property);
+
+ JobQuery page(int firstResult, int maxResults);
+
+ List<Job> list();
+ Job uniqueResult();
+}
Property changes on: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/JobQuery.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Copied: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/ManagementService.java (from rev 4568, jbpm4/trunk/modules/api/src/main/java/org/jbpm/ManagementService.java)
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/ManagementService.java (rev 0)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/ManagementService.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -0,0 +1,44 @@
+/*
+ * 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.api;
+
+
+
+
+/** operations targeted to system operators that need to keep
+ * the process engine up and running. This functionality is typically
+ * exposed through a management web console.
+ *
+ * @author Tom Baeyens
+ */
+public interface ManagementService {
+
+ /** resets the retry count, clears the exception and executes the job.
+ * An exception is thrown out of this method in case the execution
+ * of the job fails. In case the async command executor is configured
+ * for this service, failing job execution will not result into an
+ * exception coming out of this method. */
+ void executeJob(long jobDbid);
+
+ /** search for jobs */
+ JobQuery createJobQuery();
+}
Property changes on: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/ManagementService.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:mergeinfo
+
Name: svn:eol-style
+ LF
Copied: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/Problem.java (from rev 4568, jbpm4/trunk/modules/api/src/main/java/org/jbpm/Problem.java)
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/Problem.java (rev 0)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/Problem.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -0,0 +1,41 @@
+/*
+ * 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.api;
+
+/**
+ * @author Tom Baeyens
+ */
+public interface Problem {
+
+ public abstract Throwable getCause();
+
+ public abstract int getColumn();
+
+ public abstract int getLine();
+
+ public abstract String getMsg();
+
+ public abstract String getResource();
+
+ public abstract String getSeverity();
+
+}
\ No newline at end of file
Copied: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/ProcessDefinition.java (from rev 4568, jbpm4/trunk/modules/api/src/main/java/org/jbpm/ProcessDefinition.java)
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/ProcessDefinition.java (rev 0)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/ProcessDefinition.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -0,0 +1,54 @@
+/*
+ * 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.api;
+
+import java.io.Serializable;
+
+
+/** a graphical process which is deployed in the {@ ProcessService}.
+ *
+ * @author Tom Baeyens
+ */
+public interface ProcessDefinition extends Serializable {
+
+ /** the short display name given to this process definition.
+ * Multiple process definitions can have the same as long
+ * as they are given a different {@link #version}. */
+ String getName();
+
+ /** the user defined short representation of the name. Just
+ * like the name, multiple versions of a process definition
+ * can have the same key. */
+ String getKey();
+
+ /** the unique id for this process definition. */
+ String getId();
+
+ /** automatically assigned during deployment of a process that
+ * represents the sequence number for process definitions with
+ * the same {@link ObservableElement#getId() name}. */
+ int getVersion();
+
+ /** references the deployment in which this process definition is
+ * deployed. */
+ long getDeploymentDbid();
+}
Property changes on: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/ProcessDefinition.java
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/ProcessDefinitionQuery.java (from rev 4568, jbpm4/trunk/modules/api/src/main/java/org/jbpm/ProcessDefinitionQuery.java)
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/ProcessDefinitionQuery.java (rev 0)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/ProcessDefinitionQuery.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -0,0 +1,50 @@
+/*
+ * 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.api;
+
+import java.util.List;
+
+/**
+ * @author Tom Baeyens
+ */
+public interface ProcessDefinitionQuery {
+
+ String PROPERTY_ID = "idProperty.stringValue";
+ String PROPERTY_KEY = "keyProperty.stringValue";
+ String PROPERTY_NAME = "idProperty.objectName";
+ String PROPERTY_VERSION = "versionProperty.longValue";
+ String PROPERTY_DEPLOYMENT_TIMESTAMP = "deployment.timestamp";
+
+ ProcessDefinitionQuery id(String id);
+ ProcessDefinitionQuery key(String key);
+ ProcessDefinitionQuery nameLike(String name);
+ ProcessDefinitionQuery name(String name);
+ ProcessDefinitionQuery deploymentDbid(long deploymentDbid);
+
+ ProcessDefinitionQuery orderAsc(String property);
+ ProcessDefinitionQuery orderDesc(String property);
+
+ ProcessDefinitionQuery page(int firstResult, int maxResults);
+
+ List<ProcessDefinition> list();
+ ProcessDefinition uniqueResult();
+}
Property changes on: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/ProcessDefinitionQuery.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Copied: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/ProcessEngine.java (from rev 4568, jbpm4/trunk/modules/api/src/main/java/org/jbpm/ProcessEngine.java)
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/ProcessEngine.java (rev 0)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/ProcessEngine.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -0,0 +1,65 @@
+/*
+ * 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.api;
+
+
+/** central starting point for all process engine API
+ * interactions.
+ *
+ * @author Tom Baeyens
+ */
+public interface ProcessEngine {
+
+ /** the {@link RepositoryService repository service} that provides access
+ * to the process repository. */
+ RepositoryService getRepositoryService();
+
+ /** the {@link ExecutionService execution service} that provides access
+ * to the runtime executions repository. */
+ ExecutionService getExecutionService();
+
+ /** the {@link HistoryService history service} that provides access
+ * to the history executions repository. */
+ HistoryService getHistoryService();
+
+ /** the {@link TaskService task service} that exposes the
+ * runtime human task lists. */
+ TaskService getTaskService();
+
+ /** the {@link IdentityService identity service} that exposes the
+ * user and group operations management operations. */
+ IdentityService getIdentityService();
+
+ /** the {@link ManagementService management service} that exposes the
+ * management operations to operators that have to keep the jBPM system
+ * up and running. */
+ ManagementService getManagementService();
+
+ /** retrieve and object defined in the process engine by type */
+ <T> T get(Class<T> type);
+
+ /** retrieve and object defined in the process engine by name */
+ Object get(String name);
+
+ /** programmatically provide a hibernate session factory */
+ void setSessionFactory(Object sessionFactory);
+}
Property changes on: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/ProcessEngine.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:mergeinfo
+
Name: svn:eol-style
+ LF
Copied: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/ProcessInstance.java (from rev 4568, jbpm4/trunk/modules/api/src/main/java/org/jbpm/ProcessInstance.java)
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/ProcessInstance.java (rev 0)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/ProcessInstance.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -0,0 +1,33 @@
+/*
+ * 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.api;
+
+
+/** a process instance is one execution of a process definition.
+ * One process instance can have many concurrent executions.
+ * Executions are structured in a tree of which the ProcessInstance
+ * is the root.
+ *
+ * @author Tom Baeyens
+ */
+public interface ProcessInstance extends Execution {
+}
Property changes on: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/ProcessInstance.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/ProcessInstanceQuery.java (from rev 4568, jbpm4/trunk/modules/api/src/main/java/org/jbpm/ProcessInstanceQuery.java)
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/ProcessInstanceQuery.java (rev 0)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/ProcessInstanceQuery.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -0,0 +1,45 @@
+/*
+ * 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.api;
+
+import java.util.List;
+
+
+/**
+ * @author Tom Baeyens
+ */
+public interface ProcessInstanceQuery {
+
+ String PROPERTY_KEY = "key";
+
+ ProcessInstanceQuery processDefinitionId(String processDefinitionId);
+
+ ProcessInstanceQuery processInstanceId(String processInstanceId);
+
+ ProcessInstanceQuery orderAsc(String property);
+ ProcessInstanceQuery orderDesc(String property);
+
+ ProcessInstanceQuery page(int firstResult, int maxResults);
+
+ List<Execution> list();
+ Execution uniqueResult();
+}
Property changes on: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/ProcessInstanceQuery.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Copied: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/ProcessService.java (from rev 4568, jbpm4/trunk/modules/api/src/main/java/org/jbpm/ProcessService.java)
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/ProcessService.java (rev 0)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/ProcessService.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -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.api;
+
+import java.util.List;
+
+
+/** a process definition repository.
+ *
+ * @author Tom Baeyens
+ */
+public interface ProcessService {
+
+ /** start a deployment */
+ Deployment createDeployment();
+
+ /** all deployed process definition keys. */
+ List<String> findProcessDefinitionKeys();
+
+ /** all versions of the given process.
+ * @return the process definitions in descending version order. So you get the
+ * highest version number as the first. */
+ List<ProcessDefinition> findProcessDefinitionsByKey(String processDefinitionKey);
+
+ /** latest version of the processDefinition with the given key. */
+ ProcessDefinition findLatestProcessDefinitionByKey(String processDefinitionKey);
+
+ /** specific version of a named processDefinition. */
+ ProcessDefinition findProcessDefinitionById(String processDefinitionId);
+
+ /** search for process definitions */
+ ProcessDefinitionQuery createProcessDefinitionQuery();
+
+ /** deletes process definition if there are no existing executions.
+ * @throws JbpmException if there are existing executions or history. */
+ void deleteProcessDefinition(String processDefinitionId);
+
+ /** deletes process definition, the existing executions and the history. */
+ void deleteProcessDefinitionCascade(String processDefinitionId);
+}
Property changes on: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/ProcessService.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:mergeinfo
+
Name: svn:eol-style
+ LF
Copied: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/RepositoryService.java (from rev 4568, jbpm4/trunk/modules/api/src/main/java/org/jbpm/RepositoryService.java)
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/RepositoryService.java (rev 0)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/RepositoryService.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -0,0 +1,41 @@
+/*
+ * 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.api;
+
+import java.io.InputStream;
+
+
+/**
+ * @author Tom Baeyens
+ */
+public interface RepositoryService {
+
+ Deployment createDeployment();
+
+ void deleteDeployment(long deploymentDbid);
+ void deleteDeploymentCascade(long deploymentDbid);
+
+ InputStream getResourceAsStream(long deploymentDbid, String resourceName);
+
+ ProcessDefinitionQuery createProcessDefinitionQuery();
+
+}
Property changes on: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/RepositoryService.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Copied: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/TaskQuery.java (from rev 4568, jbpm4/trunk/modules/api/src/main/java/org/jbpm/TaskQuery.java)
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/TaskQuery.java (rev 0)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/TaskQuery.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -0,0 +1,58 @@
+/*
+ * 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.api;
+
+import java.util.List;
+
+import org.jbpm.api.task.Task;
+
+
+/**
+ * @author Tom Baeyens
+ * @author Heiko Braun <heiko.braun(a)jboss.com>
+ */
+public interface TaskQuery {
+
+ public static final String PROPERTY_NAME = "name";
+ public static final String PROPERTY_ASSIGNEE = "assignee";
+ public static final String PROPERTY_CREATEDATE = "create";
+ public static final String PROPERTY_DUEDATE = "dueDate";
+ public static final String PROPERTY_PRIORITY = "priority";
+ public static final String PROPERTY_PROGRESS = "progress";
+
+ /** only find tasks for which the given user is the assignee */
+ TaskQuery assignee(String userId);
+
+ /** query for tasks that are unassigned.
+ * These tasks can still potentially have candidates. */
+ TaskQuery unassigned();
+
+ /** only query for tasks that are takable by the given user. */
+ TaskQuery takableBy(String userId);
+
+ TaskQuery page(int firstResult, int maxResults);
+ TaskQuery orderAsc(String property);
+ TaskQuery orderDesc(String property);
+
+ List<Task> list();
+ Task uniqueResult();
+}
Property changes on: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/TaskQuery.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Copied: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/TaskService.java (from rev 4568, jbpm4/trunk/modules/api/src/main/java/org/jbpm/TaskService.java)
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/TaskService.java (rev 0)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/TaskService.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -0,0 +1,171 @@
+/*
+ * 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.api;
+
+import org.jbpm.api.model.Comment;
+import org.jbpm.api.task.Participation;
+import org.jbpm.api.task.Task;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * Human task management facility.
+ * @author Alejandro Guizar
+ * @author Heiko Braun <heiko.braun(a)jboss.com>
+ */
+public interface TaskService {
+
+ /** Creates a task.
+ * The returned task will be transient.
+ * Use {@link #saveTask(Task)} to persist the task. Only
+ * after the invocation of {@link #saveTask(Task)}, the
+ * {@link Task#getDbid()} property will be initialized. */
+ Task newTask();
+
+ /** Creates a new subtask for the given task.
+ * Make sure that the parent task is saved before the
+ * {@link Task#getDbid() dbid} is taken.
+ * The returned task will be transient.
+ * Use {@link #saveTask(Task)} to persist the task. */
+ Task newTask(long parentTaskDbid);
+
+ /** Saves the given task to persistent storage.
+ * @return the taskDbid */
+ long saveTask(Task task);
+
+ /** Retrieves the task with the given identifier from persistent storage.
+ * If no task with the given identifier exists,
+ * the call returns <code>null</code>. */
+ Task getTask(long taskDbid);
+
+ /** assigns this task to the given assignee. */
+ void assignTask(long taskDbid, String userId);
+
+ /** taking this task will prevent all other candidates from
+ * taking and working on this task.
+ * @throws JbpmException if this task already has been taken. */
+ void takeTask(long taskDbid, String userId);
+
+ /** Deletes this task, marks the related history task as completed.
+ * If the task was created in the context
+ * of a process execution, this operation may result in a process instance
+ * being triggered. */
+ void completeTask(long taskDbid);
+
+ /** Deletes this task, marks the related history task as completed
+ * with the specified outcome. If the task was created in the context
+ * of a process execution, this operation may result in a process instance
+ * being triggered. The outcome in that case corresponds to an outgoing
+ * transition in the process. */
+ void completeTask(long taskDbid, String outcome);
+
+ /** Deletes the task.
+ * If this task was created in the context of a process execution, one
+ * of three things might happen depending on configurations of the task
+ * in the process definition:
+ * a) process executions resumes
+ * b) whole process execution is cancelled as well.
+ * c) exception is thrown */
+ void cancelTask(long taskDbid);
+
+ /** Deletes the task providing an indication of the reason. Example reasons
+ * could be: "failed", "error", "exited", "obsolete" or "deleted".
+ * If this task was created in the context of a process execution, one
+ * of three things might happen depending on configurations of the task
+ * in the process definition:
+ * a) process executions resumes
+ * b) whole process execution is cancelled as well.
+ * c) exception is thrown */
+ void cancelTask(long taskDbid, String reason);
+
+ /** add a role to a given task.
+ * @param participation specifies the kind of involvement of the participatingUser
+ * in this task. see {@link Participation} for default constants. */
+ void addTaskParticipatingUser(long taskDbid, String userId, String participationType);
+
+ /** add a role to a given task.
+ * @param participation specifies the kind of involvement of the participatingUser
+ * in this task. see {@link Participation} for default constants. */
+ void addTaskParticipatingGroup(long taskDbid, String groupId, String participationType);
+
+ /** get roles related to a given task. */
+ List<Participation> getTaskParticipations(long taskDbid);
+
+ /** removes a role to a given task. Nothing happens (no exception) if
+ * the role does not exist.
+ * @param participation specifies the kind of involvement of the participatingUser
+ * in this task. see {@link Participation} for default constants. */
+ void removeTaskParticipatingUser(long taskDbid, String userId, String participationType);
+
+ /** removes a role to a given task. Nothing happens (no exception) if
+ * the role does not exist.
+ * @param participation specifies the kind of involvement of the participatingUser
+ * in this task. see {@link Participation} for default constants. */
+ void removeTaskParticipatingGroup(long taskDbid, String groupId, String participationType);
+
+ /** create a new query for tasks */
+ TaskQuery createTaskQuery();
+
+ /** list of tasks that are assigned to the given user.
+ * Returns an empty list in case no such tasks exist. */
+ List<Task> findAssignedTasks(String userId);
+
+ /** list of tasks that can be taken by the given user.
+ * Returns an empty list in case no such tasks exist. */
+ List<Task> findTakableTasks(String userId);
+
+ /** get the subtasks for this task. Only goes one level deep at a time. */
+ List<Task> getSubTasks(long taskDbid);
+
+ /** add a comment to a task */
+ Comment addTaskComment(long taskDbid, String message);
+
+ /** get the list of comments made to a task. this will
+ * fetch all the comments and recursively all replies to those
+ * comments. */
+ List<Comment> getTaskComments(long taskDbid);
+
+ /** add a reply to another comment */
+ Comment addReplyComment(long commentDbid, String message);
+
+ /** delete a comment.
+ * this will recursively delete all replies to this comment. */
+ void deleteComment(long commentDbid);
+
+ /** creates or overwrites a variable value on the given task */
+ void setVariable(long taskDbid, String name, Object value);
+
+ /** creates or overwrites the variable values on the given task */
+ void setVariables(long taskDbid, Map<String, Object> variables);
+
+ /** retrieves a variable */
+ Object getVariable(long taskDbid, String variableName);
+
+ /** all the variables visible in the given task */
+ Set<String> getVariableNames(long taskDbid);
+
+ /** retrieves a map of variables */
+ Map<String, Object> getVariables(long taskDbid, Set<String> variableNames);
+
+}
Property changes on: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/TaskService.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:mergeinfo
+
Name: svn:eol-style
+ LF
Copied: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/activity (from rev 4568, jbpm4/trunk/modules/api/src/main/java/org/jbpm/activity)
Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/activity/ActivityBehaviour.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/activity/ActivityBehaviour.java 2009-04-16 16:28:23 UTC (rev 4568)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/activity/ActivityBehaviour.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -19,7 +19,7 @@
* 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.activity;
+package org.jbpm.api.activity;
import java.io.Serializable;
Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/activity/ActivityExecution.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/activity/ActivityExecution.java 2009-04-16 16:28:23 UTC (rev 4568)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/activity/ActivityExecution.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -19,19 +19,19 @@
* 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.activity;
+package org.jbpm.api.activity;
-import org.jbpm.Execution;
-import org.jbpm.JbpmException;
-import org.jbpm.client.ClientProcessDefinition;
-import org.jbpm.client.ClientProcessInstance;
-import org.jbpm.env.Environment;
-import org.jbpm.model.Activity;
-import org.jbpm.model.ObservableElement;
-import org.jbpm.model.OpenExecution;
-import org.jbpm.model.Transition;
-import org.jbpm.session.PvmDbSession;
-import org.jbpm.task.Task;
+import org.jbpm.api.Execution;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.client.ClientProcessDefinition;
+import org.jbpm.api.client.ClientProcessInstance;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.model.Activity;
+import org.jbpm.api.model.ObservableElement;
+import org.jbpm.api.model.OpenExecution;
+import org.jbpm.api.model.Transition;
+import org.jbpm.api.session.PvmDbSession;
+import org.jbpm.api.task.Task;
/** view upon an {@link Execution path of execution} exposed to
Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/activity/ExternalActivityBehaviour.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/activity/ExternalActivityBehaviour.java 2009-04-16 16:28:23 UTC (rev 4568)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/activity/ExternalActivityBehaviour.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -19,11 +19,11 @@
* 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.activity;
+package org.jbpm.api.activity;
import java.util.Map;
-import org.jbpm.Execution;
+import org.jbpm.api.Execution;
/** extends {@link ActivityBehaviour} for handling external triggers after a wait state.
Copied: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/client (from rev 4568, jbpm4/trunk/modules/api/src/main/java/org/jbpm/client)
Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/client/ClientExecution.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/client/ClientExecution.java 2009-04-16 16:28:23 UTC (rev 4568)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/client/ClientExecution.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -19,15 +19,15 @@
* 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.client;
+package org.jbpm.api.client;
import java.util.Map;
-import org.jbpm.Execution;
-import org.jbpm.JbpmException;
-import org.jbpm.activity.ActivityBehaviour;
-import org.jbpm.activity.ExternalActivityBehaviour;
-import org.jbpm.model.OpenExecution;
+import org.jbpm.api.Execution;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.activity.ActivityBehaviour;
+import org.jbpm.api.activity.ExternalActivityBehaviour;
+import org.jbpm.api.model.OpenExecution;
/** view upon an {@link Execution path of execution} exposed to
* external clients.
Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/client/ClientProcessDefinition.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/client/ClientProcessDefinition.java 2009-04-16 16:28:23 UTC (rev 4568)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/client/ClientProcessDefinition.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -19,10 +19,10 @@
* 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.client;
+package org.jbpm.api.client;
-import org.jbpm.model.OpenExecution;
-import org.jbpm.model.OpenProcessDefinition;
+import org.jbpm.api.model.OpenExecution;
+import org.jbpm.api.model.OpenProcessDefinition;
/** adds factory methods for creating and beginning new process instances.
Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/client/ClientProcessInstance.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/client/ClientProcessInstance.java 2009-04-16 16:28:23 UTC (rev 4568)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/client/ClientProcessInstance.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -19,9 +19,9 @@
* 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.client;
+package org.jbpm.api.client;
-import org.jbpm.model.OpenProcessInstance;
+import org.jbpm.api.model.OpenProcessInstance;
/**
Copied: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/cmd (from rev 4568, jbpm4/trunk/modules/api/src/main/java/org/jbpm/cmd)
Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/cmd/Command.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/cmd/Command.java 2009-04-16 16:28:23 UTC (rev 4568)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/cmd/Command.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -1,8 +1,8 @@
-package org.jbpm.cmd;
+package org.jbpm.api.cmd;
import java.io.Serializable;
-import org.jbpm.env.Environment;
+import org.jbpm.api.env.Environment;
public interface Command<T> extends Serializable {
Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/cmd/CommandService.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/cmd/CommandService.java 2009-04-16 16:28:23 UTC (rev 4568)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/cmd/CommandService.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -1,6 +1,6 @@
-package org.jbpm.cmd;
+package org.jbpm.api.cmd;
-import org.jbpm.JbpmException;
+import org.jbpm.api.JbpmException;
/**
* abstract extensible session facade. Developers can use this directly or
Copied: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/env (from rev 4568, jbpm4/trunk/modules/api/src/main/java/org/jbpm/env)
Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/env/Context.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/env/Context.java 2009-04-16 16:28:23 UTC (rev 4568)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/env/Context.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -19,7 +19,7 @@
* 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.env;
+package org.jbpm.api.env;
import java.util.Set;
Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/env/Environment.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/env/Environment.java 2009-04-16 16:28:23 UTC (rev 4568)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/env/Environment.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -19,12 +19,12 @@
* 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.env;
+package org.jbpm.api.env;
import java.io.Serializable;
import java.util.Stack;
-import org.jbpm.JbpmException;
+import org.jbpm.api.JbpmException;
/**
Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/env/EnvironmentFactory.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/env/EnvironmentFactory.java 2009-04-16 16:28:23 UTC (rev 4568)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/env/EnvironmentFactory.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -19,7 +19,7 @@
* 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.env;
+package org.jbpm.api.env;
import java.io.InputStream;
import java.io.Serializable;
Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/env/Transaction.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/env/Transaction.java 2009-04-16 16:28:23 UTC (rev 4568)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/env/Transaction.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -19,7 +19,7 @@
* 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.env;
+package org.jbpm.api.env;
import javax.transaction.Synchronization;
Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/env/WireObject.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/env/WireObject.java 2009-04-16 16:28:23 UTC (rev 4568)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/env/WireObject.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -19,9 +19,9 @@
* 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.env;
+package org.jbpm.api.env;
-import org.jbpm.JbpmException;
+import org.jbpm.api.JbpmException;
/**
Copied: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/history (from rev 4568, jbpm4/trunk/modules/api/src/main/java/org/jbpm/history)
Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/history/HistoryActivityInstance.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/history/HistoryActivityInstance.java 2009-04-16 16:28:23 UTC (rev 4568)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/history/HistoryActivityInstance.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -19,7 +19,7 @@
* 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.history;
+package org.jbpm.api.history;
import java.util.Date;
Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/history/HistoryActivityInstanceQuery.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/history/HistoryActivityInstanceQuery.java 2009-04-16 16:28:23 UTC (rev 4568)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/history/HistoryActivityInstanceQuery.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -19,12 +19,12 @@
* 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.history;
+package org.jbpm.api.history;
import java.util.Date;
import java.util.List;
-import org.jbpm.task.Task;
+import org.jbpm.api.task.Task;
/**
Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/history/HistoryProcessInstance.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/history/HistoryProcessInstance.java 2009-04-16 16:28:23 UTC (rev 4568)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/history/HistoryProcessInstance.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -19,7 +19,7 @@
* 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.history;
+package org.jbpm.api.history;
import java.util.Date;
Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/history/HistoryProcessInstanceQuery.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/history/HistoryProcessInstanceQuery.java 2009-04-16 16:28:23 UTC (rev 4568)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/history/HistoryProcessInstanceQuery.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -19,7 +19,7 @@
* 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.history;
+package org.jbpm.api.history;
import java.util.List;
Copied: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/identity (from rev 4568, jbpm4/trunk/modules/api/src/main/java/org/jbpm/identity)
Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/identity/Group.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/identity/Group.java 2009-04-16 16:28:23 UTC (rev 4568)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/identity/Group.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -19,7 +19,7 @@
* 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.identity;
+package org.jbpm.api.identity;
/** a group.
Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/identity/User.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/identity/User.java 2009-04-16 16:28:23 UTC (rev 4568)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/identity/User.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -19,7 +19,7 @@
* 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.identity;
+package org.jbpm.api.identity;
/** a user
Copied: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/job (from rev 4568, jbpm4/trunk/modules/api/src/main/java/org/jbpm/job)
Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/job/Job.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/job/Job.java 2009-04-16 16:28:23 UTC (rev 4568)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/job/Job.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -19,11 +19,11 @@
* 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.job;
+package org.jbpm.api.job;
import java.util.Date;
-import org.jbpm.Execution;
+import org.jbpm.api.Execution;
/** base class for timers and messages.
*
Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/job/Message.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/job/Message.java 2009-04-16 16:28:23 UTC (rev 4568)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/job/Message.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -19,7 +19,7 @@
* 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.job;
+package org.jbpm.api.job;
/** an asynchronous message.
*
Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/job/Timer.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/job/Timer.java 2009-04-16 16:28:23 UTC (rev 4568)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/job/Timer.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -19,7 +19,7 @@
* 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.job;
+package org.jbpm.api.job;
/** a timer.
Copied: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/jpdl (from rev 4568, jbpm4/trunk/modules/api/src/main/java/org/jbpm/jpdl)
Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/jpdl/DecisionHandler.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/jpdl/DecisionHandler.java 2009-04-16 16:28:23 UTC (rev 4568)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/jpdl/DecisionHandler.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -19,9 +19,9 @@
* 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.jpdl;
+package org.jbpm.api.jpdl;
-import org.jbpm.model.OpenExecution;
+import org.jbpm.api.model.OpenExecution;
/**
Copied: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/listener (from rev 4568, jbpm4/trunk/modules/api/src/main/java/org/jbpm/listener)
Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/listener/EventListener.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/listener/EventListener.java 2009-04-16 16:28:23 UTC (rev 4568)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/listener/EventListener.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -19,7 +19,7 @@
* 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.listener;
+package org.jbpm.api.listener;
import java.io.Serializable;
Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/listener/EventListenerExecution.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/listener/EventListenerExecution.java 2009-04-16 16:28:23 UTC (rev 4568)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/listener/EventListenerExecution.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -19,14 +19,14 @@
* 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.listener;
+package org.jbpm.api.listener;
-import org.jbpm.Execution;
-import org.jbpm.activity.ActivityBehaviour;
-import org.jbpm.model.Event;
-import org.jbpm.model.ObservableElement;
-import org.jbpm.model.OpenExecution;
-import org.jbpm.model.Transition;
+import org.jbpm.api.Execution;
+import org.jbpm.api.activity.ActivityBehaviour;
+import org.jbpm.api.model.Event;
+import org.jbpm.api.model.ObservableElement;
+import org.jbpm.api.model.OpenExecution;
+import org.jbpm.api.model.Transition;
/** view upon an {@link Execution path of execution} exposed to
Copied: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/model (from rev 4568, jbpm4/trunk/modules/api/src/main/java/org/jbpm/model)
Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/model/Activity.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/Activity.java 2009-04-16 16:28:23 UTC (rev 4568)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/model/Activity.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -19,12 +19,12 @@
* 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.model;
+package org.jbpm.api.model;
import java.util.List;
import java.util.Map;
-import org.jbpm.Execution;
+import org.jbpm.api.Execution;
/**
Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/model/Comment.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/Comment.java 2009-04-16 16:28:23 UTC (rev 4568)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/model/Comment.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -19,12 +19,12 @@
* 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.model;
+package org.jbpm.api.model;
import java.util.Date;
import java.util.List;
-import org.jbpm.Execution;
+import org.jbpm.api.Execution;
/** a free text comment that can be made to an {@link Execution}
* or a task.
Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/model/CompositeElement.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/CompositeElement.java 2009-04-16 16:28:23 UTC (rev 4568)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/model/CompositeElement.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -19,7 +19,7 @@
* 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.model;
+package org.jbpm.api.model;
import java.util.List;
import java.util.Map;
Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/model/Condition.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/Condition.java 2009-04-16 16:28:23 UTC (rev 4568)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/model/Condition.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -19,7 +19,7 @@
* 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.model;
+package org.jbpm.api.model;
import java.io.Serializable;
Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/model/Discussable.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/Discussable.java 2009-04-16 16:28:23 UTC (rev 4568)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/model/Discussable.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -19,7 +19,7 @@
* 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.model;
+package org.jbpm.api.model;
import java.util.List;
Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/model/Event.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/Event.java 2009-04-16 16:28:23 UTC (rev 4568)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/model/Event.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -19,7 +19,7 @@
* 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.model;
+package org.jbpm.api.model;
/** event constants.
Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/model/ObservableElement.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/ObservableElement.java 2009-04-16 16:28:23 UTC (rev 4568)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/model/ObservableElement.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -19,7 +19,7 @@
* 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.model;
+package org.jbpm.api.model;
import java.util.Set;
Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/model/OpenExecution.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/OpenExecution.java 2009-04-16 16:28:23 UTC (rev 4568)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/model/OpenExecution.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -19,15 +19,15 @@
* 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.model;
+package org.jbpm.api.model;
import java.util.Collection;
import java.util.Map;
import java.util.Set;
-import org.jbpm.Execution;
-import org.jbpm.JbpmException;
-import org.jbpm.job.Timer;
+import org.jbpm.api.Execution;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.job.Timer;
/** execution that opens up access to the related
Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/model/OpenProcessDefinition.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/OpenProcessDefinition.java 2009-04-16 16:28:23 UTC (rev 4568)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/model/OpenProcessDefinition.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -19,9 +19,9 @@
* 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.model;
+package org.jbpm.api.model;
-import org.jbpm.ProcessDefinition;
+import org.jbpm.api.ProcessDefinition;
Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/model/OpenProcessInstance.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/OpenProcessInstance.java 2009-04-16 16:28:23 UTC (rev 4568)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/model/OpenProcessInstance.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -19,9 +19,9 @@
* 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.model;
+package org.jbpm.api.model;
-import org.jbpm.ProcessInstance;
+import org.jbpm.api.ProcessInstance;
public interface OpenProcessInstance extends OpenExecution, ProcessInstance {
}
Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/model/Transition.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/Transition.java 2009-04-16 16:28:23 UTC (rev 4568)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/model/Transition.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -19,7 +19,7 @@
* 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.model;
+package org.jbpm.api.model;
import java.util.Set;
Copied: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/package.html (from rev 4568, jbpm4/trunk/modules/api/src/main/java/org/jbpm/package.html)
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/package.html (rev 0)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/package.html 2009-04-16 19:28:20 UTC (rev 4570)
@@ -0,0 +1,5 @@
+<body>the primary facade interfaces to
+{@link org.jbpm.pvm.ProcessService the process repository},
+{@link org.jbpm.pvm.ExecutionService the execution repository}
+and {@link org.jbpm.pvm.ManagementService the management functionalities}.
+</body>
\ No newline at end of file
Property changes on: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/package.html
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/session (from rev 4568, jbpm4/trunk/modules/api/src/main/java/org/jbpm/session)
Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/session/DbSession.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/session/DbSession.java 2009-04-16 16:28:23 UTC (rev 4568)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/session/DbSession.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -19,7 +19,7 @@
* 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.session;
+package org.jbpm.api.session;
/**
Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/session/MessageSession.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/session/MessageSession.java 2009-04-16 16:28:23 UTC (rev 4568)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/session/MessageSession.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -19,9 +19,9 @@
* 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.session;
+package org.jbpm.api.session;
-import org.jbpm.job.Message;
+import org.jbpm.api.job.Message;
/**
Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/session/PvmDbSession.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/session/PvmDbSession.java 2009-04-16 16:28:23 UTC (rev 4568)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/session/PvmDbSession.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -19,16 +19,16 @@
* 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.session;
+package org.jbpm.api.session;
import java.util.List;
-import org.jbpm.Execution;
-import org.jbpm.client.ClientExecution;
-import org.jbpm.client.ClientProcessDefinition;
-import org.jbpm.job.Job;
-import org.jbpm.job.Message;
-import org.jbpm.job.Timer;
+import org.jbpm.api.Execution;
+import org.jbpm.api.client.ClientExecution;
+import org.jbpm.api.client.ClientProcessDefinition;
+import org.jbpm.api.job.Job;
+import org.jbpm.api.job.Message;
+import org.jbpm.api.job.Timer;
/**
* @author Tom Baeyens
Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/session/RepositorySession.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/session/RepositorySession.java 2009-04-16 16:28:23 UTC (rev 4568)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/session/RepositorySession.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -19,13 +19,13 @@
* 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.session;
+package org.jbpm.api.session;
import java.io.InputStream;
-import org.jbpm.Deployment;
-import org.jbpm.ProcessDefinitionQuery;
-import org.jbpm.client.ClientProcessDefinition;
+import org.jbpm.api.Deployment;
+import org.jbpm.api.ProcessDefinitionQuery;
+import org.jbpm.api.client.ClientProcessDefinition;
/**
Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/session/TaskDbSession.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/session/TaskDbSession.java 2009-04-16 16:28:23 UTC (rev 4568)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/session/TaskDbSession.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -19,10 +19,10 @@
* 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.session;
+package org.jbpm.api.session;
-import org.jbpm.Execution;
-import org.jbpm.task.Task;
+import org.jbpm.api.Execution;
+import org.jbpm.api.task.Task;
/**
* Persistence interface for tasks.
Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/session/TimerSession.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/session/TimerSession.java 2009-04-16 16:28:23 UTC (rev 4568)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/session/TimerSession.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -19,9 +19,9 @@
* 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.session;
+package org.jbpm.api.session;
-import org.jbpm.job.Timer;
+import org.jbpm.api.job.Timer;
/**
* @author Tom Baeyens, Pascal Verdage
Copied: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/task (from rev 4568, jbpm4/trunk/modules/api/src/main/java/org/jbpm/task)
Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/task/Assignable.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/task/Assignable.java 2009-04-16 16:28:23 UTC (rev 4568)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/task/Assignable.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -19,7 +19,7 @@
* 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.task;
+package org.jbpm.api.task;
/**
Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/task/AssignmentHandler.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/task/AssignmentHandler.java 2009-04-16 16:28:23 UTC (rev 4568)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/task/AssignmentHandler.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -19,11 +19,11 @@
* 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.task;
+package org.jbpm.api.task;
import java.io.Serializable;
-import org.jbpm.model.OpenExecution;
+import org.jbpm.api.model.OpenExecution;
/** interface to delegate {@link Task} or {@link Swimlane} assignment.
Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/task/GroupRef.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/task/GroupRef.java 2009-04-16 16:28:23 UTC (rev 4568)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/task/GroupRef.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -19,7 +19,7 @@
* 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.task;
+package org.jbpm.api.task;
Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/task/IdentityRef.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/task/IdentityRef.java 2009-04-16 16:28:23 UTC (rev 4568)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/task/IdentityRef.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -19,19 +19,19 @@
* 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.task;
+package org.jbpm.api.task;
import java.io.Serializable;
-import org.jbpm.JbpmException;
+import org.jbpm.api.JbpmException;
/**
* references an identity. usally a user or group.
*
- * @see org.jbpm.task.UserRef
- * @see org.jbpm.task.GroupRef
- * @see org.jbpm.task.Participation
+ * @see org.jbpm.api.task.UserRef
+ * @see org.jbpm.api.task.GroupRef
+ * @see org.jbpm.api.task.Participation
*
* @author Tom Baeyens
* @author Heiko Braun
Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/task/OpenTask.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/task/OpenTask.java 2009-04-16 16:28:23 UTC (rev 4568)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/task/OpenTask.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -19,9 +19,9 @@
* 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.task;
+package org.jbpm.api.task;
-import org.jbpm.client.ClientExecution;
+import org.jbpm.api.client.ClientExecution;
/**
Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/task/Participation.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/task/Participation.java 2009-04-16 16:28:23 UTC (rev 4568)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/task/Participation.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -19,7 +19,7 @@
* 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.task;
+package org.jbpm.api.task;
/**
Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/task/Swimlane.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/task/Swimlane.java 2009-04-16 16:28:23 UTC (rev 4568)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/task/Swimlane.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -19,7 +19,7 @@
* 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.task;
+package org.jbpm.api.task;
import java.io.Serializable;
Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/task/Task.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/task/Task.java 2009-04-16 16:28:23 UTC (rev 4568)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/task/Task.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -19,7 +19,7 @@
* 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.task;
+package org.jbpm.api.task;
import java.io.Serializable;
import java.util.Date;
Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/task/TaskDefinition.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/task/TaskDefinition.java 2009-04-16 16:28:23 UTC (rev 4568)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/task/TaskDefinition.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -19,7 +19,7 @@
* 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.task;
+package org.jbpm.api.task;
import java.io.Serializable;
Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/task/TaskHandler.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/task/TaskHandler.java 2009-04-16 16:28:23 UTC (rev 4568)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/task/TaskHandler.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -19,7 +19,7 @@
* 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.task;
+package org.jbpm.api.task;
/** for advanced task customization.
Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/task/UserRef.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/task/UserRef.java 2009-04-16 16:28:23 UTC (rev 4568)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/task/UserRef.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -19,7 +19,7 @@
* 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.task;
+package org.jbpm.api.task;
Deleted: jbpm4/trunk/modules/api/src/main/java/org/jbpm/package.html
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/package.html 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/package.html 2009-04-16 19:28:20 UTC (rev 4570)
@@ -1,5 +0,0 @@
-<body>the primary facade interfaces to
-{@link org.jbpm.pvm.ProcessService the process repository},
-{@link org.jbpm.pvm.ExecutionService the execution repository}
-and {@link org.jbpm.pvm.ManagementService the management functionalities}.
-</body>
\ No newline at end of file
Modified: jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/CommandExecutorSLSB.java
===================================================================
--- jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/CommandExecutorSLSB.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/CommandExecutorSLSB.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -32,12 +32,12 @@
import javax.transaction.UserTransaction;
import javax.transaction.SystemException;
-import org.jbpm.Configuration;
-import org.jbpm.ProcessEngine;
-import org.jbpm.cmd.Command;
-import org.jbpm.cmd.CommandService;
-import org.jbpm.env.Environment;
-import org.jbpm.env.EnvironmentFactory;
+import org.jbpm.api.Configuration;
+import org.jbpm.api.ProcessEngine;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.cmd.CommandService;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.env.EnvironmentFactory;
import org.jbpm.internal.log.Log;
/**
Modified: jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/CommandReceiverMDB.java
===================================================================
--- jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/CommandReceiverMDB.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/CommandReceiverMDB.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -40,9 +40,9 @@
import javax.naming.NameNotFoundException;
import javax.naming.NamingException;
-import org.jbpm.cmd.Command;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.job.Job;
import org.jbpm.internal.log.Log;
-import org.jbpm.job.Job;
import org.jbpm.pvm.internal.cmd.ExecuteJobCmd;
/**
Modified: jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/EjbLocalCommandService.java
===================================================================
--- jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/EjbLocalCommandService.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/EjbLocalCommandService.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,9 +23,9 @@
import javax.ejb.CreateException;
-import org.jbpm.JbpmException;
-import org.jbpm.cmd.Command;
-import org.jbpm.cmd.CommandService;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.cmd.CommandService;
/**
* Local, stateless session bean implementation of the command service.
Modified: jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/EjbRemoteCommandService.java
===================================================================
--- jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/EjbRemoteCommandService.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/EjbRemoteCommandService.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -26,9 +26,9 @@
import javax.naming.Context;
import javax.naming.InitialContext;
-import org.jbpm.JbpmException;
-import org.jbpm.cmd.Command;
-import org.jbpm.cmd.CommandService;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.cmd.CommandService;
import org.jbpm.internal.log.Log;
Modified: jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/EjbTimerSession.java
===================================================================
--- jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/EjbTimerSession.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/EjbTimerSession.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -24,12 +24,12 @@
import javax.ejb.FinderException;
import javax.ejb.RemoveException;
-import org.jbpm.JbpmException;
-import org.jbpm.env.Environment;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.job.Timer;
+import org.jbpm.api.session.DbSession;
+import org.jbpm.api.session.TimerSession;
import org.jbpm.internal.log.Log;
-import org.jbpm.job.Timer;
-import org.jbpm.session.DbSession;
-import org.jbpm.session.TimerSession;
/**
* Timer session based on the EJB 2.1 timer service.
Modified: jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/ExecuteTimerCmd.java
===================================================================
--- jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/ExecuteTimerCmd.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/ExecuteTimerCmd.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,11 +23,11 @@
import java.util.Date;
-import org.jbpm.cmd.Command;
-import org.jbpm.env.Environment;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.session.DbSession;
import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.job.TimerImpl;
-import org.jbpm.session.DbSession;
/**
Modified: jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/LocalCommandExecutor.java
===================================================================
--- jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/LocalCommandExecutor.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/LocalCommandExecutor.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,7 +21,7 @@
*/
package org.jbpm.enterprise.internal.ejb;
-import org.jbpm.cmd.Command;
+import org.jbpm.api.cmd.Command;
/**
* EJB2 local interface for the command executor.
Modified: jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/RemoteCommandExecutor.java
===================================================================
--- jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/RemoteCommandExecutor.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/RemoteCommandExecutor.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,7 +23,7 @@
import java.rmi.RemoteException;
-import org.jbpm.cmd.Command;
+import org.jbpm.api.cmd.Command;
/**
* EJB2 remote interface for the command executor.
Modified: jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/custom/HappyListener.java
===================================================================
--- jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/custom/HappyListener.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/custom/HappyListener.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -25,9 +25,9 @@
import java.util.concurrent.Semaphore;
import java.util.concurrent.TimeUnit;
+import org.jbpm.api.listener.EventListener;
+import org.jbpm.api.listener.EventListenerExecution;
import org.jbpm.internal.log.Log;
-import org.jbpm.listener.EventListener;
-import org.jbpm.listener.EventListenerExecution;
import org.jbpm.pvm.internal.job.TimerImpl;
/**
Modified: jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/custom/InsertCommentCmd.java
===================================================================
--- jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/custom/InsertCommentCmd.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/custom/InsertCommentCmd.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,10 +23,10 @@
import java.sql.SQLException;
-import org.jbpm.cmd.Command;
-import org.jbpm.env.Environment;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.session.DbSession;
import org.jbpm.pvm.internal.model.CommentImpl;
-import org.jbpm.session.DbSession;
/**
* @author Alejandro Guizar
Modified: jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/custom/NoisyListener.java
===================================================================
--- jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/custom/NoisyListener.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/custom/NoisyListener.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -26,9 +26,9 @@
import java.util.concurrent.Semaphore;
import java.util.concurrent.TimeUnit;
+import org.jbpm.api.listener.EventListener;
+import org.jbpm.api.listener.EventListenerExecution;
import org.jbpm.internal.log.Log;
-import org.jbpm.listener.EventListener;
-import org.jbpm.listener.EventListenerExecution;
import org.jbpm.pvm.internal.job.TimerImpl;
/**
Modified: jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/custom/RemoveCommentCmd.java
===================================================================
--- jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/custom/RemoveCommentCmd.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/custom/RemoveCommentCmd.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -26,8 +26,8 @@
import org.hibernate.Session;
import org.hibernate.criterion.Restrictions;
-import org.jbpm.cmd.Command;
-import org.jbpm.env.Environment;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.env.Environment;
import org.jbpm.pvm.internal.model.CommentImpl;
/**
Modified: jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/custom/WaitState.java
===================================================================
--- jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/custom/WaitState.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/custom/WaitState.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,10 +23,10 @@
import java.util.Map;
-import org.jbpm.activity.ActivityExecution;
-import org.jbpm.activity.ExternalActivityBehaviour;
-import org.jbpm.model.Activity;
-import org.jbpm.model.Transition;
+import org.jbpm.api.activity.ActivityExecution;
+import org.jbpm.api.activity.ExternalActivityBehaviour;
+import org.jbpm.api.model.Activity;
+import org.jbpm.api.model.Transition;
/**
* @author Alejandro Guizar
Modified: jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/CommandReceiverTest.java
===================================================================
--- jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/CommandReceiverTest.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/CommandReceiverTest.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -37,7 +37,7 @@
import org.apache.cactus.ServletTestCase;
-import org.jbpm.cmd.Command;
+import org.jbpm.api.cmd.Command;
import org.jbpm.enterprise.internal.custom.InsertCommentCmd;
import org.jbpm.enterprise.internal.custom.RemoveCommentCmd;
import org.jbpm.enterprise.internal.ejb.CommandReceiverMDB;
Modified: jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/EjbTimerSessionTest.java
===================================================================
--- jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/EjbTimerSessionTest.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/EjbTimerSessionTest.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -27,20 +27,20 @@
import junit.framework.Test;
-import org.jbpm.ExecutionService;
-import org.jbpm.RepositoryService;
-import org.jbpm.client.ClientProcessDefinition;
-import org.jbpm.cmd.Command;
-import org.jbpm.cmd.CommandService;
+import org.jbpm.api.ExecutionService;
+import org.jbpm.api.RepositoryService;
+import org.jbpm.api.client.ClientProcessDefinition;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.cmd.CommandService;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.session.DbSession;
+import org.jbpm.api.session.TimerSession;
import org.jbpm.enterprise.internal.custom.HappyListener;
import org.jbpm.enterprise.internal.custom.WaitState;
-import org.jbpm.env.Environment;
import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder;
import org.jbpm.pvm.internal.cmd.StartProcessInstanceCmd;
import org.jbpm.pvm.internal.job.TimerImpl;
import org.jbpm.pvm.internal.wire.descriptor.ObjectDescriptor;
-import org.jbpm.session.DbSession;
-import org.jbpm.session.TimerSession;
import org.jbpm.test.enterprise.EnvironmentServletTestCase;
import org.jbpm.test.enterprise.IntegrationTestSetup;
Modified: jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/TimerTest.java
===================================================================
--- jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/TimerTest.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/TimerTest.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -28,23 +28,23 @@
import junit.framework.Test;
-import org.jbpm.Execution;
-import org.jbpm.ExecutionService;
-import org.jbpm.ProcessService;
-import org.jbpm.RepositoryService;
-import org.jbpm.client.ClientProcessDefinition;
-import org.jbpm.cmd.Command;
-import org.jbpm.cmd.CommandService;
+import org.jbpm.api.Execution;
+import org.jbpm.api.ExecutionService;
+import org.jbpm.api.ProcessService;
+import org.jbpm.api.RepositoryService;
+import org.jbpm.api.client.ClientProcessDefinition;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.cmd.CommandService;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.session.DbSession;
import org.jbpm.enterprise.internal.custom.HappyListener;
import org.jbpm.enterprise.internal.custom.NoisyListener;
import org.jbpm.enterprise.internal.custom.WaitState;
-import org.jbpm.env.Environment;
import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder;
import org.jbpm.pvm.internal.job.TimerImpl;
import org.jbpm.pvm.internal.model.ExecutionImpl;
import org.jbpm.pvm.internal.wire.descriptor.ObjectDescriptor;
-import org.jbpm.session.DbSession;
import org.jbpm.test.enterprise.EnvironmentServletTestCase;
import org.jbpm.test.enterprise.IntegrationTestSetup;
Modified: jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/test/deployer/DeployerTestServlet.java
===================================================================
--- jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/test/deployer/DeployerTestServlet.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/test/deployer/DeployerTestServlet.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,11 +21,11 @@
*/
package org.jbpm.test.deployer;
-import org.jbpm.ProcessDefinitionQuery;
-import org.jbpm.ProcessEngine;
-import org.jbpm.ProcessService;
-import org.jbpm.ProcessDefinition;
-import org.jbpm.RepositoryService;
+import org.jbpm.api.ProcessDefinition;
+import org.jbpm.api.ProcessDefinitionQuery;
+import org.jbpm.api.ProcessEngine;
+import org.jbpm.api.ProcessService;
+import org.jbpm.api.RepositoryService;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
Modified: jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/test/enterprise/EnvironmentServletTestCase.java
===================================================================
--- jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/test/enterprise/EnvironmentServletTestCase.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/test/enterprise/EnvironmentServletTestCase.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -25,10 +25,10 @@
import java.util.Map;
import org.apache.cactus.ServletTestCase;
-import org.jbpm.Configuration;
-import org.jbpm.JbpmException;
-import org.jbpm.env.Environment;
-import org.jbpm.env.EnvironmentFactory;
+import org.jbpm.api.Configuration;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.env.EnvironmentFactory;
import org.jbpm.internal.log.Log;
/**
Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/concurrency/graphbased/ConcurrencyGraphBasedTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/concurrency/graphbased/ConcurrencyGraphBasedTest.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/concurrency/graphbased/ConcurrencyGraphBasedTest.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -25,8 +25,8 @@
import java.util.HashSet;
import java.util.Set;
-import org.jbpm.Execution;
-import org.jbpm.ProcessInstance;
+import org.jbpm.api.Execution;
+import org.jbpm.api.ProcessInstance;
import org.jbpm.test.JbpmTestCase;
Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/decision/conditions/DecisionConditionsTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/decision/conditions/DecisionConditionsTest.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/decision/conditions/DecisionConditionsTest.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -24,7 +24,7 @@
import java.util.HashMap;
import java.util.Map;
-import org.jbpm.Execution;
+import org.jbpm.api.Execution;
import org.jbpm.test.JbpmTestCase;
Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/decision/expression/DecisionExpressionTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/decision/expression/DecisionExpressionTest.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/decision/expression/DecisionExpressionTest.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -24,7 +24,7 @@
import java.util.HashMap;
import java.util.Map;
-import org.jbpm.Execution;
+import org.jbpm.api.Execution;
import org.jbpm.test.JbpmTestCase;
Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/decision/handler/ContentEvaluation.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/decision/handler/ContentEvaluation.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/decision/handler/ContentEvaluation.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,8 +21,8 @@
*/
package org.jbpm.examples.decision.handler;
-import org.jbpm.jpdl.DecisionHandler;
-import org.jbpm.model.OpenExecution;
+import org.jbpm.api.jpdl.DecisionHandler;
+import org.jbpm.api.model.OpenExecution;
public class ContentEvaluation implements DecisionHandler {
Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/decision/handler/DecisionHandlerTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/decision/handler/DecisionHandlerTest.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/decision/handler/DecisionHandlerTest.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -24,7 +24,7 @@
import java.util.HashMap;
import java.util.Map;
-import org.jbpm.Execution;
+import org.jbpm.api.Execution;
import org.jbpm.test.JbpmTestCase;
Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/end/multiple/EndMultipleTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/end/multiple/EndMultipleTest.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/end/multiple/EndMultipleTest.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,7 +21,7 @@
*/
package org.jbpm.examples.end.multiple;
-import org.jbpm.Execution;
+import org.jbpm.api.Execution;
import org.jbpm.test.JbpmTestCase;
Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/end/processinstance/EndProcessInstanceTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/end/processinstance/EndProcessInstanceTest.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/end/processinstance/EndProcessInstanceTest.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,7 +21,7 @@
*/
package org.jbpm.examples.end.processinstance;
-import org.jbpm.Execution;
+import org.jbpm.api.Execution;
import org.jbpm.test.JbpmTestCase;
Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/end/state/EndStateTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/end/state/EndStateTest.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/end/state/EndStateTest.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,7 +21,7 @@
*/
package org.jbpm.examples.end.state;
-import org.jbpm.Execution;
+import org.jbpm.api.Execution;
import org.jbpm.test.JbpmTestCase;
Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/esb/EsbTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/esb/EsbTest.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/esb/EsbTest.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -30,7 +30,7 @@
import org.jboss.soa.esb.addressing.EPR;
import org.jboss.soa.esb.message.Body;
import org.jboss.soa.esb.message.Message;
-import org.jbpm.Execution;
+import org.jbpm.api.Execution;
import org.jbpm.test.JbpmTestCase;
Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/eventlistener/EventListenerTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/eventlistener/EventListenerTest.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/eventlistener/EventListenerTest.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -3,7 +3,7 @@
import java.util.ArrayList;
import java.util.List;
-import org.jbpm.Execution;
+import org.jbpm.api.Execution;
import org.jbpm.test.JbpmTestCase;
Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/eventlistener/LogListener.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/eventlistener/LogListener.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/eventlistener/LogListener.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -2,8 +2,8 @@
import java.util.List;
-import org.jbpm.listener.EventListener;
-import org.jbpm.listener.EventListenerExecution;
+import org.jbpm.api.listener.EventListener;
+import org.jbpm.api.listener.EventListenerExecution;
public class LogListener implements EventListener {
Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/hql/HqlTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/hql/HqlTest.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/hql/HqlTest.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -25,8 +25,8 @@
import java.util.HashSet;
import java.util.Set;
-import org.jbpm.Execution;
-import org.jbpm.task.Task;
+import org.jbpm.api.Execution;
+import org.jbpm.api.task.Task;
import org.jbpm.test.JbpmTestCase;
Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/java/JavaInstantiateTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/java/JavaInstantiateTest.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/java/JavaInstantiateTest.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,7 +21,7 @@
*/
package org.jbpm.examples.java;
-import org.jbpm.Execution;
+import org.jbpm.api.Execution;
import org.jbpm.test.JbpmTestCase;
Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/script/expression/ScriptExpressionTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/script/expression/ScriptExpressionTest.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/script/expression/ScriptExpressionTest.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -24,7 +24,7 @@
import java.util.HashMap;
import java.util.Map;
-import org.jbpm.Execution;
+import org.jbpm.api.Execution;
import org.jbpm.examples.script.text.Person;
import org.jbpm.test.JbpmTestCase;
Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/script/text/ScriptTextTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/script/text/ScriptTextTest.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/script/text/ScriptTextTest.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -24,7 +24,7 @@
import java.util.HashMap;
import java.util.Map;
-import org.jbpm.Execution;
+import org.jbpm.api.Execution;
import org.jbpm.test.JbpmTestCase;
Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/services/ServicesTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/services/ServicesTest.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/services/ServicesTest.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -2,13 +2,13 @@
import junit.framework.TestCase;
-import org.jbpm.Configuration;
-import org.jbpm.ExecutionService;
-import org.jbpm.HistoryService;
-import org.jbpm.ManagementService;
-import org.jbpm.ProcessEngine;
-import org.jbpm.RepositoryService;
-import org.jbpm.TaskService;
+import org.jbpm.api.Configuration;
+import org.jbpm.api.ExecutionService;
+import org.jbpm.api.HistoryService;
+import org.jbpm.api.ManagementService;
+import org.jbpm.api.ProcessEngine;
+import org.jbpm.api.RepositoryService;
+import org.jbpm.api.TaskService;
import org.jbpm.test.JbpmTestCase;
/** shows explicitely the part of the API that is
Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/sql/SqlTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/sql/SqlTest.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/sql/SqlTest.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -26,8 +26,8 @@
import java.util.HashSet;
import java.util.Set;
-import org.jbpm.Execution;
-import org.jbpm.task.Task;
+import org.jbpm.api.Execution;
+import org.jbpm.api.task.Task;
import org.jbpm.test.JbpmTestCase;
Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/state/choice/StateChoiceTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/state/choice/StateChoiceTest.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/state/choice/StateChoiceTest.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,7 +21,7 @@
*/
package org.jbpm.examples.state.choice;
-import org.jbpm.Execution;
+import org.jbpm.api.Execution;
import org.jbpm.test.JbpmTestCase;
Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/state/sequence/StateSequenceTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/state/sequence/StateSequenceTest.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/state/sequence/StateSequenceTest.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,7 +21,7 @@
*/
package org.jbpm.examples.state.sequence;
-import org.jbpm.Execution;
+import org.jbpm.api.Execution;
import org.jbpm.test.JbpmTestCase;
Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/assignee/TaskAssigneeTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/assignee/TaskAssigneeTest.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/assignee/TaskAssigneeTest.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -25,8 +25,8 @@
import java.util.List;
import java.util.Map;
-import org.jbpm.Execution;
-import org.jbpm.task.Task;
+import org.jbpm.api.Execution;
+import org.jbpm.api.task.Task;
import org.jbpm.test.JbpmTestCase;
Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/assignmenthandler/AssignTask.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/assignmenthandler/AssignTask.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/assignmenthandler/AssignTask.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,9 +21,9 @@
*/
package org.jbpm.examples.task.assignmenthandler;
-import org.jbpm.model.OpenExecution;
-import org.jbpm.task.Assignable;
-import org.jbpm.task.AssignmentHandler;
+import org.jbpm.api.model.OpenExecution;
+import org.jbpm.api.task.Assignable;
+import org.jbpm.api.task.AssignmentHandler;
/**
Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/assignmenthandler/TaskAssignmentHandlerTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/assignmenthandler/TaskAssignmentHandlerTest.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/assignmenthandler/TaskAssignmentHandlerTest.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,7 +23,7 @@
import java.util.List;
-import org.jbpm.task.Task;
+import org.jbpm.api.task.Task;
import org.jbpm.test.JbpmTestCase;
/**
Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/candidates/TaskCandidatesTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/candidates/TaskCandidatesTest.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/candidates/TaskCandidatesTest.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,8 +23,8 @@
import java.util.List;
-import org.jbpm.Execution;
-import org.jbpm.task.Task;
+import org.jbpm.api.Execution;
+import org.jbpm.api.task.Task;
import org.jbpm.test.JbpmTestCase;
Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/swimlane/TaskSwimlaneTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/swimlane/TaskSwimlaneTest.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/swimlane/TaskSwimlaneTest.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,7 +23,7 @@
import java.util.List;
-import org.jbpm.task.Task;
+import org.jbpm.api.task.Task;
import org.jbpm.test.JbpmTestCase;
Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/variables/TaskVariablesTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/variables/TaskVariablesTest.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/variables/TaskVariablesTest.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -27,9 +27,9 @@
import java.util.Map;
import java.util.Set;
-import org.jbpm.Execution;
-import org.jbpm.task.Task;
-import org.jbpm.task.UserRef;
+import org.jbpm.api.Execution;
+import org.jbpm.api.task.Task;
+import org.jbpm.api.task.UserRef;
import org.jbpm.test.JbpmTestCase;
Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/timer/transition/TimerTransitionTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/timer/transition/TimerTransitionTest.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/timer/transition/TimerTransitionTest.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -3,8 +3,8 @@
import java.util.ArrayList;
import java.util.List;
-import org.jbpm.Execution;
-import org.jbpm.job.Job;
+import org.jbpm.api.Execution;
+import org.jbpm.api.job.Job;
import org.jbpm.test.JbpmTestCase;
Modified: jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/JBPMIntegration.java
===================================================================
--- jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/JBPMIntegration.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/JBPMIntegration.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,7 +21,7 @@
*/
package org.jbpm.integration.console;
-import org.jbpm.ProcessEngine;
+import org.jbpm.api.ProcessEngine;
import javax.naming.InitialContext;
Modified: jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/ModelAdaptor.java
===================================================================
--- jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/ModelAdaptor.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/ModelAdaptor.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -31,14 +31,14 @@
import org.jboss.bpm.console.client.model.ProcessInstanceRef;
import org.jboss.bpm.console.client.model.TaskRef;
import org.jboss.bpm.console.client.model.jbpm3.TokenReference;
-import org.jbpm.Execution;
-import org.jbpm.ProcessDefinition;
-import org.jbpm.model.OpenExecution;
-import org.jbpm.model.Transition;
+import org.jbpm.api.Execution;
+import org.jbpm.api.ProcessDefinition;
+import org.jbpm.api.model.OpenExecution;
+import org.jbpm.api.model.Transition;
+import org.jbpm.api.task.Participation;
+import org.jbpm.api.task.Task;
import org.jbpm.pvm.internal.model.ExecutionImpl;
import org.jbpm.pvm.internal.task.TaskImpl;
-import org.jbpm.task.Participation;
-import org.jbpm.task.Task;
/**
* @author Heiko.Braun <heiko.braun(a)jboss.com>
Modified: jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/ProcessManagementImpl.java
===================================================================
--- jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/ProcessManagementImpl.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/ProcessManagementImpl.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -28,15 +28,15 @@
import org.jboss.bpm.console.client.model.ProcessDefinitionRef;
import org.jboss.bpm.console.client.model.ProcessInstanceRef;
import org.jboss.bpm.console.server.integration.ProcessManagement;
-import org.jbpm.Execution;
-import org.jbpm.ProcessInstanceQuery;
-import org.jbpm.ExecutionService;
-import org.jbpm.ProcessDefinition;
-import org.jbpm.ProcessDefinitionQuery;
-import org.jbpm.RepositoryService;
-import org.jbpm.env.Environment;
-import org.jbpm.env.EnvironmentFactory;
-import org.jbpm.model.OpenExecution;
+import org.jbpm.api.Execution;
+import org.jbpm.api.ExecutionService;
+import org.jbpm.api.ProcessDefinition;
+import org.jbpm.api.ProcessDefinitionQuery;
+import org.jbpm.api.ProcessInstanceQuery;
+import org.jbpm.api.RepositoryService;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.env.EnvironmentFactory;
+import org.jbpm.api.model.OpenExecution;
/**
* @author Heiko.Braun <heiko.braun(a)jboss.com>
Modified: jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/TaskManagementImpl.java
===================================================================
--- jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/TaskManagementImpl.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/TaskManagementImpl.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -26,11 +26,11 @@
import org.jboss.bpm.console.client.model.TaskRef;
import org.jboss.bpm.console.server.integration.TaskManagement;
-import org.jbpm.IdentityService;
-import org.jbpm.TaskService;
-import org.jbpm.task.GroupRef;
-import org.jbpm.task.Participation;
-import org.jbpm.task.Task;
+import org.jbpm.api.IdentityService;
+import org.jbpm.api.TaskService;
+import org.jbpm.api.task.GroupRef;
+import org.jbpm.api.task.Participation;
+import org.jbpm.api.task.Task;
/**
* @author Heiko.Braun <heiko.braun(a)jboss.com>
Modified: jbpm4/trunk/modules/integration/spi/src/main/java/org/jbpm/integration/spi/DeploymentAdaptor.java
===================================================================
--- jbpm4/trunk/modules/integration/spi/src/main/java/org/jbpm/integration/spi/DeploymentAdaptor.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/integration/spi/src/main/java/org/jbpm/integration/spi/DeploymentAdaptor.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -28,7 +28,7 @@
import javax.transaction.SystemException;
import javax.transaction.UserTransaction;
-import org.jbpm.RepositoryService;
+import org.jbpm.api.RepositoryService;
import org.jbpm.internal.log.Log;
/**
Modified: jbpm4/trunk/modules/integration/spi/src/main/java/org/jbpm/integration/spi/JBPMService.java
===================================================================
--- jbpm4/trunk/modules/integration/spi/src/main/java/org/jbpm/integration/spi/JBPMService.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/integration/spi/src/main/java/org/jbpm/integration/spi/JBPMService.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,8 +21,8 @@
*/
package org.jbpm.integration.spi;
-import org.jbpm.Configuration;
-import org.jbpm.ProcessEngine;
+import org.jbpm.api.Configuration;
+import org.jbpm.api.ProcessEngine;
import org.jbpm.integration.spi.mgmt.ServerConfig;
import org.jbpm.internal.log.Log;
Modified: jbpm4/trunk/modules/integration/spi/src/main/java/org/jbpm/integration/spi/ProcessEngineObjectFactory.java
===================================================================
--- jbpm4/trunk/modules/integration/spi/src/main/java/org/jbpm/integration/spi/ProcessEngineObjectFactory.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/integration/spi/src/main/java/org/jbpm/integration/spi/ProcessEngineObjectFactory.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,7 +21,7 @@
*/
package org.jbpm.integration.spi;
-import org.jbpm.ProcessEngine;
+import org.jbpm.api.ProcessEngine;
import javax.naming.Context;
import javax.naming.Name;
@@ -31,7 +31,7 @@
import java.util.Hashtable;
/**
- * Constructs a {@link org.jbpm.ProcessEngine} on the JNDI client side.
+ * Constructs a {@link org.jbpm.api.ProcessEngine} on the JNDI client side.
*
* @author Heiko.Braun <heiko.braun(a)jboss.com>
*/
Modified: jbpm4/trunk/modules/integration/spi/src/main/java/org/jbpm/integration/spi/ProcessEngineReference.java
===================================================================
--- jbpm4/trunk/modules/integration/spi/src/main/java/org/jbpm/integration/spi/ProcessEngineReference.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/integration/spi/src/main/java/org/jbpm/integration/spi/ProcessEngineReference.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,7 +21,7 @@
*/
package org.jbpm.integration.spi;
-import org.jbpm.ProcessEngine;
+import org.jbpm.api.ProcessEngine;
import javax.naming.Referenceable;
import javax.naming.Reference;
@@ -29,7 +29,7 @@
import javax.naming.StringRefAddr;
/**
- * Stored in JNDI. Will be used to reference a {@link org.jbpm.ProcessEngine}
+ * Stored in JNDI. Will be used to reference a {@link org.jbpm.api.ProcessEngine}
* when the {@link org.jbpm.integration.spi.ProcessEngineObjectFactory} is invoked.
*
* @author Heiko.Braun <heiko.braun(a)jboss.com>
Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/DecisionConditionActivity.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/DecisionConditionActivity.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/DecisionConditionActivity.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,11 +23,11 @@
import java.util.List;
-import org.jbpm.JbpmException;
-import org.jbpm.activity.ActivityExecution;
-import org.jbpm.model.Activity;
-import org.jbpm.model.Condition;
-import org.jbpm.model.Transition;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.activity.ActivityExecution;
+import org.jbpm.api.model.Activity;
+import org.jbpm.api.model.Condition;
+import org.jbpm.api.model.Transition;
/**
Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/DecisionExpressionActivity.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/DecisionExpressionActivity.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/DecisionExpressionActivity.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,10 +21,10 @@
*/
package org.jbpm.jpdl.internal.activity;
-import org.jbpm.JbpmException;
-import org.jbpm.activity.ActivityExecution;
-import org.jbpm.model.Activity;
-import org.jbpm.model.Transition;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.activity.ActivityExecution;
+import org.jbpm.api.model.Activity;
+import org.jbpm.api.model.Transition;
import org.jbpm.pvm.internal.env.EnvironmentDefaults;
import org.jbpm.pvm.internal.script.ScriptManager;
Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/DecisionHandlerActivity.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/DecisionHandlerActivity.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/DecisionHandlerActivity.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,12 +21,12 @@
*/
package org.jbpm.jpdl.internal.activity;
-import org.jbpm.JbpmException;
-import org.jbpm.activity.ActivityExecution;
-import org.jbpm.env.Environment;
-import org.jbpm.jpdl.DecisionHandler;
-import org.jbpm.model.Activity;
-import org.jbpm.model.Transition;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.activity.ActivityExecution;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.jpdl.DecisionHandler;
+import org.jbpm.api.model.Activity;
+import org.jbpm.api.model.Transition;
import org.jbpm.pvm.internal.wire.Descriptor;
import org.jbpm.pvm.internal.wire.WireContext;
Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/EndActivity.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/EndActivity.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/EndActivity.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,8 +21,8 @@
*/
package org.jbpm.jpdl.internal.activity;
-import org.jbpm.activity.ActivityExecution;
-import org.jbpm.model.OpenExecution;
+import org.jbpm.api.activity.ActivityExecution;
+import org.jbpm.api.model.OpenExecution;
/**
Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/EsbActivity.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/EsbActivity.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/EsbActivity.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -25,8 +25,8 @@
import org.jboss.soa.esb.message.Body;
import org.jboss.soa.esb.message.Message;
import org.jboss.soa.esb.message.format.MessageFactory;
+import org.jbpm.api.model.OpenExecution;
import org.jbpm.internal.log.Log;
-import org.jbpm.model.OpenExecution;
import org.jbpm.pvm.internal.model.ExpressionEvaluator;
import org.jbpm.pvm.internal.wire.Descriptor;
import org.jbpm.pvm.internal.wire.WireContext;
Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/EventListenerBinding.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/EventListenerBinding.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/EventListenerBinding.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,8 +21,8 @@
*/
package org.jbpm.jpdl.internal.activity;
+import org.jbpm.api.listener.EventListener;
import org.jbpm.jpdl.internal.xml.JpdlParser;
-import org.jbpm.listener.EventListener;
import org.jbpm.pvm.internal.wire.Descriptor;
import org.jbpm.pvm.internal.wire.WireContext;
import org.jbpm.pvm.internal.xml.Parse;
Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/ForkActivity.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/ForkActivity.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/ForkActivity.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,11 +23,11 @@
import java.util.List;
-import org.jbpm.Execution;
-import org.jbpm.activity.ActivityExecution;
-import org.jbpm.model.Activity;
-import org.jbpm.model.OpenExecution;
-import org.jbpm.model.Transition;
+import org.jbpm.api.Execution;
+import org.jbpm.api.activity.ActivityExecution;
+import org.jbpm.api.model.Activity;
+import org.jbpm.api.model.OpenExecution;
+import org.jbpm.api.model.Transition;
import org.jbpm.pvm.internal.model.ExecutionImpl;
Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/HqlActivity.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/HqlActivity.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/HqlActivity.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,10 +23,10 @@
import org.hibernate.Query;
import org.hibernate.Session;
-import org.jbpm.JbpmException;
-import org.jbpm.env.Environment;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.model.OpenExecution;
import org.jbpm.internal.log.Log;
-import org.jbpm.model.OpenExecution;
import org.jbpm.pvm.internal.wire.Descriptor;
import org.jbpm.pvm.internal.wire.WireContext;
import org.jbpm.pvm.internal.wire.descriptor.ListDescriptor;
Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JavaActivity.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JavaActivity.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JavaActivity.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -24,7 +24,7 @@
import java.lang.reflect.Method;
import java.util.List;
-import org.jbpm.model.OpenExecution;
+import org.jbpm.api.model.OpenExecution;
import org.jbpm.pvm.internal.util.ReflectUtil;
import org.jbpm.pvm.internal.wire.Descriptor;
import org.jbpm.pvm.internal.wire.WireContext;
Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JoinActivity.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JoinActivity.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JoinActivity.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -25,11 +25,11 @@
import java.util.Collection;
import java.util.List;
-import org.jbpm.Execution;
-import org.jbpm.activity.ActivityExecution;
-import org.jbpm.model.Activity;
-import org.jbpm.model.OpenExecution;
-import org.jbpm.model.Transition;
+import org.jbpm.api.Execution;
+import org.jbpm.api.activity.ActivityExecution;
+import org.jbpm.api.model.Activity;
+import org.jbpm.api.model.OpenExecution;
+import org.jbpm.api.model.Transition;
import org.jbpm.pvm.internal.model.ExecutionImpl;
Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JpdlActivity.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JpdlActivity.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JpdlActivity.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,7 +21,7 @@
*/
package org.jbpm.jpdl.internal.activity;
-import org.jbpm.activity.ActivityBehaviour;
+import org.jbpm.api.activity.ActivityBehaviour;
/**
* @author Tom Baeyens
Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JpdlAutomaticActivity.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JpdlAutomaticActivity.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JpdlAutomaticActivity.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -1,9 +1,9 @@
package org.jbpm.jpdl.internal.activity;
-import org.jbpm.activity.ActivityExecution;
-import org.jbpm.listener.EventListener;
-import org.jbpm.listener.EventListenerExecution;
-import org.jbpm.model.OpenExecution;
+import org.jbpm.api.activity.ActivityExecution;
+import org.jbpm.api.listener.EventListener;
+import org.jbpm.api.listener.EventListenerExecution;
+import org.jbpm.api.model.OpenExecution;
public abstract class JpdlAutomaticActivity extends JpdlActivity implements EventListener {
Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JpdlBinding.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JpdlBinding.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JpdlBinding.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,9 +23,9 @@
import java.util.List;
+import org.jbpm.api.model.Event;
import org.jbpm.jpdl.internal.xml.JpdlParser;
import org.jbpm.jpdl.internal.xml.UnresolvedTransitions;
-import org.jbpm.model.Event;
import org.jbpm.pvm.internal.model.ActivityImpl;
import org.jbpm.pvm.internal.model.TransitionImpl;
import org.jbpm.pvm.internal.util.TagBinding;
Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JpdlExternalActivity.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JpdlExternalActivity.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JpdlExternalActivity.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,7 +21,7 @@
*/
package org.jbpm.jpdl.internal.activity;
-import org.jbpm.activity.ExternalActivityBehaviour;
+import org.jbpm.api.activity.ExternalActivityBehaviour;
/**
* @author Tom Baeyens
Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/ScriptActivity.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/ScriptActivity.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/ScriptActivity.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,8 +21,8 @@
*/
package org.jbpm.jpdl.internal.activity;
-import org.jbpm.env.Environment;
-import org.jbpm.model.OpenExecution;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.model.OpenExecution;
import org.jbpm.pvm.internal.script.ScriptManager;
Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/ScriptBinding.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/ScriptBinding.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/ScriptBinding.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,7 +21,7 @@
*/
package org.jbpm.jpdl.internal.activity;
-import org.jbpm.env.Environment;
+import org.jbpm.api.env.Environment;
import org.jbpm.pvm.internal.script.ScriptManager;
import org.jbpm.pvm.internal.util.XmlUtil;
import org.jbpm.pvm.internal.xml.Parse;
Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/StartActivity.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/StartActivity.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/StartActivity.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,7 +21,7 @@
*/
package org.jbpm.jpdl.internal.activity;
-import org.jbpm.activity.ActivityExecution;
+import org.jbpm.api.activity.ActivityExecution;
/**
Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/StateActivity.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/StateActivity.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/StateActivity.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,9 +23,9 @@
import java.util.Map;
-import org.jbpm.activity.ActivityExecution;
-import org.jbpm.model.Activity;
-import org.jbpm.model.Transition;
+import org.jbpm.api.activity.ActivityExecution;
+import org.jbpm.api.model.Activity;
+import org.jbpm.api.model.Transition;
/**
* @author Tom Baeyens
Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/TaskActivity.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/TaskActivity.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/TaskActivity.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,16 +23,16 @@
import java.util.Map;
-import org.jbpm.JbpmException;
-import org.jbpm.activity.ActivityExecution;
-import org.jbpm.env.Environment;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.activity.ActivityExecution;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.model.Activity;
+import org.jbpm.api.model.Transition;
+import org.jbpm.api.session.TaskDbSession;
+import org.jbpm.api.task.TaskHandler;
import org.jbpm.jpdl.internal.model.JpdlExecution;
-import org.jbpm.model.Activity;
-import org.jbpm.model.Transition;
import org.jbpm.pvm.internal.task.TaskDefinitionImpl;
import org.jbpm.pvm.internal.task.TaskImpl;
-import org.jbpm.session.TaskDbSession;
-import org.jbpm.task.TaskHandler;
/**
Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/model/JpdlExecution.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/model/JpdlExecution.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/model/JpdlExecution.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -26,8 +26,11 @@
import java.util.StringTokenizer;
import org.hibernate.Session;
-import org.jbpm.JbpmException;
-import org.jbpm.env.Environment;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.session.TaskDbSession;
+import org.jbpm.api.task.Assignable;
+import org.jbpm.api.task.AssignmentHandler;
import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.model.ExecutionImpl;
import org.jbpm.pvm.internal.script.ScriptManager;
@@ -39,9 +42,6 @@
import org.jbpm.pvm.internal.task.TaskImpl;
import org.jbpm.pvm.internal.wire.Descriptor;
import org.jbpm.pvm.internal.wire.WireContext;
-import org.jbpm.session.TaskDbSession;
-import org.jbpm.task.Assignable;
-import org.jbpm.task.AssignmentHandler;
/**
* @author Tom Baeyens
Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/repository/JpdlDeployer.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/repository/JpdlDeployer.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/repository/JpdlDeployer.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -24,9 +24,10 @@
import java.io.InputStream;
import java.util.List;
-import org.jbpm.ProcessDefinition;
-import org.jbpm.ProcessDefinitionQuery;
-import org.jbpm.env.Environment;
+import org.jbpm.api.ProcessDefinition;
+import org.jbpm.api.ProcessDefinitionQuery;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.session.RepositorySession;
import org.jbpm.internal.log.Log;
import org.jbpm.jpdl.internal.model.JpdlProcessDefinition;
import org.jbpm.jpdl.internal.xml.JpdlParser;
@@ -34,7 +35,6 @@
import org.jbpm.pvm.internal.repository.Deployer;
import org.jbpm.pvm.internal.repository.DeploymentImpl;
import org.jbpm.pvm.internal.xml.Parse;
-import org.jbpm.session.RepositorySession;
/**
Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/xml/JpdlParser.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/xml/JpdlParser.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/xml/JpdlParser.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -30,12 +30,12 @@
import java.util.List;
import java.util.Set;
-import org.jbpm.activity.ActivityBehaviour;
-import org.jbpm.env.Environment;
+import org.jbpm.api.activity.ActivityBehaviour;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.listener.EventListener;
import org.jbpm.internal.log.Log;
import org.jbpm.jpdl.internal.activity.JpdlBinding;
import org.jbpm.jpdl.internal.model.JpdlProcessDefinition;
-import org.jbpm.listener.EventListener;
import org.jbpm.pvm.internal.model.ActivityImpl;
import org.jbpm.pvm.internal.model.EventImpl;
import org.jbpm.pvm.internal.model.ObservableElementImpl;
Modified: jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/JpdlTestCase.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/JpdlTestCase.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/JpdlTestCase.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,7 +21,7 @@
*/
package org.jbpm.jpdl;
-import org.jbpm.client.ClientProcessDefinition;
+import org.jbpm.api.client.ClientProcessDefinition;
import org.jbpm.internal.log.Log;
import org.jbpm.jpdl.internal.xml.JpdlParser;
import org.jbpm.pvm.internal.xml.Parse;
Modified: jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/ActivityParsingTest.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/ActivityParsingTest.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/ActivityParsingTest.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,7 +23,7 @@
import java.util.List;
-import org.jbpm.Problem;
+import org.jbpm.api.Problem;
/**
Modified: jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/JpdlParseTestCase.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/JpdlParseTestCase.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/JpdlParseTestCase.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,8 +23,8 @@
import java.util.List;
-import org.jbpm.Problem;
-import org.jbpm.client.ClientProcessDefinition;
+import org.jbpm.api.Problem;
+import org.jbpm.api.client.ClientProcessDefinition;
import org.jbpm.jpdl.internal.xml.JpdlParser;
import org.jbpm.test.BaseJbpmTestCase;
Modified: jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/JpdlSchemaTest.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/JpdlSchemaTest.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/JpdlSchemaTest.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,7 +23,7 @@
import java.util.List;
-import org.jbpm.Problem;
+import org.jbpm.api.Problem;
/**
Modified: jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/ProcessParsingTest.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/ProcessParsingTest.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/ProcessParsingTest.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,8 +23,8 @@
import java.util.List;
-import org.jbpm.Problem;
-import org.jbpm.client.ClientProcessDefinition;
+import org.jbpm.api.Problem;
+import org.jbpm.api.client.ClientProcessDefinition;
/**
* @author Tom Baeyens
Modified: jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/TransitionParsingTest.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/TransitionParsingTest.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/TransitionParsingTest.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,10 +23,10 @@
import java.util.List;
-import org.jbpm.Problem;
-import org.jbpm.client.ClientProcessDefinition;
-import org.jbpm.model.Activity;
-import org.jbpm.model.Transition;
+import org.jbpm.api.Problem;
+import org.jbpm.api.client.ClientProcessDefinition;
+import org.jbpm.api.model.Activity;
+import org.jbpm.api.model.Transition;
/**
Modified: jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/test/xml/JpdlXmlTest.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/test/xml/JpdlXmlTest.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/test/xml/JpdlXmlTest.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,7 +23,7 @@
import java.util.List;
-import org.jbpm.Problem;
+import org.jbpm.api.Problem;
import org.jbpm.jpdl.internal.xml.JpdlParser;
import org.jbpm.test.BaseJbpmTestCase;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/CompositeBuilder.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/CompositeBuilder.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/CompositeBuilder.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,8 +21,8 @@
*/
package org.jbpm.pvm.internal.builder;
-import org.jbpm.JbpmException;
-import org.jbpm.activity.ActivityBehaviour;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.activity.ActivityBehaviour;
import org.jbpm.pvm.internal.model.CompositeElementImpl;
import org.jbpm.pvm.internal.model.EventImpl;
import org.jbpm.pvm.internal.model.ActivityImpl;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/CompositeExceptionHandlerBuilder.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/CompositeExceptionHandlerBuilder.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/CompositeExceptionHandlerBuilder.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,7 +21,7 @@
*/
package org.jbpm.pvm.internal.builder;
-import org.jbpm.listener.EventListener;
+import org.jbpm.api.listener.EventListener;
import org.jbpm.pvm.internal.wire.Descriptor;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/EventBuilder.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/EventBuilder.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/EventBuilder.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,7 +21,7 @@
*/
package org.jbpm.pvm.internal.builder;
-import org.jbpm.listener.EventListener;
+import org.jbpm.api.listener.EventListener;
import org.jbpm.pvm.internal.wire.Descriptor;
import org.jbpm.pvm.internal.wire.descriptor.StringDescriptor;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/EventExceptionHandlerBuilder.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/EventExceptionHandlerBuilder.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/EventExceptionHandlerBuilder.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,7 +21,7 @@
*/
package org.jbpm.pvm.internal.builder;
-import org.jbpm.listener.EventListener;
+import org.jbpm.api.listener.EventListener;
import org.jbpm.pvm.internal.wire.Descriptor;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/ExceptionHandlerBuilder.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/ExceptionHandlerBuilder.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/ExceptionHandlerBuilder.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,7 +21,7 @@
*/
package org.jbpm.pvm.internal.builder;
-import org.jbpm.listener.EventListener;
+import org.jbpm.api.listener.EventListener;
import org.jbpm.pvm.internal.model.ExceptionHandlerImpl;
import org.jbpm.pvm.internal.wire.Descriptor;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/FlowBuilder.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/FlowBuilder.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/FlowBuilder.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,8 +21,8 @@
*/
package org.jbpm.pvm.internal.builder;
-import org.jbpm.listener.EventListener;
-import org.jbpm.model.Event;
+import org.jbpm.api.listener.EventListener;
+import org.jbpm.api.model.Event;
import org.jbpm.pvm.internal.model.TransitionImpl;
import org.jbpm.pvm.internal.wire.Descriptor;
import org.jbpm.pvm.internal.wire.descriptor.StringDescriptor;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/ObservableBuilder.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/ObservableBuilder.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/ObservableBuilder.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,7 +21,7 @@
*/
package org.jbpm.pvm.internal.builder;
-import org.jbpm.listener.EventListener;
+import org.jbpm.api.listener.EventListener;
import org.jbpm.pvm.internal.model.EventImpl;
import org.jbpm.pvm.internal.model.EventListenerReference;
import org.jbpm.pvm.internal.model.ObservableElementImpl;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/TimerBuilder.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/TimerBuilder.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/TimerBuilder.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,7 +23,7 @@
import java.util.Date;
-import org.jbpm.listener.EventListener;
+import org.jbpm.api.listener.EventListener;
import org.jbpm.pvm.internal.model.TimerDefinitionImpl;
import org.jbpm.pvm.internal.wire.Descriptor;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cal/Duration.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cal/Duration.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cal/Duration.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -27,7 +27,7 @@
import java.util.List;
import java.util.Map;
-import org.jbpm.JbpmException;
+import org.jbpm.api.JbpmException;
/**
* represents a time duration.
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cfg/JbpmConfiguration.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cfg/JbpmConfiguration.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cfg/JbpmConfiguration.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -27,19 +27,19 @@
import java.util.List;
import java.util.Set;
-import org.jbpm.Configuration;
-import org.jbpm.ExecutionService;
-import org.jbpm.HistoryService;
-import org.jbpm.IdentityService;
-import org.jbpm.ManagementService;
-import org.jbpm.ProcessEngine;
-import org.jbpm.ProcessService;
-import org.jbpm.RepositoryService;
-import org.jbpm.TaskService;
-import org.jbpm.env.Context;
-import org.jbpm.env.Environment;
-import org.jbpm.env.EnvironmentFactory;
-import org.jbpm.env.WireObject;
+import org.jbpm.api.Configuration;
+import org.jbpm.api.ExecutionService;
+import org.jbpm.api.HistoryService;
+import org.jbpm.api.IdentityService;
+import org.jbpm.api.ManagementService;
+import org.jbpm.api.ProcessEngine;
+import org.jbpm.api.ProcessService;
+import org.jbpm.api.RepositoryService;
+import org.jbpm.api.TaskService;
+import org.jbpm.api.env.Context;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.env.EnvironmentFactory;
+import org.jbpm.api.env.WireObject;
import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.env.PvmEnvironment;
import org.jbpm.pvm.internal.env.JbpmConfigurationParser;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cfg/SpringConfiguration.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cfg/SpringConfiguration.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cfg/SpringConfiguration.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -25,9 +25,9 @@
import java.util.List;
import java.util.Set;
-import org.jbpm.env.Environment;
-import org.jbpm.env.EnvironmentFactory;
-import org.jbpm.env.WireObject;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.env.EnvironmentFactory;
+import org.jbpm.api.env.WireObject;
import org.jbpm.pvm.internal.spring.SpringEnvironment;
import org.jbpm.pvm.internal.util.ReflectUtil;
import org.springframework.context.ApplicationContext;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/AbstractCommand.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/AbstractCommand.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/AbstractCommand.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,8 +23,8 @@
import java.util.List;
-import org.jbpm.cmd.Command;
-import org.jbpm.env.WireObject;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.env.WireObject;
/**
* @author Tom Baeyens
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/AddParticipationCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/AddParticipationCmd.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/AddParticipationCmd.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -22,10 +22,10 @@
package org.jbpm.pvm.internal.cmd;
import org.hibernate.Session;
-import org.jbpm.JbpmException;
-import org.jbpm.env.Environment;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.task.IdentityRef;
import org.jbpm.pvm.internal.task.TaskImpl;
-import org.jbpm.task.IdentityRef;
/**
* @author Tom Baeyens
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/AddReplyCommentCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/AddReplyCommentCmd.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/AddReplyCommentCmd.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,12 +21,12 @@
*/
package org.jbpm.pvm.internal.cmd;
-import org.jbpm.JbpmException;
-import org.jbpm.cmd.Command;
-import org.jbpm.env.Environment;
-import org.jbpm.model.Comment;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.model.Comment;
+import org.jbpm.api.session.DbSession;
import org.jbpm.pvm.internal.model.CommentImpl;
-import org.jbpm.session.DbSession;
/**
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/AddTaskCommentCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/AddTaskCommentCmd.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/AddTaskCommentCmd.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,11 +21,11 @@
*/
package org.jbpm.pvm.internal.cmd;
-import org.jbpm.cmd.Command;
-import org.jbpm.env.Environment;
-import org.jbpm.model.Comment;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.model.Comment;
+import org.jbpm.api.session.DbSession;
import org.jbpm.pvm.internal.task.TaskImpl;
-import org.jbpm.session.DbSession;
/**
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/AssignTaskCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/AssignTaskCmd.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/AssignTaskCmd.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,10 +21,10 @@
*/
package org.jbpm.pvm.internal.cmd;
-import org.jbpm.JbpmException;
-import org.jbpm.env.Environment;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.session.TaskDbSession;
import org.jbpm.pvm.internal.task.TaskImpl;
-import org.jbpm.session.TaskDbSession;
/**
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CancelTaskCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CancelTaskCmd.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CancelTaskCmd.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,12 +21,12 @@
*/
package org.jbpm.pvm.internal.cmd;
-import org.jbpm.JbpmException;
-import org.jbpm.cmd.Command;
-import org.jbpm.env.Environment;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.session.DbSession;
+import org.jbpm.api.task.Assignable;
import org.jbpm.pvm.internal.task.TaskImpl;
-import org.jbpm.session.DbSession;
-import org.jbpm.task.Assignable;
/**
* @author Alejandro Guizar
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CommandException.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CommandException.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CommandException.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,7 +21,7 @@
*/
package org.jbpm.pvm.internal.cmd;
-import org.jbpm.JbpmException;
+import org.jbpm.api.JbpmException;
/**
* @author Tom Baeyens
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CompleteTaskCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CompleteTaskCmd.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CompleteTaskCmd.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,9 +21,9 @@
*/
package org.jbpm.pvm.internal.cmd;
-import org.jbpm.env.Environment;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.session.TaskDbSession;
import org.jbpm.pvm.internal.task.TaskImpl;
-import org.jbpm.session.TaskDbSession;
/**
* @author Tom Baeyens
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CompositeCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CompositeCmd.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CompositeCmd.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -24,8 +24,8 @@
import java.util.ArrayList;
import java.util.List;
-import org.jbpm.cmd.Command;
-import org.jbpm.env.Environment;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.env.Environment;
/** container for executing multiple commands in one transaction.
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/DeleteCommentCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/DeleteCommentCmd.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/DeleteCommentCmd.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,12 +21,12 @@
*/
package org.jbpm.pvm.internal.cmd;
-import org.jbpm.JbpmException;
-import org.jbpm.cmd.Command;
-import org.jbpm.env.Environment;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.session.DbSession;
import org.jbpm.pvm.internal.model.CommentImpl;
import org.jbpm.pvm.internal.task.TaskImpl;
-import org.jbpm.session.DbSession;
/**
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/DeleteDeploymentCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/DeleteDeploymentCmd.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/DeleteDeploymentCmd.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -24,14 +24,14 @@
import java.util.List;
import org.hibernate.Session;
-import org.jbpm.JbpmException;
-import org.jbpm.ProcessDefinition;
-import org.jbpm.cmd.Command;
-import org.jbpm.env.Environment;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.ProcessDefinition;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.session.PvmDbSession;
+import org.jbpm.api.session.RepositorySession;
import org.jbpm.pvm.internal.repository.DeploymentImpl;
import org.jbpm.pvm.internal.repository.RepositoryCache;
-import org.jbpm.session.PvmDbSession;
-import org.jbpm.session.RepositorySession;
/**
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/DeleteProcessDefinitionCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/DeleteProcessDefinitionCmd.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/DeleteProcessDefinitionCmd.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,11 +21,11 @@
*/
package org.jbpm.pvm.internal.cmd;
-import org.jbpm.JbpmException;
-import org.jbpm.cmd.Command;
-import org.jbpm.env.Environment;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.session.PvmDbSession;
import org.jbpm.pvm.internal.wire.binding.PvmDbSessionBinding;
-import org.jbpm.session.PvmDbSession;
/**
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/DeleteProcessInstance.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/DeleteProcessInstance.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/DeleteProcessInstance.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,9 +21,9 @@
*/
package org.jbpm.pvm.internal.cmd;
-import org.jbpm.cmd.Command;
-import org.jbpm.env.Environment;
-import org.jbpm.session.PvmDbSession;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.session.PvmDbSession;
/**
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/DeployCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/DeployCmd.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/DeployCmd.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,12 +21,12 @@
*/
package org.jbpm.pvm.internal.cmd;
-import org.jbpm.JbpmException;
-import org.jbpm.cmd.Command;
-import org.jbpm.env.Environment;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.session.RepositorySession;
import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.repository.DeploymentImpl;
-import org.jbpm.session.RepositorySession;
/**
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/EndProcessInstance.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/EndProcessInstance.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/EndProcessInstance.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,10 +21,10 @@
*/
package org.jbpm.pvm.internal.cmd;
-import org.jbpm.cmd.Command;
-import org.jbpm.env.Environment;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.session.PvmDbSession;
import org.jbpm.pvm.internal.model.ExecutionImpl;
-import org.jbpm.session.PvmDbSession;
/**
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/ExecuteJobCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/ExecuteJobCmd.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/ExecuteJobCmd.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,13 +23,13 @@
import java.util.Date;
-import org.jbpm.JbpmException;
-import org.jbpm.cmd.Command;
-import org.jbpm.cmd.CommandService;
-import org.jbpm.env.Environment;
-import org.jbpm.env.Transaction;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.cmd.CommandService;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.env.Transaction;
+import org.jbpm.api.job.Job;
import org.jbpm.internal.log.Log;
-import org.jbpm.job.Job;
import org.jbpm.pvm.internal.job.JobImpl;
import org.jbpm.pvm.internal.jobexecutor.JobDbSession;
import org.jbpm.pvm.internal.jobexecutor.JobExceptionHandler;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/FindExecutionCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/FindExecutionCmd.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/FindExecutionCmd.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,11 +21,11 @@
*/
package org.jbpm.pvm.internal.cmd;
-import org.jbpm.Execution;
-import org.jbpm.JbpmException;
-import org.jbpm.cmd.Command;
-import org.jbpm.env.Environment;
-import org.jbpm.session.PvmDbSession;
+import org.jbpm.api.Execution;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.session.PvmDbSession;
/**
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/FindExecutionsCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/FindExecutionsCmd.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/FindExecutionsCmd.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -25,11 +25,11 @@
import java.util.Collection;
import java.util.List;
-import org.jbpm.Execution;
-import org.jbpm.JbpmException;
-import org.jbpm.client.ClientExecution;
-import org.jbpm.env.Environment;
-import org.jbpm.session.PvmDbSession;
+import org.jbpm.api.Execution;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.client.ClientExecution;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.session.PvmDbSession;
/**
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/FindLatestProcessDefinitionByKeyCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/FindLatestProcessDefinitionByKeyCmd.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/FindLatestProcessDefinitionByKeyCmd.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,11 +21,11 @@
*/
package org.jbpm.pvm.internal.cmd;
-import org.jbpm.ProcessDefinition;
-import org.jbpm.cmd.Command;
-import org.jbpm.env.Environment;
-import org.jbpm.model.OpenProcessDefinition;
-import org.jbpm.session.PvmDbSession;
+import org.jbpm.api.ProcessDefinition;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.model.OpenProcessDefinition;
+import org.jbpm.api.session.PvmDbSession;
/**
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/FindProcessDefinitionByIdCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/FindProcessDefinitionByIdCmd.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/FindProcessDefinitionByIdCmd.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,10 +21,10 @@
*/
package org.jbpm.pvm.internal.cmd;
-import org.jbpm.cmd.Command;
-import org.jbpm.env.Environment;
-import org.jbpm.model.OpenProcessDefinition;
-import org.jbpm.session.PvmDbSession;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.model.OpenProcessDefinition;
+import org.jbpm.api.session.PvmDbSession;
/**
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/FindProcessDefinitionKeysCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/FindProcessDefinitionKeysCmd.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/FindProcessDefinitionKeysCmd.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,9 +23,9 @@
import java.util.List;
-import org.jbpm.cmd.Command;
-import org.jbpm.env.Environment;
-import org.jbpm.session.PvmDbSession;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.session.PvmDbSession;
/**
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/FindProcessDefinitionsByKeyCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/FindProcessDefinitionsByKeyCmd.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/FindProcessDefinitionsByKeyCmd.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,10 +23,10 @@
import java.util.List;
-import org.jbpm.client.ClientProcessDefinition;
-import org.jbpm.cmd.Command;
-import org.jbpm.env.Environment;
-import org.jbpm.session.PvmDbSession;
+import org.jbpm.api.client.ClientProcessDefinition;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.session.PvmDbSession;
/**
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetParticipantsCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetParticipantsCmd.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetParticipantsCmd.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -25,10 +25,10 @@
import org.hibernate.Query;
import org.hibernate.Session;
-import org.jbpm.JbpmException;
-import org.jbpm.env.Environment;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.task.Participation;
import org.jbpm.pvm.internal.task.ParticipationImpl;
-import org.jbpm.task.Participation;
/**
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetResourceAsStreamCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetResourceAsStreamCmd.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetResourceAsStreamCmd.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,8 +23,8 @@
import java.io.InputStream;
-import org.jbpm.env.Environment;
-import org.jbpm.session.RepositorySession;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.session.RepositorySession;
/**
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetSubTasksCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetSubTasksCmd.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetSubTasksCmd.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -25,10 +25,10 @@
import org.hibernate.Query;
import org.hibernate.Session;
-import org.jbpm.cmd.Command;
-import org.jbpm.env.Environment;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.task.Task;
import org.jbpm.pvm.internal.task.TaskImpl;
-import org.jbpm.task.Task;
/**
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetTaskCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetTaskCmd.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetTaskCmd.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,10 +21,10 @@
*/
package org.jbpm.pvm.internal.cmd;
-import org.jbpm.cmd.Command;
-import org.jbpm.env.Environment;
-import org.jbpm.session.TaskDbSession;
-import org.jbpm.task.Task;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.session.TaskDbSession;
+import org.jbpm.api.task.Task;
/**
* @author Alejandro Guizar
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetTaskCommentsCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetTaskCommentsCmd.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetTaskCommentsCmd.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -24,11 +24,11 @@
import java.util.ArrayList;
import java.util.List;
-import org.jbpm.cmd.Command;
-import org.jbpm.env.Environment;
-import org.jbpm.model.Comment;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.model.Comment;
+import org.jbpm.api.session.DbSession;
import org.jbpm.pvm.internal.task.TaskImpl;
-import org.jbpm.session.DbSession;
/**
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetVariableNamesCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetVariableNamesCmd.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetVariableNamesCmd.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,12 +23,12 @@
import java.util.Set;
-import org.jbpm.JbpmException;
-import org.jbpm.client.ClientExecution;
-import org.jbpm.env.Environment;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.client.ClientExecution;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.session.PvmDbSession;
+import org.jbpm.api.session.TaskDbSession;
import org.jbpm.pvm.internal.task.TaskImpl;
-import org.jbpm.session.PvmDbSession;
-import org.jbpm.session.TaskDbSession;
/**
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetVariablesCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetVariablesCmd.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetVariablesCmd.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -25,12 +25,12 @@
import java.util.Map;
import java.util.Set;
-import org.jbpm.JbpmException;
-import org.jbpm.client.ClientExecution;
-import org.jbpm.env.Environment;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.client.ClientExecution;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.session.PvmDbSession;
+import org.jbpm.api.session.TaskDbSession;
import org.jbpm.pvm.internal.task.TaskImpl;
-import org.jbpm.session.PvmDbSession;
-import org.jbpm.session.TaskDbSession;
/**
* @author Tom Baeyens
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/NewTaskCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/NewTaskCmd.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/NewTaskCmd.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,10 +21,10 @@
*/
package org.jbpm.pvm.internal.cmd;
-import org.jbpm.env.Environment;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.session.TaskDbSession;
+import org.jbpm.api.task.Task;
import org.jbpm.pvm.internal.task.TaskImpl;
-import org.jbpm.session.TaskDbSession;
-import org.jbpm.task.Task;
/**
* @author Tom Baeyens
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/QueryCommand.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/QueryCommand.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/QueryCommand.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,7 +21,7 @@
*/
package org.jbpm.pvm.internal.cmd;
-import org.jbpm.cmd.Command;
+import org.jbpm.api.cmd.Command;
/** base class for commands that execute scalable queries.
*
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/RemoveParticipantCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/RemoveParticipantCmd.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/RemoveParticipantCmd.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -25,8 +25,8 @@
import java.util.Set;
import org.hibernate.Session;
-import org.jbpm.JbpmException;
-import org.jbpm.env.Environment;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.env.Environment;
import org.jbpm.pvm.internal.task.ParticipationImpl;
import org.jbpm.pvm.internal.task.TaskImpl;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/SaveTaskCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/SaveTaskCmd.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/SaveTaskCmd.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,9 +21,9 @@
*/
package org.jbpm.pvm.internal.cmd;
-import org.jbpm.env.Environment;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.session.TaskDbSession;
import org.jbpm.pvm.internal.task.TaskImpl;
-import org.jbpm.session.TaskDbSession;
/**
* @author Alejandro Guizar
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/SendMessageCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/SendMessageCmd.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/SendMessageCmd.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,10 +21,10 @@
*/
package org.jbpm.pvm.internal.cmd;
-import org.jbpm.cmd.Command;
-import org.jbpm.env.Environment;
-import org.jbpm.job.Message;
-import org.jbpm.session.MessageSession;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.job.Message;
+import org.jbpm.api.session.MessageSession;
/** sends a given message to the configured message service.
*
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/SetVariablesCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/SetVariablesCmd.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/SetVariablesCmd.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,11 +23,11 @@
import java.util.Map;
-import org.jbpm.JbpmException;
-import org.jbpm.client.ClientExecution;
-import org.jbpm.env.Environment;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.client.ClientExecution;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.session.TaskDbSession;
import org.jbpm.pvm.internal.task.TaskImpl;
-import org.jbpm.session.TaskDbSession;
/**
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/SignalCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/SignalCmd.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/SignalCmd.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,11 +23,11 @@
import java.util.Map;
-import org.jbpm.JbpmException;
-import org.jbpm.ProcessInstance;
-import org.jbpm.client.ClientExecution;
-import org.jbpm.env.Environment;
-import org.jbpm.session.PvmDbSession;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.ProcessInstance;
+import org.jbpm.api.client.ClientExecution;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.session.PvmDbSession;
/**
* @author Tom Baeyens
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/StartProcessInstanceCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/StartProcessInstanceCmd.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/StartProcessInstanceCmd.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -24,12 +24,12 @@
import java.util.Map;
import org.hibernate.Session;
-import org.jbpm.JbpmException;
-import org.jbpm.ProcessInstance;
-import org.jbpm.client.ClientProcessDefinition;
-import org.jbpm.client.ClientProcessInstance;
-import org.jbpm.env.Environment;
-import org.jbpm.session.RepositorySession;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.ProcessInstance;
+import org.jbpm.api.client.ClientProcessDefinition;
+import org.jbpm.api.client.ClientProcessInstance;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.session.RepositorySession;
/**
* @author Tom Baeyens
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/StartProcessInstanceInLatestCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/StartProcessInstanceInLatestCmd.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/StartProcessInstanceInLatestCmd.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -24,13 +24,13 @@
import java.util.Map;
import org.hibernate.Session;
-import org.jbpm.JbpmException;
-import org.jbpm.ProcessDefinitionQuery;
-import org.jbpm.ProcessInstance;
-import org.jbpm.client.ClientProcessDefinition;
-import org.jbpm.client.ClientProcessInstance;
-import org.jbpm.env.Environment;
-import org.jbpm.session.RepositorySession;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.ProcessDefinitionQuery;
+import org.jbpm.api.ProcessInstance;
+import org.jbpm.api.client.ClientProcessDefinition;
+import org.jbpm.api.client.ClientProcessInstance;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.session.RepositorySession;
/**
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/VariablesCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/VariablesCmd.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/VariablesCmd.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -24,10 +24,10 @@
import java.util.HashMap;
import java.util.Map;
-import org.jbpm.JbpmException;
-import org.jbpm.client.ClientExecution;
-import org.jbpm.env.Environment;
-import org.jbpm.session.PvmDbSession;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.client.ClientExecution;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.session.PvmDbSession;
/**
* @author Tom Baeyens
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/BasicEnvironment.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/BasicEnvironment.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/BasicEnvironment.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -25,9 +25,9 @@
import java.util.HashMap;
import java.util.Map;
-import org.jbpm.JbpmException;
-import org.jbpm.env.Context;
-import org.jbpm.env.Environment;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.env.Context;
+import org.jbpm.api.env.Environment;
import org.jbpm.internal.log.Log;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/EnvironmentDefaults.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/EnvironmentDefaults.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/EnvironmentDefaults.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,7 +21,7 @@
*/
package org.jbpm.pvm.internal.env;
-import org.jbpm.env.Environment;
+import org.jbpm.api.env.Environment;
import org.jbpm.pvm.internal.script.ScriptManager;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/ExecutionContext.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/ExecutionContext.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/ExecutionContext.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,8 +23,8 @@
import java.util.Set;
-import org.jbpm.Execution;
-import org.jbpm.env.Context;
+import org.jbpm.api.Execution;
+import org.jbpm.api.env.Context;
import org.jbpm.pvm.internal.model.ExecutionImpl;
public class ExecutionContext implements Context {
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/ExecutionEnvironment.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/ExecutionEnvironment.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/ExecutionEnvironment.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,7 +21,7 @@
*/
package org.jbpm.pvm.internal.env;
-import org.jbpm.Execution;
+import org.jbpm.api.Execution;
/**
* @author Tom Baeyens
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/JbpmConfigurationParser.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/JbpmConfigurationParser.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/JbpmConfigurationParser.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,7 +21,7 @@
*/
package org.jbpm.pvm.internal.env;
-import org.jbpm.env.EnvironmentFactory;
+import org.jbpm.api.env.EnvironmentFactory;
import org.jbpm.pvm.internal.cfg.JbpmConfiguration;
import org.jbpm.pvm.internal.stream.StreamInput;
import org.jbpm.pvm.internal.util.XmlUtil;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/JobContext.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/JobContext.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/JobContext.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -25,7 +25,7 @@
import java.util.HashSet;
import java.util.Set;
-import org.jbpm.env.Context;
+import org.jbpm.api.env.Context;
import org.jbpm.pvm.internal.job.JobImpl;
public class JobContext implements Context {
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/PvmEnvironment.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/PvmEnvironment.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/PvmEnvironment.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,7 +21,7 @@
*/
package org.jbpm.pvm.internal.env;
-import org.jbpm.env.Context;
+import org.jbpm.api.env.Context;
import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.cfg.JbpmConfiguration;
import org.jbpm.pvm.internal.util.Closable;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/ConverterType.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/ConverterType.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/ConverterType.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -32,7 +32,7 @@
import org.hibernate.HibernateException;
import org.hibernate.type.ImmutableType;
import org.hibernate.usertype.ParameterizedType;
-import org.jbpm.JbpmException;
+import org.jbpm.api.JbpmException;
import org.jbpm.pvm.internal.type.Converter;
import org.jbpm.pvm.internal.util.ReflectUtil;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/ExecutionType.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/ExecutionType.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/ExecutionType.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -11,7 +11,7 @@
import org.hibernate.HibernateException;
import org.hibernate.usertype.ParameterizedType;
import org.hibernate.usertype.UserType;
-import org.jbpm.Execution;
+import org.jbpm.api.Execution;
import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.model.ExecutionImpl;
import org.jbpm.pvm.internal.model.ActivityImpl;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/HibernateDbSession.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/HibernateDbSession.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/HibernateDbSession.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -25,7 +25,7 @@
import org.hibernate.LockMode;
import org.hibernate.Session;
-import org.jbpm.session.DbSession;
+import org.jbpm.api.session.DbSession;
/**
* @author Tom Baeyens
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/HibernateJobDbSession.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/HibernateJobDbSession.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/HibernateJobDbSession.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -24,7 +24,7 @@
import java.util.List;
import org.hibernate.Query;
-import org.jbpm.Execution;
+import org.jbpm.api.Execution;
import org.jbpm.pvm.internal.job.JobImpl;
import org.jbpm.pvm.internal.jobexecutor.JobDbSession;
import org.jbpm.pvm.internal.util.Clock;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/HibernatePvmDbSession.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/HibernatePvmDbSession.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/HibernatePvmDbSession.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -25,22 +25,22 @@
import org.hibernate.Query;
import org.hibernate.metadata.ClassMetadata;
-import org.jbpm.Execution;
-import org.jbpm.JbpmException;
-import org.jbpm.ProcessDefinition;
-import org.jbpm.client.ClientExecution;
-import org.jbpm.client.ClientProcessDefinition;
-import org.jbpm.history.HistoryProcessInstance;
+import org.jbpm.api.Execution;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.ProcessDefinition;
+import org.jbpm.api.client.ClientExecution;
+import org.jbpm.api.client.ClientProcessDefinition;
+import org.jbpm.api.history.HistoryProcessInstance;
+import org.jbpm.api.job.Job;
+import org.jbpm.api.job.Message;
+import org.jbpm.api.job.Timer;
+import org.jbpm.api.session.PvmDbSession;
import org.jbpm.internal.log.Log;
-import org.jbpm.job.Job;
-import org.jbpm.job.Message;
-import org.jbpm.job.Timer;
import org.jbpm.pvm.internal.history.model.HistoryProcessInstanceImpl;
import org.jbpm.pvm.internal.model.ExecutionImpl;
import org.jbpm.pvm.internal.query.HistoryProcessInstanceQueryImpl;
import org.jbpm.pvm.internal.svc.DefaultCommandService;
import org.jbpm.pvm.internal.task.TaskImpl;
-import org.jbpm.session.PvmDbSession;
/**
* @author Tom Baeyens
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/HibernateTaskDbSession.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/HibernateTaskDbSession.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/HibernateTaskDbSession.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -24,14 +24,14 @@
import java.io.Serializable;
import org.hibernate.Query;
-import org.jbpm.Execution;
+import org.jbpm.api.Execution;
+import org.jbpm.api.session.TaskDbSession;
+import org.jbpm.api.task.Task;
import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.task.LifeCycle;
import org.jbpm.pvm.internal.task.SwimlaneImpl;
import org.jbpm.pvm.internal.task.TaskImpl;
import org.jbpm.pvm.internal.util.Clock;
-import org.jbpm.session.TaskDbSession;
-import org.jbpm.task.Task;
/**
* @author Alejandro Guizar
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/ActivityEnd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/ActivityEnd.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/ActivityEnd.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -22,7 +22,7 @@
package org.jbpm.pvm.internal.history.events;
import org.hibernate.Session;
-import org.jbpm.env.Environment;
+import org.jbpm.api.env.Environment;
import org.jbpm.pvm.internal.history.HistoryEvent;
import org.jbpm.pvm.internal.history.model.HistoryActivityInstanceImpl;
import org.jbpm.pvm.internal.util.Clock;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/ActivityStart.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/ActivityStart.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/ActivityStart.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -22,8 +22,8 @@
package org.jbpm.pvm.internal.history.events;
import org.hibernate.Session;
-import org.jbpm.env.Environment;
-import org.jbpm.history.HistoryProcessInstance;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.history.HistoryProcessInstance;
import org.jbpm.pvm.internal.history.HistoryEvent;
import org.jbpm.pvm.internal.history.model.HistoryActivityInstanceImpl;
import org.jbpm.pvm.internal.history.model.HistoryProcessInstanceImpl;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/AutomaticEnd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/AutomaticEnd.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/AutomaticEnd.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,7 +21,7 @@
*/
package org.jbpm.pvm.internal.history.events;
-import org.jbpm.history.HistoryProcessInstance;
+import org.jbpm.api.history.HistoryProcessInstance;
import org.jbpm.pvm.internal.history.model.HistoryActivityInstanceImpl;
import org.jbpm.pvm.internal.history.model.HistoryAutomaticInstanceImpl;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/DecisionEnd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/DecisionEnd.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/DecisionEnd.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,7 +21,7 @@
*/
package org.jbpm.pvm.internal.history.events;
-import org.jbpm.history.HistoryProcessInstance;
+import org.jbpm.api.history.HistoryProcessInstance;
import org.jbpm.pvm.internal.history.model.HistoryActivityInstanceImpl;
import org.jbpm.pvm.internal.history.model.HistoryDecisionInstanceImpl;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/ProcessInstanceEnd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/ProcessInstanceEnd.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/ProcessInstanceEnd.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -22,7 +22,7 @@
package org.jbpm.pvm.internal.history.events;
import org.hibernate.Session;
-import org.jbpm.env.Environment;
+import org.jbpm.api.env.Environment;
import org.jbpm.pvm.internal.history.HistoryEvent;
import org.jbpm.pvm.internal.history.model.HistoryProcessInstanceImpl;
import org.jbpm.pvm.internal.util.Clock;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/ProcessInstanceStart.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/ProcessInstanceStart.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/ProcessInstanceStart.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -24,8 +24,8 @@
import java.io.Serializable;
import org.hibernate.Session;
-import org.jbpm.env.Environment;
-import org.jbpm.history.HistoryProcessInstance;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.history.HistoryProcessInstance;
import org.jbpm.pvm.internal.history.HistoryEvent;
import org.jbpm.pvm.internal.history.model.HistoryProcessInstanceImpl;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/TaskStart.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/TaskStart.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/TaskStart.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,10 +21,10 @@
*/
package org.jbpm.pvm.internal.history.events;
-import org.jbpm.history.HistoryProcessInstance;
+import org.jbpm.api.history.HistoryProcessInstance;
+import org.jbpm.api.task.Task;
import org.jbpm.pvm.internal.history.model.HistoryActivityInstanceImpl;
import org.jbpm.pvm.internal.history.model.HistoryTaskInstanceImpl;
-import org.jbpm.task.Task;
/**
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/model/HistoryActivityInstanceImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/model/HistoryActivityInstanceImpl.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/model/HistoryActivityInstanceImpl.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -24,8 +24,8 @@
import java.io.Serializable;
import java.util.Date;
-import org.jbpm.history.HistoryActivityInstance;
-import org.jbpm.history.HistoryProcessInstance;
+import org.jbpm.api.history.HistoryActivityInstance;
+import org.jbpm.api.history.HistoryProcessInstance;
import org.jbpm.pvm.internal.model.ActivityImpl;
import org.jbpm.pvm.internal.model.ExecutionImpl;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/model/HistoryAutomaticInstanceImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/model/HistoryAutomaticInstanceImpl.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/model/HistoryAutomaticInstanceImpl.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,7 +21,7 @@
*/
package org.jbpm.pvm.internal.history.model;
-import org.jbpm.history.HistoryProcessInstance;
+import org.jbpm.api.history.HistoryProcessInstance;
import org.jbpm.pvm.internal.model.ExecutionImpl;
import org.jbpm.pvm.internal.util.Clock;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/model/HistoryDecisionInstanceImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/model/HistoryDecisionInstanceImpl.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/model/HistoryDecisionInstanceImpl.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,7 +21,7 @@
*/
package org.jbpm.pvm.internal.history.model;
-import org.jbpm.history.HistoryProcessInstance;
+import org.jbpm.api.history.HistoryProcessInstance;
import org.jbpm.pvm.internal.model.ExecutionImpl;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/model/HistoryProcessInstanceImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/model/HistoryProcessInstanceImpl.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/model/HistoryProcessInstanceImpl.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -25,7 +25,7 @@
import java.util.Date;
import java.util.Set;
-import org.jbpm.history.HistoryProcessInstance;
+import org.jbpm.api.history.HistoryProcessInstance;
import org.jbpm.pvm.internal.model.ExecutionImpl;
import org.jbpm.pvm.internal.model.ProcessDefinitionImpl;
import org.jbpm.pvm.internal.util.Clock;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/model/HistoryTaskInstanceImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/model/HistoryTaskInstanceImpl.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/model/HistoryTaskInstanceImpl.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,7 +21,7 @@
*/
package org.jbpm.pvm.internal.history.model;
-import org.jbpm.history.HistoryProcessInstance;
+import org.jbpm.api.history.HistoryProcessInstance;
import org.jbpm.pvm.internal.model.ExecutionImpl;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/CreateGroup.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/CreateGroup.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/CreateGroup.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,8 +21,8 @@
*/
package org.jbpm.pvm.internal.identity.cmd;
-import org.jbpm.cmd.Command;
-import org.jbpm.env.Environment;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.env.Environment;
import org.jbpm.pvm.internal.identity.spi.IdentitySession;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/CreateMembership.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/CreateMembership.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/CreateMembership.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,8 +21,8 @@
*/
package org.jbpm.pvm.internal.identity.cmd;
-import org.jbpm.cmd.Command;
-import org.jbpm.env.Environment;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.env.Environment;
import org.jbpm.pvm.internal.identity.spi.IdentitySession;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/CreateUser.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/CreateUser.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/CreateUser.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,8 +21,8 @@
*/
package org.jbpm.pvm.internal.identity.cmd;
-import org.jbpm.cmd.Command;
-import org.jbpm.env.Environment;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.env.Environment;
import org.jbpm.pvm.internal.identity.spi.IdentitySession;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/DeleteGroup.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/DeleteGroup.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/DeleteGroup.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,8 +21,8 @@
*/
package org.jbpm.pvm.internal.identity.cmd;
-import org.jbpm.cmd.Command;
-import org.jbpm.env.Environment;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.env.Environment;
import org.jbpm.pvm.internal.identity.spi.IdentitySession;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/DeleteMembership.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/DeleteMembership.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/DeleteMembership.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,8 +21,8 @@
*/
package org.jbpm.pvm.internal.identity.cmd;
-import org.jbpm.cmd.Command;
-import org.jbpm.env.Environment;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.env.Environment;
import org.jbpm.pvm.internal.identity.spi.IdentitySession;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/DeleteUser.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/DeleteUser.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/DeleteUser.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,8 +21,8 @@
*/
package org.jbpm.pvm.internal.identity.cmd;
-import org.jbpm.cmd.Command;
-import org.jbpm.env.Environment;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.env.Environment;
import org.jbpm.pvm.internal.identity.spi.IdentitySession;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/FindGroup.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/FindGroup.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/FindGroup.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,9 +21,9 @@
*/
package org.jbpm.pvm.internal.identity.cmd;
-import org.jbpm.cmd.Command;
-import org.jbpm.env.Environment;
-import org.jbpm.identity.Group;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.identity.Group;
import org.jbpm.pvm.internal.identity.spi.IdentitySession;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/FindGroups.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/FindGroups.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/FindGroups.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,9 +23,9 @@
import java.util.List;
-import org.jbpm.cmd.Command;
-import org.jbpm.env.Environment;
-import org.jbpm.identity.Group;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.identity.Group;
import org.jbpm.pvm.internal.identity.spi.IdentitySession;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/FindUser.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/FindUser.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/FindUser.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,9 +21,9 @@
*/
package org.jbpm.pvm.internal.identity.cmd;
-import org.jbpm.cmd.Command;
-import org.jbpm.env.Environment;
-import org.jbpm.identity.User;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.identity.User;
import org.jbpm.pvm.internal.identity.spi.IdentitySession;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/FindUsers.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/FindUsers.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/FindUsers.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,9 +23,9 @@
import java.util.List;
-import org.jbpm.cmd.Command;
-import org.jbpm.env.Environment;
-import org.jbpm.identity.User;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.identity.User;
import org.jbpm.pvm.internal.identity.spi.IdentitySession;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/GroupImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/GroupImpl.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/GroupImpl.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,7 +23,7 @@
import java.io.Serializable;
-import org.jbpm.identity.Group;
+import org.jbpm.api.identity.Group;
/**
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/IdentitySessionImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/IdentitySessionImpl.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/IdentitySessionImpl.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -25,9 +25,9 @@
import org.hibernate.Query;
import org.hibernate.Session;
-import org.jbpm.JbpmException;
-import org.jbpm.identity.Group;
-import org.jbpm.identity.User;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.identity.Group;
+import org.jbpm.api.identity.User;
import org.jbpm.pvm.internal.identity.spi.IdentitySession;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/IdentitySessionResource.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/IdentitySessionResource.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/IdentitySessionResource.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -24,7 +24,7 @@
import org.jboss.identity.idm.api.IdentitySession;
import org.jboss.identity.idm.api.Transaction;
import org.jboss.identity.idm.exception.IdentityException;
-import org.jbpm.JbpmException;
+import org.jbpm.api.JbpmException;
import org.jbpm.pvm.internal.tx.StandardResource;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/JBossIdmIdentitySessionImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/JBossIdmIdentitySessionImpl.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/JBossIdmIdentitySessionImpl.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -39,10 +39,10 @@
import org.jboss.identity.idm.impl.api.SimpleAttribute;
import org.jboss.identity.idm.impl.api.model.SimpleGroupType;
import org.jboss.identity.idm.p3p.P3PConstants;
-import org.jbpm.JbpmException;
-import org.jbpm.env.Environment;
-import org.jbpm.identity.Group;
-import org.jbpm.identity.User;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.identity.Group;
+import org.jbpm.api.identity.User;
import org.jbpm.pvm.internal.tx.StandardTransaction;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/JbpmIdentityStore.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/JbpmIdentityStore.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/JbpmIdentityStore.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -25,7 +25,7 @@
import org.jboss.identity.idm.exception.IdentityException;
import org.jboss.identity.idm.impl.store.hibernate.HibernateIdentityStoreImpl;
import org.jboss.identity.idm.spi.store.IdentityStoreInvocationContext;
-import org.jbpm.env.Environment;
+import org.jbpm.api.env.Environment;
/**
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/MembershipImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/MembershipImpl.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/MembershipImpl.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,8 +21,8 @@
*/
package org.jbpm.pvm.internal.identity.impl;
-import org.jbpm.identity.User;
-import org.jbpm.identity.Group;
+import org.jbpm.api.identity.Group;
+import org.jbpm.api.identity.User;
/**
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/UserImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/UserImpl.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/UserImpl.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,7 +23,7 @@
import java.io.Serializable;
-import org.jbpm.identity.User;
+import org.jbpm.api.identity.User;
/**
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/spi/IdentitySession.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/spi/IdentitySession.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/spi/IdentitySession.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,8 +23,8 @@
import java.util.List;
-import org.jbpm.identity.Group;
-import org.jbpm.identity.User;
+import org.jbpm.api.identity.Group;
+import org.jbpm.api.identity.User;
/**
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jms/JmsMessageSession.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jms/JmsMessageSession.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jms/JmsMessageSession.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -26,10 +26,10 @@
import javax.jms.MessageProducer;
import javax.jms.Session;
-import org.jbpm.JbpmException;
-import org.jbpm.job.Message;
-import org.jbpm.session.DbSession;
-import org.jbpm.session.MessageSession;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.job.Message;
+import org.jbpm.api.session.DbSession;
+import org.jbpm.api.session.MessageSession;
/** message service implementation based on JMS.
* @author Tom Baeyens
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/job/CommandMessage.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/job/CommandMessage.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/job/CommandMessage.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,8 +21,8 @@
*/
package org.jbpm.pvm.internal.job;
-import org.jbpm.cmd.Command;
-import org.jbpm.env.Environment;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.env.Environment;
import org.jbpm.pvm.internal.jobexecutor.JobDbSession;
import org.jbpm.pvm.internal.wire.Descriptor;
import org.jbpm.pvm.internal.wire.WireContext;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/job/JobImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/job/JobImpl.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/job/JobImpl.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -3,8 +3,8 @@
import java.io.Serializable;
import java.util.Date;
-import org.jbpm.cmd.Command;
-import org.jbpm.job.Job;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.job.Job;
import org.jbpm.pvm.internal.model.ExecutionImpl;
import org.jbpm.pvm.internal.wire.Descriptor;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/job/MessageImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/job/MessageImpl.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/job/MessageImpl.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,8 +21,8 @@
*/
package org.jbpm.pvm.internal.job;
-import org.jbpm.JbpmException;
-import org.jbpm.job.Message;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.job.Message;
import org.jbpm.pvm.internal.model.ExecutionImpl;
/**
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/job/TimerImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/job/TimerImpl.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/job/TimerImpl.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -24,12 +24,12 @@
import java.text.SimpleDateFormat;
import java.util.Date;
-import org.jbpm.JbpmException;
-import org.jbpm.env.Environment;
-import org.jbpm.env.Transaction;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.env.Transaction;
+import org.jbpm.api.job.Timer;
+import org.jbpm.api.model.ObservableElement;
import org.jbpm.internal.log.Log;
-import org.jbpm.job.Timer;
-import org.jbpm.model.ObservableElement;
import org.jbpm.pvm.internal.cal.BusinessCalendar;
import org.jbpm.pvm.internal.cal.Duration;
import org.jbpm.pvm.internal.env.JobContext;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/AcquireJobsCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/AcquireJobsCmd.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/AcquireJobsCmd.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -28,8 +28,8 @@
import java.util.Date;
import java.util.List;
-import org.jbpm.cmd.Command;
-import org.jbpm.env.Environment;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.env.Environment;
import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.job.JobImpl;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/DispatcherThread.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/DispatcherThread.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/DispatcherThread.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -24,8 +24,8 @@
import java.util.Collection;
import java.util.Date;
-import org.jbpm.cmd.Command;
-import org.jbpm.cmd.CommandService;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.cmd.CommandService;
import org.jbpm.internal.log.Log;
/** this thread is responsible for acquiring jobs in the job that need to be
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/GetNextDueDateCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/GetNextDueDateCmd.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/GetNextDueDateCmd.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,8 +23,8 @@
import java.util.Date;
-import org.jbpm.cmd.Command;
-import org.jbpm.env.Environment;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.env.Environment;
import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.job.JobImpl;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobDbSession.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobDbSession.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobDbSession.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -2,10 +2,10 @@
import java.util.List;
-import org.jbpm.Execution;
+import org.jbpm.api.Execution;
+import org.jbpm.api.session.DbSession;
+import org.jbpm.api.session.MessageSession;
import org.jbpm.pvm.internal.job.JobImpl;
-import org.jbpm.session.DbSession;
-import org.jbpm.session.MessageSession;
/** internal interface used by the job executor and the
* implementations of {@link MessageSession} and {@link TimerSession}.
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExceptionHandler.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExceptionHandler.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExceptionHandler.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -27,11 +27,11 @@
import javax.transaction.Synchronization;
import org.hibernate.Session;
-import org.jbpm.JbpmException;
-import org.jbpm.cmd.Command;
-import org.jbpm.cmd.CommandService;
-import org.jbpm.env.Environment;
-import org.jbpm.env.Transaction;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.cmd.CommandService;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.env.Transaction;
import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.job.JobImpl;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutor.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutor.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutor.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -30,9 +30,9 @@
import java.util.concurrent.ArrayBlockingQueue;
import java.util.concurrent.BlockingQueue;
-import org.jbpm.JbpmException;
-import org.jbpm.cmd.Command;
-import org.jbpm.cmd.CommandService;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.cmd.CommandService;
import org.jbpm.internal.log.Log;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorMessageSession.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorMessageSession.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorMessageSession.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,14 +21,14 @@
*/
package org.jbpm.pvm.internal.jobexecutor;
-import org.jbpm.JbpmException;
-import org.jbpm.env.Environment;
-import org.jbpm.env.Transaction;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.env.Transaction;
+import org.jbpm.api.job.Message;
+import org.jbpm.api.session.DbSession;
+import org.jbpm.api.session.MessageSession;
import org.jbpm.internal.log.Log;
-import org.jbpm.job.Message;
import org.jbpm.pvm.internal.util.ReflectUtil;
-import org.jbpm.session.DbSession;
-import org.jbpm.session.MessageSession;
/**
* @author Tom Baeyens
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorServlet.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorServlet.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorServlet.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -29,9 +29,9 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.jbpm.Configuration;
-import org.jbpm.JbpmException;
-import org.jbpm.env.EnvironmentFactory;
+import org.jbpm.api.Configuration;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.env.EnvironmentFactory;
import org.jbpm.pvm.internal.cfg.JbpmConfiguration;
/**
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorThread.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorThread.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorThread.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -24,7 +24,7 @@
import java.util.Collection;
import java.util.concurrent.BlockingQueue;
-import org.jbpm.cmd.CommandService;
+import org.jbpm.api.cmd.CommandService;
import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.cmd.ExecuteJobCmd;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorTimerSession.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorTimerSession.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorTimerSession.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -13,12 +13,12 @@
**/
package org.jbpm.pvm.internal.jobexecutor;
-import org.jbpm.JbpmException;
-import org.jbpm.env.Transaction;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.env.Transaction;
+import org.jbpm.api.job.Timer;
+import org.jbpm.api.session.TimerSession;
import org.jbpm.internal.log.Log;
-import org.jbpm.job.Timer;
import org.jbpm.pvm.internal.job.TimerImpl;
-import org.jbpm.session.TimerSession;
/**
* Timers created with this service are committed at the end of the transaction,
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/lob/BlobStrategyBlob.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/lob/BlobStrategyBlob.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/lob/BlobStrategyBlob.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -3,7 +3,7 @@
import java.sql.SQLException;
import org.hibernate.Hibernate;
-import org.jbpm.JbpmException;
+import org.jbpm.api.JbpmException;
public class BlobStrategyBlob implements BlobStrategy {
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/lob/ClobStrategyClob.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/lob/ClobStrategyClob.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/lob/ClobStrategyClob.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -3,7 +3,7 @@
import java.sql.SQLException;
import org.hibernate.Hibernate;
-import org.jbpm.JbpmException;
+import org.jbpm.api.JbpmException;
public class ClobStrategyClob implements ClobStrategy {
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/lob/Lob.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/lob/Lob.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/lob/Lob.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -24,7 +24,7 @@
import java.io.Serializable;
import java.util.List;
-import org.jbpm.env.Environment;
+import org.jbpm.api.env.Environment;
/**
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ActivityImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ActivityImpl.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ActivityImpl.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -26,10 +26,10 @@
import java.util.List;
import java.util.Map;
-import org.jbpm.JbpmException;
-import org.jbpm.activity.ActivityBehaviour;
-import org.jbpm.model.Activity;
-import org.jbpm.model.Transition;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.activity.ActivityBehaviour;
+import org.jbpm.api.model.Activity;
+import org.jbpm.api.model.Transition;
import org.jbpm.pvm.internal.wire.Descriptor;
/**
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/CommentImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/CommentImpl.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/CommentImpl.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -27,9 +27,9 @@
import java.util.Date;
import java.util.List;
-import org.jbpm.JbpmException;
-import org.jbpm.env.Environment;
-import org.jbpm.model.Comment;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.model.Comment;
import org.jbpm.pvm.internal.task.TaskImpl;
import org.jbpm.pvm.internal.util.Clock;
import org.jbpm.pvm.internal.util.EqualsUtil;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/CompositeElementImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/CompositeElementImpl.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/CompositeElementImpl.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -25,8 +25,8 @@
import java.util.List;
import java.util.Map;
-import org.jbpm.model.CompositeElement;
-import org.jbpm.model.Activity;
+import org.jbpm.api.model.Activity;
+import org.jbpm.api.model.CompositeElement;
/**
* @author Tom Baeyens
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/DefaultIdGenerator.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/DefaultIdGenerator.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/DefaultIdGenerator.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -22,9 +22,9 @@
package org.jbpm.pvm.internal.model;
import org.hibernate.Session;
-import org.jbpm.Execution;
-import org.jbpm.ProcessDefinition;
-import org.jbpm.env.Environment;
+import org.jbpm.api.Execution;
+import org.jbpm.api.ProcessDefinition;
+import org.jbpm.api.env.Environment;
import org.jbpm.internal.log.Log;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/EventImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/EventImpl.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/EventImpl.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -25,8 +25,8 @@
import java.util.ArrayList;
import java.util.List;
-import org.jbpm.listener.EventListener;
-import org.jbpm.model.Event;
+import org.jbpm.api.listener.EventListener;
+import org.jbpm.api.model.Event;
import org.jbpm.pvm.internal.wire.Descriptor;
/**
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/EventListenerReference.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/EventListenerReference.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/EventListenerReference.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,7 +21,7 @@
*/
package org.jbpm.pvm.internal.model;
-import org.jbpm.listener.EventListener;
+import org.jbpm.api.listener.EventListener;
/**
* @author Tom Baeyens
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExceptionHandlerImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExceptionHandlerImpl.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExceptionHandlerImpl.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -26,13 +26,13 @@
import java.util.List;
-import org.jbpm.JbpmException;
-import org.jbpm.cmd.CommandService;
-import org.jbpm.env.Environment;
-import org.jbpm.env.Transaction;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.cmd.CommandService;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.env.Transaction;
+import org.jbpm.api.listener.EventListener;
+import org.jbpm.api.model.OpenProcessDefinition;
import org.jbpm.internal.log.Log;
-import org.jbpm.listener.EventListener;
-import org.jbpm.model.OpenProcessDefinition;
import org.jbpm.pvm.internal.model.op.MoveToChildActivity;
import org.jbpm.pvm.internal.wire.Descriptor;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExceptionHandlerSynchronization.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExceptionHandlerSynchronization.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExceptionHandlerSynchronization.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -24,13 +24,13 @@
import javax.transaction.Status;
import javax.transaction.Synchronization;
-import org.jbpm.JbpmException;
-import org.jbpm.cmd.Command;
-import org.jbpm.cmd.CommandService;
-import org.jbpm.env.Environment;
-import org.jbpm.env.EnvironmentFactory;
-import org.jbpm.env.Transaction;
-import org.jbpm.session.DbSession;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.cmd.CommandService;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.env.EnvironmentFactory;
+import org.jbpm.api.env.Transaction;
+import org.jbpm.api.session.DbSession;
public class ExceptionHandlerSynchronization implements Synchronization, Command<Object> {
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExecutionImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExecutionImpl.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExecutionImpl.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -34,23 +34,25 @@
import java.util.Queue;
import java.util.Set;
-import org.jbpm.Execution;
-import org.jbpm.JbpmException;
-import org.jbpm.activity.ActivityExecution;
-import org.jbpm.client.ClientProcessDefinition;
-import org.jbpm.client.ClientProcessInstance;
-import org.jbpm.cmd.CommandService;
-import org.jbpm.env.Environment;
-import org.jbpm.env.Transaction;
+import org.jbpm.api.Execution;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.activity.ActivityExecution;
+import org.jbpm.api.client.ClientProcessDefinition;
+import org.jbpm.api.client.ClientProcessInstance;
+import org.jbpm.api.cmd.CommandService;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.env.Transaction;
+import org.jbpm.api.listener.EventListener;
+import org.jbpm.api.listener.EventListenerExecution;
+import org.jbpm.api.model.Activity;
+import org.jbpm.api.model.Comment;
+import org.jbpm.api.model.Event;
+import org.jbpm.api.model.ObservableElement;
+import org.jbpm.api.model.OpenExecution;
+import org.jbpm.api.model.Transition;
+import org.jbpm.api.session.MessageSession;
+import org.jbpm.api.session.RepositorySession;
import org.jbpm.internal.log.Log;
-import org.jbpm.listener.EventListener;
-import org.jbpm.listener.EventListenerExecution;
-import org.jbpm.model.Activity;
-import org.jbpm.model.Comment;
-import org.jbpm.model.Event;
-import org.jbpm.model.ObservableElement;
-import org.jbpm.model.OpenExecution;
-import org.jbpm.model.Transition;
import org.jbpm.pvm.internal.history.HistoryEvent;
import org.jbpm.pvm.internal.history.HistorySession;
import org.jbpm.pvm.internal.history.events.ActivityEnd;
@@ -69,8 +71,6 @@
import org.jbpm.pvm.internal.model.op.TakeTransition;
import org.jbpm.pvm.internal.util.EqualsUtil;
import org.jbpm.pvm.internal.util.Priority;
-import org.jbpm.session.MessageSession;
-import org.jbpm.session.RepositorySession;
/**
* @author Tom Baeyens
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExecutionKeyGenerator.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExecutionKeyGenerator.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExecutionKeyGenerator.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,8 +21,8 @@
*/
package org.jbpm.pvm.internal.model;
-import org.jbpm.Execution;
-import org.jbpm.ProcessDefinition;
+import org.jbpm.api.Execution;
+import org.jbpm.api.ProcessDefinition;
/**
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExpressionEvaluator.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExpressionEvaluator.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExpressionEvaluator.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,8 +21,8 @@
*/
package org.jbpm.pvm.internal.model;
-import org.jbpm.model.Condition;
-import org.jbpm.model.OpenExecution;
+import org.jbpm.api.model.Condition;
+import org.jbpm.api.model.OpenExecution;
import org.jbpm.pvm.internal.env.EnvironmentDefaults;
import org.jbpm.pvm.internal.script.ScriptManager;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/IdGenerator.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/IdGenerator.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/IdGenerator.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,8 +21,8 @@
*/
package org.jbpm.pvm.internal.model;
-import org.jbpm.Execution;
-import org.jbpm.ProcessDefinition;
+import org.jbpm.api.Execution;
+import org.jbpm.api.ProcessDefinition;
/**
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ObjectReference.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ObjectReference.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ObjectReference.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,7 +21,7 @@
*/
package org.jbpm.pvm.internal.model;
-import org.jbpm.env.Environment;
+import org.jbpm.api.env.Environment;
import org.jbpm.pvm.internal.wire.Descriptor;
import org.jbpm.pvm.internal.wire.WireContext;
import org.jbpm.pvm.internal.wire.WireDefinition;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ObservableElementImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ObservableElementImpl.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ObservableElementImpl.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -24,8 +24,8 @@
import java.util.HashMap;
import java.util.Map;
-import org.jbpm.model.Event;
-import org.jbpm.model.ObservableElement;
+import org.jbpm.api.model.Event;
+import org.jbpm.api.model.ObservableElement;
/** observable and visible process elements.
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ProcessDefinitionImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ProcessDefinitionImpl.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ProcessDefinitionImpl.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -27,12 +27,12 @@
import java.util.HashMap;
import java.util.Map;
-import org.jbpm.Execution;
-import org.jbpm.client.ClientProcessDefinition;
-import org.jbpm.client.ClientProcessInstance;
-import org.jbpm.env.Environment;
+import org.jbpm.api.Execution;
+import org.jbpm.api.client.ClientProcessDefinition;
+import org.jbpm.api.client.ClientProcessInstance;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.model.OpenProcessDefinition;
import org.jbpm.internal.log.Log;
-import org.jbpm.model.OpenProcessDefinition;
import org.jbpm.pvm.internal.lob.Lob;
import org.jbpm.pvm.internal.task.TaskDefinitionImpl;
import org.jbpm.pvm.internal.util.IoUtil;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ProcessInstanceEndedSynchronization.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ProcessInstanceEndedSynchronization.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ProcessInstanceEndedSynchronization.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -27,11 +27,11 @@
import javax.transaction.Synchronization;
import org.hibernate.Session;
-import org.jbpm.ExecutionService;
-import org.jbpm.cmd.Command;
-import org.jbpm.cmd.CommandService;
-import org.jbpm.env.Environment;
-import org.jbpm.session.PvmDbSession;
+import org.jbpm.api.ExecutionService;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.cmd.CommandService;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.session.PvmDbSession;
/**
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ProcessModificationsImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ProcessModificationsImpl.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ProcessModificationsImpl.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -24,7 +24,7 @@
import java.io.Serializable;
import java.util.List;
-import org.jbpm.model.Activity;
+import org.jbpm.api.model.Activity;
/**
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ScopeInstanceImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ScopeInstanceImpl.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ScopeInstanceImpl.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -31,11 +31,12 @@
import java.util.TreeMap;
import java.util.TreeSet;
-import org.jbpm.Execution;
-import org.jbpm.JbpmException;
-import org.jbpm.env.Environment;
+import org.jbpm.api.Execution;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.job.Timer;
+import org.jbpm.api.session.TimerSession;
import org.jbpm.internal.log.Log;
-import org.jbpm.job.Timer;
import org.jbpm.pvm.internal.job.TimerImpl;
import org.jbpm.pvm.internal.type.Converter;
import org.jbpm.pvm.internal.type.Type;
@@ -43,7 +44,6 @@
import org.jbpm.pvm.internal.type.Variable;
import org.jbpm.pvm.internal.type.variable.NullVariable;
import org.jbpm.pvm.internal.type.variable.UnpersistableVariable;
-import org.jbpm.session.TimerSession;
/**
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/TransitionImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/TransitionImpl.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/TransitionImpl.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,9 +23,9 @@
import java.util.List;
-import org.jbpm.model.Condition;
-import org.jbpm.model.Event;
-import org.jbpm.model.Transition;
+import org.jbpm.api.model.Condition;
+import org.jbpm.api.model.Event;
+import org.jbpm.api.model.Transition;
import org.jbpm.pvm.internal.wire.Descriptor;
import org.jbpm.pvm.internal.wire.WireContext;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/ExecuteActivity.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/ExecuteActivity.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/ExecuteActivity.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,7 +21,7 @@
*/
package org.jbpm.pvm.internal.model.op;
-import org.jbpm.activity.ActivityBehaviour;
+import org.jbpm.api.activity.ActivityBehaviour;
import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.job.MessageImpl;
import org.jbpm.pvm.internal.model.ExecutionImpl;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/ExecuteActivityMessage.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/ExecuteActivityMessage.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/ExecuteActivityMessage.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,7 +21,7 @@
*/
package org.jbpm.pvm.internal.model.op;
-import org.jbpm.env.Environment;
+import org.jbpm.api.env.Environment;
import org.jbpm.pvm.internal.job.MessageImpl;
import org.jbpm.pvm.internal.jobexecutor.JobDbSession;
import org.jbpm.pvm.internal.model.ExecutionImpl;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/ProceedToDestinationMessage.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/ProceedToDestinationMessage.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/ProceedToDestinationMessage.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,7 +21,7 @@
*/
package org.jbpm.pvm.internal.model.op;
-import org.jbpm.env.Environment;
+import org.jbpm.api.env.Environment;
import org.jbpm.pvm.internal.job.MessageImpl;
import org.jbpm.pvm.internal.jobexecutor.JobDbSession;
import org.jbpm.pvm.internal.model.ExecutionImpl;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/Signal.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/Signal.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/Signal.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,8 +23,8 @@
import java.util.Map;
-import org.jbpm.JbpmException;
-import org.jbpm.activity.ExternalActivityBehaviour;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.activity.ExternalActivityBehaviour;
import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.job.MessageImpl;
import org.jbpm.pvm.internal.model.ExecutionImpl;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/SignalMessage.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/SignalMessage.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/SignalMessage.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,7 +21,7 @@
*/
package org.jbpm.pvm.internal.model.op;
-import org.jbpm.env.Environment;
+import org.jbpm.api.env.Environment;
import org.jbpm.pvm.internal.job.MessageImpl;
import org.jbpm.pvm.internal.jobexecutor.JobDbSession;
import org.jbpm.pvm.internal.model.ExecutionImpl;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/TakeTransition.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/TakeTransition.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/TakeTransition.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -24,9 +24,9 @@
import java.util.ArrayList;
import java.util.List;
+import org.jbpm.api.model.Condition;
+import org.jbpm.api.model.Event;
import org.jbpm.internal.log.Log;
-import org.jbpm.model.Condition;
-import org.jbpm.model.Event;
import org.jbpm.pvm.internal.job.MessageImpl;
import org.jbpm.pvm.internal.model.ExecutionImpl;
import org.jbpm.pvm.internal.model.ActivityImpl;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/TakeTransitionMessage.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/TakeTransitionMessage.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/TakeTransitionMessage.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,7 +21,7 @@
*/
package org.jbpm.pvm.internal.model.op;
-import org.jbpm.env.Environment;
+import org.jbpm.api.env.Environment;
import org.jbpm.pvm.internal.job.MessageImpl;
import org.jbpm.pvm.internal.jobexecutor.JobDbSession;
import org.jbpm.pvm.internal.model.ExecutionImpl;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/AbstractQuery.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/AbstractQuery.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/AbstractQuery.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -26,10 +26,10 @@
import org.hibernate.Query;
import org.hibernate.Session;
-import org.jbpm.JbpmException;
-import org.jbpm.cmd.Command;
-import org.jbpm.cmd.CommandService;
-import org.jbpm.env.Environment;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.cmd.CommandService;
+import org.jbpm.api.env.Environment;
/**
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/AvgDurationPerActivityQueryCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/AvgDurationPerActivityQueryCmd.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/AvgDurationPerActivityQueryCmd.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -27,8 +27,8 @@
import org.hibernate.Query;
import org.hibernate.Session;
-import org.jbpm.cmd.Command;
-import org.jbpm.env.Environment;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.env.Environment;
import org.jbpm.pvm.internal.history.model.HistoryActivityInstanceImpl;
/**
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/ChoiceDistributionQueryCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/ChoiceDistributionQueryCmd.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/ChoiceDistributionQueryCmd.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -27,8 +27,8 @@
import org.hibernate.Query;
import org.hibernate.Session;
-import org.jbpm.cmd.Command;
-import org.jbpm.env.Environment;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.env.Environment;
import org.jbpm.pvm.internal.history.model.HistoryActivityInstanceImpl;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/HistoryActivityInstanceQueryImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/HistoryActivityInstanceQueryImpl.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/HistoryActivityInstanceQueryImpl.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -25,10 +25,10 @@
import java.util.List;
import org.hibernate.Query;
-import org.jbpm.JbpmException;
-import org.jbpm.cmd.CommandService;
-import org.jbpm.history.HistoryActivityInstance;
-import org.jbpm.history.HistoryActivityInstanceQuery;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.cmd.CommandService;
+import org.jbpm.api.history.HistoryActivityInstance;
+import org.jbpm.api.history.HistoryActivityInstanceQuery;
import org.jbpm.pvm.internal.history.model.HistoryActivityInstanceImpl;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/HistoryProcessInstanceQueryImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/HistoryProcessInstanceQueryImpl.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/HistoryProcessInstanceQueryImpl.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -24,10 +24,10 @@
import java.util.List;
import org.hibernate.Query;
-import org.jbpm.JbpmException;
-import org.jbpm.cmd.CommandService;
-import org.jbpm.history.HistoryProcessInstance;
-import org.jbpm.history.HistoryProcessInstanceQuery;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.cmd.CommandService;
+import org.jbpm.api.history.HistoryProcessInstance;
+import org.jbpm.api.history.HistoryProcessInstanceQuery;
import org.jbpm.pvm.internal.history.model.HistoryProcessInstanceImpl;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/JobQueryImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/JobQueryImpl.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/JobQueryImpl.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -24,9 +24,9 @@
import java.util.List;
import org.hibernate.Query;
-import org.jbpm.JobQuery;
-import org.jbpm.cmd.CommandService;
-import org.jbpm.job.Job;
+import org.jbpm.api.JobQuery;
+import org.jbpm.api.cmd.CommandService;
+import org.jbpm.api.job.Job;
import org.jbpm.pvm.internal.job.JobImpl;
import org.jbpm.pvm.internal.job.MessageImpl;
import org.jbpm.pvm.internal.job.TimerImpl;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/ProcessDefinitionQueryImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/ProcessDefinitionQueryImpl.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/ProcessDefinitionQueryImpl.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -27,9 +27,9 @@
import org.hibernate.Query;
import org.hibernate.Session;
-import org.jbpm.ProcessDefinition;
-import org.jbpm.ProcessDefinitionQuery;
-import org.jbpm.cmd.CommandService;
+import org.jbpm.api.ProcessDefinition;
+import org.jbpm.api.ProcessDefinitionQuery;
+import org.jbpm.api.cmd.CommandService;
import org.jbpm.pvm.internal.model.ProcessDefinitionImpl;
import org.jbpm.pvm.internal.repository.DeploymentImpl;
import org.jbpm.pvm.internal.repository.DeploymentProperty;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/ProcessInstanceQueryImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/ProcessInstanceQueryImpl.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/ProcessInstanceQueryImpl.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -24,9 +24,9 @@
import java.util.List;
import org.hibernate.Query;
-import org.jbpm.Execution;
-import org.jbpm.ProcessInstanceQuery;
-import org.jbpm.cmd.CommandService;
+import org.jbpm.api.Execution;
+import org.jbpm.api.ProcessInstanceQuery;
+import org.jbpm.api.cmd.CommandService;
import org.jbpm.pvm.internal.model.ExecutionImpl;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/DeploymentClassLoader.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/DeploymentClassLoader.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/DeploymentClassLoader.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -28,7 +28,7 @@
import java.net.URLConnection;
import java.net.URLStreamHandler;
-import org.jbpm.JbpmException;
+import org.jbpm.api.JbpmException;
import org.jbpm.pvm.internal.util.IoUtil;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/DeploymentImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/DeploymentImpl.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/DeploymentImpl.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -33,10 +33,10 @@
import java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream;
-import org.jbpm.Deployment;
-import org.jbpm.JbpmException;
-import org.jbpm.client.ClientProcessDefinition;
-import org.jbpm.cmd.CommandService;
+import org.jbpm.api.Deployment;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.client.ClientProcessDefinition;
+import org.jbpm.api.cmd.CommandService;
import org.jbpm.pvm.internal.cmd.DeployCmd;
import org.jbpm.pvm.internal.lob.Lob;
import org.jbpm.pvm.internal.stream.ByteArrayStreamInput;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/DeploymentProperty.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/DeploymentProperty.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/DeploymentProperty.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,7 +23,7 @@
import java.io.Serializable;
-import org.jbpm.JbpmException;
+import org.jbpm.api.JbpmException;
/**
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/RepositoryServiceImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/RepositoryServiceImpl.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/RepositoryServiceImpl.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,10 +23,10 @@
import java.io.InputStream;
-import org.jbpm.Deployment;
-import org.jbpm.ProcessDefinitionQuery;
-import org.jbpm.RepositoryService;
-import org.jbpm.cmd.CommandService;
+import org.jbpm.api.Deployment;
+import org.jbpm.api.ProcessDefinitionQuery;
+import org.jbpm.api.RepositoryService;
+import org.jbpm.api.cmd.CommandService;
import org.jbpm.pvm.internal.cmd.DeleteDeploymentCmd;
import org.jbpm.pvm.internal.cmd.GetResourceAsStreamCmd;
import org.jbpm.pvm.internal.query.ProcessDefinitionQueryImpl;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/RepositorySessionImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/RepositorySessionImpl.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/RepositorySessionImpl.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -25,14 +25,14 @@
import java.util.ArrayList;
import org.hibernate.Session;
-import org.jbpm.Deployment;
-import org.jbpm.JbpmException;
-import org.jbpm.Problem;
-import org.jbpm.ProcessDefinitionQuery;
-import org.jbpm.client.ClientProcessDefinition;
+import org.jbpm.api.Deployment;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.Problem;
+import org.jbpm.api.ProcessDefinitionQuery;
+import org.jbpm.api.client.ClientProcessDefinition;
+import org.jbpm.api.session.RepositorySession;
import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.query.ProcessDefinitionQueryImpl;
-import org.jbpm.session.RepositorySession;
/**
* @author Tom Baeyens
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/script/EnvironmentBindings.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/script/EnvironmentBindings.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/script/EnvironmentBindings.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -27,8 +27,8 @@
import javax.script.Bindings;
-import org.jbpm.env.Context;
-import org.jbpm.env.Environment;
+import org.jbpm.api.env.Context;
+import org.jbpm.api.env.Environment;
/**
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/script/ScriptManager.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/script/ScriptManager.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/script/ScriptManager.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -27,9 +27,9 @@
import javax.script.ScriptEngineManager;
import javax.script.ScriptException;
-import org.jbpm.Execution;
-import org.jbpm.JbpmException;
-import org.jbpm.env.Environment;
+import org.jbpm.api.Execution;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.env.Environment;
import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.env.ExecutionContext;
import org.jbpm.pvm.internal.env.ExecutionEnvironment;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/spring/CommandTransactionCallback.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/spring/CommandTransactionCallback.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/spring/CommandTransactionCallback.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,9 +21,9 @@
*/
package org.jbpm.pvm.internal.spring;
-import org.jbpm.cmd.Command;
-import org.jbpm.env.Environment;
-import org.jbpm.env.EnvironmentFactory;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.env.EnvironmentFactory;
import org.springframework.transaction.TransactionStatus;
import org.springframework.transaction.support.TransactionCallback;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/spring/SpringCommandService.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/spring/SpringCommandService.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/spring/SpringCommandService.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -22,10 +22,10 @@
package org.jbpm.pvm.internal.spring;
import org.hibernate.Session;
-import org.jbpm.cmd.Command;
-import org.jbpm.cmd.CommandService;
-import org.jbpm.env.Environment;
-import org.jbpm.env.EnvironmentFactory;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.cmd.CommandService;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.env.EnvironmentFactory;
import org.springframework.orm.hibernate3.HibernateTransactionManager;
import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
import org.springframework.transaction.support.TransactionTemplate;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/spring/SpringEnvironment.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/spring/SpringEnvironment.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/spring/SpringEnvironment.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,7 +21,7 @@
*/
package org.jbpm.pvm.internal.spring;
-import org.jbpm.env.EnvironmentFactory;
+import org.jbpm.api.env.EnvironmentFactory;
import org.jbpm.pvm.internal.cfg.SpringConfiguration;
import org.jbpm.pvm.internal.env.BasicEnvironment;
import org.springframework.context.ApplicationContext;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/spring/SpringEnvironmentContext.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/spring/SpringEnvironmentContext.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/spring/SpringEnvironmentContext.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -26,8 +26,8 @@
import java.util.Map;
import java.util.Set;
-import org.jbpm.env.Context;
-import org.jbpm.env.Environment;
+import org.jbpm.api.env.Context;
+import org.jbpm.api.env.Environment;
import org.jbpm.pvm.internal.util.ReflectUtil;
import org.springframework.context.ApplicationContext;
import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/stream/ByteArrayStreamInput.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/stream/ByteArrayStreamInput.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/stream/ByteArrayStreamInput.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -25,7 +25,7 @@
import java.io.InputStream;
import java.io.Serializable;
-import org.jbpm.JbpmException;
+import org.jbpm.api.JbpmException;
/**
* @author Tom Baeyens
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/stream/FileStreamInput.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/stream/FileStreamInput.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/stream/FileStreamInput.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -26,7 +26,7 @@
import java.io.InputStream;
import java.net.MalformedURLException;
-import org.jbpm.JbpmException;
+import org.jbpm.api.JbpmException;
/**
* @author Tom Baeyens
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/stream/InputStreamInput.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/stream/InputStreamInput.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/stream/InputStreamInput.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,7 +23,7 @@
import java.io.InputStream;
-import org.jbpm.JbpmException;
+import org.jbpm.api.JbpmException;
/**
* @author Tom Baeyens
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/stream/ResourceStreamInput.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/stream/ResourceStreamInput.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/stream/ResourceStreamInput.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,7 +23,7 @@
import java.io.InputStream;
-import org.jbpm.JbpmException;
+import org.jbpm.api.JbpmException;
import org.jbpm.pvm.internal.util.ReflectUtil;
/**
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/stream/UrlStreamInput.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/stream/UrlStreamInput.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/stream/UrlStreamInput.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -25,7 +25,7 @@
import java.io.InputStream;
import java.net.URL;
-import org.jbpm.JbpmException;
+import org.jbpm.api.JbpmException;
/**
* @author Tom Baeyens
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/AbstractServiceImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/AbstractServiceImpl.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/AbstractServiceImpl.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -25,8 +25,8 @@
import java.util.ArrayList;
import java.util.List;
-import org.jbpm.cmd.CommandService;
-import org.jbpm.env.WireObject;
+import org.jbpm.api.cmd.CommandService;
+import org.jbpm.api.env.WireObject;
import org.jbpm.pvm.internal.cmd.AbstractCommand;
import org.jbpm.pvm.internal.env.ProvidedAuthentication;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/AsyncCommandMessage.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/AsyncCommandMessage.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/AsyncCommandMessage.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,9 +21,9 @@
*/
package org.jbpm.pvm.internal.svc;
-import org.jbpm.cmd.Command;
-import org.jbpm.cmd.CommandService;
-import org.jbpm.env.Environment;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.cmd.CommandService;
+import org.jbpm.api.env.Environment;
import org.jbpm.pvm.internal.job.MessageImpl;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/AsyncCommandService.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/AsyncCommandService.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/AsyncCommandService.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,11 +21,11 @@
*/
package org.jbpm.pvm.internal.svc;
-import org.jbpm.JbpmException;
-import org.jbpm.cmd.Command;
-import org.jbpm.cmd.CommandService;
-import org.jbpm.env.Environment;
-import org.jbpm.session.MessageSession;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.cmd.CommandService;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.session.MessageSession;
/**
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/AuthorizationInterceptor.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/AuthorizationInterceptor.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/AuthorizationInterceptor.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,9 +21,9 @@
*/
package org.jbpm.pvm.internal.svc;
-import org.jbpm.JbpmException;
-import org.jbpm.cmd.Command;
-import org.jbpm.env.Environment;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.env.Environment;
/** performs an authorization check before the command is executed.
* @author Tom Baeyens
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/AuthorizationSession.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/AuthorizationSession.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/AuthorizationSession.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -1,7 +1,7 @@
package org.jbpm.pvm.internal.svc;
-import org.jbpm.cmd.Command;
-import org.jbpm.env.Environment;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.env.Environment;
public interface AuthorizationSession {
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/DefaultCommandService.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/DefaultCommandService.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/DefaultCommandService.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,10 +21,10 @@
*/
package org.jbpm.pvm.internal.svc;
-import org.jbpm.JbpmException;
-import org.jbpm.cmd.Command;
-import org.jbpm.cmd.CommandService;
-import org.jbpm.env.Environment;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.cmd.CommandService;
+import org.jbpm.api.env.Environment;
import org.jbpm.internal.log.Log;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/EnvironmentInterceptor.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/EnvironmentInterceptor.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/EnvironmentInterceptor.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,10 +23,10 @@
import java.util.List;
-import org.jbpm.cmd.Command;
-import org.jbpm.env.Environment;
-import org.jbpm.env.EnvironmentFactory;
-import org.jbpm.env.WireObject;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.env.EnvironmentFactory;
+import org.jbpm.api.env.WireObject;
import org.jbpm.pvm.internal.cmd.AbstractCommand;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/ExecutionServiceImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/ExecutionServiceImpl.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/ExecutionServiceImpl.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -26,10 +26,10 @@
import java.util.Map;
import java.util.Set;
-import org.jbpm.Execution;
-import org.jbpm.ExecutionService;
-import org.jbpm.ProcessInstance;
-import org.jbpm.ProcessInstanceQuery;
+import org.jbpm.api.Execution;
+import org.jbpm.api.ExecutionService;
+import org.jbpm.api.ProcessInstance;
+import org.jbpm.api.ProcessInstanceQuery;
import org.jbpm.pvm.internal.cmd.DeleteProcessInstance;
import org.jbpm.pvm.internal.cmd.EndProcessInstance;
import org.jbpm.pvm.internal.cmd.FindExecutionCmd;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/FindGroupIds.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/FindGroupIds.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/FindGroupIds.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -3,9 +3,9 @@
import java.util.ArrayList;
import java.util.List;
-import org.jbpm.cmd.Command;
-import org.jbpm.env.Environment;
-import org.jbpm.identity.Group;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.identity.Group;
import org.jbpm.pvm.internal.identity.cmd.FindGroups;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/HistoryServiceImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/HistoryServiceImpl.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/HistoryServiceImpl.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,9 +23,9 @@
import java.util.Map;
-import org.jbpm.HistoryService;
-import org.jbpm.history.HistoryActivityInstanceQuery;
-import org.jbpm.history.HistoryProcessInstanceQuery;
+import org.jbpm.api.HistoryService;
+import org.jbpm.api.history.HistoryActivityInstanceQuery;
+import org.jbpm.api.history.HistoryProcessInstanceQuery;
import org.jbpm.pvm.internal.query.AvgDurationPerActivityQueryCmd;
import org.jbpm.pvm.internal.query.ChoiceDistributionQueryCmd;
import org.jbpm.pvm.internal.query.HistoryActivityInstanceQueryImpl;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/IdentityServiceImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/IdentityServiceImpl.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/IdentityServiceImpl.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,10 +23,10 @@
import java.util.List;
-import org.jbpm.IdentityService;
-import org.jbpm.cmd.CommandService;
-import org.jbpm.identity.Group;
-import org.jbpm.identity.User;
+import org.jbpm.api.IdentityService;
+import org.jbpm.api.cmd.CommandService;
+import org.jbpm.api.identity.Group;
+import org.jbpm.api.identity.User;
import org.jbpm.pvm.internal.identity.cmd.CreateGroup;
import org.jbpm.pvm.internal.identity.cmd.CreateMembership;
import org.jbpm.pvm.internal.identity.cmd.CreateUser;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/Interceptor.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/Interceptor.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/Interceptor.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,7 +21,7 @@
*/
package org.jbpm.pvm.internal.svc;
-import org.jbpm.cmd.CommandService;
+import org.jbpm.api.cmd.CommandService;
import org.jbpm.internal.log.Log;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/ManagementServiceImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/ManagementServiceImpl.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/ManagementServiceImpl.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,8 +21,8 @@
*/
package org.jbpm.pvm.internal.svc;
-import org.jbpm.JobQuery;
-import org.jbpm.ManagementService;
+import org.jbpm.api.JobQuery;
+import org.jbpm.api.ManagementService;
import org.jbpm.pvm.internal.cmd.ExecuteJobCmd;
import org.jbpm.pvm.internal.query.JobQueryImpl;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/RetryInterceptor.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/RetryInterceptor.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/RetryInterceptor.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,8 +21,8 @@
*/
package org.jbpm.pvm.internal.svc;
-import org.jbpm.JbpmException;
-import org.jbpm.cmd.Command;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.cmd.Command;
import org.jbpm.internal.log.Log;
import org.hibernate.StaleStateException;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/SerializeInterceptor.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/SerializeInterceptor.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/SerializeInterceptor.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -26,8 +26,8 @@
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
-import org.jbpm.JbpmException;
-import org.jbpm.cmd.Command;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.cmd.Command;
import org.jbpm.internal.log.Log;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/TaskServiceImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/TaskServiceImpl.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/TaskServiceImpl.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -26,13 +26,13 @@
import java.util.Map;
import java.util.Set;
-import org.jbpm.TaskQuery;
-import org.jbpm.TaskService;
-import org.jbpm.model.Comment;
+import org.jbpm.api.TaskQuery;
+import org.jbpm.api.TaskService;
+import org.jbpm.api.model.Comment;
+import org.jbpm.api.task.*;
import org.jbpm.pvm.internal.cmd.*;
import org.jbpm.pvm.internal.task.TaskImpl;
import org.jbpm.pvm.internal.task.TaskQueryImpl;
-import org.jbpm.task.*;
/**
* @author Alejandro Guizar, Tom Baeyens
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/LifeCycle.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/LifeCycle.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/LifeCycle.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -24,9 +24,9 @@
import java.util.HashMap;
import java.util.Map;
-import org.jbpm.JbpmException;
-import org.jbpm.client.ClientProcessInstance;
-import org.jbpm.model.Activity;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.client.ClientProcessInstance;
+import org.jbpm.api.model.Activity;
import org.jbpm.pvm.internal.model.ActivityImpl;
import org.jbpm.pvm.internal.model.ExecutionImpl;
import org.jbpm.pvm.internal.model.IdGenerator;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/LifeCycleState.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/LifeCycleState.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/LifeCycleState.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,8 +23,8 @@
import java.util.Map;
-import org.jbpm.activity.ActivityExecution;
-import org.jbpm.activity.ExternalActivityBehaviour;
+import org.jbpm.api.activity.ActivityExecution;
+import org.jbpm.api.activity.ExternalActivityBehaviour;
/**
* @author Tom Baeyens
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/ParticipationImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/ParticipationImpl.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/ParticipationImpl.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,7 +23,7 @@
import java.io.Serializable;
-import org.jbpm.task.Participation;
+import org.jbpm.api.task.Participation;
/** the relation between a task and a person.
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/SwimlaneImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/SwimlaneImpl.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/SwimlaneImpl.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -26,12 +26,12 @@
import java.util.HashSet;
import java.util.Set;
-import org.jbpm.JbpmException;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.task.Assignable;
+import org.jbpm.api.task.Participation;
+import org.jbpm.api.task.Swimlane;
import org.jbpm.pvm.internal.model.ExecutionImpl;
import org.jbpm.pvm.internal.util.EqualsUtil;
-import org.jbpm.task.Assignable;
-import org.jbpm.task.Participation;
-import org.jbpm.task.Swimlane;
/**
* runtime process role for a specific process instance.
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/TaskImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/TaskImpl.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/TaskImpl.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -29,11 +29,18 @@
import java.util.List;
import java.util.Set;
-import org.jbpm.Execution;
-import org.jbpm.JbpmException;
-import org.jbpm.env.Environment;
+import org.jbpm.api.Execution;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.model.Comment;
+import org.jbpm.api.session.TaskDbSession;
+import org.jbpm.api.task.Assignable;
+import org.jbpm.api.task.OpenTask;
+import org.jbpm.api.task.Participation;
+import org.jbpm.api.task.Swimlane;
+import org.jbpm.api.task.Task;
+import org.jbpm.api.task.TaskHandler;
import org.jbpm.internal.log.Log;
-import org.jbpm.model.Comment;
import org.jbpm.pvm.internal.history.events.TaskCancel;
import org.jbpm.pvm.internal.history.events.TaskComplete;
import org.jbpm.pvm.internal.history.events.TaskStart;
@@ -44,13 +51,6 @@
import org.jbpm.pvm.internal.util.EqualsUtil;
import org.jbpm.pvm.internal.util.Priority;
import org.jbpm.pvm.internal.wire.WireContext;
-import org.jbpm.session.TaskDbSession;
-import org.jbpm.task.Assignable;
-import org.jbpm.task.OpenTask;
-import org.jbpm.task.Participation;
-import org.jbpm.task.Swimlane;
-import org.jbpm.task.Task;
-import org.jbpm.task.TaskHandler;
/**
* is one task instance that can be assigned to an actor (read: put in
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/TaskQueryImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/TaskQueryImpl.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/TaskQueryImpl.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -25,17 +25,17 @@
import java.util.List;
import org.hibernate.Query;
-import org.jbpm.JbpmException;
-import org.jbpm.ProcessDefinition;
-import org.jbpm.TaskQuery;
-import org.jbpm.cmd.CommandService;
-import org.jbpm.env.Environment;
-import org.jbpm.identity.Group;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.ProcessDefinition;
+import org.jbpm.api.TaskQuery;
+import org.jbpm.api.cmd.CommandService;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.identity.Group;
+import org.jbpm.api.task.Task;
import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.identity.spi.IdentitySession;
import org.jbpm.pvm.internal.query.AbstractQuery;
import org.jbpm.pvm.internal.query.Page;
-import org.jbpm.task.Task;
/**
* @author Tom Baeyens
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/test/JobTestHelper.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/test/JobTestHelper.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/test/JobTestHelper.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,11 +23,11 @@
import org.hibernate.Query;
import org.hibernate.Session;
-import org.jbpm.Execution;
-import org.jbpm.cmd.Command;
-import org.jbpm.cmd.CommandService;
-import org.jbpm.env.Environment;
-import org.jbpm.job.Job;
+import org.jbpm.api.Execution;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.cmd.CommandService;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.job.Job;
import org.jbpm.pvm.internal.cmd.ExecuteJobCmd;
import org.jbpm.pvm.internal.job.MessageImpl;
import org.jbpm.pvm.internal.job.TimerImpl;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/JtaTransaction.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/JtaTransaction.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/JtaTransaction.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -28,8 +28,8 @@
import javax.transaction.TransactionManager;
import javax.transaction.UserTransaction;
-import org.jbpm.JbpmException;
-import org.jbpm.env.Transaction;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.env.Transaction;
/**
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/StandardTransaction.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/StandardTransaction.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/StandardTransaction.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -27,7 +27,7 @@
import javax.transaction.Synchronization;
-import org.jbpm.env.Transaction;
+import org.jbpm.api.env.Transaction;
import org.jbpm.internal.log.Log;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/StandardTransactionInterceptor.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/StandardTransactionInterceptor.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/StandardTransactionInterceptor.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,9 +21,9 @@
*/
package org.jbpm.pvm.internal.tx;
-import org.jbpm.JbpmException;
-import org.jbpm.cmd.Command;
-import org.jbpm.env.Environment;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.env.Environment;
import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.svc.Interceptor;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/TransactionException.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/TransactionException.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/TransactionException.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,7 +21,7 @@
*/
package org.jbpm.pvm.internal.tx;
-import org.jbpm.JbpmException;
+import org.jbpm.api.JbpmException;
/**
* @author Tom Baeyens
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/type/Variable.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/type/Variable.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/type/Variable.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,7 +23,7 @@
import java.io.Serializable;
-import org.jbpm.JbpmException;
+import org.jbpm.api.JbpmException;
import org.jbpm.pvm.internal.model.ExecutionImpl;
/**
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/type/converter/DateToStringConverter.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/type/converter/DateToStringConverter.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/type/converter/DateToStringConverter.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -26,7 +26,7 @@
import java.text.SimpleDateFormat;
import java.util.Date;
-import org.jbpm.JbpmException;
+import org.jbpm.api.JbpmException;
import org.jbpm.pvm.internal.type.Converter;
/**
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 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/type/converter/SerializableToBytesConverter.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -28,7 +28,7 @@
import java.io.ObjectOutputStream;
import java.io.Serializable;
-import org.jbpm.JbpmException;
+import org.jbpm.api.JbpmException;
import org.jbpm.pvm.internal.type.Converter;
public class SerializableToBytesConverter implements Converter {
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/type/matcher/HibernateIdMatcher.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/type/matcher/HibernateIdMatcher.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/type/matcher/HibernateIdMatcher.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -24,7 +24,7 @@
import org.hibernate.SessionFactory;
import org.hibernate.metadata.ClassMetadata;
import org.hibernate.type.Type;
-import org.jbpm.env.Environment;
+import org.jbpm.api.env.Environment;
import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.type.Matcher;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/type/variable/BlobVariable.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/type/variable/BlobVariable.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/type/variable/BlobVariable.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,10 +21,10 @@
*/
package org.jbpm.pvm.internal.type.variable;
-import org.jbpm.env.Environment;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.session.DbSession;
import org.jbpm.pvm.internal.lob.Lob;
import org.jbpm.pvm.internal.type.Variable;
-import org.jbpm.session.DbSession;
public class BlobVariable extends Variable {
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/DefaultObservable.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/DefaultObservable.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/DefaultObservable.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -3,7 +3,7 @@
import java.util.ArrayList;
import java.util.List;
-import org.jbpm.JbpmException;
+import org.jbpm.api.JbpmException;
/** default implementation of the {@link Observable} interface.
*
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/FilterListener.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/FilterListener.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/FilterListener.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -3,7 +3,7 @@
import java.util.ArrayList;
import java.util.List;
-import org.jbpm.JbpmException;
+import org.jbpm.api.JbpmException;
/** listener that only delegates events to a given listener if
* they pass the filter based on event names. */
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/IoUtil.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/IoUtil.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/IoUtil.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -26,7 +26,7 @@
import java.io.InputStream;
import java.io.OutputStream;
-import org.jbpm.JbpmException;
+import org.jbpm.api.JbpmException;
public abstract class IoUtil {
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/Priority.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/Priority.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/Priority.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,7 +21,7 @@
*/
package org.jbpm.pvm.internal.util;
-import org.jbpm.JbpmException;
+import org.jbpm.api.JbpmException;
public abstract class Priority {
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/ReflectUtil.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/ReflectUtil.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/ReflectUtil.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -9,8 +9,8 @@
import java.util.Enumeration;
import java.util.List;
-import org.jbpm.JbpmException;
-import org.jbpm.env.Environment;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.env.Environment;
import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.wire.descriptor.ArgDescriptor;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/StringUtil.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/StringUtil.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/StringUtil.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -25,7 +25,7 @@
import java.util.Collections;
import java.util.List;
-import org.jbpm.JbpmException;
+import org.jbpm.api.JbpmException;
/**
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/TagBinding.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/TagBinding.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/TagBinding.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,7 +21,7 @@
*/
package org.jbpm.pvm.internal.util;
-import org.jbpm.JbpmException;
+import org.jbpm.api.JbpmException;
import org.jbpm.pvm.internal.xml.Binding;
import org.jbpm.pvm.internal.xml.Bindings;
import org.w3c.dom.Element;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/UrlEntity.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/UrlEntity.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/UrlEntity.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -25,7 +25,7 @@
import java.io.InputStream;
import java.net.URL;
-import org.jbpm.JbpmException;
+import org.jbpm.api.JbpmException;
import org.jbpm.pvm.internal.xml.Entity;
import org.jbpm.pvm.internal.xml.Parser;
import org.xml.sax.EntityResolver;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/XmlUtil.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/XmlUtil.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/XmlUtil.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -29,7 +29,7 @@
import java.util.Set;
import java.util.StringTokenizer;
-import org.jbpm.JbpmException;
+import org.jbpm.api.JbpmException;
import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.xml.Parse;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/WireContext.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/WireContext.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/WireContext.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -29,10 +29,10 @@
import java.util.Map;
import java.util.Set;
-import org.jbpm.activity.ActivityBehaviour;
-import org.jbpm.env.Context;
-import org.jbpm.env.Environment;
-import org.jbpm.env.EnvironmentFactory;
+import org.jbpm.api.activity.ActivityBehaviour;
+import org.jbpm.api.env.Context;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.env.EnvironmentFactory;
import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.cfg.JbpmConfiguration;
import org.jbpm.pvm.internal.model.ProcessElementImpl;
@@ -73,7 +73,7 @@
* </p>
*
* <p>Another usage of the WireContext is construction and configuration of user
- * code objects in a persistable way. {@link ActivityBehaviour}s and {@link org.jbpm.activity.ExternalActivityBehaviour}
+ * code objects in a persistable way. {@link ActivityBehaviour}s and {@link org.jbpm.api.activity.ExternalActivityBehaviour}
* and other user code can be instantiated with a WireContext. That way, they can
* be persisted in a fixed schema.
* </p>
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/WireDefinition.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/WireDefinition.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/WireDefinition.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -27,7 +27,7 @@
import java.util.List;
import java.util.Map;
-import org.jbpm.env.WireObject;
+import org.jbpm.api.env.WireObject;
import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.wire.descriptor.AbstractDescriptor;
import org.jbpm.pvm.internal.wire.descriptor.ProvidedObjectDescriptor;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/AbstractCollectionBinding.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/AbstractCollectionBinding.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/AbstractCollectionBinding.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -3,7 +3,7 @@
import java.util.ArrayList;
import java.util.List;
-import org.jbpm.JbpmException;
+import org.jbpm.api.JbpmException;
import org.jbpm.pvm.internal.util.ReflectUtil;
import org.jbpm.pvm.internal.util.XmlUtil;
import org.jbpm.pvm.internal.wire.Descriptor;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/CommandServiceBinding.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/CommandServiceBinding.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/CommandServiceBinding.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,7 +23,7 @@
import java.util.List;
-import org.jbpm.cmd.CommandService;
+import org.jbpm.api.cmd.CommandService;
import org.jbpm.pvm.internal.svc.AsyncCommandService;
import org.jbpm.pvm.internal.svc.DefaultCommandService;
import org.jbpm.pvm.internal.svc.SerializeInterceptor;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/ContextRefBinding.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/ContextRefBinding.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/ContextRefBinding.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,7 +21,7 @@
*/
package org.jbpm.pvm.internal.wire.binding;
-import org.jbpm.env.Context;
+import org.jbpm.api.env.Context;
import org.jbpm.pvm.internal.wire.descriptor.ContextRefDescriptor;
import org.jbpm.pvm.internal.xml.Parse;
import org.jbpm.pvm.internal.xml.Parser;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/EnvRefBinding.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/EnvRefBinding.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/EnvRefBinding.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,7 +21,7 @@
*/
package org.jbpm.pvm.internal.wire.binding;
-import org.jbpm.env.Environment;
+import org.jbpm.api.env.Environment;
import org.jbpm.pvm.internal.wire.descriptor.EnvironmentDescriptor;
import org.jbpm.pvm.internal.xml.Parse;
import org.jbpm.pvm.internal.xml.Parser;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/EnvironmentFactoryRefBinding.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/EnvironmentFactoryRefBinding.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/EnvironmentFactoryRefBinding.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,7 +21,7 @@
*/
package org.jbpm.pvm.internal.wire.binding;
-import org.jbpm.env.EnvironmentFactory;
+import org.jbpm.api.env.EnvironmentFactory;
import org.jbpm.pvm.internal.wire.descriptor.EnvironmentFactoryDescriptor;
import org.jbpm.pvm.internal.xml.Parse;
import org.jbpm.pvm.internal.xml.Parser;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/EnvironmentInterceptorBinding.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/EnvironmentInterceptorBinding.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/EnvironmentInterceptorBinding.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,7 +21,7 @@
*/
package org.jbpm.pvm.internal.wire.binding;
-import org.jbpm.env.EnvironmentFactory;
+import org.jbpm.api.env.EnvironmentFactory;
import org.jbpm.pvm.internal.wire.descriptor.EnvironmentInterceptorDescriptor;
import org.jbpm.pvm.internal.xml.Parse;
import org.jbpm.pvm.internal.xml.Parser;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/ExecutionServiceBinding.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/ExecutionServiceBinding.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/ExecutionServiceBinding.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,7 +21,7 @@
*/
package org.jbpm.pvm.internal.wire.binding;
-import org.jbpm.cmd.CommandService;
+import org.jbpm.api.cmd.CommandService;
import org.jbpm.pvm.internal.svc.ExecutionServiceImpl;
import org.jbpm.pvm.internal.wire.descriptor.ContextTypeRefDescriptor;
import org.jbpm.pvm.internal.wire.descriptor.ObjectDescriptor;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/HistoryServiceBinding.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/HistoryServiceBinding.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/HistoryServiceBinding.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,7 +21,7 @@
*/
package org.jbpm.pvm.internal.wire.binding;
-import org.jbpm.cmd.CommandService;
+import org.jbpm.api.cmd.CommandService;
import org.jbpm.pvm.internal.svc.HistoryServiceImpl;
import org.jbpm.pvm.internal.wire.descriptor.ContextTypeRefDescriptor;
import org.jbpm.pvm.internal.wire.descriptor.ObjectDescriptor;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/IdentityServiceBinding.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/IdentityServiceBinding.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/IdentityServiceBinding.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,7 +21,7 @@
*/
package org.jbpm.pvm.internal.wire.binding;
-import org.jbpm.cmd.CommandService;
+import org.jbpm.api.cmd.CommandService;
import org.jbpm.pvm.internal.svc.IdentityServiceImpl;
import org.jbpm.pvm.internal.wire.descriptor.ContextTypeRefDescriptor;
import org.jbpm.pvm.internal.wire.descriptor.ObjectDescriptor;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/JobExecutorBinding.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/JobExecutorBinding.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/JobExecutorBinding.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,7 +21,7 @@
*/
package org.jbpm.pvm.internal.wire.binding;
-import org.jbpm.cmd.CommandService;
+import org.jbpm.api.cmd.CommandService;
import org.jbpm.pvm.internal.jobexecutor.JobExecutor;
import org.jbpm.pvm.internal.util.XmlUtil;
import org.jbpm.pvm.internal.wire.descriptor.ContextTypeRefDescriptor;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/JobTestHelperBinding.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/JobTestHelperBinding.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/JobTestHelperBinding.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,7 +21,7 @@
*/
package org.jbpm.pvm.internal.wire.binding;
-import org.jbpm.cmd.CommandService;
+import org.jbpm.api.cmd.CommandService;
import org.jbpm.pvm.internal.test.JobTestHelper;
import org.jbpm.pvm.internal.wire.descriptor.ObjectDescriptor;
import org.jbpm.pvm.internal.xml.Parse;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/ManagementServiceBinding.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/ManagementServiceBinding.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/ManagementServiceBinding.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,7 +21,7 @@
*/
package org.jbpm.pvm.internal.wire.binding;
-import org.jbpm.cmd.CommandService;
+import org.jbpm.api.cmd.CommandService;
import org.jbpm.pvm.internal.svc.ManagementServiceImpl;
import org.jbpm.pvm.internal.wire.descriptor.ContextTypeRefDescriptor;
import org.jbpm.pvm.internal.wire.descriptor.ObjectDescriptor;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/MessageSessionBinding.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/MessageSessionBinding.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/MessageSessionBinding.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,6 +21,8 @@
*/
package org.jbpm.pvm.internal.wire.binding;
+import org.jbpm.api.session.DbSession;
+import org.jbpm.api.session.MessageSession;
import org.jbpm.pvm.internal.jms.JmsMessageSession;
import org.jbpm.pvm.internal.jobexecutor.JobExecutorMessageSession;
import org.jbpm.pvm.internal.util.XmlUtil;
@@ -30,8 +32,6 @@
import org.jbpm.pvm.internal.wire.descriptor.TransactionRefDescriptor;
import org.jbpm.pvm.internal.xml.Parse;
import org.jbpm.pvm.internal.xml.Parser;
-import org.jbpm.session.DbSession;
-import org.jbpm.session.MessageSession;
import org.w3c.dom.Element;
/** parses a descriptor for creating a {@link MessageSession}.
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/TaskServiceBinding.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/TaskServiceBinding.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/TaskServiceBinding.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,7 +21,7 @@
*/
package org.jbpm.pvm.internal.wire.binding;
-import org.jbpm.cmd.CommandService;
+import org.jbpm.api.cmd.CommandService;
import org.jbpm.pvm.internal.svc.TaskServiceImpl;
import org.jbpm.pvm.internal.wire.descriptor.ContextTypeRefDescriptor;
import org.jbpm.pvm.internal.wire.descriptor.ObjectDescriptor;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/TimerSessionBinding.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/TimerSessionBinding.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/TimerSessionBinding.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,6 +21,7 @@
*/
package org.jbpm.pvm.internal.wire.binding;
+import org.jbpm.api.session.TimerSession;
import org.jbpm.pvm.internal.jobexecutor.JobDbSession;
import org.jbpm.pvm.internal.jobexecutor.JobExecutor;
import org.jbpm.pvm.internal.jobexecutor.JobExecutorTimerSession;
@@ -31,7 +32,6 @@
import org.jbpm.pvm.internal.wire.descriptor.TransactionRefDescriptor;
import org.jbpm.pvm.internal.xml.Parse;
import org.jbpm.pvm.internal.xml.Parser;
-import org.jbpm.session.TimerSession;
import org.w3c.dom.Element;
/** parses a descriptor for creating a {@link TimerSession}.
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/TransactionBinding.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/TransactionBinding.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/TransactionBinding.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,7 +21,7 @@
*/
package org.jbpm.pvm.internal.wire.binding;
-import org.jbpm.env.Transaction;
+import org.jbpm.api.env.Transaction;
import org.jbpm.pvm.internal.tx.JtaTransaction;
import org.jbpm.pvm.internal.tx.StandardTransaction;
import org.jbpm.pvm.internal.wire.descriptor.ObjectDescriptor;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/TransactionRefBinding.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/TransactionRefBinding.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/TransactionRefBinding.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,7 +21,7 @@
*/
package org.jbpm.pvm.internal.wire.binding;
-import org.jbpm.env.Transaction;
+import org.jbpm.api.env.Transaction;
import org.jbpm.pvm.internal.wire.descriptor.TransactionRefDescriptor;
import org.jbpm.pvm.internal.xml.Parse;
import org.jbpm.pvm.internal.xml.Parser;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/VersionTimestampPolicy.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/VersionTimestampPolicy.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/VersionTimestampPolicy.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -24,11 +24,11 @@
import java.io.Serializable;
import java.util.List;
-import org.jbpm.ProcessDefinition;
-import org.jbpm.ProcessDefinitionQuery;
-import org.jbpm.ProcessService;
-import org.jbpm.client.ClientProcessDefinition;
-import org.jbpm.env.Environment;
+import org.jbpm.api.ProcessDefinition;
+import org.jbpm.api.ProcessDefinitionQuery;
+import org.jbpm.api.ProcessService;
+import org.jbpm.api.client.ClientProcessDefinition;
+import org.jbpm.api.env.Environment;
import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.repository.DeploymentImpl;
import org.jbpm.pvm.internal.util.XmlUtil;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/ClassDescriptor.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/ClassDescriptor.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/ClassDescriptor.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -1,6 +1,6 @@
package org.jbpm.pvm.internal.wire.descriptor;
-import org.jbpm.JbpmException;
+import org.jbpm.api.JbpmException;
import org.jbpm.pvm.internal.util.ReflectUtil;
import org.jbpm.pvm.internal.wire.WireContext;
import org.jbpm.pvm.internal.wire.WireException;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/CommandServiceDescriptor.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/CommandServiceDescriptor.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/CommandServiceDescriptor.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -24,7 +24,7 @@
import java.util.ArrayList;
import java.util.List;
-import org.jbpm.cmd.CommandService;
+import org.jbpm.api.cmd.CommandService;
import org.jbpm.pvm.internal.svc.Interceptor;
import org.jbpm.pvm.internal.wire.Descriptor;
import org.jbpm.pvm.internal.wire.WireContext;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/ContextRefDescriptor.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/ContextRefDescriptor.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/ContextRefDescriptor.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -1,6 +1,6 @@
package org.jbpm.pvm.internal.wire.descriptor;
-import org.jbpm.env.Environment;
+import org.jbpm.api.env.Environment;
import org.jbpm.pvm.internal.wire.Descriptor;
import org.jbpm.pvm.internal.wire.WireContext;
import org.jbpm.pvm.internal.wire.WireException;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/EnvDescriptor.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/EnvDescriptor.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/EnvDescriptor.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,7 +21,7 @@
*/
package org.jbpm.pvm.internal.wire.descriptor;
-import org.jbpm.env.Environment;
+import org.jbpm.api.env.Environment;
import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.wire.WireContext;
import org.jbpm.pvm.internal.wire.WireException;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/EnvironmentDescriptor.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/EnvironmentDescriptor.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/EnvironmentDescriptor.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -1,6 +1,6 @@
package org.jbpm.pvm.internal.wire.descriptor;
-import org.jbpm.env.Environment;
+import org.jbpm.api.env.Environment;
import org.jbpm.pvm.internal.wire.Descriptor;
import org.jbpm.pvm.internal.wire.WireContext;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/EnvironmentFactoryDescriptor.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/EnvironmentFactoryDescriptor.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/EnvironmentFactoryDescriptor.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -1,6 +1,6 @@
package org.jbpm.pvm.internal.wire.descriptor;
-import org.jbpm.env.EnvironmentFactory;
+import org.jbpm.api.env.EnvironmentFactory;
import org.jbpm.pvm.internal.wire.WireContext;
/** the {@link EnvironmentFactory} of the current {@link WireContext}.
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/EnvironmentInterceptorDescriptor.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/EnvironmentInterceptorDescriptor.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/EnvironmentInterceptorDescriptor.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,7 +21,7 @@
*/
package org.jbpm.pvm.internal.wire.descriptor;
-import org.jbpm.env.EnvironmentFactory;
+import org.jbpm.api.env.EnvironmentFactory;
import org.jbpm.pvm.internal.svc.EnvironmentInterceptor;
import org.jbpm.pvm.internal.wire.WireContext;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/HibernateConfigurationDescriptor.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/HibernateConfigurationDescriptor.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/HibernateConfigurationDescriptor.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -28,7 +28,7 @@
import java.util.Properties;
import org.hibernate.cfg.Configuration;
-import org.jbpm.JbpmException;
+import org.jbpm.api.JbpmException;
import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.util.ReflectUtil;
import org.jbpm.pvm.internal.wire.WireContext;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/HibernateSessionDescriptor.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/HibernateSessionDescriptor.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/HibernateSessionDescriptor.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -26,7 +26,7 @@
import org.hibernate.Session;
import org.hibernate.SessionFactory;
import org.hibernate.impl.SessionImpl;
-import org.jbpm.env.Environment;
+import org.jbpm.api.env.Environment;
import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.tx.HibernateSessionResource;
import org.jbpm.pvm.internal.tx.StandardTransaction;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/JbossIdmIdentitySessionDescriptor.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/JbossIdmIdentitySessionDescriptor.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/JbossIdmIdentitySessionDescriptor.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -22,7 +22,7 @@
package org.jbpm.pvm.internal.wire.descriptor;
import org.jboss.identity.idm.api.IdentitySessionFactory;
-import org.jbpm.env.Environment;
+import org.jbpm.api.env.Environment;
import org.jbpm.pvm.internal.identity.impl.JBossIdmIdentitySessionImpl;
import org.jbpm.pvm.internal.wire.WireContext;
import org.jbpm.pvm.internal.wire.WireDefinition;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/JbossIdmIdentitySessionFactoryDescriptor.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/JbossIdmIdentitySessionFactoryDescriptor.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/JbossIdmIdentitySessionFactoryDescriptor.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -25,7 +25,7 @@
import org.jboss.identity.idm.api.IdentitySessionFactory;
import org.jboss.identity.idm.impl.api.IdentitySessionFactoryImpl;
-import org.jbpm.JbpmException;
+import org.jbpm.api.JbpmException;
import org.jbpm.pvm.internal.wire.WireContext;
import org.jbpm.pvm.internal.wire.WireDefinition;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/JobExecutorDescriptor.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/JobExecutorDescriptor.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/JobExecutorDescriptor.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -13,7 +13,7 @@
**/
package org.jbpm.pvm.internal.wire.descriptor;
-import org.jbpm.JbpmException;
+import org.jbpm.api.JbpmException;
import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.jobexecutor.JobExecutor;
import org.jbpm.pvm.internal.util.Listener;
@@ -25,7 +25,7 @@
* Descriptor for the JobExecutor.
* If it is automatically started, a listener is created to stop it when
* the environementFactory is closed
- * @see org.jbpm.env.EnvironmentFactory
+ * @see org.jbpm.api.env.EnvironmentFactory
* @see org.jbpm.pvm.internal.wire.binding.JobExecutorBinding
*/
public class JobExecutorDescriptor extends ObjectDescriptor {
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/ObjectDescriptor.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/ObjectDescriptor.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/ObjectDescriptor.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -7,8 +7,8 @@
import java.util.ArrayList;
import java.util.List;
-import org.jbpm.JbpmException;
-import org.jbpm.env.Environment;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.env.Environment;
import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.util.ArrayUtil;
import org.jbpm.pvm.internal.util.ReflectUtil;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/TransactionRefDescriptor.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/TransactionRefDescriptor.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/TransactionRefDescriptor.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,8 +21,8 @@
*/
package org.jbpm.pvm.internal.wire.descriptor;
-import org.jbpm.env.Environment;
-import org.jbpm.env.Transaction;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.env.Transaction;
import org.jbpm.pvm.internal.wire.WireContext;
/**
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/operation/EnlistOperation.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/operation/EnlistOperation.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/operation/EnlistOperation.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -1,6 +1,6 @@
package org.jbpm.pvm.internal.wire.operation;
-import org.jbpm.env.Transaction;
+import org.jbpm.api.env.Transaction;
import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.tx.StandardResource;
import org.jbpm.pvm.internal.tx.StandardTransaction;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/operation/SubscribeOperation.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/operation/SubscribeOperation.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/operation/SubscribeOperation.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -4,8 +4,8 @@
import java.util.List;
import java.util.Set;
-import org.jbpm.env.Context;
-import org.jbpm.env.Environment;
+import org.jbpm.api.env.Context;
+import org.jbpm.api.env.Environment;
import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.util.FilterListener;
import org.jbpm.pvm.internal.util.Listener;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/Parse.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/Parse.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/Parse.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -31,7 +31,7 @@
import javax.xml.parsers.DocumentBuilder;
-import org.jbpm.JbpmException;
+import org.jbpm.api.JbpmException;
import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.stream.FileStreamInput;
import org.jbpm.pvm.internal.stream.InputStreamInput;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/ProblemImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/ProblemImpl.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/ProblemImpl.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,7 +23,7 @@
import java.io.Serializable;
-import org.jbpm.Problem;
+import org.jbpm.api.Problem;
import org.xml.sax.SAXParseException;
/**
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/ProblemList.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/ProblemList.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/ProblemList.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -26,8 +26,8 @@
import java.util.Collections;
import java.util.List;
-import org.jbpm.JbpmException;
-import org.jbpm.Problem;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.Problem;
import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.repository.DeploymentImpl;
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/activities/AutomaticActivity.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/activities/AutomaticActivity.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/activities/AutomaticActivity.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,8 +21,8 @@
*/
package org.jbpm.pvm.activities;
-import org.jbpm.activity.ActivityBehaviour;
-import org.jbpm.activity.ActivityExecution;
+import org.jbpm.api.activity.ActivityBehaviour;
+import org.jbpm.api.activity.ActivityExecution;
/**
* @author Tom Baeyens
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/activities/DisplaySource.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/activities/DisplaySource.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/activities/DisplaySource.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,8 +21,8 @@
*/
package org.jbpm.pvm.activities;
-import org.jbpm.listener.EventListener;
-import org.jbpm.listener.EventListenerExecution;
+import org.jbpm.api.listener.EventListener;
+import org.jbpm.api.listener.EventListenerExecution;
public class DisplaySource implements EventListener {
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/activities/PrintLn.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/activities/PrintLn.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/activities/PrintLn.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,11 +21,11 @@
*/
package org.jbpm.pvm.activities;
-import org.jbpm.activity.ActivityBehaviour;
-import org.jbpm.activity.ActivityExecution;
-import org.jbpm.listener.EventListener;
-import org.jbpm.listener.EventListenerExecution;
-import org.jbpm.model.OpenExecution;
+import org.jbpm.api.activity.ActivityBehaviour;
+import org.jbpm.api.activity.ActivityExecution;
+import org.jbpm.api.listener.EventListener;
+import org.jbpm.api.listener.EventListenerExecution;
+import org.jbpm.api.model.OpenExecution;
public class PrintLn implements ActivityBehaviour, EventListener {
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/activities/WaitState.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/activities/WaitState.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/activities/WaitState.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,8 +23,8 @@
import java.util.Map;
-import org.jbpm.activity.ActivityExecution;
-import org.jbpm.activity.ExternalActivityBehaviour;
+import org.jbpm.api.activity.ActivityExecution;
+import org.jbpm.api.activity.ExternalActivityBehaviour;
/**
* @author Tom Baeyens
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/builder/BuilderTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/builder/BuilderTest.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/builder/BuilderTest.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -24,8 +24,8 @@
import java.util.List;
import java.util.Map;
-import org.jbpm.client.ClientProcessDefinition;
-import org.jbpm.model.Transition;
+import org.jbpm.api.client.ClientProcessDefinition;
+import org.jbpm.api.model.Transition;
import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder;
import org.jbpm.pvm.internal.model.ActivityImpl;
import org.jbpm.test.BaseJbpmTestCase;
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/builder/TestActivity.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/builder/TestActivity.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/builder/TestActivity.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,8 +21,8 @@
*/
package org.jbpm.pvm.builder;
-import org.jbpm.activity.ActivityBehaviour;
-import org.jbpm.activity.ActivityExecution;
+import org.jbpm.api.activity.ActivityBehaviour;
+import org.jbpm.api.activity.ActivityExecution;
/**
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/BasicEnvironmentTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/BasicEnvironmentTest.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/BasicEnvironmentTest.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,9 +21,9 @@
*/
package org.jbpm.pvm.env;
-import org.jbpm.env.Context;
-import org.jbpm.env.Environment;
-import org.jbpm.env.EnvironmentFactory;
+import org.jbpm.api.env.Context;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.env.EnvironmentFactory;
import org.jbpm.pvm.internal.cfg.JbpmConfiguration;
import org.jbpm.test.BaseJbpmTestCase;
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/EnvironmentSearchOrderTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/EnvironmentSearchOrderTest.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/EnvironmentSearchOrderTest.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,8 +21,8 @@
*/
package org.jbpm.pvm.env;
-import org.jbpm.env.Environment;
-import org.jbpm.env.EnvironmentFactory;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.env.EnvironmentFactory;
import org.jbpm.pvm.internal.cfg.JbpmConfiguration;
import org.jbpm.pvm.internal.wire.WireContext;
import org.jbpm.pvm.internal.wire.WireDefinition;
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/EnvironmentTypeLookupTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/EnvironmentTypeLookupTest.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/EnvironmentTypeLookupTest.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,8 +21,8 @@
*/
package org.jbpm.pvm.env;
-import org.jbpm.env.Environment;
-import org.jbpm.env.EnvironmentFactory;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.env.EnvironmentFactory;
import org.jbpm.pvm.internal.cfg.JbpmConfiguration;
import org.jbpm.test.BaseJbpmTestCase;
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/NestedEnvironmentTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/NestedEnvironmentTest.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/NestedEnvironmentTest.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,8 +21,8 @@
*/
package org.jbpm.pvm.env;
-import org.jbpm.env.Environment;
-import org.jbpm.env.EnvironmentFactory;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.env.EnvironmentFactory;
import org.jbpm.pvm.internal.cfg.JbpmConfiguration;
import org.jbpm.test.BaseJbpmTestCase;
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/eventlistener/EventListenerTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/eventlistener/EventListenerTest.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/eventlistener/EventListenerTest.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,9 +21,9 @@
*/
package org.jbpm.pvm.eventlistener;
-import org.jbpm.client.ClientExecution;
-import org.jbpm.client.ClientProcessDefinition;
-import org.jbpm.model.Event;
+import org.jbpm.api.client.ClientExecution;
+import org.jbpm.api.client.ClientProcessDefinition;
+import org.jbpm.api.model.Event;
import org.jbpm.pvm.activities.AutomaticActivity;
import org.jbpm.pvm.activities.PrintLn;
import org.jbpm.pvm.activities.TestConsoleTestCase;
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/eventlistener/EventPropagationTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/eventlistener/EventPropagationTest.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/eventlistener/EventPropagationTest.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -24,9 +24,9 @@
import java.util.ArrayList;
import java.util.List;
-import org.jbpm.client.ClientExecution;
-import org.jbpm.client.ClientProcessDefinition;
-import org.jbpm.model.Event;
+import org.jbpm.api.client.ClientExecution;
+import org.jbpm.api.client.ClientProcessDefinition;
+import org.jbpm.api.model.Event;
import org.jbpm.pvm.activities.DisplaySource;
import org.jbpm.pvm.activities.TestConsole;
import org.jbpm.pvm.activities.WaitState;
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/executionmode/embedded/AutomaticActivity.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/executionmode/embedded/AutomaticActivity.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/executionmode/embedded/AutomaticActivity.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,8 +21,8 @@
*/
package org.jbpm.pvm.executionmode.embedded;
-import org.jbpm.activity.ActivityBehaviour;
-import org.jbpm.activity.ActivityExecution;
+import org.jbpm.api.activity.ActivityBehaviour;
+import org.jbpm.api.activity.ActivityExecution;
/** a activity behaviour implementation that records its execution and then
* just proceeds.
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/executionmode/embedded/Loan.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/executionmode/embedded/Loan.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/executionmode/embedded/Loan.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -22,8 +22,8 @@
package org.jbpm.pvm.executionmode.embedded;
-import org.jbpm.client.ClientExecution;
-import org.jbpm.client.ClientProcessDefinition;
+import org.jbpm.api.client.ClientExecution;
+import org.jbpm.api.client.ClientProcessDefinition;
import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder;
/**
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/executionmode/embedded/WaitState.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/executionmode/embedded/WaitState.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/executionmode/embedded/WaitState.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,8 +23,8 @@
import java.util.Map;
-import org.jbpm.activity.ActivityExecution;
-import org.jbpm.activity.ExternalActivityBehaviour;
+import org.jbpm.api.activity.ActivityExecution;
+import org.jbpm.api.activity.ExternalActivityBehaviour;
/**
* @author Tom Baeyens
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/executionmode/object/ObjectExecutionModeTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/executionmode/object/ObjectExecutionModeTest.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/executionmode/object/ObjectExecutionModeTest.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,8 +23,8 @@
import junit.framework.TestCase;
-import org.jbpm.client.ClientExecution;
-import org.jbpm.client.ClientProcessDefinition;
+import org.jbpm.api.client.ClientExecution;
+import org.jbpm.api.client.ClientProcessDefinition;
import org.jbpm.pvm.activities.AutomaticActivity;
import org.jbpm.pvm.activities.WaitState;
import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder;
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/CommentDbTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/CommentDbTest.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/CommentDbTest.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -24,10 +24,10 @@
import java.util.Date;
import java.util.List;
-import org.jbpm.model.Comment;
+import org.jbpm.api.model.Comment;
+import org.jbpm.api.session.DbSession;
import org.jbpm.pvm.internal.model.CommentImpl;
import org.jbpm.pvm.test.EnvironmentDbTestCase;
-import org.jbpm.session.DbSession;
/**
* @author Tom Baeyens
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/GroovyExpressionTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/GroovyExpressionTest.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/GroovyExpressionTest.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,9 +21,9 @@
*/
package org.jbpm.pvm.internal.expr;
-import org.jbpm.client.ClientExecution;
-import org.jbpm.env.Environment;
-import org.jbpm.env.EnvironmentFactory;
+import org.jbpm.api.client.ClientExecution;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.env.EnvironmentFactory;
import org.jbpm.pvm.activities.WaitState;
import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder;
import org.jbpm.pvm.internal.cfg.JbpmConfiguration;
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/JuelExpressionTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/JuelExpressionTest.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/JuelExpressionTest.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,9 +21,9 @@
*/
package org.jbpm.pvm.internal.expr;
-import org.jbpm.client.ClientExecution;
-import org.jbpm.env.Environment;
-import org.jbpm.env.EnvironmentFactory;
+import org.jbpm.api.client.ClientExecution;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.env.EnvironmentFactory;
import org.jbpm.pvm.activities.WaitState;
import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder;
import org.jbpm.pvm.internal.cfg.JbpmConfiguration;
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/identity/IdentityTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/identity/IdentityTest.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/identity/IdentityTest.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,9 +23,9 @@
import java.util.List;
-import org.jbpm.IdentityService;
-import org.jbpm.identity.Group;
-import org.jbpm.identity.User;
+import org.jbpm.api.IdentityService;
+import org.jbpm.api.identity.Group;
+import org.jbpm.api.identity.User;
import org.jbpm.test.JbpmTestCase;
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/EnlistTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/EnlistTest.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/EnlistTest.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -3,10 +3,10 @@
import java.util.ArrayList;
import java.util.List;
-import org.jbpm.Configuration;
-import org.jbpm.env.Environment;
-import org.jbpm.env.EnvironmentFactory;
-import org.jbpm.env.Transaction;
+import org.jbpm.api.Configuration;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.env.EnvironmentFactory;
+import org.jbpm.api.env.Transaction;
import org.jbpm.pvm.internal.wire.WireContext;
import org.jbpm.pvm.internal.wire.WireException;
import org.jbpm.pvm.internal.wire.WireTestCase;
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/TransactionFailingCommitTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/TransactionFailingCommitTest.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/TransactionFailingCommitTest.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,9 +21,9 @@
*/
package org.jbpm.pvm.internal.tx;
-import org.jbpm.Configuration;
-import org.jbpm.env.Environment;
-import org.jbpm.env.EnvironmentFactory;
+import org.jbpm.api.Configuration;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.env.EnvironmentFactory;
import org.jbpm.test.BaseJbpmTestCase;
/**
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/TransactionResourcesCommitTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/TransactionResourcesCommitTest.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/TransactionResourcesCommitTest.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,9 +21,9 @@
*/
package org.jbpm.pvm.internal.tx;
-import org.jbpm.Configuration;
-import org.jbpm.env.Environment;
-import org.jbpm.env.EnvironmentFactory;
+import org.jbpm.api.Configuration;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.env.EnvironmentFactory;
import org.jbpm.pvm.internal.tx.StandardTransaction;
import org.jbpm.test.BaseJbpmTestCase;
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/TransactionResourcesSetRollbackOnlyTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/TransactionResourcesSetRollbackOnlyTest.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/TransactionResourcesSetRollbackOnlyTest.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,10 +21,10 @@
*/
package org.jbpm.pvm.internal.tx;
-import org.jbpm.Configuration;
-import org.jbpm.env.Environment;
-import org.jbpm.env.EnvironmentFactory;
-import org.jbpm.env.Transaction;
+import org.jbpm.api.Configuration;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.env.EnvironmentFactory;
+import org.jbpm.api.env.Transaction;
import org.jbpm.pvm.internal.tx.StandardTransaction;
import org.jbpm.test.BaseJbpmTestCase;
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/AutoWireTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/AutoWireTest.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/AutoWireTest.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,7 +23,7 @@
import java.util.List;
-import org.jbpm.Problem;
+import org.jbpm.api.Problem;
/**
* @author Tom Baeyens
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/BasicTypeWireTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/BasicTypeWireTest.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/BasicTypeWireTest.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,7 +23,7 @@
import java.util.List;
-import org.jbpm.Problem;
+import org.jbpm.api.Problem;
/**
* @author Tom Baeyens
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ClassWireTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ClassWireTest.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ClassWireTest.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -2,8 +2,8 @@
import java.util.List;
-import org.jbpm.Problem;
-import org.jbpm.env.Environment;
+import org.jbpm.api.Problem;
+import org.jbpm.api.env.Environment;
/**
* Tests for the ClassDescriptor
@@ -89,7 +89,7 @@
Object o = wireContext.get("o");
assertNotNull(o);
- assertEquals(org.jbpm.env.Environment.class, o);
+ assertEquals(org.jbpm.api.env.Environment.class, o);
}
}
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ContextBlockSubscriptionTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ContextBlockSubscriptionTest.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ContextBlockSubscriptionTest.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -22,9 +22,9 @@
package org.jbpm.pvm.internal.wire;
-import org.jbpm.env.Context;
-import org.jbpm.env.Environment;
-import org.jbpm.env.EnvironmentFactory;
+import org.jbpm.api.env.Context;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.env.EnvironmentFactory;
import org.jbpm.pvm.internal.cfg.JbpmConfiguration;
import org.jbpm.pvm.internal.wire.Descriptor;
import org.jbpm.pvm.internal.wire.WireContext;
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ContextTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ContextTest.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ContextTest.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -16,8 +16,8 @@
import java.util.HashSet;
import java.util.Set;
-import org.jbpm.env.Environment;
-import org.jbpm.env.EnvironmentFactory;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.env.EnvironmentFactory;
import org.jbpm.pvm.internal.cfg.JbpmConfiguration;
import org.jbpm.pvm.internal.wire.WireContext;
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/EnvWireTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/EnvWireTest.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/EnvWireTest.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -1,7 +1,7 @@
package org.jbpm.pvm.internal.wire;
-import org.jbpm.env.Environment;
-import org.jbpm.env.EnvironmentFactory;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.env.EnvironmentFactory;
import org.jbpm.pvm.internal.cfg.JbpmConfiguration;
import org.jbpm.pvm.internal.wire.WireContext;
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ListWireTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ListWireTest.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ListWireTest.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -25,7 +25,7 @@
import java.util.HashSet;
import java.util.List;
-import org.jbpm.Problem;
+import org.jbpm.api.Problem;
/**
* @author Tom Baeyens
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/MapWireTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/MapWireTest.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/MapWireTest.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -4,7 +4,7 @@
import java.util.Map;
import java.util.TreeMap;
-import org.jbpm.Problem;
+import org.jbpm.api.Problem;
/**
* @author Tom Baeyens
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/MethodSubscriptionTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/MethodSubscriptionTest.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/MethodSubscriptionTest.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -1,7 +1,7 @@
package org.jbpm.pvm.internal.wire;
-import org.jbpm.env.Environment;
-import org.jbpm.env.EnvironmentFactory;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.env.EnvironmentFactory;
import org.jbpm.pvm.internal.cfg.JbpmConfiguration;
import org.jbpm.pvm.internal.util.DefaultObservable;
import org.jbpm.pvm.internal.util.Observable;
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ObjectSubscriptionTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ObjectSubscriptionTest.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ObjectSubscriptionTest.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,8 +21,8 @@
*/
package org.jbpm.pvm.internal.wire;
-import org.jbpm.env.Environment;
-import org.jbpm.env.EnvironmentFactory;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.env.EnvironmentFactory;
import org.jbpm.pvm.internal.cfg.JbpmConfiguration;
import org.jbpm.pvm.internal.util.DefaultObservable;
import org.jbpm.pvm.internal.util.Observable;
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ObjectWireTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ObjectWireTest.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ObjectWireTest.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,8 +23,8 @@
import java.util.List;
-import org.jbpm.JbpmException;
-import org.jbpm.Problem;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.Problem;
/**
* @author Tom Baeyens
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/PropertiesWireTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/PropertiesWireTest.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/PropertiesWireTest.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -24,7 +24,7 @@
import java.util.List;
import java.util.Properties;
-import org.jbpm.Problem;
+import org.jbpm.api.Problem;
import org.jbpm.pvm.internal.util.FileUtil;
/**
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/RefWireTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/RefWireTest.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/RefWireTest.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -25,7 +25,7 @@
import java.util.Map;
import java.util.Set;
-import org.jbpm.Problem;
+import org.jbpm.api.Problem;
/**
* @author Tom Baeyens
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/SetWireTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/SetWireTest.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/SetWireTest.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -3,7 +3,7 @@
import java.util.List;
import java.util.Set;
-import org.jbpm.Problem;
+import org.jbpm.api.Problem;
public class SetWireTest extends WireTestCase {
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/WireEventsSubscriptionTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/WireEventsSubscriptionTest.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/WireEventsSubscriptionTest.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,8 +21,8 @@
*/
package org.jbpm.pvm.internal.wire;
-import org.jbpm.env.Environment;
-import org.jbpm.env.EnvironmentFactory;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.env.EnvironmentFactory;
import org.jbpm.pvm.internal.cfg.JbpmConfiguration;
import org.jbpm.pvm.internal.util.DefaultObservable;
import org.jbpm.pvm.internal.util.Observable;
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/WireObservableTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/WireObservableTest.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/WireObservableTest.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,9 +23,9 @@
import java.util.List;
-import org.jbpm.env.Context;
-import org.jbpm.env.Environment;
-import org.jbpm.env.EnvironmentFactory;
+import org.jbpm.api.env.Context;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.env.EnvironmentFactory;
import org.jbpm.pvm.internal.cfg.JbpmConfiguration;
import org.jbpm.pvm.internal.util.Listener;
import org.jbpm.pvm.internal.wire.WireContext;
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/WireTestCase.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/WireTestCase.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/WireTestCase.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,7 +23,7 @@
import java.util.List;
-import org.jbpm.Problem;
+import org.jbpm.api.Problem;
import org.jbpm.pvm.internal.wire.xml.WireParser;
import org.jbpm.test.BaseJbpmTestCase;
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/println/PrintlnTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/println/PrintlnTest.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/println/PrintlnTest.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,7 +21,7 @@
*/
package org.jbpm.pvm.println;
-import org.jbpm.client.ClientProcessDefinition;
+import org.jbpm.api.client.ClientProcessDefinition;
import org.jbpm.pvm.activities.PrintLnBuilder;
import org.jbpm.pvm.activities.TestConsoleTestCase;
import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder;
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/test/EnvironmentDbTestCase.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/test/EnvironmentDbTestCase.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/test/EnvironmentDbTestCase.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -26,10 +26,10 @@
import org.hibernate.Session;
import org.hibernate.SessionFactory;
import org.hibernate.Transaction;
-import org.jbpm.Execution;
-import org.jbpm.model.OpenProcessDefinition;
-import org.jbpm.session.DbSession;
-import org.jbpm.session.PvmDbSession;
+import org.jbpm.api.Execution;
+import org.jbpm.api.model.OpenProcessDefinition;
+import org.jbpm.api.session.DbSession;
+import org.jbpm.api.session.PvmDbSession;
import org.jbpm.test.Db;
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/test/EnvironmentFactoryTestCase.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/test/EnvironmentFactoryTestCase.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/test/EnvironmentFactoryTestCase.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -24,9 +24,9 @@
import java.util.HashMap;
import java.util.Map;
-import org.jbpm.Configuration;
-import org.jbpm.JbpmException;
-import org.jbpm.env.EnvironmentFactory;
+import org.jbpm.api.Configuration;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.env.EnvironmentFactory;
import org.jbpm.test.BaseJbpmTestCase;
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/test/EnvironmentTestCase.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/test/EnvironmentTestCase.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/test/EnvironmentTestCase.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,7 +21,7 @@
*/
package org.jbpm.pvm.test;
-import org.jbpm.env.Environment;
+import org.jbpm.api.env.Environment;
/**
* @author Tom Baeyens
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/tx/BasicTransactionTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/tx/BasicTransactionTest.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/tx/BasicTransactionTest.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -26,10 +26,10 @@
import javax.transaction.Synchronization;
import org.hibernate.Session;
-import org.jbpm.JbpmException;
-import org.jbpm.cmd.Command;
-import org.jbpm.env.Environment;
-import org.jbpm.env.Transaction;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.env.Transaction;
import org.jbpm.pvm.internal.model.CommentImpl;
import org.jbpm.pvm.internal.type.variable.StringVariable;
import org.jbpm.test.JbpmTestCase;
Modified: jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/BaseJbpmTestCase.java
===================================================================
--- jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/BaseJbpmTestCase.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/BaseJbpmTestCase.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -24,7 +24,7 @@
import junit.framework.AssertionFailedError;
import junit.framework.TestCase;
-import org.jbpm.env.Environment;
+import org.jbpm.api.env.Environment;
import org.jbpm.internal.log.Jdk14LogFactory;
import org.jbpm.internal.log.Log;
import org.jbpm.internal.log.LogFormatter;
Modified: jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/Db.java
===================================================================
--- jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/Db.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/Db.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -35,8 +35,8 @@
import org.hibernate.engine.SessionFactoryImplementor;
import org.hibernate.mapping.ForeignKey;
import org.hibernate.mapping.Table;
-import org.jbpm.ProcessEngine;
-import org.jbpm.env.EnvironmentFactory;
+import org.jbpm.api.ProcessEngine;
+import org.jbpm.api.env.EnvironmentFactory;
import org.jbpm.internal.log.Log;
Modified: jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JbpmTestCase.java
===================================================================
--- jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JbpmTestCase.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JbpmTestCase.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,10 +21,10 @@
*/
package org.jbpm.test;
-import org.jbpm.*;
-import org.jbpm.cmd.CommandService;
-import org.jbpm.job.Job;
-import org.jbpm.task.Task;
+import org.jbpm.api.*;
+import org.jbpm.api.cmd.CommandService;
+import org.jbpm.api.job.Job;
+import org.jbpm.api.task.Task;
import org.jbpm.test.enterprise.IntegrationTestHelper;
import java.util.ArrayList;
Deleted: jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/MessageFinder.java
===================================================================
--- jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/MessageFinder.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/MessageFinder.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -1,36 +0,0 @@
-/*
- * 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;
-
-
-/**
- * @author Tom Baeyens
- */
-public class MessageFinder {
-
- protected JbpmTestCase jbpmTestCase;
-
- public MessageFinder(JbpmTestCase jbpmTestCase) {
- this.jbpmTestCase = jbpmTestCase;
- }
-
-}
Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/activities/DecisionTest.java
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/activities/DecisionTest.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/activities/DecisionTest.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -24,7 +24,7 @@
import java.util.HashMap;
import java.util.Map;
-import org.jbpm.Execution;
+import org.jbpm.api.Execution;
import org.jbpm.test.JbpmTestCase;
Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/activities/StateTest.java
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/activities/StateTest.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/activities/StateTest.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,8 +21,8 @@
*/
package org.jbpm.test.activities;
-import org.jbpm.Execution;
-import org.jbpm.JbpmException;
+import org.jbpm.api.Execution;
+import org.jbpm.api.JbpmException;
import org.jbpm.test.JbpmTestCase;
/**
Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/cfg/ConfigurationTest.java
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/cfg/ConfigurationTest.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/cfg/ConfigurationTest.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,8 +21,8 @@
*/
package org.jbpm.test.cfg;
-import org.jbpm.Configuration;
-import org.jbpm.ProcessEngine;
+import org.jbpm.api.Configuration;
+import org.jbpm.api.ProcessEngine;
import org.jbpm.test.BaseJbpmTestCase;
/**
Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/eventlistener/EventListenerTest.java
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/eventlistener/EventListenerTest.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/eventlistener/EventListenerTest.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -24,9 +24,9 @@
import java.util.ArrayList;
import java.util.List;
-import org.jbpm.Execution;
-import org.jbpm.listener.EventListener;
-import org.jbpm.listener.EventListenerExecution;
+import org.jbpm.api.Execution;
+import org.jbpm.api.listener.EventListener;
+import org.jbpm.api.listener.EventListenerExecution;
import org.jbpm.test.JbpmTestCase;
Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/eventlistener/HqlEventListenerTest.java
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/eventlistener/HqlEventListenerTest.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/eventlistener/HqlEventListenerTest.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -4,8 +4,8 @@
import java.util.HashSet;
import java.util.Set;
-import org.jbpm.Execution;
-import org.jbpm.task.Task;
+import org.jbpm.api.Execution;
+import org.jbpm.api.task.Task;
import org.jbpm.test.JbpmTestCase;
Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/execution/ExecutionEagerLoadingTest.java
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/execution/ExecutionEagerLoadingTest.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/execution/ExecutionEagerLoadingTest.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,7 +23,7 @@
import java.util.HashMap;
-import org.jbpm.Execution;
+import org.jbpm.api.Execution;
import org.jbpm.test.JbpmTestCase;
Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/execution/FindExecutionTest.java
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/execution/FindExecutionTest.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/execution/FindExecutionTest.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,7 +21,7 @@
*/
package org.jbpm.test.execution;
-import org.jbpm.Execution;
+import org.jbpm.api.Execution;
import org.jbpm.test.JbpmTestCase;
/**
Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/execution/SignalExecutionTest.java
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/execution/SignalExecutionTest.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/execution/SignalExecutionTest.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -26,7 +26,7 @@
import java.util.Map;
import java.util.Set;
-import org.jbpm.Execution;
+import org.jbpm.api.Execution;
import org.jbpm.test.JbpmTestCase;
Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/execution/StartExecutionTest.java
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/execution/StartExecutionTest.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/execution/StartExecutionTest.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -26,8 +26,8 @@
import java.util.Map;
import java.util.Set;
-import org.jbpm.Execution;
-import org.jbpm.ProcessDefinition;
+import org.jbpm.api.Execution;
+import org.jbpm.api.ProcessDefinition;
import org.jbpm.test.JbpmTestCase;
Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/history/AvgDurationTest.java
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/history/AvgDurationTest.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/history/AvgDurationTest.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,7 +23,7 @@
import java.util.Map;
-import org.jbpm.Execution;
+import org.jbpm.api.Execution;
import org.jbpm.test.JbpmTestCase;
Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/history/EndProcessInstanceTest.java
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/history/EndProcessInstanceTest.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/history/EndProcessInstanceTest.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,8 +23,8 @@
import java.util.List;
-import org.jbpm.Execution;
-import org.jbpm.history.HistoryProcessInstance;
+import org.jbpm.api.Execution;
+import org.jbpm.api.history.HistoryProcessInstance;
import org.jbpm.test.JbpmTestCase;
Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/history/ProcessInstanceHistoryTest.java
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/history/ProcessInstanceHistoryTest.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/history/ProcessInstanceHistoryTest.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,9 +23,9 @@
import java.util.List;
-import org.jbpm.Execution;
-import org.jbpm.history.HistoryProcessInstance;
-import org.jbpm.history.HistoryProcessInstanceQuery;
+import org.jbpm.api.Execution;
+import org.jbpm.api.history.HistoryProcessInstance;
+import org.jbpm.api.history.HistoryProcessInstanceQuery;
import org.jbpm.test.JbpmTestCase;
Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/mgmt/JobQueryTest.java
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/mgmt/JobQueryTest.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/mgmt/JobQueryTest.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -2,7 +2,7 @@
import java.util.List;
-import org.jbpm.job.Job;
+import org.jbpm.api.job.Job;
import org.jbpm.test.JbpmTestCase;
Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/process/DeploymentResourcesTest.java
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/process/DeploymentResourcesTest.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/process/DeploymentResourcesTest.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -28,8 +28,8 @@
import java.io.OutputStream;
import java.util.Arrays;
-import org.jbpm.JbpmException;
-import org.jbpm.ProcessDefinition;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.ProcessDefinition;
import org.jbpm.test.JbpmTestCase;
Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/process/ProcessDefinitionQueryTest.java
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/process/ProcessDefinitionQueryTest.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/process/ProcessDefinitionQueryTest.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,8 +23,8 @@
import java.util.List;
-import org.jbpm.ProcessDefinition;
-import org.jbpm.ProcessDefinitionQuery;
+import org.jbpm.api.ProcessDefinition;
+import org.jbpm.api.ProcessDefinitionQuery;
import org.jbpm.test.JbpmTestCase;
Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/process/RepositoryServiceTest.java
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/process/RepositoryServiceTest.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/process/RepositoryServiceTest.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,10 +23,10 @@
import java.util.List;
-import org.jbpm.Execution;
-import org.jbpm.JbpmException;
-import org.jbpm.ProcessDefinition;
-import org.jbpm.ProcessDefinitionQuery;
+import org.jbpm.api.Execution;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.ProcessDefinition;
+import org.jbpm.api.ProcessDefinitionQuery;
import org.jbpm.test.JbpmTestCase;
Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/task/SubTaskTest.java
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/task/SubTaskTest.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/task/SubTaskTest.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -25,7 +25,7 @@
import java.util.List;
import java.util.Set;
-import org.jbpm.task.Task;
+import org.jbpm.api.task.Task;
import org.jbpm.test.JbpmTestCase;
Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/task/TaskCandidatesTest.java
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/task/TaskCandidatesTest.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/task/TaskCandidatesTest.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -25,9 +25,9 @@
import java.util.List;
import java.util.Map;
-import org.jbpm.Execution;
-import org.jbpm.JbpmException;
-import org.jbpm.task.Task;
+import org.jbpm.api.Execution;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.task.Task;
import org.jbpm.test.JbpmTestCase;
Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/task/TaskCommentsTest.java
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/task/TaskCommentsTest.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/task/TaskCommentsTest.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,8 +23,8 @@
import java.util.List;
-import org.jbpm.model.Comment;
-import org.jbpm.task.Task;
+import org.jbpm.api.model.Comment;
+import org.jbpm.api.task.Task;
import org.jbpm.test.JbpmTestCase;
Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/task/TaskCreateUpdateDeleteTest.java
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/task/TaskCreateUpdateDeleteTest.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/task/TaskCreateUpdateDeleteTest.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -24,7 +24,7 @@
import java.util.Date;
import java.text.DateFormat;
-import org.jbpm.task.Task;
+import org.jbpm.api.task.Task;
import org.jbpm.test.JbpmTestCase;
/**
Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/task/TaskHandlerTest.java
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/task/TaskHandlerTest.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/task/TaskHandlerTest.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,10 +21,10 @@
*/
package org.jbpm.test.task;
-import org.jbpm.Execution;
-import org.jbpm.task.OpenTask;
-import org.jbpm.task.Task;
-import org.jbpm.task.TaskHandler;
+import org.jbpm.api.Execution;
+import org.jbpm.api.task.OpenTask;
+import org.jbpm.api.task.Task;
+import org.jbpm.api.task.TaskHandler;
import org.jbpm.test.JbpmTestCase;
Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/task/TaskListTest.java
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/task/TaskListTest.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/task/TaskListTest.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,8 +23,8 @@
import java.util.List;
-import org.jbpm.task.Task;
-import org.jbpm.task.UserRef;
+import org.jbpm.api.task.Task;
+import org.jbpm.api.task.UserRef;
import org.jbpm.test.JbpmTestCase;
Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/task/TaskParticipationsTest.java
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/task/TaskParticipationsTest.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/task/TaskParticipationsTest.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -25,8 +25,8 @@
import java.util.List;
import java.util.Set;
-import org.jbpm.task.Participation;
-import org.jbpm.task.Task;
+import org.jbpm.api.task.Participation;
+import org.jbpm.api.task.Task;
import org.jbpm.test.JbpmTestCase;
Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/task/TaskQueryTest.java
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/task/TaskQueryTest.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/task/TaskQueryTest.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,8 +23,8 @@
import java.util.List;
-import org.jbpm.TaskQuery;
-import org.jbpm.task.Task;
+import org.jbpm.api.TaskQuery;
+import org.jbpm.api.task.Task;
import org.jbpm.test.JbpmTestCase;
Modified: jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/LoadTestCase.java
===================================================================
--- jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/LoadTestCase.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/LoadTestCase.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -27,9 +27,9 @@
import org.hibernate.Query;
import org.hibernate.Session;
-import org.jbpm.cmd.Command;
-import org.jbpm.cmd.CommandService;
-import org.jbpm.env.Environment;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.cmd.CommandService;
+import org.jbpm.api.env.Environment;
import org.jbpm.pvm.internal.job.JobImpl;
import org.jbpm.pvm.internal.jobexecutor.JobExecutor;
import org.jbpm.pvm.internal.util.ReflectUtil;
Modified: jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/AutomaticActivity.java
===================================================================
--- jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/AutomaticActivity.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/AutomaticActivity.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,8 +21,8 @@
*/
package org.jbpm.test.load.async;
-import org.jbpm.activity.ActivityBehaviour;
-import org.jbpm.activity.ActivityExecution;
+import org.jbpm.api.activity.ActivityBehaviour;
+import org.jbpm.api.activity.ActivityExecution;
/** a activity behaviour implementation that records its execution and then
* just proceeds.
Modified: jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/ContinuationTest.java
===================================================================
--- jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/ContinuationTest.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/ContinuationTest.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -25,9 +25,9 @@
import java.util.List;
import org.hibernate.Session;
-import org.jbpm.cmd.Command;
-import org.jbpm.env.Environment;
-import org.jbpm.model.OpenProcessDefinition;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.model.OpenProcessDefinition;
import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder;
/**
Modified: jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/ExclusiveMessagesTest.java
===================================================================
--- jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/ExclusiveMessagesTest.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/ExclusiveMessagesTest.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -26,17 +26,17 @@
import java.util.Set;
import org.hibernate.Session;
-import org.jbpm.Execution;
-import org.jbpm.activity.ActivityExecution;
-import org.jbpm.activity.ExternalActivityBehaviour;
-import org.jbpm.cmd.Command;
-import org.jbpm.env.Environment;
+import org.jbpm.api.Execution;
+import org.jbpm.api.activity.ActivityExecution;
+import org.jbpm.api.activity.ExternalActivityBehaviour;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.session.MessageSession;
import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder;
import org.jbpm.pvm.internal.cmd.StartProcessInstanceCmd;
import org.jbpm.pvm.internal.job.CommandMessage;
import org.jbpm.pvm.internal.jobexecutor.JobExecutor;
import org.jbpm.pvm.internal.model.ProcessDefinitionImpl;
-import org.jbpm.session.MessageSession;
/**
* @author Tom Baeyens
Modified: jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/ExclusiveTestCommand.java
===================================================================
--- jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/ExclusiveTestCommand.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/ExclusiveTestCommand.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -26,9 +26,9 @@
import java.util.Set;
import org.hibernate.Session;
-import org.jbpm.Execution;
-import org.jbpm.cmd.Command;
-import org.jbpm.env.Environment;
+import org.jbpm.api.Execution;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.env.Environment;
import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.job.CommandMessage;
import org.jbpm.pvm.internal.model.ExecutionImpl;
Modified: jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/FailOnceMessageTest.java
===================================================================
--- jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/FailOnceMessageTest.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/FailOnceMessageTest.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -26,13 +26,13 @@
import java.util.List;
import org.hibernate.Session;
-import org.jbpm.cmd.Command;
-import org.jbpm.env.Environment;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.model.Comment;
+import org.jbpm.api.session.MessageSession;
import org.jbpm.internal.log.Log;
-import org.jbpm.model.Comment;
import org.jbpm.pvm.internal.job.CommandMessage;
import org.jbpm.pvm.internal.model.CommentImpl;
-import org.jbpm.session.MessageSession;
/**
Modified: jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/FailOnceTestCommand.java
===================================================================
--- jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/FailOnceTestCommand.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/FailOnceTestCommand.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,16 +21,16 @@
*/
package org.jbpm.test.load.async;
-import org.jbpm.cmd.Command;
-import org.jbpm.env.Environment;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.model.Comment;
+import org.jbpm.api.session.DbSession;
import org.jbpm.internal.log.Log;
-import org.jbpm.model.Comment;
import org.jbpm.pvm.internal.job.CommandMessage;
import org.jbpm.pvm.internal.job.JobImpl;
import org.jbpm.pvm.internal.model.CommentImpl;
import org.jbpm.pvm.internal.wire.descriptor.IntegerDescriptor;
import org.jbpm.pvm.internal.wire.descriptor.ObjectDescriptor;
-import org.jbpm.session.DbSession;
/**
Modified: jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/FailingMessageTest.java
===================================================================
--- jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/FailingMessageTest.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/FailingMessageTest.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -24,14 +24,14 @@
import java.util.List;
import org.hibernate.Session;
-import org.jbpm.cmd.Command;
-import org.jbpm.cmd.CommandService;
-import org.jbpm.env.Environment;
-import org.jbpm.job.Job;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.cmd.CommandService;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.job.Job;
+import org.jbpm.api.session.MessageSession;
+import org.jbpm.api.session.PvmDbSession;
import org.jbpm.pvm.internal.job.CommandMessage;
import org.jbpm.pvm.internal.model.CommentImpl;
-import org.jbpm.session.MessageSession;
-import org.jbpm.session.PvmDbSession;
import org.jbpm.test.JbpmTestCase;
Modified: jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/FailingTestCommand.java
===================================================================
--- jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/FailingTestCommand.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/FailingTestCommand.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,13 +21,13 @@
*/
package org.jbpm.test.load.async;
-import org.jbpm.cmd.Command;
-import org.jbpm.env.Environment;
-import org.jbpm.model.Comment;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.model.Comment;
+import org.jbpm.api.session.DbSession;
import org.jbpm.pvm.internal.job.CommandMessage;
import org.jbpm.pvm.internal.model.CommentImpl;
import org.jbpm.pvm.internal.wire.descriptor.ObjectDescriptor;
-import org.jbpm.session.DbSession;
/**
Modified: jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/GenerateExceptionTestCommand.java
===================================================================
--- jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/GenerateExceptionTestCommand.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/GenerateExceptionTestCommand.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,8 +21,8 @@
*/
package org.jbpm.test.load.async;
-import org.jbpm.cmd.Command;
-import org.jbpm.env.Environment;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.env.Environment;
import org.jbpm.pvm.internal.job.CommandMessage;
import org.jbpm.pvm.internal.wire.descriptor.IntegerDescriptor;
import org.jbpm.pvm.internal.wire.descriptor.ObjectDescriptor;
Modified: jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/JobExecutorTestCase.java
===================================================================
--- jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/JobExecutorTestCase.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/JobExecutorTestCase.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -27,9 +27,9 @@
import org.hibernate.Query;
import org.hibernate.Session;
-import org.jbpm.cmd.Command;
-import org.jbpm.cmd.CommandService;
-import org.jbpm.env.Environment;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.cmd.CommandService;
+import org.jbpm.api.env.Environment;
import org.jbpm.pvm.internal.job.JobImpl;
import org.jbpm.pvm.internal.jobexecutor.JobExecutor;
import org.jbpm.test.JbpmTestCase;
Modified: jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/NormalMessageCommand.java
===================================================================
--- jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/NormalMessageCommand.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/NormalMessageCommand.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -24,8 +24,8 @@
import java.util.Random;
import org.hibernate.Session;
-import org.jbpm.cmd.Command;
-import org.jbpm.env.Environment;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.env.Environment;
import org.jbpm.pvm.internal.job.CommandMessage;
import org.jbpm.pvm.internal.model.CommentImpl;
import org.jbpm.pvm.internal.wire.descriptor.IntegerDescriptor;
Modified: jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/NormalMessageTest.java
===================================================================
--- jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/NormalMessageTest.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/NormalMessageTest.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -25,13 +25,13 @@
import java.util.List;
import org.hibernate.Session;
-import org.jbpm.cmd.Command;
-import org.jbpm.env.Environment;
-import org.jbpm.model.Comment;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.model.Comment;
+import org.jbpm.api.session.MessageSession;
import org.jbpm.pvm.internal.job.CommandMessage;
import org.jbpm.pvm.internal.jobexecutor.JobExecutor;
import org.jbpm.pvm.internal.model.CommentImpl;
-import org.jbpm.session.MessageSession;
import org.jbpm.test.Db;
/**
Modified: jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/WaitState.java
===================================================================
--- jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/WaitState.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/WaitState.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,8 +23,8 @@
import java.util.Map;
-import org.jbpm.activity.ActivityExecution;
-import org.jbpm.activity.ExternalActivityBehaviour;
+import org.jbpm.api.activity.ActivityExecution;
+import org.jbpm.api.activity.ExternalActivityBehaviour;
/**
* @author Tom Baeyens
Modified: jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/executions/ProcessExecutionTest.java
===================================================================
--- jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/executions/ProcessExecutionTest.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/executions/ProcessExecutionTest.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -24,7 +24,7 @@
import java.util.ArrayList;
import java.util.List;
-import org.jbpm.Execution;
+import org.jbpm.api.Execution;
import org.jbpm.internal.log.Log;
import org.jbpm.test.load.LoadTestCase;
Modified: jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/messages/AddCommentCmd.java
===================================================================
--- jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/messages/AddCommentCmd.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/messages/AddCommentCmd.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -22,8 +22,8 @@
package org.jbpm.test.load.messages;
import org.hibernate.Session;
-import org.jbpm.cmd.Command;
-import org.jbpm.env.Environment;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.env.Environment;
import org.jbpm.pvm.internal.model.CommentImpl;
/**
Modified: jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/messages/MessageProcessingTest.java
===================================================================
--- jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/messages/MessageProcessingTest.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/messages/MessageProcessingTest.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -25,10 +25,10 @@
import java.util.List;
import org.hibernate.Session;
-import org.jbpm.cmd.Command;
-import org.jbpm.env.Environment;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.model.Comment;
import org.jbpm.internal.log.Log;
-import org.jbpm.model.Comment;
import org.jbpm.pvm.internal.cmd.CompositeCmd;
import org.jbpm.pvm.internal.cmd.SendMessageCmd;
import org.jbpm.pvm.internal.job.CommandMessage;
Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/AutomaticActivity.java
===================================================================
--- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/AutomaticActivity.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/AutomaticActivity.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,8 +21,8 @@
*/
package org.jbpm.test.activities;
-import org.jbpm.activity.ActivityBehaviour;
-import org.jbpm.activity.ActivityExecution;
+import org.jbpm.api.activity.ActivityBehaviour;
+import org.jbpm.api.activity.ActivityExecution;
/**
* @author Tom Baeyens
Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/AutomaticDecisionTest.java
===================================================================
--- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/AutomaticDecisionTest.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/AutomaticDecisionTest.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,11 +23,11 @@
import java.util.Map;
-import org.jbpm.activity.ActivityBehaviour;
-import org.jbpm.activity.ActivityExecution;
-import org.jbpm.activity.ExternalActivityBehaviour;
-import org.jbpm.client.ClientProcessDefinition;
-import org.jbpm.client.ClientProcessInstance;
+import org.jbpm.api.activity.ActivityBehaviour;
+import org.jbpm.api.activity.ActivityExecution;
+import org.jbpm.api.activity.ExternalActivityBehaviour;
+import org.jbpm.api.client.ClientProcessDefinition;
+import org.jbpm.api.client.ClientProcessInstance;
import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder;
import org.jbpm.test.BaseJbpmTestCase;
Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/BasicExecutionFlowTest.java
===================================================================
--- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/BasicExecutionFlowTest.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/BasicExecutionFlowTest.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -25,12 +25,12 @@
import java.util.List;
import java.util.Map;
-import org.jbpm.activity.ActivityBehaviour;
-import org.jbpm.activity.ActivityExecution;
-import org.jbpm.activity.ExternalActivityBehaviour;
-import org.jbpm.client.ClientExecution;
-import org.jbpm.client.ClientProcessDefinition;
-import org.jbpm.client.ClientProcessInstance;
+import org.jbpm.api.activity.ActivityBehaviour;
+import org.jbpm.api.activity.ActivityExecution;
+import org.jbpm.api.activity.ExternalActivityBehaviour;
+import org.jbpm.api.client.ClientExecution;
+import org.jbpm.api.client.ClientProcessDefinition;
+import org.jbpm.api.client.ClientProcessInstance;
import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder;
import org.jbpm.test.BaseJbpmTestCase;
Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/EventPropagationTest.java
===================================================================
--- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/EventPropagationTest.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/EventPropagationTest.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -25,15 +25,15 @@
import java.util.List;
import java.util.Map;
-import org.jbpm.activity.ActivityExecution;
-import org.jbpm.activity.ExternalActivityBehaviour;
-import org.jbpm.client.ClientExecution;
-import org.jbpm.client.ClientProcessDefinition;
-import org.jbpm.listener.EventListener;
-import org.jbpm.listener.EventListenerExecution;
-import org.jbpm.model.Activity;
-import org.jbpm.model.Event;
-import org.jbpm.model.ObservableElement;
+import org.jbpm.api.activity.ActivityExecution;
+import org.jbpm.api.activity.ExternalActivityBehaviour;
+import org.jbpm.api.client.ClientExecution;
+import org.jbpm.api.client.ClientProcessDefinition;
+import org.jbpm.api.listener.EventListener;
+import org.jbpm.api.listener.EventListenerExecution;
+import org.jbpm.api.model.Activity;
+import org.jbpm.api.model.Event;
+import org.jbpm.api.model.ObservableElement;
import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder;
import org.jbpm.test.BaseJbpmTestCase;
Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/EventTest.java
===================================================================
--- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/EventTest.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/EventTest.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -25,16 +25,16 @@
import java.util.List;
import java.util.Map;
-import org.jbpm.activity.ActivityBehaviour;
-import org.jbpm.activity.ActivityExecution;
-import org.jbpm.activity.ExternalActivityBehaviour;
-import org.jbpm.client.ClientExecution;
-import org.jbpm.client.ClientProcessDefinition;
-import org.jbpm.listener.EventListener;
-import org.jbpm.listener.EventListenerExecution;
-import org.jbpm.model.Event;
-import org.jbpm.model.Activity;
-import org.jbpm.model.ObservableElement;
+import org.jbpm.api.activity.ActivityBehaviour;
+import org.jbpm.api.activity.ActivityExecution;
+import org.jbpm.api.activity.ExternalActivityBehaviour;
+import org.jbpm.api.client.ClientExecution;
+import org.jbpm.api.client.ClientProcessDefinition;
+import org.jbpm.api.listener.EventListener;
+import org.jbpm.api.listener.EventListenerExecution;
+import org.jbpm.api.model.Activity;
+import org.jbpm.api.model.Event;
+import org.jbpm.api.model.ObservableElement;
import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder;
import org.jbpm.pvm.internal.model.ExecutionImpl;
import org.jbpm.pvm.internal.model.ProcessDefinitionImpl;
Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ExceptionHandlerTest.java
===================================================================
--- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ExceptionHandlerTest.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ExceptionHandlerTest.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,13 +23,13 @@
import java.util.Map;
-import org.jbpm.activity.ActivityExecution;
-import org.jbpm.activity.ExternalActivityBehaviour;
-import org.jbpm.client.ClientExecution;
-import org.jbpm.client.ClientProcessDefinition;
-import org.jbpm.listener.EventListener;
-import org.jbpm.listener.EventListenerExecution;
-import org.jbpm.model.Event;
+import org.jbpm.api.activity.ActivityExecution;
+import org.jbpm.api.activity.ExternalActivityBehaviour;
+import org.jbpm.api.client.ClientExecution;
+import org.jbpm.api.client.ClientProcessDefinition;
+import org.jbpm.api.listener.EventListener;
+import org.jbpm.api.listener.EventListenerExecution;
+import org.jbpm.api.model.Event;
import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder;
import org.jbpm.test.BaseJbpmTestCase;
Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ExecutionStateTest.java
===================================================================
--- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ExecutionStateTest.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ExecutionStateTest.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,13 +23,13 @@
import java.util.Map;
-import org.jbpm.Execution;
-import org.jbpm.JbpmException;
-import org.jbpm.activity.ActivityBehaviour;
-import org.jbpm.activity.ActivityExecution;
-import org.jbpm.activity.ExternalActivityBehaviour;
-import org.jbpm.client.ClientProcessDefinition;
-import org.jbpm.client.ClientProcessInstance;
+import org.jbpm.api.Execution;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.activity.ActivityBehaviour;
+import org.jbpm.api.activity.ActivityExecution;
+import org.jbpm.api.activity.ExternalActivityBehaviour;
+import org.jbpm.api.client.ClientProcessDefinition;
+import org.jbpm.api.client.ClientProcessInstance;
import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder;
import org.jbpm.test.BaseJbpmTestCase;
Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ExternalDecisionTest.java
===================================================================
--- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ExternalDecisionTest.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ExternalDecisionTest.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -25,10 +25,10 @@
import junit.framework.TestCase;
-import org.jbpm.activity.ActivityExecution;
-import org.jbpm.activity.ExternalActivityBehaviour;
-import org.jbpm.client.ClientExecution;
-import org.jbpm.client.ClientProcessDefinition;
+import org.jbpm.api.activity.ActivityExecution;
+import org.jbpm.api.activity.ExternalActivityBehaviour;
+import org.jbpm.api.client.ClientExecution;
+import org.jbpm.api.client.ClientProcessDefinition;
import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder;
Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/FunctionalActivityTest.java
===================================================================
--- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/FunctionalActivityTest.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/FunctionalActivityTest.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -25,15 +25,15 @@
import java.util.List;
import java.util.Map;
-import org.jbpm.activity.ActivityBehaviour;
-import org.jbpm.activity.ActivityExecution;
-import org.jbpm.activity.ExternalActivityBehaviour;
-import org.jbpm.client.ClientProcessDefinition;
-import org.jbpm.client.ClientProcessInstance;
-import org.jbpm.listener.EventListener;
-import org.jbpm.listener.EventListenerExecution;
-import org.jbpm.model.Activity;
-import org.jbpm.model.OpenExecution;
+import org.jbpm.api.activity.ActivityBehaviour;
+import org.jbpm.api.activity.ActivityExecution;
+import org.jbpm.api.activity.ExternalActivityBehaviour;
+import org.jbpm.api.client.ClientProcessDefinition;
+import org.jbpm.api.client.ClientProcessInstance;
+import org.jbpm.api.listener.EventListener;
+import org.jbpm.api.listener.EventListenerExecution;
+import org.jbpm.api.model.Activity;
+import org.jbpm.api.model.OpenExecution;
import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder;
import org.jbpm.test.BaseJbpmTestCase;
Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/LoopingTest.java
===================================================================
--- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/LoopingTest.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/LoopingTest.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -4,11 +4,11 @@
import java.util.List;
import java.util.Map;
-import org.jbpm.activity.ActivityBehaviour;
-import org.jbpm.activity.ActivityExecution;
-import org.jbpm.activity.ExternalActivityBehaviour;
-import org.jbpm.client.ClientExecution;
-import org.jbpm.client.ClientProcessDefinition;
+import org.jbpm.api.activity.ActivityBehaviour;
+import org.jbpm.api.activity.ActivityExecution;
+import org.jbpm.api.activity.ExternalActivityBehaviour;
+import org.jbpm.api.client.ClientExecution;
+import org.jbpm.api.client.ClientProcessDefinition;
import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder;
import org.jbpm.test.BaseJbpmTestCase;
Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ScopeStateTest.java
===================================================================
--- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ScopeStateTest.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ScopeStateTest.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,12 +23,12 @@
import java.util.Map;
-import org.jbpm.Execution;
-import org.jbpm.activity.ActivityBehaviour;
-import org.jbpm.activity.ActivityExecution;
-import org.jbpm.activity.ExternalActivityBehaviour;
-import org.jbpm.client.ClientProcessDefinition;
-import org.jbpm.client.ClientProcessInstance;
+import org.jbpm.api.Execution;
+import org.jbpm.api.activity.ActivityBehaviour;
+import org.jbpm.api.activity.ActivityExecution;
+import org.jbpm.api.activity.ExternalActivityBehaviour;
+import org.jbpm.api.client.ClientProcessDefinition;
+import org.jbpm.api.client.ClientProcessInstance;
import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder;
import org.jbpm.test.BaseJbpmTestCase;
Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ScopeVariableDeclarationTest.java
===================================================================
--- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ScopeVariableDeclarationTest.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ScopeVariableDeclarationTest.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -24,12 +24,12 @@
import java.util.HashMap;
import java.util.Map;
-import org.jbpm.activity.ActivityExecution;
-import org.jbpm.activity.ExternalActivityBehaviour;
-import org.jbpm.client.ClientExecution;
-import org.jbpm.client.ClientProcessDefinition;
-import org.jbpm.model.Activity;
-import org.jbpm.model.OpenExecution;
+import org.jbpm.api.activity.ActivityExecution;
+import org.jbpm.api.activity.ExternalActivityBehaviour;
+import org.jbpm.api.client.ClientExecution;
+import org.jbpm.api.client.ClientProcessDefinition;
+import org.jbpm.api.model.Activity;
+import org.jbpm.api.model.OpenExecution;
import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder;
import org.jbpm.pvm.internal.wire.descriptor.StringDescriptor;
import org.jbpm.test.BaseJbpmTestCase;
Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ScopeVariableTest.java
===================================================================
--- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ScopeVariableTest.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ScopeVariableTest.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,12 +23,12 @@
import java.util.Map;
-import org.jbpm.JbpmException;
-import org.jbpm.activity.ActivityExecution;
-import org.jbpm.activity.ExternalActivityBehaviour;
-import org.jbpm.client.ClientExecution;
-import org.jbpm.client.ClientProcessDefinition;
-import org.jbpm.model.OpenExecution;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.activity.ActivityExecution;
+import org.jbpm.api.activity.ExternalActivityBehaviour;
+import org.jbpm.api.client.ClientExecution;
+import org.jbpm.api.client.ClientProcessDefinition;
+import org.jbpm.api.model.OpenExecution;
import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder;
import org.jbpm.test.BaseJbpmTestCase;
Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/SubProcessTest.java
===================================================================
--- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/SubProcessTest.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/SubProcessTest.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,11 +23,11 @@
import java.util.Map;
-import org.jbpm.activity.ActivityBehaviour;
-import org.jbpm.activity.ActivityExecution;
-import org.jbpm.activity.ExternalActivityBehaviour;
-import org.jbpm.client.ClientExecution;
-import org.jbpm.client.ClientProcessDefinition;
+import org.jbpm.api.activity.ActivityBehaviour;
+import org.jbpm.api.activity.ActivityExecution;
+import org.jbpm.api.activity.ExternalActivityBehaviour;
+import org.jbpm.api.client.ClientExecution;
+import org.jbpm.api.client.ClientProcessDefinition;
import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder;
import org.jbpm.pvm.internal.model.ExecutionImpl;
import org.jbpm.test.BaseJbpmTestCase;
Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/TransitionBasedConcurrencyTest.java
===================================================================
--- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/TransitionBasedConcurrencyTest.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/TransitionBasedConcurrencyTest.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -5,15 +5,15 @@
import java.util.List;
import java.util.Map;
-import org.jbpm.Execution;
-import org.jbpm.activity.ActivityBehaviour;
-import org.jbpm.activity.ActivityExecution;
-import org.jbpm.activity.ExternalActivityBehaviour;
-import org.jbpm.client.ClientExecution;
-import org.jbpm.client.ClientProcessDefinition;
-import org.jbpm.model.Activity;
-import org.jbpm.model.OpenExecution;
-import org.jbpm.model.Transition;
+import org.jbpm.api.Execution;
+import org.jbpm.api.activity.ActivityBehaviour;
+import org.jbpm.api.activity.ActivityExecution;
+import org.jbpm.api.activity.ExternalActivityBehaviour;
+import org.jbpm.api.client.ClientExecution;
+import org.jbpm.api.client.ClientProcessDefinition;
+import org.jbpm.api.model.Activity;
+import org.jbpm.api.model.OpenExecution;
+import org.jbpm.api.model.Transition;
import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder;
import org.jbpm.pvm.internal.model.ExecutionImpl;
import org.jbpm.test.BaseJbpmTestCase;
Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/TransitionEventsTest.java
===================================================================
--- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/TransitionEventsTest.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/TransitionEventsTest.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -24,11 +24,11 @@
import java.util.ArrayList;
import java.util.List;
-import org.jbpm.client.ClientExecution;
-import org.jbpm.client.ClientProcessDefinition;
-import org.jbpm.listener.EventListener;
-import org.jbpm.listener.EventListenerExecution;
-import org.jbpm.model.Event;
+import org.jbpm.api.client.ClientExecution;
+import org.jbpm.api.client.ClientProcessDefinition;
+import org.jbpm.api.listener.EventListener;
+import org.jbpm.api.listener.EventListenerExecution;
+import org.jbpm.api.model.Event;
import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder;
import org.jbpm.test.BaseJbpmTestCase;
Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/VariableTest.java
===================================================================
--- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/VariableTest.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/VariableTest.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -26,11 +26,11 @@
import java.util.Map;
import java.util.Set;
-import org.jbpm.activity.ActivityExecution;
-import org.jbpm.activity.ExternalActivityBehaviour;
-import org.jbpm.client.ClientExecution;
-import org.jbpm.client.ClientProcessDefinition;
-import org.jbpm.client.ClientProcessInstance;
+import org.jbpm.api.activity.ActivityExecution;
+import org.jbpm.api.activity.ExternalActivityBehaviour;
+import org.jbpm.api.client.ClientExecution;
+import org.jbpm.api.client.ClientProcessDefinition;
+import org.jbpm.api.client.ClientProcessInstance;
import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder;
import org.jbpm.test.BaseJbpmTestCase;
Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/WaitState.java
===================================================================
--- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/WaitState.java 2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/WaitState.java 2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,8 +23,8 @@
import java.util.Map;
-import org.jbpm.activity.ActivityExecution;
-import org.jbpm.activity.ExternalActivityBehaviour;
+import org.jbpm.api.activity.ActivityExecution;
+import org.jbpm.api.activity.ExternalActivityBehaviour;
/**
* @author Tom Baeyens
17 years
JBoss JBPM SVN: r4569 - jbpm4/branches.
by do-not-reply@jboss.org
Author: tom.baeyens(a)jboss.com
Date: 2009-04-16 14:39:40 -0400 (Thu, 16 Apr 2009)
New Revision: 4569
Removed:
jbpm4/branches/tbaeyens/
Log:
deleting personal tbaeyens branch
17 years
JBoss JBPM SVN: r4568 - in jbpm4/trunk/modules: pvm/src/main/java/org/jbpm/pvm/internal/query and 3 other directories.
by do-not-reply@jboss.org
Author: tom.baeyens(a)jboss.com
Date: 2009-04-16 12:28:23 -0400 (Thu, 16 Apr 2009)
New Revision: 4568
Added:
jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/mgmt/
jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/mgmt/JobQueryTest.java
Modified:
jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/xml/JpdlParser.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/JobQueryImpl.java
jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch05-Jpdl.xml
Log:
JBPM-2169 timer, messages and error job queries
Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/xml/JpdlParser.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/xml/JpdlParser.java 2009-04-16 13:51:40 UTC (rev 4567)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/xml/JpdlParser.java 2009-04-16 16:28:23 UTC (rev 4568)
@@ -227,6 +227,11 @@
activity.setType(activityBinding.getTagName());
activityBinding.parseName(element, activity, parse);
activityBinding.parseTransitions(element, activity, parse, this);
+
+ if (XmlUtil.attributeBoolean(element, "async", false, parse, Boolean.FALSE)) {
+ activity.setExecutionAsync(true);
+ }
+
ActivityBehaviour activityBehaviour = (ActivityBehaviour) activityBinding.parse(element, parse, this);
activity.setBehaviour(activityBehaviour);
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/JobQueryImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/JobQueryImpl.java 2009-04-16 13:51:40 UTC (rev 4567)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/JobQueryImpl.java 2009-04-16 16:28:23 UTC (rev 4568)
@@ -67,6 +67,8 @@
if (exception) {
appendWhereClause("j.exception is not null ", hql);
+ } else {
+ appendWhereClause("j.exception is null ", hql);
}
return hql.toString();
Added: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/mgmt/JobQueryTest.java
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/mgmt/JobQueryTest.java (rev 0)
+++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/mgmt/JobQueryTest.java 2009-04-16 16:28:23 UTC (rev 4568)
@@ -0,0 +1,107 @@
+package org.jbpm.test.mgmt;
+
+import java.util.List;
+
+import org.jbpm.job.Job;
+import org.jbpm.test.JbpmTestCase;
+
+
+public class JobQueryTest extends JbpmTestCase {
+
+ public void testQueryOutstandingTimers() {
+ deployJpdlXmlString(
+ "<process name='TimerQueryTest' >" +
+ " <start>" +
+ " <transition to='t' />" +
+ " </start>" +
+ " <state name='t'>" +
+ " <timer duedate='20 seconds' transition='timeout' />" +
+ " <transition name='timeout' to='t' />" +
+ " </state>" +
+ "</process>"
+ );
+
+ executionService.startProcessInstanceByKey("TimerQueryTest");
+ executionService.startProcessInstanceByKey("TimerQueryTest");
+ executionService.startProcessInstanceByKey("TimerQueryTest");
+ executionService.startProcessInstanceByKey("TimerQueryTest");
+
+ List<Job> timers = managementService.createJobQuery()
+ .timers()
+ .list();
+
+ assertEquals(4, timers.size());
+ }
+
+ public void testQueryBacklogMessages() {
+ deployJpdlXmlString(
+ "<process name='MessagesQueryTest' >" +
+ " <start>" +
+ " <transition to='t' />" +
+ " </start>" +
+ " <state name='t' async='true' />" +
+ "</process>"
+ );
+
+ executionService.startProcessInstanceByKey("MessagesQueryTest");
+ executionService.startProcessInstanceByKey("MessagesQueryTest");
+ executionService.startProcessInstanceByKey("MessagesQueryTest");
+ executionService.startProcessInstanceByKey("MessagesQueryTest");
+
+ List<Job> timers = managementService.createJobQuery()
+ .messages()
+ .list();
+
+ assertEquals(4, timers.size());
+ }
+
+
+ public static class Dog {
+ public void bark() {
+ throw new RuntimeException("wooof");
+ }
+ }
+ public void testErrorMessages() {
+ deployJpdlXmlString(
+ "<process name='ErrorMsgQueryTest' >" +
+ " <start>" +
+ " <transition to='t' />" +
+ " </start>" +
+ " <java name='t' " +
+ " async='true' " +
+ " class='"+Dog.class.getName()+"'" +
+ " method='bark'>" +
+ " </java>" +
+ "</process>"
+ );
+
+ executionService.startProcessInstanceByKey("ErrorMsgQueryTest");
+ executionService.startProcessInstanceByKey("ErrorMsgQueryTest");
+ executionService.startProcessInstanceByKey("ErrorMsgQueryTest");
+
+
+ List<Job> messages = managementService.createJobQuery()
+ .messages()
+ .list();
+
+ assertEquals(3, messages.size());
+
+ managementService.executeJob(messages.get(0).getDbid());
+ managementService.executeJob(messages.get(0).getDbid());
+ managementService.executeJob(messages.get(0).getDbid());
+
+ List<Job> errorJobs = managementService.createJobQuery()
+ .exception()
+ .list();
+
+ assertEquals(1, errorJobs.size());
+
+ assertTextPresent("wooof", errorJobs.get(0).getException());
+
+ messages = managementService.createJobQuery()
+ .messages()
+ .list();
+
+ assertEquals(2, messages.size());
+ }
+}
Property changes on: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/mgmt/JobQueryTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch05-Jpdl.xml
===================================================================
--- jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch05-Jpdl.xml 2009-04-16 13:51:40 UTC (rev 4567)
+++ jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch05-Jpdl.xml 2009-04-16 16:28:23 UTC (rev 4568)
@@ -1838,6 +1838,16 @@
event(end) on process(EventListener)]</programlisting>
</section>
+ <section id="timer">
+ <title><literal>timer</literal> </title>
+ <para>A timer can be specified in <literal>state</literal>s,
+ <literal>task</literal>s and <literal>super-state</literal>s.
+ Timers are created when the activity is entered and cancelled
+ then the activity is left. When the duedate arrives before the
+ activity ends, then the
+ </para>
+ </section>
+
<section id="usercode">
<title>User code</title>
<para>Various elements in the jPDL process language refer to a an
17 years
JBoss JBPM SVN: r4567 - projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/v2/process.
by do-not-reply@jboss.org
Author: heiko.braun(a)jboss.com
Date: 2009-04-16 09:51:40 -0400 (Thu, 16 Apr 2009)
New Revision: 4567
Modified:
projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/v2/process/DefinitionListView.java
Log:
Cleanup
Modified: projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/v2/process/DefinitionListView.java
===================================================================
--- projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/v2/process/DefinitionListView.java 2009-04-16 13:31:50 UTC (rev 4566)
+++ projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/v2/process/DefinitionListView.java 2009-04-16 13:51:40 UTC (rev 4567)
@@ -23,17 +23,18 @@
import com.google.gwt.user.client.ui.ClickListener;
import com.google.gwt.user.client.ui.Widget;
-import com.google.gwt.user.client.ui.ChangeListener;
-import com.google.gwt.user.client.ui.FocusListener;
-import com.google.gwt.user.client.Window;
+import com.google.gwt.user.client.ui.Button;
import com.mvc4g.client.Controller;
+import com.mvc4g.client.Event;
import com.mvc4g.client.ViewInterface;
-import com.mvc4g.client.Event;
-import org.gwt.mosaic.ui.client.*;
+import org.gwt.mosaic.ui.client.ListBox;
+import org.gwt.mosaic.ui.client.ToolBar;
+import org.gwt.mosaic.ui.client.ToolButton;
+import org.gwt.mosaic.ui.client.MessageBox;
+import org.gwt.mosaic.ui.client.util.ButtonHelper;
import org.gwt.mosaic.ui.client.layout.BoxLayout;
import org.gwt.mosaic.ui.client.layout.BoxLayoutData;
import org.gwt.mosaic.ui.client.layout.LayoutPanel;
-import org.gwt.mosaic.ui.client.layout.FillLayoutData;
import org.gwt.mosaic.ui.client.list.DefaultListModel;
import org.jboss.bpm.console.client.model.ProcessDefinitionRef;
@@ -110,7 +111,7 @@
toolBox.setPadding(0);
toolBox.setWidgetSpacing(5);
//toolBox.setLayout(new BoxLayout(BoxLayout.Orientation.VERTICAL));
-
+
final ToolBar toolBar = new ToolBar();
toolBar.add(
new ToolButton("Refresh", new ClickListener() {
@@ -127,9 +128,13 @@
toolBar.addSeparator();
toolBar.add(
- new ToolButton("Test", new ClickListener() {
+ new ToolButton("View Instances", new ClickListener() {
public void onClick(Widget sender) {
- System.out.println(listBox.getSelectedIndex());
+ int index = listBox.getSelectedIndex();
+ if(index==-1)
+ MessageBox.alert("Missing selection", "Please select a process");
+ else
+ System.out.println(index);
}
}
)
17 years
JBoss JBPM SVN: r4566 - in projects/gwt-console/branches/hbraun: plugin-api/src/main/java/org/jboss/bpm/console/client and 7 other directories.
by do-not-reply@jboss.org
Author: heiko.braun(a)jboss.com
Date: 2009-04-16 09:31:50 -0400 (Thu, 16 Apr 2009)
New Revision: 4566
Added:
projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/v2/MainLayout.java
projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/v2/process/DefinitionListView.java
projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/v2/process/LoadDefinitionsAction.java
Removed:
projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/process/
projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/report/
projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/task/
projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/v2/MainView.java
projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/v2/MainViewAction.java
Modified:
projects/gwt-console/branches/hbraun/plugin-api/pom.xml
projects/gwt-console/branches/hbraun/plugin-api/src/main/java/org/jboss/bpm/console/client/ApplicationContext.java
projects/gwt-console/branches/hbraun/plugin-api/src/main/java/org/jboss/bpm/console/client/Editor.java
projects/gwt-console/branches/hbraun/plugin-api/src/main/java/org/jboss/bpm/console/client/Menu.java
projects/gwt-console/branches/hbraun/plugin-api/src/main/java/org/jboss/bpm/console/client/View.java
projects/gwt-console/branches/hbraun/plugin-api/src/main/java/org/jboss/bpm/console/client/Workspace.java
projects/gwt-console/branches/hbraun/plugin-api/src/main/java/org/jboss/bpm/console/client/model/DTOParser.java
projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/Header.java
projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/MainView.java
projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/v2/LoginView.java
projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/v2/process/ProcessEditor.java
projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/v2/process/ProcessEditorNavigation.java
projects/gwt-console/branches/hbraun/war/src/main/resources/mvc4g-conf.xml
projects/gwt-console/branches/hbraun/war/src/main/resources/org/jboss/bpm/console/public/console.css
projects/gwt-console/branches/hbraun/war/src/main/resources/org/jboss/bpm/console/workspace-default.cfg
Log:
Remove legacy code. Implement ProcessEditor list view
Modified: projects/gwt-console/branches/hbraun/plugin-api/pom.xml
===================================================================
--- projects/gwt-console/branches/hbraun/plugin-api/pom.xml 2009-04-16 13:09:58 UTC (rev 4565)
+++ projects/gwt-console/branches/hbraun/plugin-api/pom.xml 2009-04-16 13:31:50 UTC (rev 4566)
@@ -66,7 +66,24 @@
<artifactId>gwt-mosaic-gwtx</artifactId>
</dependency>
+ <dependency>
+ <groupId>com.googlecode.mvc4g</groupId>
+ <artifactId>mvc4g</artifactId>
+ </dependency>
+ <!-- 3rd party -->
+
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-configuration</groupId>
+ <artifactId>commons-configuration</artifactId>
+ </dependency>
+
+
</dependencies>
<build>
Modified: projects/gwt-console/branches/hbraun/plugin-api/src/main/java/org/jboss/bpm/console/client/ApplicationContext.java
===================================================================
--- projects/gwt-console/branches/hbraun/plugin-api/src/main/java/org/jboss/bpm/console/client/ApplicationContext.java 2009-04-16 13:09:58 UTC (rev 4565)
+++ projects/gwt-console/branches/hbraun/plugin-api/src/main/java/org/jboss/bpm/console/client/ApplicationContext.java 2009-04-16 13:31:50 UTC (rev 4566)
@@ -21,10 +21,10 @@
*/
package org.jboss.bpm.console.client;
-import com.gwtext.client.widgets.Viewport;
+import com.mvc4g.client.Controller;
/**
- * Provides context information to console compoments and plugins.
+ * Provides context information to console components and plugins.
*
* @author Heiko.Braun <heiko.braun(a)jboss.com>
*/
@@ -39,5 +39,7 @@
Authentication getAuthentication();
ConsoleConfig getConfig();
-
+
+ Controller getController();
+
}
Modified: projects/gwt-console/branches/hbraun/plugin-api/src/main/java/org/jboss/bpm/console/client/Editor.java
===================================================================
--- projects/gwt-console/branches/hbraun/plugin-api/src/main/java/org/jboss/bpm/console/client/Editor.java 2009-04-16 13:09:58 UTC (rev 4565)
+++ projects/gwt-console/branches/hbraun/plugin-api/src/main/java/org/jboss/bpm/console/client/Editor.java 2009-04-16 13:31:50 UTC (rev 4566)
@@ -21,27 +21,36 @@
*/
package org.jboss.bpm.console.client;
-import com.gwtext.client.widgets.Panel;
+import com.mvc4g.client.Controller;
+import org.gwt.mosaic.ui.client.layout.LayoutPanel;
+import org.gwt.mosaic.ui.client.layout.BorderLayout;
-import java.util.List;
-import java.util.ArrayList;
/**
- * An editor can be plugged into a {@link org.jboss.bpm.console.client.Workspace}
- *
+ * An editor can be plugged into a {@link org.jboss.bpm.console.client.Workspace}.
+ * and aggregates {@link org.jboss.bpm.console.client.View}'s.<br>
+ * View's are maintained through a {@link com.mvc4g.client.Controller}.
+ * <p/>
+ * Editor's can communicate though a hirarchical controller chain.
+ * <p/>
+ * Each Editor uses a {@link org.gwt.mosaic.ui.client.layout.BorderLayout} by default.
+ *
* @author Heiko.Braun <heiko.braun(a)jboss.com>
*/
-public abstract class Editor extends Panel
+public abstract class Editor extends LayoutPanel
{
protected ApplicationContext appContext;
- protected List<String> managedTabs;
- public Editor(ApplicationContext applicationContext)
+ protected Controller controller;
+
+ public Editor(ApplicationContext appContext)
{
- super();
- this.appContext = applicationContext;
- this.managedTabs = new ArrayList<String>();
- this.setPaddings(10);
+ super( new BorderLayout() );
+ this.appContext = appContext;
+
+ // hmvc controller chain.
+ this.controller = new Controller();
+ this.controller.setParent(appContext.getController());
}
public abstract String getEditorId();
@@ -49,19 +58,22 @@
public abstract String getTitle();
public abstract String getIconCSS();
+
+ public abstract MenuSection provideMenuSection();
- public abstract MenuSection provideMenuSection();
-
+ @Deprecated
public boolean hasView(String viewId)
{
return false;
}
+ @Deprecated
public void showView(String viewId)
{
appContext.getWorkpace().showEditor(viewId);
}
+ @Deprecated
public void addView(View view, boolean closable)
{
/*String tabId = view.getViewId() + ".tab";
@@ -75,17 +87,6 @@
appContext.getWorkpace().setActiveTab(view.getId());*/
System.out.println("*** addView should be re-implemented ***");
-
- managedTabs.add(view.getId());
-
+
}
-
- class WrapperPanel extends Panel
- {
- public WrapperPanel(String id)
- {
- super();
- setId(id);
- }
- }
}
Modified: projects/gwt-console/branches/hbraun/plugin-api/src/main/java/org/jboss/bpm/console/client/Menu.java
===================================================================
--- projects/gwt-console/branches/hbraun/plugin-api/src/main/java/org/jboss/bpm/console/client/Menu.java 2009-04-16 13:09:58 UTC (rev 4565)
+++ projects/gwt-console/branches/hbraun/plugin-api/src/main/java/org/jboss/bpm/console/client/Menu.java 2009-04-16 13:31:50 UTC (rev 4566)
@@ -26,6 +26,8 @@
import org.gwt.mosaic.ui.client.layout.BoxLayout;
import org.gwt.mosaic.ui.client.layout.BoxLayoutData;
import org.gwt.mosaic.ui.client.layout.LayoutPanel;
+import com.mvc4g.client.ViewInterface;
+import com.mvc4g.client.Controller;
/**
* The main menu on the left hand.
@@ -33,15 +35,14 @@
*
* @author Heiko.Braun <heiko.braun(a)jboss.com>
*/
-public class Menu extends LayoutPanel
-{
- private final ApplicationContext appContext;
+public class Menu extends LayoutPanel implements ViewInterface
+{
private StackLayoutPanel stack;
+ private Controller controller;
- public Menu(final ApplicationContext appContext)
+ public Menu()
{
super(new BoxLayout(BoxLayout.Orientation.VERTICAL));
- this.appContext = appContext;
this.setWidgetSpacing(5);
@@ -55,4 +56,8 @@
this.stack.add(menuSection, menuSection.getMenuTitle());
}
+ public void setController(Controller controller)
+ {
+ this.controller = controller;
+ }
}
Modified: projects/gwt-console/branches/hbraun/plugin-api/src/main/java/org/jboss/bpm/console/client/View.java
===================================================================
--- projects/gwt-console/branches/hbraun/plugin-api/src/main/java/org/jboss/bpm/console/client/View.java 2009-04-16 13:09:58 UTC (rev 4565)
+++ projects/gwt-console/branches/hbraun/plugin-api/src/main/java/org/jboss/bpm/console/client/View.java 2009-04-16 13:31:50 UTC (rev 4566)
@@ -22,17 +22,21 @@
package org.jboss.bpm.console.client;
import com.gwtext.client.widgets.Panel;
+import com.mvc4g.client.ViewInterface;
+import com.mvc4g.client.Controller;
/**
* View's are {@link org.jboss.bpm.console.client.Editor} components
*
* @author Heiko.Braun <heiko.braun(a)jboss.com>
*/
-public abstract class View extends Panel
+public abstract class View extends Panel implements ViewInterface
{
protected ApplicationContext mainMenu;
+ protected Controller controller;
+
protected View(ApplicationContext main)
{
super();
@@ -43,4 +47,10 @@
public abstract String getViewId();
public abstract String getIconCSS();
+
+
+ public void setController(Controller controller)
+ {
+ this.controller = controller;
+ }
}
Modified: projects/gwt-console/branches/hbraun/plugin-api/src/main/java/org/jboss/bpm/console/client/Workspace.java
===================================================================
--- projects/gwt-console/branches/hbraun/plugin-api/src/main/java/org/jboss/bpm/console/client/Workspace.java 2009-04-16 13:09:58 UTC (rev 4565)
+++ projects/gwt-console/branches/hbraun/plugin-api/src/main/java/org/jboss/bpm/console/client/Workspace.java 2009-04-16 13:31:50 UTC (rev 4566)
@@ -23,6 +23,8 @@
import org.gwt.mosaic.ui.client.DeckLayoutPanel;
import org.gwt.mosaic.ui.client.layout.LayoutPanel;
+import com.mvc4g.client.ActionInterface;
+import com.mvc4g.client.Controller;
/**
* Maintains {@link Editor}'s
@@ -31,22 +33,15 @@
*/
public class Workspace extends DeckLayoutPanel
{
- protected ApplicationContext view;
+ protected ApplicationContext appContext;
private Menu menu;
-
+
public Workspace(Menu menu)
{
super();
this.menu = menu;
this.setPadding(5);
-
- }
- private EditorDeck createDeck(Editor editor)
- {
- EditorDeck deck = new EditorDeck(editor);
- deck.add(editor);
- return deck;
}
public void addEditor(Editor editor, boolean closeable)
@@ -56,7 +51,7 @@
// Editor deck
EditorDeck deck = createDeck(editor);
- deck.index = this.getWidgetCount();
+ deck.index = this.getWidgetCount();
this.add(deck);
}
@@ -69,10 +64,17 @@
{
EditorDeck deck = findEditor(id);
if(null==deck)
- throw new IllegalArgumentException("No such editor: " +id);
+ throw new IllegalArgumentException("No such editor: " +id);
this.showWidget(deck.index);
}
+ private EditorDeck createDeck(Editor editor)
+ {
+ EditorDeck deck = new EditorDeck(editor);
+ deck.add(editor);
+ return deck;
+ }
+
private EditorDeck findEditor(String id)
{
EditorDeck match = null;
@@ -85,7 +87,7 @@
break;
}
}
-
+
return match;
}
Modified: projects/gwt-console/branches/hbraun/plugin-api/src/main/java/org/jboss/bpm/console/client/model/DTOParser.java
===================================================================
--- projects/gwt-console/branches/hbraun/plugin-api/src/main/java/org/jboss/bpm/console/client/model/DTOParser.java 2009-04-16 13:09:58 UTC (rev 4565)
+++ projects/gwt-console/branches/hbraun/plugin-api/src/main/java/org/jboss/bpm/console/client/model/DTOParser.java 2009-04-16 13:31:50 UTC (rev 4566)
@@ -21,15 +21,15 @@
*/
package org.jboss.bpm.console.client.model;
+import com.google.gwt.core.client.JavaScriptObject;
import com.google.gwt.json.client.*;
+import org.jboss.bpm.console.client.model.jbpm3.TokenReference;
import org.jboss.bpm.console.client.util.ConsoleLog;
-import org.jboss.bpm.console.client.model.jbpm3.TokenReference;
import org.jboss.bpm.console.client.util.JSONWalk;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
-import java.util.Map;
/**
* TODO: run integrated (gwt-console-server) test
@@ -38,9 +38,20 @@
*/
public class DTOParser
{
- public static ProcessDefinitionRef parseProcessDefinition(String json)
+ public static List<ProcessDefinitionRef> parseProcessDefinitions(JavaScriptObject jso)
{
- JSONValue root = JSONParser.parse(json);
+ List<ProcessDefinitionRef> results = new ArrayList<ProcessDefinitionRef>();
+
+ JSONArray arr = JSONWalk.on( new JSONObject(jso)).next("definitions").asArray();
+ for(int i=0; i<arr.size(); i++)
+ {
+ results.add(parseProcessDefinition(arr.get(i)));
+ }
+ return results;
+ }
+
+ public static ProcessDefinitionRef parseProcessDefinition(JSONValue root)
+ {
String id = JSONWalk.on(root).next("id").asString();
Long version = JSONWalk.on(root).next("version").asLong();
String name = JSONWalk.on(root).next("name").asString();
@@ -48,6 +59,12 @@
return new ProcessDefinitionRef(id, name, version);
}
+ public static ProcessDefinitionRef parseProcessDefinition(String json)
+ {
+ JSONValue root = JSONParser.parse(json);
+ return parseProcessDefinition(root);
+ }
+
public static List<String> parseRolesAssigned(String json)
{
// parse roles
Modified: projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/Header.java
===================================================================
--- projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/Header.java 2009-04-16 13:09:58 UTC (rev 4565)
+++ projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/Header.java 2009-04-16 13:31:50 UTC (rev 4566)
@@ -22,15 +22,18 @@
package org.jboss.bpm.console.client;
import com.google.gwt.user.client.ui.*;
+import com.mvc4g.client.Controller;
+import com.mvc4g.client.ViewInterface;
import java.util.List;
/**
* @author Heiko.Braun <heiko.braun(a)jboss.com>
*/
-public class Header extends HorizontalPanel
+public class Header extends HorizontalPanel implements ViewInterface
{
private ApplicationContext appContext;
+ private Controller controller;
public final static String ID = "org.jboss.bpm.headerPanel";
@@ -72,4 +75,10 @@
this.add(p);
}
+
+
+ public void setController(Controller controller)
+ {
+ this.controller = controller;
+ }
}
Modified: projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/MainView.java
===================================================================
--- projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/MainView.java 2009-04-16 13:09:58 UTC (rev 4565)
+++ projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/MainView.java 2009-04-16 13:31:50 UTC (rev 4566)
@@ -25,6 +25,7 @@
import com.google.gwt.user.client.ui.Composite;
import com.google.gwt.user.client.ui.HTML;
import com.google.gwt.user.client.ui.RootPanel;
+import com.mvc4g.client.Controller;
import org.gwt.mosaic.ui.client.MessageBox;
import org.gwt.mosaic.ui.client.Viewport;
import org.gwt.mosaic.ui.client.layout.BorderLayout;
@@ -65,6 +66,12 @@
RootPanel.get().add(viewport);
}
+
+ public Controller getController()
+ {
+ throw new RuntimeException("NYI");
+ }
+
private LayoutPanel createLayout()
{
final LayoutPanel layoutPanel = new LayoutPanel(new BorderLayout());
@@ -74,16 +81,13 @@
layoutPanel.add(header, new BorderLayoutData(Region.NORTH, 50));
// menu
- menu = new Menu(this);
+ menu = new Menu();
layoutPanel.add(menu, new BorderLayoutData(Region.WEST, 200));
// workspace
workspace = createWorkspace(layoutPanel);
layoutPanel.add(workspace, new BorderLayoutData(Region.CENTER, false));
- //layoutPanel.add(b2, new BorderLayoutData(Region.SOUTH, 10, 200));
- //layoutPanel.add(b3, new BorderLayoutData(Region.EAST, 10, 200));
-
return layoutPanel;
}
Modified: projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/v2/LoginView.java
===================================================================
--- projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/v2/LoginView.java 2009-04-16 13:09:58 UTC (rev 4565)
+++ projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/v2/LoginView.java 2009-04-16 13:31:50 UTC (rev 4566)
@@ -51,8 +51,6 @@
{
public final static String NAME = "loginView";
- private Controller controller;
-
private ConsoleConfig config;
private URLBuilder urlBuilder;
private Authentication auth;
@@ -63,6 +61,7 @@
public final static String[] KNOWN_ROLES = {"admin", "manager", "user"};
+ private Controller controller;
public LoginView()
{
@@ -149,10 +148,8 @@
// display main console
window.hide();
- // assemble main view
- controller.handleEvent( new Event("loginSuccessful",
- new BootstrapEvent(auth, urlBuilder, config))
- );
+ // assemble main layout
+ new MainLayout(controller, auth, urlBuilder, config);
}
public void onLoginFailed(Request request, Throwable t)
Copied: projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/v2/MainLayout.java (from rev 4556, projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/v2/MainView.java)
===================================================================
--- projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/v2/MainLayout.java (rev 0)
+++ projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/v2/MainLayout.java 2009-04-16 13:31:50 UTC (rev 4566)
@@ -0,0 +1,147 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.jboss.bpm.console.client.v2;
+
+import com.google.gwt.core.client.GWT;
+import com.google.gwt.user.client.ui.Composite;
+import com.google.gwt.user.client.ui.HTML;
+import com.google.gwt.user.client.ui.RootPanel;
+import com.mvc4g.client.Controller;
+import org.gwt.mosaic.ui.client.MessageBox;
+import org.gwt.mosaic.ui.client.Viewport;
+import org.gwt.mosaic.ui.client.InfoPanel;
+import org.gwt.mosaic.ui.client.layout.BorderLayout;
+import static org.gwt.mosaic.ui.client.layout.BorderLayout.Region;
+import org.gwt.mosaic.ui.client.layout.BorderLayoutData;
+import org.gwt.mosaic.ui.client.layout.LayoutPanel;
+import org.jboss.bpm.console.client.*;
+
+/**
+ * The main composite that assembles the gwt console application.
+ *
+ * @author Heiko.Braun <heiko.braun(a)jboss.com>
+ */
+public class MainLayout extends Composite implements ApplicationContext
+{
+
+ public final static String NAME = "mainLayout";
+
+ private HTML status = new HTML();
+ private Header header;
+ private Menu menu;
+ private Workspace workspace;
+
+ private URLBuilder urlBuilder;
+ private Authentication auth;
+
+ private ConsoleConfig config;
+
+ private Controller controller;
+
+ public MainLayout(Controller controller, Authentication auth, URLBuilder urlBuilder, ConsoleConfig config)
+ {
+ this.controller = controller;
+ this.auth = auth;
+ this.config = config;
+ this.urlBuilder = urlBuilder;
+
+ display();
+ }
+
+ public void display()
+ {
+ Viewport viewport = new Viewport();
+
+ LayoutPanel layout = createLayout();
+ viewport.add(layout);
+
+ RootPanel.get().add(viewport);
+ }
+
+ private LayoutPanel createLayout()
+ {
+ final LayoutPanel layoutPanel = new LayoutPanel(new BorderLayout());
+
+ // header
+ header = new Header(this, auth.getUsername(), auth.getRolesAssigned());
+ layoutPanel.add(header, new BorderLayoutData(Region.NORTH, 50));
+
+ // menu
+ menu = new Menu();
+ layoutPanel.add(menu, new BorderLayoutData(Region.WEST, 200));
+
+ // workspace
+ workspace = createWorkspace();
+ layoutPanel.add(workspace, new BorderLayoutData(Region.CENTER, false));
+
+ return layoutPanel;
+ }
+
+ private Workspace createWorkspace()
+ {
+ Workspace workspace = new Workspace(menu);
+ WorkspaceLauncher launcher = GWT.create(WorkspaceLauncher.class);
+ launcher.launch(this, workspace); // calls Workspace.addEditor()
+ return workspace;
+ }
+
+ // ---- ApplicationContext interface ----
+
+
+ public Controller getController()
+ {
+ return this.controller;
+ }
+
+ public URLBuilder getUrlBuilder()
+ {
+ return this.urlBuilder;
+ }
+
+ public void displayMessage(final String message, final boolean isError)
+ {
+ status.setText(message);
+
+ if(isError)
+ MessageBox.error("Error", message);
+ else
+ {
+ InfoPanel.show("", message, "");
+ }
+ }
+
+ public Authentication getAuthentication()
+ {
+ return auth;
+ }
+
+ public ConsoleConfig getConfig()
+ {
+ return config;
+ }
+
+ public Workspace getWorkpace()
+ {
+ return workspace;
+ }
+}
+
Deleted: projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/v2/MainView.java
===================================================================
--- projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/v2/MainView.java 2009-04-16 13:09:58 UTC (rev 4565)
+++ projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/v2/MainView.java 2009-04-16 13:31:50 UTC (rev 4566)
@@ -1,213 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file 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.jboss.bpm.console.client.v2;
-
-import com.google.gwt.core.client.GWT;
-import com.google.gwt.user.client.ui.Composite;
-import com.google.gwt.user.client.ui.HTML;
-import com.google.gwt.user.client.ui.RootPanel;
-import com.mvc4g.client.ViewInterface;
-import com.mvc4g.client.Controller;
-import org.gwt.mosaic.ui.client.MessageBox;
-import org.gwt.mosaic.ui.client.Viewport;
-import org.gwt.mosaic.ui.client.layout.BorderLayout;
-import static org.gwt.mosaic.ui.client.layout.BorderLayout.Region;
-import org.gwt.mosaic.ui.client.layout.BorderLayoutData;
-import org.gwt.mosaic.ui.client.layout.LayoutPanel;
-import org.jboss.bpm.console.client.util.ConsoleLog;
-import org.jboss.bpm.console.client.*;
-
-/**
- * The main composite that assembles the gwt console application.
- *
- * @author Heiko.Braun <heiko.braun(a)jboss.com>
- */
-public class MainView extends Composite implements ApplicationContext, ViewInterface
-{
-
- public final static String NAME = "mainView";
-
- private HTML status = new HTML();
- private Header header;
- private Menu menu;
- private Workspace workspace;
-
- private URLBuilder urlBuilder;
- private Authentication auth;
-
- private ConsoleConfig config;
-
- private Controller controller;
-
- private boolean isInitialized;
-
- public void init(Authentication auth, URLBuilder urlBuilder, ConsoleConfig config)
- {
- this.auth = auth;
- this.config = config;
- this.urlBuilder = urlBuilder;
-
- isInitialized = true;
- }
-
- public void display()
- {
- if(!isInitialized)
- throw new IllegalStateException("Not initalized");
-
- Viewport viewport = new Viewport();
-
- LayoutPanel layout = createLayout();
- viewport.add(layout);
-
- RootPanel.get().add(viewport);
- }
-
- public void setController(Controller controller)
- {
- this.controller = controller;
- }
-
- private LayoutPanel createLayout()
- {
- final LayoutPanel layoutPanel = new LayoutPanel(new BorderLayout());
-
- // header
- header = new Header(this, auth.getUsername(), auth.getRolesAssigned());
- layoutPanel.add(header, new BorderLayoutData(Region.NORTH, 50));
-
- // menu
- menu = new Menu(this);
- layoutPanel.add(menu, new BorderLayoutData(Region.WEST, 200));
-
- // workspace
- workspace = createWorkspace(layoutPanel);
- layoutPanel.add(workspace, new BorderLayoutData(Region.CENTER, false));
-
- //layoutPanel.add(b2, new BorderLayoutData(Region.SOUTH, 10, 200));
- //layoutPanel.add(b3, new BorderLayoutData(Region.EAST, 10, 200));
-
- return layoutPanel;
- }
-
- private Workspace createWorkspace(LayoutPanel layoutPanel)
- {
- Workspace workspace = new Workspace(menu);
- WorkspaceLauncher launcher = GWT.create(WorkspaceLauncher.class);
- launcher.launch(this, workspace);
- return workspace;
- }
-
- /*private Panel createMainPanel()
- {
- Panel mainPanel = new Panel();
- mainPanel.setBorder(false);
- mainPanel.setPaddings(5); // outer most padding
- mainPanel.setLayout(new FitLayout());
- mainPanel.setWidth(UIConstants.OVERALL_WIDTH);
- mainPanel.setHeight(UIConstants.OVERALL_WIDTH);
- mainPanel.setAutoWidth(false);
- return mainPanel;
- }
-
- private void assembleMainApplication(Panel mainPanel)
- {
- Panel borderPanel = new Panel();
- borderPanel.setBorder(false);
- borderPanel.setLayout(new BorderLayout());
-
- // ------------------------------------------
-
- header = new Header(this);
- borderPanel.add(header, new BorderLayoutData(RegionPosition.NORTH));
- header.setUserInfo(auth.getUsername(), auth.getRolesAssigned());
-
- // ------------------------------------------
-
- menu = new Menu(this);
- BorderLayoutData menuData = new BorderLayoutData(RegionPosition.WEST);
- menuData.setSplit(false);
- menuData.setMinSize(UIConstants.MAIN_MENU_MIN);
- menuData.setMaxSize(UIConstants.MAIN_MENU_MAX);
- menuData.setMargins(new Margins(0, 5, 0, 0));
- borderPanel.add(menu, menuData);
-
- // ------------------------------------------
-
- workspace = new Workspace(menu);
- WorkspaceLauncher launcher = GWT.create(WorkspaceLauncher.class);
- launcher.launch(this, workspace);
-
- borderPanel.add(workspace, new BorderLayoutData(RegionPosition.CENTER));
-
- // ------------------------------------------
-
- mainPanel.add(borderPanel);
- } */
-
- public void addEditor(Editor editor)
- {
- ConsoleLog.debug("Add editor " + editor.getEditorId());
- workspace.addEditor(editor, true);
- }
-
- public boolean hasEditor(String id)
- {
- return workspace.hasEditor(id);
- }
-
- public void showEditor(String id)
- {
- workspace.showEditor(id);
- }
-
- public URLBuilder getUrlBuilder()
- {
- return this.urlBuilder;
- }
-
- public void displayMessage(final String message, final boolean isError)
- {
- status.setText(message);
-
- if(isError)
- MessageBox.error("Error", message);
- else
- MessageBox.alert("Alert", message);
- }
-
- public Authentication getAuthentication()
- {
- return auth;
- }
-
- public ConsoleConfig getConfig()
- {
- return config;
- }
-
- public Workspace getWorkpace()
- {
- return workspace;
- }
-}
-
Deleted: projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/v2/MainViewAction.java
===================================================================
--- projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/v2/MainViewAction.java 2009-04-16 13:09:58 UTC (rev 4565)
+++ projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/v2/MainViewAction.java 2009-04-16 13:31:50 UTC (rev 4566)
@@ -1,45 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file 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.jboss.bpm.console.client.v2;
-
-import com.mvc4g.client.ActionInterface;
-import com.mvc4g.client.Controller;
-import org.jboss.bpm.console.client.v2.events.BootstrapEvent;
-
-/**
- * @author Heiko.Braun <heiko.braun(a)jboss.com>
- */
-public class MainViewAction implements ActionInterface
-{
- public void execute(Controller controller, Object object)
- {
- BootstrapEvent bootstrap = (BootstrapEvent)object;
- MainView mainView = (MainView)controller.getView(MainView.NAME);
- mainView.init(
- bootstrap.getAuth(),
- bootstrap.getUrlBuilder(),
- bootstrap.getConfig()
- );
-
- mainView.display();
- }
-}
Added: projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/v2/process/DefinitionListView.java
===================================================================
--- projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/v2/process/DefinitionListView.java (rev 0)
+++ projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/v2/process/DefinitionListView.java 2009-04-16 13:31:50 UTC (rev 4566)
@@ -0,0 +1,157 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.jboss.bpm.console.client.v2.process;
+
+import com.google.gwt.user.client.ui.ClickListener;
+import com.google.gwt.user.client.ui.Widget;
+import com.google.gwt.user.client.ui.ChangeListener;
+import com.google.gwt.user.client.ui.FocusListener;
+import com.google.gwt.user.client.Window;
+import com.mvc4g.client.Controller;
+import com.mvc4g.client.ViewInterface;
+import com.mvc4g.client.Event;
+import org.gwt.mosaic.ui.client.*;
+import org.gwt.mosaic.ui.client.layout.BoxLayout;
+import org.gwt.mosaic.ui.client.layout.BoxLayoutData;
+import org.gwt.mosaic.ui.client.layout.LayoutPanel;
+import org.gwt.mosaic.ui.client.layout.FillLayoutData;
+import org.gwt.mosaic.ui.client.list.DefaultListModel;
+import org.jboss.bpm.console.client.model.ProcessDefinitionRef;
+
+import java.util.List;
+
+/**
+ * @author Heiko.Braun <heiko.braun(a)jboss.com>
+ */
+public class DefinitionListView extends LayoutPanel implements ViewInterface
+{
+ private Controller controller;
+
+ private LayoutPanel table = null;
+
+ public final static String ID = DefinitionListView.class.getName();
+
+ public DefinitionListView()
+ {
+ super();
+ setTitle("Process Definitions");
+ }
+
+ public void setController(Controller controller)
+ {
+ this.controller = controller;
+ }
+
+ private LayoutPanel createTable(List<ProcessDefinitionRef> definitions)
+ {
+ final LayoutPanel vBox = new LayoutPanel( new BoxLayout(BoxLayout.Orientation.VERTICAL));
+ vBox.setPadding(0);
+ vBox.setWidgetSpacing(0);
+
+ final ListBox<ProcessDefinitionRef> listBox =
+ new ListBox<ProcessDefinitionRef>(
+ new String[] {
+ "Process ID", "Name", "Key", "Version"}
+ );
+
+
+ listBox.setCellRenderer(new ListBox.CellRenderer<ProcessDefinitionRef>() {
+ public void renderCell(ListBox<ProcessDefinitionRef> listBox, int row, int column,
+ ProcessDefinitionRef item) {
+ switch (column) {
+ case 0:
+ listBox.setText(row, column, item.getId());
+ break;
+ case 1:
+ listBox.setText(row, column, item.getName());
+ break;
+ case 2:
+ listBox.setText(row, column, item.getKey());
+ break;
+ case 3:
+ listBox.setText(row, column, String.valueOf(item.getVersion()));
+ break;
+ default:
+ throw new RuntimeException("Unexpected column size");
+ }
+ }
+ });
+
+ final DefaultListModel<ProcessDefinitionRef> model =
+ (DefaultListModel<ProcessDefinitionRef>) listBox.getModel();
+
+ for(ProcessDefinitionRef def : definitions)
+ {
+ model.add(def);
+ }
+
+ // toolbar
+
+ final LayoutPanel toolBox = new LayoutPanel();
+ toolBox.setPadding(0);
+ toolBox.setWidgetSpacing(5);
+ //toolBox.setLayout(new BoxLayout(BoxLayout.Orientation.VERTICAL));
+
+ final ToolBar toolBar = new ToolBar();
+ toolBar.add(
+ new ToolButton("Refresh", new ClickListener() {
+ public void onClick(Widget sender) {
+ // force loading
+ controller.handleEvent(
+ new Event(LoadDefinitionsAction.ID, null)
+ );
+ }
+ }
+ )
+ );
+
+ toolBar.addSeparator();
+
+ toolBar.add(
+ new ToolButton("Test", new ClickListener() {
+ public void onClick(Widget sender) {
+ System.out.println(listBox.getSelectedIndex());
+ }
+ }
+ )
+ );
+
+ toolBox.add(toolBar, new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL));
+
+ vBox.add(toolBox, new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL));
+ vBox.add(listBox, new BoxLayoutData(BoxLayoutData.FillStyle.BOTH));
+
+ return vBox;
+ }
+
+ public void update(List<ProcessDefinitionRef> definitions)
+ {
+ if(this.table!=null)
+ this.remove(table);
+
+ this.table = createTable(definitions);
+ this.add(table);
+
+ // layout again
+ this.invalidate();
+ }
+}
Added: projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/v2/process/LoadDefinitionsAction.java
===================================================================
--- projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/v2/process/LoadDefinitionsAction.java (rev 0)
+++ projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/v2/process/LoadDefinitionsAction.java 2009-04-16 13:31:50 UTC (rev 4566)
@@ -0,0 +1,85 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.jboss.bpm.console.client.v2.process;
+
+import com.google.gwt.core.client.JavaScriptObject;
+import com.mvc4g.client.ActionInterface;
+import com.mvc4g.client.Controller;
+import org.jboss.bpm.console.client.ApplicationContext;
+import org.jboss.bpm.console.client.model.DTOParser;
+import org.jboss.bpm.console.client.model.ProcessDefinitionRef;
+import org.jboss.bpm.console.client.util.JSONRequest;
+import org.jboss.bpm.console.client.util.JSONRequestHandler;
+
+import java.util.List;
+
+/**
+ * Fire's a new event when definitions are loaded.
+ *
+ * @author Heiko.Braun <heiko.braun(a)jboss.com>
+ */
+public class LoadDefinitionsAction implements ActionInterface
+{
+ public final static String ID = LoadDefinitionsAction.class.getName();
+
+ ApplicationContext appContext;
+
+ public LoadDefinitionsAction(ApplicationContext appContext)
+ {
+ this.appContext = appContext;
+ }
+
+ public void execute(final Controller controller, Object object)
+ {
+ String url = appContext.getUrlBuilder().getProcessDefinitionsURL();
+
+ JSONRequest.get(
+ url, new JSONRequestHandler()
+ {
+ public void onRequestComplete(JavaScriptObject json)
+ {
+ if (json == null) {
+ appContext.displayMessage("Couldn't retrieve process definition data", true);
+ return;
+ }
+
+ List<ProcessDefinitionRef> definitions = null;
+ try
+ {
+ definitions = DTOParser.parseProcessDefinitions(json);
+ }
+ catch (Throwable e)
+ {
+ e.printStackTrace();
+ appContext.displayMessage(e.getMessage(), true);
+ }
+
+
+ DefinitionListView view = (DefinitionListView) controller.getView(DefinitionListView.ID);
+ view.update(definitions);
+
+ appContext.displayMessage("Loaded " + definitions.size() + " process definitions", false);
+ }
+ }
+ );
+ }
+}
Modified: projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/v2/process/ProcessEditor.java
===================================================================
--- projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/v2/process/ProcessEditor.java 2009-04-16 13:09:58 UTC (rev 4565)
+++ projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/v2/process/ProcessEditor.java 2009-04-16 13:31:50 UTC (rev 4566)
@@ -21,6 +21,14 @@
*/
package org.jboss.bpm.console.client.v2.process;
+import com.google.gwt.user.client.ui.Widget;
+import com.mvc4g.client.ActionInterface;
+import com.mvc4g.client.Event;
+import com.mvc4g.client.ViewInterface;
+import org.gwt.mosaic.ui.client.DecoratedTabLayoutPanel;
+import org.gwt.mosaic.ui.client.TabLayoutPanel;
+import static org.gwt.mosaic.ui.client.layout.BorderLayout.Region;
+import org.gwt.mosaic.ui.client.layout.BorderLayoutData;
import org.jboss.bpm.console.client.ApplicationContext;
import org.jboss.bpm.console.client.Editor;
import org.jboss.bpm.console.client.MenuSection;
@@ -30,13 +38,47 @@
*/
public class ProcessEditor extends Editor
{
- public final static String ID = "org.jboss.bpm.process.ProcessEditor";
+ public final static String ID = ProcessEditor.class.getName();
- public ProcessEditor(ApplicationContext applicationContext)
+ private TabLayoutPanel tabPanel;
+
+ public ProcessEditor(ApplicationContext appContext)
{
- super(applicationContext);
+ super(appContext);
+
+ // create inner tab layout
+ this.tabPanel = new DecoratedTabLayoutPanel();
+ tabPanel.setPadding(5);
+ this.add(tabPanel, new BorderLayoutData(Region.CENTER, false));
+
+ // create and register views
+ addView(DefinitionListView.ID, new DefinitionListView());
+
+ // create and register actions
+ addAction(LoadDefinitionsAction.ID, new LoadDefinitionsAction(appContext));
+
+ // force loading
+ super.controller.handleEvent(
+ new Event(LoadDefinitionsAction.ID, null)
+ );
+
+ tabPanel.selectTab(0);
}
+ private void addView(String id, Widget view)
+ {
+ // register view with controller
+ super.controller.addView(id, (ViewInterface)view);
+
+ // add to tab layout
+ this.tabPanel.add(view, view.getTitle());
+ }
+
+ private void addAction(String name, ActionInterface action)
+ {
+ super.controller.addAction(name, action);
+ }
+
public String getEditorId()
{
return ID;
Modified: projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/v2/process/ProcessEditorNavigation.java
===================================================================
--- projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/v2/process/ProcessEditorNavigation.java 2009-04-16 13:09:58 UTC (rev 4565)
+++ projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/v2/process/ProcessEditorNavigation.java 2009-04-16 13:31:50 UTC (rev 4566)
@@ -24,9 +24,8 @@
import com.google.gwt.user.client.ui.Tree;
import com.google.gwt.user.client.ui.TreeItem;
import com.google.gwt.user.client.ui.TreeListener;
-import org.jboss.bpm.console.client.Workspace;
import org.jboss.bpm.console.client.ApplicationContext;
-import org.jboss.bpm.console.client.process.ProcessEditor;
+import org.jboss.bpm.console.client.Workspace;
/**
* @author Heiko.Braun <heiko.braun(a)jboss.com>
Modified: projects/gwt-console/branches/hbraun/war/src/main/resources/mvc4g-conf.xml
===================================================================
--- projects/gwt-console/branches/hbraun/war/src/main/resources/mvc4g-conf.xml 2009-04-16 13:09:58 UTC (rev 4565)
+++ projects/gwt-console/branches/hbraun/war/src/main/resources/mvc4g-conf.xml 2009-04-16 13:31:50 UTC (rev 4566)
@@ -8,11 +8,9 @@
<controller name="mainController" class="com.mvc4g.client.Controller">
<views>
<view name="loginView" class="org.jboss.bpm.console.client.v2.LoginView" />
- <view name="mainView" class="org.jboss.bpm.console.client.v2.MainView" />
</views>
<actions>
- <action name="login" class="org.jboss.bpm.console.client.v2.LoginAction" />
- <action name="loginSuccessful" class="org.jboss.bpm.console.client.v2.MainViewAction" />
+ <action name="login" class="org.jboss.bpm.console.client.v2.LoginAction" />
</actions>
</controller>
Modified: projects/gwt-console/branches/hbraun/war/src/main/resources/org/jboss/bpm/console/public/console.css
===================================================================
--- projects/gwt-console/branches/hbraun/war/src/main/resources/org/jboss/bpm/console/public/console.css 2009-04-16 13:09:58 UTC (rev 4565)
+++ projects/gwt-console/branches/hbraun/war/src/main/resources/org/jboss/bpm/console/public/console.css 2009-04-16 13:31:50 UTC (rev 4566)
@@ -14,6 +14,11 @@
width:150px;
}
+.bpm-editor-info {
+ font-family: sans-serif;
+ font-size:18px;
+}
+
.bpm-menu {
height: 50px;
width: 100%;
Modified: projects/gwt-console/branches/hbraun/war/src/main/resources/org/jboss/bpm/console/workspace-default.cfg
===================================================================
--- projects/gwt-console/branches/hbraun/war/src/main/resources/org/jboss/bpm/console/workspace-default.cfg 2009-04-16 13:09:58 UTC (rev 4565)
+++ projects/gwt-console/branches/hbraun/war/src/main/resources/org/jboss/bpm/console/workspace-default.cfg 2009-04-16 13:31:50 UTC (rev 4566)
@@ -1,5 +1,5 @@
org.jboss.bpm.console.client.v2.process.ProcessEditor
-org.jboss.bpm.console.client.task.TaskEditor
+#org.jboss.bpm.console.client.task.TaskEditor
# not yet implemented in jBPM4
#org.jboss.bpm.console.client.report.ReportEditor
\ No newline at end of file
17 years
JBoss JBPM SVN: r4565 - in jbpm4/trunk/modules: api/src/main/java/org/jbpm/client and 9 other directories.
by do-not-reply@jboss.org
Author: tom.baeyens(a)jboss.com
Date: 2009-04-16 09:09:58 -0400 (Thu, 16 Apr 2009)
New Revision: 4565
Added:
jbpm4/trunk/modules/api/src/main/java/org/jbpm/ProcessInstance.java
jbpm4/trunk/modules/api/src/main/java/org/jbpm/ProcessInstanceQuery.java
jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/OpenProcessInstance.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/ProcessInstanceQueryImpl.java
Removed:
jbpm4/trunk/modules/api/src/main/java/org/jbpm/ExecutionQuery.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/ExecutionQueryImpl.java
Modified:
jbpm4/trunk/modules/api/src/main/java/org/jbpm/ExecutionService.java
jbpm4/trunk/modules/api/src/main/java/org/jbpm/client/ClientProcessInstance.java
jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/OpenExecution.java
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/concurrency/graphbased/ConcurrencyGraphBasedTest.java
jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/ProcessManagementImpl.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/SignalCmd.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/StartProcessInstanceCmd.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/StartProcessInstanceInLatestCmd.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/ExecutionServiceImpl.java
jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JbpmTestCase.java
jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/history/EndProcessInstanceTest.java
jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/history/ProcessInstanceHistoryTest.java
jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/process/RepositoryServiceTest.java
Log:
JBPM-2171 introducing ProcessInstance
Deleted: jbpm4/trunk/modules/api/src/main/java/org/jbpm/ExecutionQuery.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/ExecutionQuery.java 2009-04-16 11:50:42 UTC (rev 4564)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/ExecutionQuery.java 2009-04-16 13:09:58 UTC (rev 4565)
@@ -1,45 +0,0 @@
-/*
- * 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;
-
-import java.util.List;
-
-
-/**
- * @author Tom Baeyens
- */
-public interface ExecutionQuery {
-
- String PROPERTY_KEY = "key";
-
- ExecutionQuery processDefinitionId(String processDefinitionId);
-
- ExecutionQuery processInstanceId(String processInstanceId);
-
- ExecutionQuery orderAsc(String property);
- ExecutionQuery orderDesc(String property);
-
- ExecutionQuery page(int firstResult, int maxResults);
-
- List<Execution> list();
- Execution uniqueResult();
-}
Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/ExecutionService.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/ExecutionService.java 2009-04-16 11:50:42 UTC (rev 4564)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/ExecutionService.java 2009-04-16 13:09:58 UTC (rev 4565)
@@ -21,7 +21,6 @@
*/
package org.jbpm;
-import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -34,36 +33,36 @@
/** starts a new process instance for the ProcessDefinition with the given processDefinitionDbid.
* @param processDefinitionId the {@link ProcessDefinition#getId() unique id} of the process definition. */
- Execution startProcessInstanceById(String processDefinitionId);
+ ProcessInstance startProcessInstanceById(String processDefinitionId);
/** starts a new process instance for the ProcessDefinition with the given processDefinitionDbid.
* @param processDefinitionId the {@link ProcessDefinition#getId() unique id} of the process definition.
* @param processInstanceKey is a user provided reference for the new process instance that must be unique over all
* process definition versions with the same name. */
- Execution startProcessInstanceById(String processDefinitionId, String processInstanceKey);
+ ProcessInstance startProcessInstanceById(String processDefinitionId, String processInstanceKey);
/** starts a new process instance for the ProcessDefinition with the given processDefinitionDbid.
* @param processDefinitionId the {@link ProcessDefinition#getId() unique id} of the process definition.
* @param variables are the initial values of the process variables that will be set before the execution starts. */
- Execution startProcessInstanceById(String processDefinitionId, Map<String, Object> variables);
+ ProcessInstance startProcessInstanceById(String processDefinitionId, Map<String, Object> variables);
/** starts a new process instance for the ProcessDefinition with the given processDefinitionDbid.
* @param processDefinitionId the {@link ProcessDefinition#getId() unique id} of the process definition.
* @param variables are the initial values of the process variables that will be set before the execution starts.
* @param processInstanceKey is a user provided reference for the new process instance that must be unique over all
* process versions with the same name. */
- Execution startProcessInstanceById(String processDefinitionId, Map<String, Object> variables, String processInstanceKey);
+ ProcessInstance startProcessInstanceById(String processDefinitionId, Map<String, Object> variables, String processInstanceKey);
/** starts a new process instance in the latest version of the given process definition.
* @param processDefinitionKey is the key of the process definition for which the latest version will be taken. */
- Execution startProcessInstanceByKey(String processDefinitionKey);
+ ProcessInstance startProcessInstanceByKey(String processDefinitionKey);
/** starts a new process instance in the latest version of the given processDefinitionName.
* @param processDefinitionKey is the key of the process definition
* for which the latest version will be taken.
* @param processInstanceKey is a user provided reference for the new process instance
* that must be unique over all process versions with the same name. */
- Execution startProcessInstanceByKey(String processDefinitionKey, String processInstanceKey);
+ ProcessInstance startProcessInstanceByKey(String processDefinitionKey, String processInstanceKey);
/** starts a new process instance in the latest version of the given processDefinitionName.
* @param processDefinitionKey is the key of the process definition
@@ -71,39 +70,36 @@
* @param variables are the initial values of the process variables that
* will be set before the execution starts (read: before the initial
* activity is executed). */
- Execution startProcessInstanceByKey(String processDefinitionKey, Map<String, Object> variables);
+ ProcessInstance startProcessInstanceByKey(String processDefinitionKey, Map<String, Object> variables);
/** starts a new process instance in the latest version of the given processDefinitionName.
* @param processDefinitionKey is the key of the process definition for which the latest version will be taken.
* @param variables are the initial values of the process variables that will be set before the execution starts.
* @param processInstanceKey is a user provided reference for the new execution that must be unique over all
* process versions with the same name. */
- Execution startProcessInstanceByKey(String processDefinitionKey, Map<String, Object> variables, String processInstanceKey);
+ ProcessInstance startProcessInstanceByKey(String processDefinitionKey, Map<String, Object> variables, String processInstanceKey);
- /** the execution that is uniquely defined by the process execution id. */
+ /** the path of execution that is uniquely defined by the execution id. */
Execution findExecutionById(String executionId);
- /** this method returns this execution and all its child executions recursively. */
- List<Execution> findExecutionsById(String processDefinitionId);
+ /** the process instance that is uniquely defined by the process execution id. */
+ ProcessInstance findProcessInstanceById(String processInstanceId);
/** provides an external trigger to an execution. */
- Execution signalExecutionById(String executionId);
+ ProcessInstance signalExecutionById(String executionId);
/** provides a named external trigger to an execution. */
- Execution signalExecutionById(String executionId, String signalName);
+ ProcessInstance signalExecutionById(String executionId, String signalName);
/** provides a named external trigger to an execution with parameters. */
- Execution signalExecutionById(String executionId, String signalName, Map<String, Object> parameters);
+ ProcessInstance signalExecutionById(String executionId, String signalName, Map<String, Object> parameters);
/** provides a external trigger to an execution with parameters. */
- Execution signalExecutionById(String executionId, Map<String, Object> parameters);
+ ProcessInstance signalExecutionById(String executionId, Map<String, Object> parameters);
- /** search for executions with criteria */
- ExecutionQuery createExecutionQuery();
-
/** search for process instances with criteria */
- ExecutionQuery createProcessInstanceQuery();
+ ProcessInstanceQuery createProcessInstanceQuery();
/** creates or overwrites a variable value on the referenced execution */
void setVariable(String executionId, String name, Object value);
Added: jbpm4/trunk/modules/api/src/main/java/org/jbpm/ProcessInstance.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/ProcessInstance.java (rev 0)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/ProcessInstance.java 2009-04-16 13:09:58 UTC (rev 4565)
@@ -0,0 +1,33 @@
+/*
+ * 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;
+
+
+/** a process instance is one execution of a process definition.
+ * One process instance can have many concurrent executions.
+ * Executions are structured in a tree of which the ProcessInstance
+ * is the root.
+ *
+ * @author Tom Baeyens
+ */
+public interface ProcessInstance extends Execution {
+}
Property changes on: jbpm4/trunk/modules/api/src/main/java/org/jbpm/ProcessInstance.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied: jbpm4/trunk/modules/api/src/main/java/org/jbpm/ProcessInstanceQuery.java (from rev 4558, jbpm4/trunk/modules/api/src/main/java/org/jbpm/ExecutionQuery.java)
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/ProcessInstanceQuery.java (rev 0)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/ProcessInstanceQuery.java 2009-04-16 13:09:58 UTC (rev 4565)
@@ -0,0 +1,45 @@
+/*
+ * 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;
+
+import java.util.List;
+
+
+/**
+ * @author Tom Baeyens
+ */
+public interface ProcessInstanceQuery {
+
+ String PROPERTY_KEY = "key";
+
+ ProcessInstanceQuery processDefinitionId(String processDefinitionId);
+
+ ProcessInstanceQuery processInstanceId(String processInstanceId);
+
+ ProcessInstanceQuery orderAsc(String property);
+ ProcessInstanceQuery orderDesc(String property);
+
+ ProcessInstanceQuery page(int firstResult, int maxResults);
+
+ List<Execution> list();
+ Execution uniqueResult();
+}
Property changes on: jbpm4/trunk/modules/api/src/main/java/org/jbpm/ProcessInstanceQuery.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/client/ClientProcessInstance.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/client/ClientProcessInstance.java 2009-04-16 11:50:42 UTC (rev 4564)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/client/ClientProcessInstance.java 2009-04-16 13:09:58 UTC (rev 4565)
@@ -21,16 +21,17 @@
*/
package org.jbpm.client;
+import org.jbpm.model.OpenProcessInstance;
+
/**
* @author Tom Baeyens
*/
-public interface ClientProcessInstance extends ClientExecution {
+public interface ClientProcessInstance extends ClientExecution, OpenProcessInstance {
// start ////////////////////////////////////////////////////////////////////
/** starts this process instance */
void start();
-
}
Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/OpenExecution.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/OpenExecution.java 2009-04-16 11:50:42 UTC (rev 4564)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/OpenExecution.java 2009-04-16 13:09:58 UTC (rev 4565)
@@ -137,7 +137,7 @@
/** the main path of execution in the <a href="package-summary.html#basicexecutionstructure">execution
* structure</a>. Null will be returned in case this execution itself is the
* main execution path. */
- OpenExecution getProcessInstance();
+ OpenProcessInstance getProcessInstance();
/** the parent execution in the <a href="package-summary.html#basicexecutionstructure">execution
* structure</a>. Null will be returned in case this execution itself is the
Added: jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/OpenProcessInstance.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/OpenProcessInstance.java (rev 0)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/OpenProcessInstance.java 2009-04-16 13:09:58 UTC (rev 4565)
@@ -0,0 +1,27 @@
+/*
+ * 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.model;
+
+import org.jbpm.ProcessInstance;
+
+public interface OpenProcessInstance extends OpenExecution, ProcessInstance {
+}
Property changes on: jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/OpenProcessInstance.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/concurrency/graphbased/ConcurrencyGraphBasedTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/concurrency/graphbased/ConcurrencyGraphBasedTest.java 2009-04-16 11:50:42 UTC (rev 4564)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/concurrency/graphbased/ConcurrencyGraphBasedTest.java 2009-04-16 13:09:58 UTC (rev 4565)
@@ -21,10 +21,12 @@
*/
package org.jbpm.examples.concurrency.graphbased;
+import java.util.Collection;
import java.util.HashSet;
import java.util.Set;
import org.jbpm.Execution;
+import org.jbpm.ProcessInstance;
import org.jbpm.test.JbpmTestCase;
@@ -50,7 +52,7 @@
public void testConcurrencyGraphBased() {
- Execution processInstance = executionService.startProcessInstanceByKey("ConcurrencyGraphBased");
+ ProcessInstance processInstance = executionService.startProcessInstanceByKey("ConcurrencyGraphBased");
String pid = processInstance.getId();
Set<String> expectedActivityNames = new HashSet<String>();
@@ -58,48 +60,63 @@
expectedActivityNames.add("load truck");
expectedActivityNames.add("print shipping documents");
- assertEquals(expectedActivityNames, getActivityNames(pid));
+ assertEquals(expectedActivityNames, getActiveActivityNames(processInstance));
- assertTrue(findExecution(pid, "send invoice").isActive());
- assertTrue(findExecution(pid, "load truck").isActive());
- assertTrue(findExecution(pid, "print shipping documents").isActive());
+ assertNotNull(processInstance.findActiveExecutionIn("send invoice"));
+ assertNotNull(processInstance.findActiveExecutionIn("load truck"));
+ assertNotNull(processInstance.findActiveExecutionIn("print shipping documents"));
- String sendInvoiceExecutionId = findExecution(pid, "send invoice").getId();
- executionService.signalExecutionById(sendInvoiceExecutionId);
+ String sendInvoiceExecutionId = processInstance.findActiveExecutionIn("send invoice").getId();
+ processInstance = executionService.signalExecutionById(sendInvoiceExecutionId);
expectedActivityNames.remove("send invoice");
- expectedActivityNames.add("final join");
- assertEquals(expectedActivityNames, getActivityNames(pid));
+ assertEquals(expectedActivityNames, getActiveActivityNames(processInstance));
- assertTrue(findExecution(pid, "load truck").isActive());
- assertTrue(findExecution(pid, "print shipping documents").isActive());
- assertFalse(findExecution(pid, "final join").isActive());
+ assertNotNull(processInstance.findActiveExecutionIn("load truck"));
+ assertNotNull(processInstance.findActiveExecutionIn("print shipping documents"));
- String loadTruckExecutionId = findExecution(pid, "load truck").getId();
- executionService.signalExecutionById(loadTruckExecutionId);
+ String loadTruckExecutionId = processInstance.findActiveExecutionIn("load truck").getId();
+ processInstance = executionService.signalExecutionById(loadTruckExecutionId);
expectedActivityNames.remove("load truck");
- expectedActivityNames.add("shipping join");
- assertEquals(expectedActivityNames, getActivityNames(pid));
+ assertEquals(expectedActivityNames, getActiveActivityNames(processInstance));
- assertTrue(findExecution(pid, "print shipping documents").isActive());
- assertFalse(findExecution(pid, "final join").isActive());
+ assertNotNull(processInstance.findActiveExecutionIn("print shipping documents"));
- String printShippingDocumentsId = findExecution(pid, "print shipping documents").getId();
- executionService.signalExecutionById(printShippingDocumentsId);
+ String printShippingDocumentsId = processInstance.findActiveExecutionIn("print shipping documents").getId();
+ processInstance = executionService.signalExecutionById(printShippingDocumentsId);
expectedActivityNames.remove("print shipping documents");
- expectedActivityNames.remove("shipping join");
expectedActivityNames.add("drive truck to destination");
- assertEquals(expectedActivityNames, getActivityNames(pid));
+ assertEquals(expectedActivityNames, getActiveActivityNames(processInstance));
- assertTrue(findExecution(pid, "drive truck to destination").isActive());
- assertFalse(findExecution(pid, "final join").isActive());
+ assertNotNull(processInstance.findActiveExecutionIn("drive truck to destination"));
- String driveTruckExecutionId = findExecution(pid, "drive truck to destination").getId();
- executionService.signalExecutionById(driveTruckExecutionId);
+ String driveTruckExecutionId = processInstance.findActiveExecutionIn("drive truck to destination").getId();
+ processInstance = executionService.signalExecutionById(driveTruckExecutionId);
assertNull("execution "+pid+" should not exist", executionService.findExecutionById(pid));
}
+ public Set<String> getActiveActivityNames(ProcessInstance processInstance) {
+ return getActiveActivityNames(processInstance, new HashSet<String>());
+ }
+
+ public Set<String> getActiveActivityNames(Execution execution, Set<String> activityNames) {
+ if (execution.isActive()) {
+ activityNames.add(execution.getActivityName());
+ }
+ Collection<Execution> childExecutions = execution.getExecutions();
+ if (childExecutions!=null) {
+ for (Execution childExecution: childExecutions) {
+ if (childExecution!=null) {
+
+ }
+ getActiveActivityNames(childExecution, activityNames);
+ }
+ }
+ return activityNames;
+ }
+
}
+
Modified: jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/ProcessManagementImpl.java
===================================================================
--- jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/ProcessManagementImpl.java 2009-04-16 11:50:42 UTC (rev 4564)
+++ jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/ProcessManagementImpl.java 2009-04-16 13:09:58 UTC (rev 4565)
@@ -29,7 +29,7 @@
import org.jboss.bpm.console.client.model.ProcessInstanceRef;
import org.jboss.bpm.console.server.integration.ProcessManagement;
import org.jbpm.Execution;
-import org.jbpm.ExecutionQuery;
+import org.jbpm.ProcessInstanceQuery;
import org.jbpm.ExecutionService;
import org.jbpm.ProcessDefinition;
import org.jbpm.ProcessDefinitionQuery;
@@ -122,7 +122,7 @@
{
ExecutionService execService = this.processEngine.getExecutionService();
- ExecutionQuery query = execService.createExecutionQuery();
+ ProcessInstanceQuery query = execService.createProcessInstanceQuery();
query.processDefinitionId(String.valueOf(procDefId));
List<Execution> executions = query.list();
@@ -175,7 +175,7 @@
{
ExecutionService execService = this.processEngine.getExecutionService();
- ExecutionQuery query = execService.createProcessInstanceQuery();
+ ProcessInstanceQuery query = execService.createProcessInstanceQuery();
query.processInstanceId(instanceId);
List<Execution> executions = query.list();
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/SignalCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/SignalCmd.java 2009-04-16 11:50:42 UTC (rev 4564)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/SignalCmd.java 2009-04-16 13:09:58 UTC (rev 4565)
@@ -23,17 +23,16 @@
import java.util.Map;
-import org.jbpm.Execution;
import org.jbpm.JbpmException;
+import org.jbpm.ProcessInstance;
import org.jbpm.client.ClientExecution;
-import org.jbpm.cmd.Command;
import org.jbpm.env.Environment;
import org.jbpm.session.PvmDbSession;
/**
* @author Tom Baeyens
*/
-public class SignalCmd extends AbstractCommand<Execution> {
+public class SignalCmd extends AbstractCommand<ProcessInstance> {
private static final long serialVersionUID = 1L;
@@ -50,7 +49,7 @@
this.parameters = parameters;
}
- public Execution execute(Environment environment) throws Exception {
+ public ProcessInstance execute(Environment environment) throws Exception {
ClientExecution execution = null;
PvmDbSession pvmDbSession = environment.get(PvmDbSession.class);
@@ -61,6 +60,6 @@
execution.signal(signalName, parameters);
- return execution;
+ return execution.getProcessInstance();
}
}
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/StartProcessInstanceCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/StartProcessInstanceCmd.java 2009-04-16 11:50:42 UTC (rev 4564)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/StartProcessInstanceCmd.java 2009-04-16 13:09:58 UTC (rev 4565)
@@ -24,18 +24,17 @@
import java.util.Map;
import org.hibernate.Session;
-import org.jbpm.Execution;
import org.jbpm.JbpmException;
+import org.jbpm.ProcessInstance;
import org.jbpm.client.ClientProcessDefinition;
import org.jbpm.client.ClientProcessInstance;
import org.jbpm.env.Environment;
-import org.jbpm.session.PvmDbSession;
import org.jbpm.session.RepositorySession;
/**
* @author Tom Baeyens
*/
-public class StartProcessInstanceCmd extends VariablesCmd<Execution> {
+public class StartProcessInstanceCmd extends VariablesCmd<ProcessInstance> {
private static final long serialVersionUID = 1L;
@@ -48,7 +47,7 @@
this.executionKey = executionKey;
}
- public Execution execute(Environment environment) throws Exception {
+ public ProcessInstance execute(Environment environment) throws Exception {
RepositorySession repositorySession = environment.get(RepositorySession.class);
ClientProcessDefinition processDefinition = (ClientProcessDefinition)
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/StartProcessInstanceInLatestCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/StartProcessInstanceInLatestCmd.java 2009-04-16 11:50:42 UTC (rev 4564)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/StartProcessInstanceInLatestCmd.java 2009-04-16 13:09:58 UTC (rev 4565)
@@ -24,9 +24,9 @@
import java.util.Map;
import org.hibernate.Session;
-import org.jbpm.Execution;
import org.jbpm.JbpmException;
import org.jbpm.ProcessDefinitionQuery;
+import org.jbpm.ProcessInstance;
import org.jbpm.client.ClientProcessDefinition;
import org.jbpm.client.ClientProcessInstance;
import org.jbpm.env.Environment;
@@ -36,7 +36,7 @@
/**
* @author Tom Baeyens
*/
-public class StartProcessInstanceInLatestCmd extends VariablesCmd<Execution> {
+public class StartProcessInstanceInLatestCmd extends VariablesCmd<ProcessInstance> {
private static final long serialVersionUID = 1L;
@@ -52,7 +52,7 @@
this.executionKey = executionKey;
}
- public Execution execute(Environment environment) throws Exception {
+ public ProcessInstance execute(Environment environment) throws Exception {
ClientProcessDefinition processDefinition = null;
RepositorySession repositorySession = environment.get(RepositorySession.class);
Deleted: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/ExecutionQueryImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/ExecutionQueryImpl.java 2009-04-16 11:50:42 UTC (rev 4564)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/ExecutionQueryImpl.java 2009-04-16 13:09:58 UTC (rev 4565)
@@ -1,108 +0,0 @@
-/*
- * 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.query;
-
-import java.util.List;
-
-import org.hibernate.Query;
-import org.jbpm.Execution;
-import org.jbpm.ExecutionQuery;
-import org.jbpm.cmd.CommandService;
-import org.jbpm.pvm.internal.model.ExecutionImpl;
-
-
-/**
- * @author Tom Baeyens
- */
-public class ExecutionQueryImpl extends AbstractQuery implements ExecutionQuery {
-
- private static final long serialVersionUID = 1L;
-
- protected boolean onlyProcessInstances;
- protected String processDefinitionId;
- protected String processInstanceId;
-
- public ExecutionQueryImpl(CommandService commandService, boolean onlyProcessInstances) {
- super(commandService);
- this.onlyProcessInstances = onlyProcessInstances;
- }
-
- public Execution uniqueResult() {
- return (Execution)untypedUniqueResult();
- }
-
- public List<Execution> list() {
- return (List<Execution>) untypedList();
- }
-
- public String hql() {
- StringBuffer hql = new StringBuffer();
- hql.append("select execution ");
- hql.append("from ");
- hql.append(ExecutionImpl.class.getName());
- hql.append(" as execution ");
-
- if (onlyProcessInstances) {
- appendWhereClause("execution.processInstance.dbid = execution.dbid ", hql);
- }
-
- if (processInstanceId!=null) {
- appendWhereClause("execution.processInstance.id = '"+processInstanceId+"' ", hql);
- }
-
- if (processDefinitionId!=null) {
- appendWhereClause("execution.processDefinitionId = '"+processDefinitionId+"' ", hql);
- }
-
- appendOrderByClause(hql);
-
- return hql.toString();
- }
-
- protected void applyParameters(Query query) {
- }
-
- public ExecutionQuery orderAsc(String property) {
- addOrderByClause("e."+property+" asc");
- return this;
- }
-
- public ExecutionQuery orderDesc(String property) {
- addOrderByClause("e."+property+" desc");
- return this;
- }
-
- public ExecutionQuery processDefinitionId(String processDefinitionId) {
- this.processDefinitionId = processDefinitionId;
- return this;
- }
-
- public ExecutionQuery page(int firstResult, int maxResults) {
- this.page = new Page(firstResult, maxResults);
- return this;
- }
-
- public ExecutionQuery processInstanceId(String processInstanceId) {
- this.processInstanceId = processInstanceId;
- return this;
- }
-}
Copied: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/ProcessInstanceQueryImpl.java (from rev 4558, jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/ExecutionQueryImpl.java)
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/ProcessInstanceQueryImpl.java (rev 0)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/ProcessInstanceQueryImpl.java 2009-04-16 13:09:58 UTC (rev 4565)
@@ -0,0 +1,104 @@
+/*
+ * 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.query;
+
+import java.util.List;
+
+import org.hibernate.Query;
+import org.jbpm.Execution;
+import org.jbpm.ProcessInstanceQuery;
+import org.jbpm.cmd.CommandService;
+import org.jbpm.pvm.internal.model.ExecutionImpl;
+
+
+/**
+ * @author Tom Baeyens
+ */
+public class ProcessInstanceQueryImpl extends AbstractQuery implements ProcessInstanceQuery {
+
+ private static final long serialVersionUID = 1L;
+
+ protected String processDefinitionId;
+ protected String processInstanceId;
+
+ public ProcessInstanceQueryImpl(CommandService commandService) {
+ super(commandService);
+ }
+
+ public Execution uniqueResult() {
+ return (Execution)untypedUniqueResult();
+ }
+
+ public List<Execution> list() {
+ return (List<Execution>) untypedList();
+ }
+
+ public String hql() {
+ StringBuffer hql = new StringBuffer();
+ hql.append("select processInstance ");
+ hql.append("from ");
+ hql.append(ExecutionImpl.class.getName());
+ hql.append(" as processInstance ");
+
+ appendWhereClause("processInstance.parent is null ", hql);
+
+ if (processInstanceId!=null) {
+ appendWhereClause("processInstance.processInstance.id = '"+processInstanceId+"' ", hql);
+ }
+
+ if (processDefinitionId!=null) {
+ appendWhereClause("processInstance.processDefinitionId = '"+processDefinitionId+"' ", hql);
+ }
+
+ appendOrderByClause(hql);
+
+ return hql.toString();
+ }
+
+ protected void applyParameters(Query query) {
+ }
+
+ public ProcessInstanceQuery orderAsc(String property) {
+ addOrderByClause("processInstance."+property+" asc");
+ return this;
+ }
+
+ public ProcessInstanceQuery orderDesc(String property) {
+ addOrderByClause("processInstance."+property+" desc");
+ return this;
+ }
+
+ public ProcessInstanceQuery processDefinitionId(String processDefinitionId) {
+ this.processDefinitionId = processDefinitionId;
+ return this;
+ }
+
+ public ProcessInstanceQuery page(int firstResult, int maxResults) {
+ this.page = new Page(firstResult, maxResults);
+ return this;
+ }
+
+ public ProcessInstanceQuery processInstanceId(String processInstanceId) {
+ this.processInstanceId = processInstanceId;
+ return this;
+ }
+}
Property changes on: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/ProcessInstanceQueryImpl.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:mergeinfo
+
Name: svn:eol-style
+ LF
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/ExecutionServiceImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/ExecutionServiceImpl.java 2009-04-16 11:50:42 UTC (rev 4564)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/ExecutionServiceImpl.java 2009-04-16 13:09:58 UTC (rev 4565)
@@ -27,8 +27,9 @@
import java.util.Set;
import org.jbpm.Execution;
-import org.jbpm.ExecutionQuery;
import org.jbpm.ExecutionService;
+import org.jbpm.ProcessInstance;
+import org.jbpm.ProcessInstanceQuery;
import org.jbpm.pvm.internal.cmd.DeleteProcessInstance;
import org.jbpm.pvm.internal.cmd.EndProcessInstance;
import org.jbpm.pvm.internal.cmd.FindExecutionCmd;
@@ -39,7 +40,7 @@
import org.jbpm.pvm.internal.cmd.SignalCmd;
import org.jbpm.pvm.internal.cmd.StartProcessInstanceCmd;
import org.jbpm.pvm.internal.cmd.StartProcessInstanceInLatestCmd;
-import org.jbpm.pvm.internal.query.ExecutionQueryImpl;
+import org.jbpm.pvm.internal.query.ProcessInstanceQueryImpl;
/**
@@ -47,53 +48,53 @@
*/
public class ExecutionServiceImpl extends AbstractServiceImpl implements ExecutionService {
- public Execution startProcessInstanceById(String processDefinitionId){
+ public ProcessInstance startProcessInstanceById(String processDefinitionId){
return commandService.execute(new StartProcessInstanceCmd(processDefinitionId, null, null));
}
- public Execution startProcessInstanceById(String processDefinitionId, String executionKey) {
+ public ProcessInstance startProcessInstanceById(String processDefinitionId, String executionKey) {
return commandService.execute(new StartProcessInstanceCmd(processDefinitionId, null, executionKey));
}
- public Execution startProcessInstanceById(String processDefinitionId, Map<String, Object> variables){
+ public ProcessInstance startProcessInstanceById(String processDefinitionId, Map<String, Object> variables){
return commandService.execute(new StartProcessInstanceCmd(processDefinitionId, variables, null));
}
- public Execution startProcessInstanceById(String processDefinitionId, Map<String, Object> variables, String executionKey){
+ public ProcessInstance startProcessInstanceById(String processDefinitionId, Map<String, Object> variables, String executionKey){
return commandService.execute(new StartProcessInstanceCmd(processDefinitionId, variables, executionKey));
}
- public Execution startProcessInstanceByKey(String processDefinitionKey) {
+ public ProcessInstance startProcessInstanceByKey(String processDefinitionKey) {
return commandService.execute(new StartProcessInstanceInLatestCmd(processDefinitionKey, null, null));
}
- public Execution startProcessInstanceByKey(String processDefinitionKey, Map<String, Object> variables){
+ public ProcessInstance startProcessInstanceByKey(String processDefinitionKey, Map<String, Object> variables){
return commandService.execute(new StartProcessInstanceInLatestCmd(processDefinitionKey, variables, null));
}
- public Execution startProcessInstanceByKey(String processDefinitionKey, String executionKey) {
+ public ProcessInstance startProcessInstanceByKey(String processDefinitionKey, String executionKey) {
return commandService.execute(new StartProcessInstanceInLatestCmd(processDefinitionKey, null, executionKey));
}
- public Execution startProcessInstanceByKey(String processDefinitionKey, Map<String, Object> variables, String executionKey){
+ public ProcessInstance startProcessInstanceByKey(String processDefinitionKey, Map<String, Object> variables, String executionKey){
return commandService.execute(new StartProcessInstanceInLatestCmd(processDefinitionKey, variables, executionKey));
}
- public Execution signalExecutionById(String executionId) {
+ public ProcessInstance signalExecutionById(String executionId) {
return commandService.execute(new SignalCmd(executionId, null, null));
}
- public Execution signalExecutionById(String executionId, String signalName) {
+ public ProcessInstance signalExecutionById(String executionId, String signalName) {
return commandService.execute(new SignalCmd(executionId, signalName, null));
}
- public Execution signalExecutionById(String executionId, String signalName, Map<String, Object> parameters) {
+ public ProcessInstance signalExecutionById(String executionId, String signalName, Map<String, Object> parameters) {
return commandService.execute(new SignalCmd(executionId, signalName, parameters));
}
- public Execution signalExecutionById(String executionId, Map<String, Object> parameters) {
+ public ProcessInstance signalExecutionById(String executionId, Map<String, Object> parameters) {
return commandService.execute(new SignalCmd(executionId, null, parameters));
}
@@ -102,18 +103,15 @@
return commandService.execute(new FindExecutionCmd(executionId));
}
- public List<Execution> findExecutionsById(String executionId) {
- return commandService.execute(new FindExecutionsCmd(executionId));
+ public ProcessInstance findProcessInstanceById(String executionId) {
+ return (ProcessInstance) commandService.execute(new FindExecutionCmd(executionId));
}
+
- public ExecutionQuery createExecutionQuery() {
- return new ExecutionQueryImpl(commandService, false);
+ public ProcessInstanceQuery createProcessInstanceQuery() {
+ return new ProcessInstanceQueryImpl(commandService);
}
- public ExecutionQuery createProcessInstanceQuery() {
- return new ExecutionQueryImpl(commandService, true);
- }
-
public void endProcessInstance(String processInstanceId, String state) {
commandService.execute(new EndProcessInstance(processInstanceId, state));
}
Modified: jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JbpmTestCase.java
===================================================================
--- jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JbpmTestCase.java 2009-04-16 11:50:42 UTC (rev 4564)
+++ jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JbpmTestCase.java 2009-04-16 13:09:58 UTC (rev 4565)
@@ -231,31 +231,6 @@
return taskDbid;
}
- public HashSet<String> getActivityNames(String processInstanceId) {
- HashSet<String> activityNames = new HashSet<String>();
-
- List<Execution> executions = executionService.findExecutionsById(processInstanceId);
- for (Execution execution: executions) {
- String activityName = execution.getActivityName();
- if (activityName!=null) {
- activityNames.add(activityName);
- }
- }
-
- return activityNames;
- }
-
- public Execution findExecution(String processInstanceId, String activityName) {
- List<Execution> executions = executionService.findExecutionsById(processInstanceId);
- for (Execution execution: executions) {
- if (activityName.equals(execution.getActivityName())) {
- return execution;
- }
- }
-
- return null;
- }
-
public static Task getTask(List<Task> taskList, String taskName) {
for (Task task : taskList) {
if (taskName.equals(task.getName())) {
Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/history/EndProcessInstanceTest.java
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/history/EndProcessInstanceTest.java 2009-04-16 11:50:42 UTC (rev 4564)
+++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/history/EndProcessInstanceTest.java 2009-04-16 13:09:58 UTC (rev 4565)
@@ -50,7 +50,7 @@
String processInstanceId = execution.getId();
executionService.endProcessInstance(processInstanceId, Execution.STATE_CANCELLED);
- List<Execution> executions = executionService.createExecutionQuery()
+ List<Execution> executions = executionService.createProcessInstanceQuery()
.processInstanceId(processInstanceId)
.list();
assertEquals(0, executions.size());
Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/history/ProcessInstanceHistoryTest.java
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/history/ProcessInstanceHistoryTest.java 2009-04-16 11:50:42 UTC (rev 4564)
+++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/history/ProcessInstanceHistoryTest.java 2009-04-16 13:09:58 UTC (rev 4565)
@@ -66,7 +66,7 @@
// also check that the ended process instances have been removed from the
// runtime database
List<Execution> executions = executionService
- .createExecutionQuery()
+ .createProcessInstanceQuery()
.processDefinitionId("ICL-1")
.list();
Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/process/RepositoryServiceTest.java
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/process/RepositoryServiceTest.java 2009-04-16 11:50:42 UTC (rev 4564)
+++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/process/RepositoryServiceTest.java 2009-04-16 13:09:58 UTC (rev 4565)
@@ -185,7 +185,7 @@
// check if the db is empty
assertEquals(0, repositoryService.createProcessDefinitionQuery().list().size());
- assertEquals(0, executionService.createExecutionQuery().list().size());
+ assertEquals(0, executionService.createProcessInstanceQuery().list().size());
}
public void testDeleteProcessDefinitionButNotInstances() {
17 years