JBoss JBPM SVN: r4785 - jbpm4/trunk/modules/distro/src/main/files/jboss/config.jboss5/conf/bootstrap.
by do-not-reply＠jboss.org
Author: heiko.braun(a)jboss.com
Date: 2009-05-12 03:45:38 -0400 (Tue, 12 May 2009)
New Revision: 4785
Modified:
jbpm4/trunk/modules/distro/src/main/files/jboss/config.jboss5/conf/bootstrap/deployers.xml
Log:
bootstrap/deployers.xml uses .bar as well
Modified: jbpm4/trunk/modules/distro/src/main/files/jboss/config.jboss5/conf/bootstrap/deployers.xml
===================================================================
--- jbpm4/trunk/modules/distro/src/main/files/jboss/config.jboss5/conf/bootstrap/deployers.xml 2009-05-12 07:43:43 UTC (rev 4784)
+++ jbpm4/trunk/modules/distro/src/main/files/jboss/config.jboss5/conf/bootstrap/deployers.xml 2009-05-12 07:45:38 UTC (rev 4785)
@@ -102,7 +102,7 @@
<value>.spring</value>
<value>.rails</value>
<value>.esb</value>
- <value>.jpdl</value>
+ <value>.bar</value>
</set>
</parameter>
</constructor>
16 years, 11 months
- 1
- 0
JBoss JBPM SVN: r4784 - jbpm4/branches/jbpm-4.0.0.Beta2.
by do-not-reply＠jboss.org
Author: heiko.braun(a)jboss.com
Date: 2009-05-12 03:43:43 -0400 (Tue, 12 May 2009)
New Revision: 4784
Modified:
jbpm4/branches/jbpm-4.0.0.Beta2/pom.xml
Log:
Update to console 1.0.0.Beta3
Modified: jbpm4/branches/jbpm-4.0.0.Beta2/pom.xml
===================================================================
--- jbpm4/branches/jbpm-4.0.0.Beta2/pom.xml 2009-05-12 07:42:54 UTC (rev 4783)
+++ jbpm4/branches/jbpm-4.0.0.Beta2/pom.xml 2009-05-12 07:43:43 UTC (rev 4784)
@@ -47,7 +47,7 @@
<apache.ant.version>1.7.0</apache.ant.version>
<cactus.version>13-1.7.1</cactus.version>
<freemarker.version>2.3.15</freemarker.version>
- <gwt.console.version>1.0.0-SNAPSHOT</gwt.console.version>
+ <gwt.console.version>1.0.0.Beta3</gwt.console.version>
<jbpm.gpd.version>4.0.0.Beta2</jbpm.gpd.version>
<hibernate.version>3.3.1.GA</hibernate.version>
<slf4j.version>1.5.2</slf4j.version>
16 years, 11 months
- 1
- 0
JBoss JBPM SVN: r4783 - jbpm4/trunk/modules/distro/src/main/files/jboss/config.jboss5/deployers/jbpm.deployer/META-INF.
by do-not-reply＠jboss.org
Author: heiko.braun(a)jboss.com
Date: 2009-05-12 03:42:54 -0400 (Tue, 12 May 2009)
New Revision: 4783
Modified:
jbpm4/trunk/modules/distro/src/main/files/jboss/config.jboss5/deployers/jbpm.deployer/META-INF/jbpm-deployers-jboss-beans.xml
Log:
Use *.bar extension for deployments
Modified: jbpm4/trunk/modules/distro/src/main/files/jboss/config.jboss5/deployers/jbpm.deployer/META-INF/jbpm-deployers-jboss-beans.xml
===================================================================
--- jbpm4/trunk/modules/distro/src/main/files/jboss/config.jboss5/deployers/jbpm.deployer/META-INF/jbpm-deployers-jboss-beans.xml 2009-05-12 00:05:39 UTC (rev 4782)
+++ jbpm4/trunk/modules/distro/src/main/files/jboss/config.jboss5/deployers/jbpm.deployer/META-INF/jbpm-deployers-jboss-beans.xml 2009-05-12 07:42:54 UTC (rev 4783)
@@ -28,7 +28,7 @@
<property name="suffix">.jpdl.xml</property>
<!-- Move to .par when https://jira.jboss.org/jira/browse/JBAS-6274 is done -->
- <property name="jarExtension">jpdl</property>
+ <property name="jarExtension">bar</property>
<property name="allowMultipleFiles">true</property>
16 years, 11 months
- 1
- 0
JBoss JBPM SVN: r4782 - in jbpm4/trunk/modules: api/src/main/java/org/jbpm/api/identity and 17 other directories.
by do-not-reply＠jboss.org
Author: alex.guizar(a)jboss.com
Date: 2009-05-11 20:05:39 -0400 (Mon, 11 May 2009)
New Revision: 4782
Added:
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/DefaultAddressResolver.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/spi/AddressResolver.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/AddressResolverBinding.java
Removed:
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/AddressBuilderImpl.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/spi/AddressBuilder.java
Modified:
jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/IdentityService.java
jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/identity/User.java
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/mail/inline/InlineMailTest.java
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/mail/template/TemplateMailTest.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/resources/jbpm.cfg.xml
jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/mail/inline/process.jpdl.xml
jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/mail/template/process.jpdl.xml
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/identity/cmd/CreateUserCmd.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/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/svc/IdentityServiceImpl.java
jbpm4/trunk/modules/pvm/src/main/resources/jbpm.default.cfg.xml
jbpm4/trunk/modules/pvm/src/main/resources/jbpm.identity.hbm.xml
jbpm4/trunk/modules/pvm/src/main/resources/jbpm.wire.bindings.xml
jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/identity/IdentityTest.java
Log:
[JBPM-2058] email resolution for users and groups did not actually work
Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/IdentityService.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/IdentityService.java 2009-05-11 21:12:48 UTC (rev 4781)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/IdentityService.java 2009-05-12 00:05:39 UTC (rev 4782)
@@ -26,15 +26,17 @@
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);
+ /** create a new user. */
+ void createUser(String userId, String givenName, String familyName);
+ /** create a new user, providing an email address */
+ void createUser(String userId, String givenName, String familyName, String businessEmail);
+
/** lookup a user
* @return the user or null if no such user exists */
User findUserById(String userId);
@@ -83,9 +85,8 @@
* but not the associated users. */
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. */
+ void createMembership(String userId, String groupId);
/** makes the given user a member of the given group with the given role.
* Role can be null. */
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-05-11 21:12:48 UTC (rev 4781)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/identity/User.java 2009-05-12 00:05:39 UTC (rev 4782)
@@ -32,5 +32,5 @@
String getGivenName();
String getFamilyName();
- String getEmailAddress();
+ String getBusinessEmail();
}
Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/mail/inline/InlineMailTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/mail/inline/InlineMailTest.java 2009-05-11 21:12:48 UTC (rev 4781)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/mail/inline/InlineMailTest.java 2009-05-12 00:05:39 UTC (rev 4782)
@@ -23,9 +23,11 @@
import java.io.IOException;
import java.util.Arrays;
-import java.util.Collections;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.HashMap;
import java.util.List;
-import java.util.Random;
+import java.util.Map;
import javax.mail.Address;
import javax.mail.Message;
@@ -44,40 +46,80 @@
protected void setUp() throws Exception {
super.setUp();
- long deploymentDbid = repositoryService.createDeployment().addResourceFromClasspath(
- "org/jbpm/examples/mail/inline/process.jpdl.xml").deploy();
+
+ // deploy process
+ long deploymentDbid = repositoryService.createDeployment()
+ .addResourceFromClasspath("org/jbpm/examples/mail/inline/process.jpdl.xml")
+ .deploy();
registerDeployment(deploymentDbid);
+
+ // create actors
+ identityService.createUser("bb", "Big Brother", null, "bb@oceania");
+ identityService.createUser("obrien", null, "O'Brien", "obrien@miniluv");
+ identityService.createUser("charr", null, "Charrington", "charr@miniluv");
+ identityService.createGroup("thinkpol");
+ identityService.createGroup("innerparty");
+ identityService.createMembership("obrien", "innerparty");
+ identityService.createMembership("charr", "thinkpol");
+ identityService.createMembership("obrien", "thinkpol");
}
+ protected void tearDown() throws Exception {
+ // delete actors
+ identityService.deleteGroup("thinkpol");
+ identityService.deleteGroup("innerparty");
+ identityService.deleteUser("bb");
+ identityService.deleteUser("obrien");
+ identityService.deleteUser("charr");
+
+ super.tearDown();
+ }
+
public void testInlineMail() throws MessagingException, IOException {
Wiser wiser = new Wiser();
- wiser.setPort(2525); // default is 25, but has security restrictions
+ wiser.setPort(2525);
wiser.start();
try {
+ // prepare dynamic values
+ String newspaper = "times";
+ Calendar calendar = Calendar.getInstance();
+ calendar.clear();
+ calendar.set(1983, Calendar.DECEMBER, 3);
+ Date date = calendar.getTime();
+ // assemble variables
+ Map<String, Object> variables = new HashMap<String, Object>();
+ variables.put("newspaper", newspaper);
+ variables.put("date", date);
// start process instance
- Object orderId = new Random().nextInt(1000) + 1;
- executionService.startProcessInstanceByKey("InlineMail", Collections.singletonMap("orderId",
- orderId));
+ executionService.startProcessInstanceByKey("InlineMail", variables);
// examine produced message
- List<WiserMessage> wiserMessages = wiser.getMessages();
- assertEquals(3, wiserMessages.size());
+ List<WiserMessage> wisMessages = wiser.getMessages();
+ // winston, bb, innerparty(obrien), thinkpol(charr, obrien)
+ assertEquals(5, wisMessages.size());
- for (WiserMessage wiserMessage : wiserMessages) {
- Message message = wiserMessage.getMimeMessage();
+ for (WiserMessage wisMessage : wisMessages) {
+ Message message = wisMessage.getMimeMessage();
// from
Address[] from = message.getFrom();
assertEquals(1, from.length);
assertEquals("noreply(a)jbpm.org", from[0].toString());
// to
- Address[] expectedTo = InternetAddress.parse("dilbert@office, alice@work, dogbert@house");
+ Address[] expectedTo = InternetAddress.parse("winston@minitrue");
Address[] to = message.getRecipients(RecipientType.TO);
- assert Arrays.equals(expectedTo, to) : to;
+ assert Arrays.equals(expectedTo, to) : Arrays.asList(to);
+ // cc
+ Address[] expectedCc = InternetAddress.parse("bb@oceania, obrien@miniluv");
+ System.out.println(Arrays.toString(expectedCc));
+ Address[] cc = message.getRecipients(RecipientType.CC);
+ System.out.println(Arrays.toString(cc));
+ assert Arrays.equals(expectedCc, cc) : Arrays.asList(cc);
+ // bcc - recipients undisclosed
+ assertNull(message.getRecipients(RecipientType.BCC));
// subject
- assertEquals("bureaucracy", message.getSubject());
+ assertEquals("rectify " + newspaper, message.getSubject());
// text
- assertEquals("Order http://example.com/order/" + orderId + " is stalled.",
- message.getContent());
+ assertTextPresent(newspaper + ' ' + date + " reporting bb dayorder", (String) message.getContent());
}
}
finally {
Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/mail/template/TemplateMailTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/mail/template/TemplateMailTest.java 2009-05-11 21:12:48 UTC (rev 4781)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/mail/template/TemplateMailTest.java 2009-05-12 00:05:39 UTC (rev 4782)
@@ -23,9 +23,11 @@
import java.io.IOException;
import java.util.Arrays;
-import java.util.Collections;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.HashMap;
import java.util.List;
-import java.util.Random;
+import java.util.Map;
import javax.mail.Address;
import javax.mail.Message;
@@ -44,40 +46,83 @@
protected void setUp() throws Exception {
super.setUp();
- long deploymentDbid = repositoryService.createDeployment().addResourceFromClasspath(
- "org/jbpm/examples/mail/template/process.jpdl.xml").deploy();
+
+ // deploy process
+ long deploymentDbid = repositoryService.createDeployment()
+ .addResourceFromClasspath("org/jbpm/examples/mail/template/process.jpdl.xml")
+ .deploy();
registerDeployment(deploymentDbid);
+
+ // create actors
+ identityService.createUser("bb", "Big Brother", null, "bb@oceania");
+ identityService.createUser("obrien", null, "O'Brien", "obrien@miniluv");
+ identityService.createUser("charr", null, "Charrington", "charr@miniluv");
+ identityService.createGroup("thinkpol");
+ identityService.createGroup("innerparty");
+ identityService.createMembership("obrien", "innerparty");
+ identityService.createMembership("charr", "thinkpol");
+ identityService.createMembership("obrien", "thinkpol");
}
+ protected void tearDown() throws Exception {
+ // delete actors
+ identityService.deleteGroup("thinkpol");
+ identityService.deleteGroup("innerparty");
+ identityService.deleteUser("bb");
+ identityService.deleteUser("obrien");
+ identityService.deleteUser("charr");
+
+ super.tearDown();
+ }
+
public void testTemplateMail() throws MessagingException, IOException {
Wiser wiser = new Wiser();
- wiser.setPort(2525); // default is 25, but has security restrictions
+ wiser.setPort(2525);
wiser.start();
try {
+ // prepare dynamic values
+ String addressee = "winston@minitrue";
+ String newspaper = "times";
+ Calendar calendar = Calendar.getInstance();
+ calendar.clear();
+ calendar.set(1983, Calendar.DECEMBER, 3);
+ Date date = calendar.getTime();
+ String details = "reporting bb dayorder doubleplusungood refs unpersons rewrite "
+ + "fullwise upsub antefiling";
+ // assemble variables
+ Map<String, Object> variables = new HashMap<String, Object>();
+ variables.put("addressee", addressee);
+ variables.put("newspaper", newspaper);
+ variables.put("date", date);
+ variables.put("details", details);
// start process instance
- Object orderId = new Random().nextInt(1000) + 1;
- executionService.startProcessInstanceByKey("TemplateMail", Collections.singletonMap(
- "orderId", orderId));
+ executionService.startProcessInstanceByKey("TemplateMail", variables);
// examine produced message
- List<WiserMessage> wiserMessages = wiser.getMessages();
- assertEquals(3, wiserMessages.size());
+ List<WiserMessage> wisMessages = wiser.getMessages();
+ // winston, bb, innerparty(obrien), thinkpol(charr, obrien)
+ assertEquals(5, wisMessages.size());
- for (WiserMessage wiserMessage : wiserMessages) {
- Message message = wiserMessage.getMimeMessage();
+ for (WiserMessage wisMessage : wisMessages) {
+ Message message = wisMessage.getMimeMessage();
// from
Address[] from = message.getFrom();
assertEquals(1, from.length);
assertEquals("noreply(a)jbpm.org", from[0].toString());
// to
- Address[] expectedTo = InternetAddress.parse("dilbert@office, alice@work, dogbert@house");
+ Address[] expectedTo = InternetAddress.parse(addressee);
Address[] to = message.getRecipients(RecipientType.TO);
- assert Arrays.equals(expectedTo, to) : to;
+ assert Arrays.equals(expectedTo, to) : Arrays.asList(to);
+ // cc
+ Address[] expectedCc = InternetAddress.parse("bb@oceania, obrien@miniluv");
+ Address[] cc = message.getRecipients(RecipientType.CC);
+ assert Arrays.equals(expectedCc, cc) : Arrays.asList(cc);
+ // bcc - recipients undisclosed
+ assertNull(message.getRecipients(RecipientType.BCC));
// subject
- assertEquals("bureaucracy", message.getSubject());
+ assertEquals("rectify " + newspaper, message.getSubject());
// text
- assertEquals("Order http://example.com/order/" + orderId + " is stalled.",
- message.getContent());
+ assertEquals(newspaper + ' ' + date + ' ' + details, (String) message.getContent());
}
}
finally {
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-05-11 21:12:48 UTC (rev 4781)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/candidates/TaskCandidatesTest.java 2009-05-12 00:05:39 UTC (rev 4782)
@@ -41,10 +41,10 @@
// create identities
identityService.createGroup("sales-dept");
- identityService.createUser("johndoe", "johndoe", "John", "Doe");
+ identityService.createUser("johndoe", "John", "Doe");
identityService.createMembership("johndoe", "sales-dept");
- identityService.createUser("joesmoe", "joesmoe", "Joe", "Smoe");
+ identityService.createUser("joesmoe", "Joe", "Smoe");
identityService.createMembership("joesmoe", "sales-dept");
// deploy process
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-05-11 21:12:48 UTC (rev 4781)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/swimlane/TaskSwimlaneTest.java 2009-05-12 00:05:39 UTC (rev 4782)
@@ -40,7 +40,7 @@
// create identities
identityService.createGroup("sales-dept");
- identityService.createUser("johndoe", "johndoe", "John", "Doe");
+ identityService.createUser("johndoe", "John", "Doe");
identityService.createMembership("johndoe", "sales-dept");
// deploy process
Modified: jbpm4/trunk/modules/examples/src/test/resources/jbpm.cfg.xml
===================================================================
--- jbpm4/trunk/modules/examples/src/test/resources/jbpm.cfg.xml 2009-05-11 21:12:48 UTC (rev 4781)
+++ jbpm4/trunk/modules/examples/src/test/resources/jbpm.cfg.xml 2009-05-12 00:05:39 UTC (rev 4782)
@@ -7,16 +7,20 @@
<import resource="jbpm.jpdl.cfg.xml" />
<import resource="jbpm.identity.cfg.xml" />
- <!-- Job executor is excluded for running the example test cases.
- To enable timers and messages in production use, this should be included.
- import resource="jbpm.jobexecutor.cfg.xml" / -->
+ <!-- Job executor is excluded for running the example test cases. -->
+ <!-- To enable timers and messages in production use, this should be included. -->
+ <!--
+ <import resource="jbpm.jobexecutor.cfg.xml" />
+ -->
<process-engine-context>
- <mail-template name="MemoTemplate">
- <to addresses='dilbert@office, alice@work, dogbert@house' />
- <subject>bureaucracy</subject>
- <text>Order http://example.com/order/#{orderId} is stalled.</text>
+ <mail-template name="rectify template">
+ <to addresses="${addressee}" />
+ <cc users="bb" groups="innerparty" />
+ <bcc groups="thinkpol" />
+ <subject>rectify ${newspaper}</subject>
+ <text>${newspaper} ${date} ${details}</text>
</mail-template>
</process-engine-context>
Modified: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/mail/inline/process.jpdl.xml
===================================================================
--- jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/mail/inline/process.jpdl.xml 2009-05-11 21:12:48 UTC (rev 4781)
+++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/mail/inline/process.jpdl.xml 2009-05-12 00:05:39 UTC (rev 4782)
@@ -3,16 +3,30 @@
<process name="InlineMail">
<start>
- <transition to="send memo"/>
+ <transition to="send rectify note" />
</start>
-
- <mail name="send memo">
- <to addresses='dilbert@office, alice@work, dogbert@house'/>
- <subject>bureaucracy</subject>
- <text>Order http://example.com/order/#{orderId} is stalled.</text>
- <transition to="end" />
+
+ <mail name="send rectify note" language="juel">
+ <to addresses="winston@minitrue" />
+ <cc users="bb" groups="innerparty" />
+ <bcc groups="thinkpol" />
+ <subject>rectify ${newspaper}</subject>
+ <text>${newspaper} ${date} reporting bb dayorder doubleplusungood
+ refs unpersons rewrite fullwise upsub antefiling</text>
+ <!--
+ <html><table><tr><td>${newspaper}</td><td>${date}</td>
+ <td>reporting bb dayorder doubleplusungood
+ refs unpersons rewrite fullwise upsub antefiling</td>
+ </tr></table></html>
+ <attachments>
+ <attachment url='http://www.george-orwell.org/1984/3.html' />
+ <attachment resource='org/example/pic.jpg' />
+ <attachment file='${user.home}/.face' />
+ </attachments>
+ -->
+ <transition to="end" />
</mail>
-
- <state name="end"/>
+ <state name="end" />
+
</process>
\ No newline at end of file
Modified: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/mail/template/process.jpdl.xml
===================================================================
--- jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/mail/template/process.jpdl.xml 2009-05-11 21:12:48 UTC (rev 4781)
+++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/mail/template/process.jpdl.xml 2009-05-12 00:05:39 UTC (rev 4782)
@@ -3,13 +3,13 @@
<process name="TemplateMail">
<start>
- <transition to="send memo" />
+ <transition to="send rectify note" />
</start>
- <mail name="send memo" template="MemoTemplate">
- <transition to="end" />
+ <mail name="send rectify note" template="rectify template">
+ <transition to="end" />
</mail>
-
- <state name="end"/>
+ <state name="end" />
+
</process>
\ No newline at end of file
Deleted: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/AddressBuilderImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/AddressBuilderImpl.java 2009-05-11 21:12:48 UTC (rev 4781)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/AddressBuilderImpl.java 2009-05-12 00:05:39 UTC (rev 4782)
@@ -1,52 +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.UnsupportedEncodingException;
-
-import javax.mail.Address;
-import javax.mail.internet.InternetAddress;
-
-import org.jbpm.api.JbpmException;
-import org.jbpm.api.identity.User;
-import org.jbpm.pvm.internal.email.spi.AddressBuilder;
-
-/**
- * @author Alejandro Guizar
- */
-public class AddressBuilderImpl implements AddressBuilder {
-
- public Address buildAddress(User user) {
- String givenName = user.getGivenName();
- String familyName = user.getFamilyName();
- String personal =
- givenName != null ? familyName != null ? givenName + ' ' + familyName : givenName
- : familyName;
- try {
- return new InternetAddress(user.getEmailAddress(), personal);
- }
- catch (UnsupportedEncodingException e) {
- throw new JbpmException("invalid recipient name: " + personal);
- }
- }
-
-}
Copied: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/DefaultAddressResolver.java (from rev 4777, jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/AddressBuilderImpl.java)
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/DefaultAddressResolver.java (rev 0)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/DefaultAddressResolver.java 2009-05-12 00:05:39 UTC (rev 4782)
@@ -0,0 +1,66 @@
+/*
+ * 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.UnsupportedEncodingException;
+import java.util.List;
+
+import javax.mail.Address;
+import javax.mail.internet.InternetAddress;
+
+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.email.spi.AddressResolver;
+import org.jbpm.pvm.internal.identity.spi.IdentitySession;
+
+/**
+ * @author Alejandro Guizar
+ */
+public class DefaultAddressResolver implements AddressResolver {
+
+ public Address resolveAddress(User user) {
+ String givenName = user.getGivenName();
+ String familyName = user.getFamilyName();
+ String personal = givenName != null ? familyName != null ? givenName + ' ' + familyName
+ : givenName : familyName;
+ try {
+ return new InternetAddress(user.getBusinessEmail(), personal);
+ }
+ catch (UnsupportedEncodingException e) {
+ throw new JbpmException("invalid recipient name: " + personal);
+ }
+ }
+
+ public Address[] resolveAddresses(Group group) {
+ List<User> users = Environment.getFromCurrent(IdentitySession.class)
+ .findUsersByGroup(group.getId());
+ int userCount = users.size();
+ Address[] addresses = new Address[userCount];
+ for (int i = 0; i < userCount; i++) {
+ addresses[i] = resolveAddress(users.get(i));
+ }
+ return addresses;
+ }
+
+}
Modified: 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/MailProducerImpl.java 2009-05-11 21:12:48 UTC (rev 4781)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/MailProducerImpl.java 2009-05-12 00:05:39 UTC (rev 4782)
@@ -46,8 +46,9 @@
import org.jbpm.api.Execution;
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.email.spi.AddressBuilder;
+import org.jbpm.pvm.internal.email.spi.AddressResolver;
import org.jbpm.pvm.internal.email.spi.MailProducer;
import org.jbpm.pvm.internal.identity.spi.IdentitySession;
import org.jbpm.pvm.internal.script.ScriptManager;
@@ -99,20 +100,24 @@
}
}
+ Environment environment = Environment.getCurrent();
+ IdentitySession identitySession = environment.get(IdentitySession.class);
+ AddressResolver addressResolver = environment.get(AddressResolver.class);
+
// resolve and tokenize users
- IdentitySession identitySession = Environment.getFromCurrent(IdentitySession.class);
String userList = fromTemplate.getUsers();
if (userList != null) {
String[] userIds = tokenizeActors(userList, execution);
List<User> users = identitySession.findUsersById(userIds);
- addSenders(users, email);
+ addSenders(resolveAddresses(users, addressResolver), email);
}
- // resolve and tokenize actors
+
+ // resolve and tokenize groups
String groupList = fromTemplate.getGroups();
if (groupList != null) {
for (String groupId : tokenizeActors(groupList, execution)) {
- List<User> users = identitySession.findUsersByGroup(groupId);
- addSenders(users, email);
+ Group group = identitySession.findGroupById(groupId);
+ addSenders(addressResolver.resolveAddresses(group), email);
}
}
}
@@ -127,9 +132,18 @@
return evaluateExpression(recipients, execution).split("[,|\\s]+");
}
+ /** construct recipient addresses from user entities */
+ private Address[] resolveAddresses(List<User> users, AddressResolver addressResolver) {
+ int userCount = users.size();
+ Address[] addresses = new Address[userCount];
+ for (int i = 0; i < userCount; i++) {
+ addresses[i] = addressResolver.resolveAddress(users.get(i));
+ }
+ return addresses;
+ }
+
/** add senders to message */
- private void addSenders(List<User> users, Message email) {
- Address[] addresses = buildAddresses(users);
+ private void addSenders(Address[] addresses, Message email) {
try {
email.addFrom(addresses);
}
@@ -138,18 +152,6 @@
}
}
- /** construct recipient addresses from user entities */
- private Address[] buildAddresses(List<User> users) {
- AddressBuilder addressBuilder = Environment.getFromCurrent(AddressBuilder.class);
-
- int userCount = users.size();
- Address[] addresses = new Address[userCount];
- for (int i = 0; i < userCount; i++) {
- addresses[i] = addressBuilder.buildAddress(users.get(i));
- }
- return addresses;
- }
-
protected void fillRecipients(Execution execution, Message email) {
// to
AddressTemplate to = template.getTo();
@@ -181,27 +183,30 @@
}
}
- IdentitySession identitySession = Environment.getFromCurrent(IdentitySession.class);
+ Environment environment = Environment.getCurrent();
+ IdentitySession identitySession = environment.get(IdentitySession.class);
+ AddressResolver addressResolver = environment.get(AddressResolver.class);
+
// resolve and tokenize users
String userList = addressTemplate.getUsers();
if (userList != null) {
String[] userIds = tokenizeActors(userList, execution);
List<User> users = identitySession.findUsersById(userIds);
- addRecipients(users, email, recipientType);
+ addRecipients(resolveAddresses(users, addressResolver), email, recipientType);
}
+
// resolve and tokenize groups
String groupList = addressTemplate.getGroups();
if (groupList != null) {
for (String groupId : tokenizeActors(groupList, execution)) {
- List<User> users = identitySession.findUsersByGroup(groupId);
- addRecipients(users, email, recipientType);
+ Group group = identitySession.findGroupById(groupId);
+ addRecipients(addressResolver.resolveAddresses(group), email, recipientType);
}
}
}
/** add recipient addresses to message */
- private void addRecipients(List<User> users, Message email, RecipientType recipientType) {
- Address[] addresses = buildAddresses(users);
+ private void addRecipients(Address[] addresses, Message email, RecipientType recipientType) {
try {
email.addRecipients(recipientType, addresses);
}
Deleted: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/spi/AddressBuilder.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/spi/AddressBuilder.java 2009-05-11 21:12:48 UTC (rev 4781)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/spi/AddressBuilder.java 2009-05-12 00:05:39 UTC (rev 4782)
@@ -1,34 +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 javax.mail.Address;
-
-import org.jbpm.api.identity.User;
-
-/**
- * @author Alejandro Guizar
- */
-public interface AddressBuilder {
-
- Address buildAddress(User user);
-}
Copied: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/spi/AddressResolver.java (from rev 4777, jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/spi/AddressBuilder.java)
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/spi/AddressResolver.java (rev 0)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/spi/AddressResolver.java 2009-05-12 00:05:39 UTC (rev 4782)
@@ -0,0 +1,37 @@
+/*
+ * 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 javax.mail.Address;
+
+import org.jbpm.api.identity.Group;
+import org.jbpm.api.identity.User;
+
+/**
+ * @author Alejandro Guizar
+ */
+public interface AddressResolver {
+
+ Address resolveAddress(User user);
+
+ Address[] resolveAddresses(Group group);
+}
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/CreateUserCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/CreateUserCmd.java 2009-05-11 21:12:48 UTC (rev 4781)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/CreateUserCmd.java 2009-05-12 00:05:39 UTC (rev 4782)
@@ -34,21 +34,27 @@
private static final long serialVersionUID = 1L;
protected String userId;
- protected String password;
protected String givenName;
protected String familyName;
+ protected String businessEmail;
+ protected String password;
- public CreateUserCmd(String userId, String password, String givenName, String familyName) {
+ public CreateUserCmd(String userId, String givenName, String familyName) {
this.userId = userId;
- this.password = password;
this.givenName = givenName;
this.familyName = familyName;
}
+ public CreateUserCmd(String userId, String givenName, String familyName, String businessEmail) {
+ this.userId = userId;
+ this.givenName = givenName;
+ this.familyName = familyName;
+ this.businessEmail = businessEmail;
+ }
public Void execute(Environment environment) throws Exception {
IdentitySession identitySession = environment.get(IdentitySession.class);
- identitySession.createUser(userId, password, givenName, familyName);
+ identitySession.createUser(userId, givenName, familyName, businessEmail);
return null;
}
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-05-11 21:12:48 UTC (rev 4781)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/IdentitySessionImpl.java 2009-05-12 00:05:39 UTC (rev 4782)
@@ -21,71 +21,60 @@
*/
package org.jbpm.pvm.internal.identity.impl;
-import java.util.Collection;
import java.util.List;
import org.hibernate.Query;
import org.hibernate.Session;
+import org.hibernate.criterion.Projections;
+import org.hibernate.criterion.Restrictions;
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;
-
/**
* @author Tom Baeyens
*/
public class IdentitySessionImpl implements IdentitySession {
-
+
protected Session session;
- public String createUser(String userName, String password, String givenName, String familyName) {
- UserImpl user = new UserImpl();
- user.setId(userName);
- user.setPassword(password);
- user.setGivenName(givenName);
- user.setFamilyName(familyName);
+ public String createUser(String userName, String givenName, String familyName, String businessEmail) {
+ UserImpl user = new UserImpl(userName, givenName, familyName);
+ user.setBusinessEmail(businessEmail);
session.save(user);
-
+
return user.getId();
}
public User findUserById(String userId) {
- UserImpl user = (UserImpl) session.createQuery(
- "select user " +
- "from "+UserImpl.class.getName()+" as user " +
- "where user.id = '"+userId+"'"
- ).uniqueResult();
- return user;
+ return (User) session.createCriteria(UserImpl.class)
+ .add(Restrictions.eq("id", userId))
+ .uniqueResult();
}
public List<User> findUsersById(String... userIds) {
- return session.createQuery("from " + UserImpl.class.getName() + " u " +
- "where u.id in :userIds")
- .setParameterList("userIds", userIds)
- .list();
+ return session.createCriteria(UserImpl.class).add(Restrictions.in("id", userIds)).list();
}
public List<User> findUsers() {
- return session.createQuery(
- "from "+UserImpl.class.getName()
- ).list();
+ return session.createCriteria(UserImpl.class).list();
}
public void deleteUser(String userId) {
// lookup the user
User user = findUserById(userId);
-
+
// cascade the deletion to the memberships
- Query query = session.createQuery(
- "from "+MembershipImpl.class.getName()+" as m "+
- "where m.user is :user"
- );
+ Query query = session.createQuery("from "
+ + MembershipImpl.class.getName()
+ + " as m "
+ + "where m.user is :user");
query.setEntity("user", user);
List<MembershipImpl> memberships = query.list();
-
+
// delete the related memberships
- for (MembershipImpl membership: memberships) {
+ for (MembershipImpl membership : memberships) {
session.delete(membership);
}
@@ -95,103 +84,108 @@
public String createGroup(String groupName, String groupType, String parentGroupId) {
GroupImpl group = new GroupImpl();
- String groupId = (groupType!=null ? groupType+"."+groupName : groupName);
+ String groupId = groupType != null ? groupType + "." + groupName : groupName;
group.setId(groupId);
group.setName(groupName);
group.setType(groupType);
-
- if (parentGroupId!=null) {
+
+ if (parentGroupId != null) {
GroupImpl parentGroup = findGroupById(parentGroupId);
group.setParent(parentGroup);
}
-
+
session.save(group);
-
+
return group.getId();
}
-
public List<User> findUsersByGroup(String groupId) {
- return session.createQuery("select m.user " +
- "from "+MembershipImpl.class.getName()+" m " +
- "where m.group.id = : groupId")
- .setString("groupId", groupId)
+ return session.createCriteria(MembershipImpl.class)
+ .createAlias("group", "g")
+ .add(Restrictions.eq("g.id", groupId))
+ .setProjection(Projections.property("user"))
.list();
}
-
+
public GroupImpl findGroupById(String groupId) {
- GroupImpl group = (GroupImpl) session.createQuery(
- "select group " +
- "from "+GroupImpl.class.getName()+" as group " +
- "where group.id = '"+groupId+"'"
- ).uniqueResult();
+ GroupImpl group = (GroupImpl) session.createQuery("select group "
+ + "from "
+ + GroupImpl.class.getName()
+ + " as group "
+ + "where group.id = '"
+ + groupId
+ + "'").uniqueResult();
return group;
}
public List<Group> findGroupsByUserAndGroupType(String userId, String groupType) {
- Query query = session.createQuery(
- "select distinct membership.group " +
- "from "+MembershipImpl.class.getName()+" as membership " +
- "where membership.user.id = '"+userId+"'" +
- " and membership.group.type = '"+groupType+"'"
- );
+ Query query = session.createQuery("select distinct membership.group "
+ + "from "
+ + MembershipImpl.class.getName()
+ + " as membership "
+ + "where membership.user.id = '"
+ + userId
+ + "'"
+ + " and membership.group.type = '"
+ + groupType
+ + "'");
return query.list();
}
public List<Group> findGroupsByUser(String userId) {
- Query query = session.createQuery(
- "select distinct membership.group " +
- "from "+MembershipImpl.class.getName()+" as membership " +
- "where membership.user.id = '"+userId+"'"
- );
+ Query query = session.createQuery("select distinct membership.group "
+ + "from "
+ + MembershipImpl.class.getName()
+ + " as membership "
+ + "where membership.user.id = '"
+ + userId
+ + "'");
return query.list();
}
public List<Group> findGroups() {
- return session.createQuery(
- "from "+GroupImpl.class.getName()
- ).list();
+ return session.createQuery("from " + GroupImpl.class.getName()).list();
}
public void deleteGroup(String groupId) {
// look up the group
GroupImpl group = findGroupById(groupId);
-
+
// cascade the deletion to the memberships
- Query query = session.createQuery(
- "from "+MembershipImpl.class.getName()+" as m "+
- "where m.group is :group"
- );
+ Query query = session.createQuery("from "
+ + MembershipImpl.class.getName()
+ + " as m "
+ + "where m.group is :group");
query.setEntity("group", group);
List<MembershipImpl> memberships = query.list();
-
+
// delete the related memberships
- for (MembershipImpl membership: memberships) {
+ for (MembershipImpl membership : memberships) {
session.delete(membership);
}
-
+
// delete the group
session.delete(group);
}
public void createMembership(String userId, String groupId, String role) {
User user = findUserById(userId);
- if (user==null) {
- throw new JbpmException("user "+userId+" doesn't exist");
+ if (user == null) {
+ throw new JbpmException("user " + userId + " doesn't exist");
}
GroupImpl group = findGroupById(groupId);
- if (group==null) {
- throw new JbpmException("group "+groupId+" doesn't exist");
+ if (group == null) {
+ throw new JbpmException("group " + groupId + " doesn't exist");
}
-
+
MembershipImpl membership = new MembershipImpl();
membership.setUser(user);
membership.setGroup(group);
membership.setRole(role);
-
+
session.save(membership);
}
-
+
public void deleteMembership(String userId, String groupId, String role) {
throw new UnsupportedOperationException("please implement me");
}
@@ -200,5 +194,4 @@
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-05-11 21:12:48 UTC (rev 4781)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/JBossIdmIdentitySessionImpl.java 2009-05-12 00:05:39 UTC (rev 4782)
@@ -59,7 +59,7 @@
transaction.enlistResource(identitySessionResource);
}
- public String createUser(String userName, String password, String givenName, String lastName) {
+ public String createUser(String userName, String givenName, String familyName, String businessEmail) {
try {
Identity identity = identitySession.getPersistenceManager().createIdentity(userName);
@@ -67,8 +67,9 @@
// identitySession.getAttributesManager().updateCredential(identity, new PasswordCredential(password));
Attribute[] attributes = new Attribute[] {
- new SimpleAttribute(P3PConstants.INFO_USER_NAME_GIVEN, new String[] { givenName }),
- new SimpleAttribute(P3PConstants.INFO_USER_NAME_FAMILY, new String[] { lastName })
+ new SimpleAttribute(P3PConstants.INFO_USER_NAME_GIVEN, givenName),
+ new SimpleAttribute(P3PConstants.INFO_USER_NAME_FAMILY, familyName),
+ new SimpleAttribute(P3PConstants.INFO_USER_BUSINESS_INFO_ONLINE_EMAIL, businessEmail)
};
identitySession.getAttributesManager().addAttributes(identity, attributes);
} catch (IdentityException e) {
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-05-11 21:12:48 UTC (rev 4781)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/UserImpl.java 2009-05-12 00:05:39 UTC (rev 4782)
@@ -22,27 +22,25 @@
package org.jbpm.pvm.internal.identity.impl;
import java.io.Serializable;
-import java.util.Set;
import org.jbpm.api.identity.User;
-
/**
* @author Tom Baeyens
*/
public class UserImpl implements User, Serializable {
private static final long serialVersionUID = 1L;
-
+
protected long dbid;
protected int dbversion;
protected String id;
+ protected String password;
protected String givenName;
protected String familyName;
- protected String emailAddress;
- protected String password;
-
+ protected String businessEmail;
+
public UserImpl() {
}
@@ -55,40 +53,44 @@
public String getId() {
return id;
}
+
public String getGivenName() {
return givenName;
}
+
public String getFamilyName() {
return familyName;
}
- public String getEmailAddress() {
- return emailAddress;
- }
- public String toString() {
- if ( (givenName!=null)
- && (familyName!=null)
- ) {
- return givenName+" "+familyName;
- }
- return id;
+ public String getBusinessEmail() {
+ return businessEmail;
}
-
+
+ public String toString() {
+ return givenName != null ? familyName != null ? givenName + ' ' + familyName : givenName
+ : familyName != null ? familyName : id;
+ }
+
public void setId(String id) {
this.id = id;
}
+
public void setGivenName(String givenName) {
this.givenName = givenName;
}
+
public void setFamilyName(String familyName) {
this.familyName = familyName;
}
- public void setEmailAddress(String emailAddress) {
- this.emailAddress = emailAddress;
- }
- public String getPassword() {
+
+ public void setBusinessEmail(String emailAddress) {
+ this.businessEmail = emailAddress;
+ }
+
+ public String getPassword() {
return password;
}
+
public void setPassword(String password) {
this.password = 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-05-11 21:12:48 UTC (rev 4781)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/spi/IdentitySession.java 2009-05-12 00:05:39 UTC (rev 4782)
@@ -29,10 +29,10 @@
/**
* @author Tom Baeyens
*/
-public interface IdentitySession{
+public interface IdentitySession {
/** create a new user */
- String createUser(String userId, String password, String givenName, String familyName);
+ String createUser(String userId, String givenName, String familyName, String businessEmail);
/** lookup a user.
* @return the user or null if no such user exists */
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-05-11 21:12:48 UTC (rev 4781)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/IdentityServiceImpl.java 2009-05-12 00:05:39 UTC (rev 4782)
@@ -46,10 +46,14 @@
protected CommandService commandService;
- public void createUser(String userId, String password, String givenName, String familyName) {
- commandService.execute(new CreateUserCmd(userId, password, givenName, familyName));
+ public void createUser(String userId, String givenName, String familyName) {
+ commandService.execute(new CreateUserCmd(userId, givenName, familyName));
}
+ public void createUser(String userId, String givenName, String familyName, String businessEmail) {
+ commandService.execute(new CreateUserCmd(userId, givenName, familyName, businessEmail));
+ }
+
public User findUserById(String userId) {
return commandService.execute(new FindUserCmd(userId));
}
Added: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/AddressResolverBinding.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/AddressResolverBinding.java (rev 0)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/AddressResolverBinding.java 2009-05-12 00:05:39 UTC (rev 4782)
@@ -0,0 +1,43 @@
+/*
+ * 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 org.jbpm.pvm.internal.email.impl.DefaultAddressResolver;
+import org.jbpm.pvm.internal.wire.descriptor.ObjectDescriptor;
+import org.jbpm.pvm.internal.xml.Parse;
+import org.jbpm.pvm.internal.xml.Parser;
+import org.w3c.dom.Element;
+
+/**
+ * @author Alejandro Guizar
+ */
+public class AddressResolverBinding extends WireDescriptorBinding {
+
+ public AddressResolverBinding() {
+ super("address-resolver");
+ }
+
+ public Object parse(Element element, Parse parse, Parser parser) {
+ return new ObjectDescriptor(DefaultAddressResolver.class);
+ }
+
+}
Modified: jbpm4/trunk/modules/pvm/src/main/resources/jbpm.default.cfg.xml
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/resources/jbpm.default.cfg.xml 2009-05-11 21:12:48 UTC (rev 4781)
+++ jbpm4/trunk/modules/pvm/src/main/resources/jbpm.default.cfg.xml 2009-05-12 00:05:39 UTC (rev 4782)
@@ -22,7 +22,7 @@
default-script-language="juel"
read-contexts="execution, environment, process-engine"
write-context="">
- <script-language name="juel" factory="org.jbpm.pvm.internal.script.JuelScriptEngineFactory" />
+ <script-language name="juel" factory="org.jbpm.pvm.internal.script.JuelScriptEngineFactory" />
</script-manager>
<authentication />
@@ -30,6 +30,8 @@
<id-generator />
<types resource="jbpm.variable.types.xml" />
+ <address-resolver />
+
<business-calendar>
<monday hours="9:00-12:00 and 12:30-17:00"/>
<tuesday hours="9:00-12:00 and 12:30-17:00"/>
Modified: jbpm4/trunk/modules/pvm/src/main/resources/jbpm.identity.hbm.xml
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/resources/jbpm.identity.hbm.xml 2009-05-11 21:12:48 UTC (rev 4781)
+++ jbpm4/trunk/modules/pvm/src/main/resources/jbpm.identity.hbm.xml 2009-05-12 00:05:39 UTC (rev 4782)
@@ -14,6 +14,7 @@
<property name="password" column="PASSWORD_" />
<property name="givenName" column="GIVENNAME_" />
<property name="familyName" column="FAMILYNAME_" />
+ <property name="businessEmail" column="BUSINESSEMAIL_" />
</class>
<!-- ### MEMBERSHIP ##################################################### -->
Modified: jbpm4/trunk/modules/pvm/src/main/resources/jbpm.wire.bindings.xml
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/resources/jbpm.wire.bindings.xml 2009-05-11 21:12:48 UTC (rev 4781)
+++ jbpm4/trunk/modules/pvm/src/main/resources/jbpm.wire.bindings.xml 2009-05-12 00:05:39 UTC (rev 4782)
@@ -39,6 +39,8 @@
<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" />
+ <binding class="org.jbpm.pvm.internal.wire.binding.AddressResolverBinding"/>
<!-- hibernate bindings -->
<binding class="org.jbpm.pvm.internal.wire.binding.HibernateConfigurationBinding" />
<binding class="org.jbpm.pvm.internal.wire.binding.SeamHibernateSessionBinding" />
@@ -53,7 +55,6 @@
<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" />
- <binding class="org.jbpm.pvm.internal.wire.binding.MailTemplateBinding" />
<!-- db sessions -->
<binding class="org.jbpm.pvm.internal.wire.binding.PvmDbSessionBinding" />
Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/identity/IdentityTest.java
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/identity/IdentityTest.java 2009-05-11 21:12:48 UTC (rev 4781)
+++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/identity/IdentityTest.java 2009-05-12 00:05:39 UTC (rev 4782)
@@ -23,22 +23,18 @@
import java.util.List;
-import org.jbpm.api.IdentityService;
import org.jbpm.api.identity.Group;
import org.jbpm.api.identity.User;
import org.jbpm.test.JbpmTestCase;
-
/**
* @author Tom Baeyens
*/
public class IdentityTest extends JbpmTestCase {
public void testSingleUser() throws Exception {
- IdentityService identityService = processEngine.get(IdentityService.class);
+ identityService.createUser("johndoe", "John", "Doe");
- identityService.createUser("johndoe", "johndoe", "John", "Doe");
-
List<User> users = identityService.findUsers();
assertNotNull(users);
assertEquals(1, users.size());
@@ -55,12 +51,10 @@
}
public void testSingleGroup() throws Exception {
- IdentityService identityService = processEngine.get(IdentityService.class);
+ identityService.createUser("johndoe", "John", "Doe");
+ identityService.createUser("joesmoe", "Joe", "Smoe");
+ identityService.createUser("jackblack", "Jack", "Black");
- identityService.createUser("johndoe", "johndoe", "John", "Doe");
- identityService.createUser("joesmoe", "joesmoe", "Joe", "Smoe");
- identityService.createUser("jackblack", "jackblack", "Jack", "Black");
-
String redhatId = identityService.createGroup("redhat", Group.TYPE_UNIT, null);
String jbossId = identityService.createGroup("jboss", Group.TYPE_UNIT, "redhat");
String jbpmId = identityService.createGroup("jbpm", Group.TYPE_UNIT, "jboss");
16 years, 11 months
- 1
- 0
JBoss JBPM SVN: r4781 - jbpm4/branches/jbpm-4.0.0.Beta2.
by do-not-reply＠jboss.org
Author: koen.aers(a)jboss.com
Date: 2009-05-11 17:12:48 -0400 (Mon, 11 May 2009)
New Revision: 4781
Modified:
jbpm4/branches/jbpm-4.0.0.Beta2/pom.xml
Log:
update of jbpm.gpd.version property to 4.0.0.Beta2
Modified: jbpm4/branches/jbpm-4.0.0.Beta2/pom.xml
===================================================================
--- jbpm4/branches/jbpm-4.0.0.Beta2/pom.xml 2009-05-11 16:20:17 UTC (rev 4780)
+++ jbpm4/branches/jbpm-4.0.0.Beta2/pom.xml 2009-05-11 21:12:48 UTC (rev 4781)
@@ -48,7 +48,7 @@
<cactus.version>13-1.7.1</cactus.version>
<freemarker.version>2.3.15</freemarker.version>
<gwt.console.version>1.0.0-SNAPSHOT</gwt.console.version>
- <jbpm.gpd.version>4.0.0-SNAPSHOT</jbpm.gpd.version>
+ <jbpm.gpd.version>4.0.0.Beta2</jbpm.gpd.version>
<hibernate.version>3.3.1.GA</hibernate.version>
<slf4j.version>1.5.2</slf4j.version>
<hsqldb.version>1.8.0.7</hsqldb.version>
16 years, 11 months
- 1
- 0
JBoss JBPM SVN: r4780 - in projects/gwt-console/tags/gwt-console-1.0.0.Beta3: gui and 7 other directories.
by do-not-reply＠jboss.org
Author: heiko.braun(a)jboss.com
Date: 2009-05-11 12:20:17 -0400 (Mon, 11 May 2009)
New Revision: 4780
Modified:
projects/gwt-console/tags/gwt-console-1.0.0.Beta3/gui/pom.xml
projects/gwt-console/tags/gwt-console-1.0.0.Beta3/gui/war/pom.xml
projects/gwt-console/tags/gwt-console-1.0.0.Beta3/gui/workspace-api/pom.xml
projects/gwt-console/tags/gwt-console-1.0.0.Beta3/gui/workspace-example/pom.xml
projects/gwt-console/tags/gwt-console-1.0.0.Beta3/pom.xml
projects/gwt-console/tags/gwt-console-1.0.0.Beta3/rpc/pom.xml
projects/gwt-console/tags/gwt-console-1.0.0.Beta3/server/pom.xml
projects/gwt-console/tags/gwt-console-1.0.0.Beta3/server/server-core/pom.xml
projects/gwt-console/tags/gwt-console-1.0.0.Beta3/server/server-integration/pom.xml
Log:
Version 1.0.0.Beta3
Modified: projects/gwt-console/tags/gwt-console-1.0.0.Beta3/gui/pom.xml
===================================================================
--- projects/gwt-console/tags/gwt-console-1.0.0.Beta3/gui/pom.xml 2009-05-11 16:14:02 UTC (rev 4779)
+++ projects/gwt-console/tags/gwt-console-1.0.0.Beta3/gui/pom.xml 2009-05-11 16:20:17 UTC (rev 4780)
@@ -12,7 +12,7 @@
<parent>
<groupId>org.jboss.bpm</groupId>
<artifactId>gwt-console-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.Beta3</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: projects/gwt-console/tags/gwt-console-1.0.0.Beta3/gui/war/pom.xml
===================================================================
--- projects/gwt-console/tags/gwt-console-1.0.0.Beta3/gui/war/pom.xml 2009-05-11 16:14:02 UTC (rev 4779)
+++ projects/gwt-console/tags/gwt-console-1.0.0.Beta3/gui/war/pom.xml 2009-05-11 16:20:17 UTC (rev 4780)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.bpm</groupId>
<artifactId>gwt-console-guimodule</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.Beta3</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: projects/gwt-console/tags/gwt-console-1.0.0.Beta3/gui/workspace-api/pom.xml
===================================================================
--- projects/gwt-console/tags/gwt-console-1.0.0.Beta3/gui/workspace-api/pom.xml 2009-05-11 16:14:02 UTC (rev 4779)
+++ projects/gwt-console/tags/gwt-console-1.0.0.Beta3/gui/workspace-api/pom.xml 2009-05-11 16:20:17 UTC (rev 4780)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.bpm</groupId>
<artifactId>gwt-console-guimodule</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.Beta3</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: projects/gwt-console/tags/gwt-console-1.0.0.Beta3/gui/workspace-example/pom.xml
===================================================================
--- projects/gwt-console/tags/gwt-console-1.0.0.Beta3/gui/workspace-example/pom.xml 2009-05-11 16:14:02 UTC (rev 4779)
+++ projects/gwt-console/tags/gwt-console-1.0.0.Beta3/gui/workspace-example/pom.xml 2009-05-11 16:20:17 UTC (rev 4780)
@@ -4,19 +4,19 @@
<name>JBoss BPM Console - Mapsplugin</name>
<groupId>org.jboss.bpm.console</groupId>
<artifactId>mapsplugin</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.Beta3</version>
<packaging>jar</packaging>
<!-- Parent -->
<parent>
<groupId>org.jboss.bpm</groupId>
<artifactId>gwt-console-guimodule</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.Beta3</version>
<relativePath>../pom.xml</relativePath>
</parent>
<properties>
- <gwt-console.version>1.0.0-SNAPSHOT</gwt-console.version>
+ <gwt-console.version>1.0.0.Beta3</gwt-console.version>
<gwt-mosaic.version>0.1.9</gwt-mosaic.version>
</properties>
Modified: projects/gwt-console/tags/gwt-console-1.0.0.Beta3/pom.xml
===================================================================
--- projects/gwt-console/tags/gwt-console-1.0.0.Beta3/pom.xml 2009-05-11 16:14:02 UTC (rev 4779)
+++ projects/gwt-console/tags/gwt-console-1.0.0.Beta3/pom.xml 2009-05-11 16:20:17 UTC (rev 4780)
@@ -4,7 +4,7 @@
<name>JBoss BPM - GWT Console</name>
<groupId>org.jboss.bpm</groupId>
<artifactId>gwt-console-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.Beta3</version>
<packaging>pom</packaging>
<!-- Parent -->
Modified: projects/gwt-console/tags/gwt-console-1.0.0.Beta3/rpc/pom.xml
===================================================================
--- projects/gwt-console/tags/gwt-console-1.0.0.Beta3/rpc/pom.xml 2009-05-11 16:14:02 UTC (rev 4779)
+++ projects/gwt-console/tags/gwt-console-1.0.0.Beta3/rpc/pom.xml 2009-05-11 16:20:17 UTC (rev 4780)
@@ -12,7 +12,7 @@
<parent>
<groupId>org.jboss.bpm</groupId>
<artifactId>gwt-console-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.Beta3</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: projects/gwt-console/tags/gwt-console-1.0.0.Beta3/server/pom.xml
===================================================================
--- projects/gwt-console/tags/gwt-console-1.0.0.Beta3/server/pom.xml 2009-05-11 16:14:02 UTC (rev 4779)
+++ projects/gwt-console/tags/gwt-console-1.0.0.Beta3/server/pom.xml 2009-05-11 16:20:17 UTC (rev 4780)
@@ -12,7 +12,7 @@
<parent>
<groupId>org.jboss.bpm</groupId>
<artifactId>gwt-console-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.Beta3</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: projects/gwt-console/tags/gwt-console-1.0.0.Beta3/server/server-core/pom.xml
===================================================================
--- projects/gwt-console/tags/gwt-console-1.0.0.Beta3/server/server-core/pom.xml 2009-05-11 16:14:02 UTC (rev 4779)
+++ projects/gwt-console/tags/gwt-console-1.0.0.Beta3/server/server-core/pom.xml 2009-05-11 16:20:17 UTC (rev 4780)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.bpm</groupId>
<artifactId>gwt-console-servermodule</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.Beta3</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: projects/gwt-console/tags/gwt-console-1.0.0.Beta3/server/server-integration/pom.xml
===================================================================
--- projects/gwt-console/tags/gwt-console-1.0.0.Beta3/server/server-integration/pom.xml 2009-05-11 16:14:02 UTC (rev 4779)
+++ projects/gwt-console/tags/gwt-console-1.0.0.Beta3/server/server-integration/pom.xml 2009-05-11 16:20:17 UTC (rev 4780)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.bpm</groupId>
<artifactId>gwt-console-servermodule</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.Beta3</version>
<relativePath>../pom.xml</relativePath>
</parent>
16 years, 11 months
- 1
- 0
JBoss JBPM SVN: r4779 - projects/gwt-console/tags.
by do-not-reply＠jboss.org
Author: heiko.braun(a)jboss.com
Date: 2009-05-11 12:14:02 -0400 (Mon, 11 May 2009)
New Revision: 4779
Added:
projects/gwt-console/tags/gwt-console-1.0.0.Beta3/
Log:
Release Beta3
Copied: projects/gwt-console/tags/gwt-console-1.0.0.Beta3 (from rev 4778, projects/gwt-console/trunk)
16 years, 11 months
- 1
- 0
JBoss JBPM SVN: r4778 - in projects/gwt-console/trunk: gui/war/src/main/java/org/jboss/bpm/console/client/common and 5 other directories.
by do-not-reply＠jboss.org
Author: heiko.braun(a)jboss.com
Date: 2009-05-11 12:08:06 -0400 (Mon, 11 May 2009)
New Revision: 4778
Added:
projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/DeleteDefinitionAction.java
projects/gwt-console/trunk/server/server-core/src/main/webapp/login.html
projects/gwt-console/trunk/server/server-core/src/main/webapp/login_failed.html
Modified:
projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/LoginView.java
projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/ServerStatusView.java
projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/SettingsEditor.java
projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/common/AbstractRESTAction.java
projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/DefinitionListView.java
projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/ProcessEditor.java
projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/AssignedTasksView.java
projects/gwt-console/trunk/gui/war/src/main/resources/org/jboss/bpm/console/public/console.css
projects/gwt-console/trunk/server/server-core/src/main/webapp/WEB-INF/web.xml
Log:
Layout fixes
Modified: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/LoginView.java
===================================================================
--- projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/LoginView.java 2009-05-11 12:02:14 UTC (rev 4777)
+++ projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/LoginView.java 2009-05-11 16:08:06 UTC (rev 4778)
@@ -99,8 +99,8 @@
window.setSize("320px", "180px");
LayoutPanel panel = new LayoutPanel();
+ createLayoutContent(panel);
window.setWidget(panel);
- createLayoutContent(panel);
window.addWindowCloseListener(new WindowCloseListener() {
public void onWindowClosed() {
@@ -163,7 +163,12 @@
// TODO: does this load the imagebundle already?
ConsoleIconBundle icons = GWT.create(ConsoleIconBundle.class);
+
+ LayoutPanel imgPanel = new LayoutPanel();
+ imgPanel.add(icons.userIcon().createImage());
+ imgPanel.setVisible(false);
+ layoutPanel.add(imgPanel, new BorderLayoutData(BorderLayout.Region.NORTH, 50, 200));
layoutPanel.add(createForm(), new BorderLayoutData(BorderLayout.Region.CENTER, 10, 200));
layoutPanel.add(submit, new BorderLayoutData(BorderLayout.Region.SOUTH, 10, 200));
Modified: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/ServerStatusView.java
===================================================================
--- projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/ServerStatusView.java 2009-05-11 12:02:14 UTC (rev 4777)
+++ projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/ServerStatusView.java 2009-05-11 16:08:06 UTC (rev 4778)
@@ -58,14 +58,15 @@
public void update(ServerStatus status)
{
Grid g = new Grid(status.getPlugins().size()+1, 2);
-
+
g.setWidget(0, 0, new Label("Plugins:"));
for (int row = 1; row < status.getPlugins().size()+1; ++row)
{
PluginInfo p = status.getPlugins().get(row-1);
g.setText(row, 0, p.getType());
-
+ g.setStyleName("bpm-info-table");
+
final Image img = p.isAvailable() ?
new Image("images/icons/confirm_small.png"):
new Image("images/icons/deny_small.png");
Modified: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/SettingsEditor.java
===================================================================
--- projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/SettingsEditor.java 2009-05-11 12:02:14 UTC (rev 4777)
+++ projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/SettingsEditor.java 2009-05-11 16:08:06 UTC (rev 4778)
@@ -57,35 +57,38 @@
new BoxLayout(BoxLayout.Orientation.VERTICAL)
);
-
// console info
- HTML console = new HTML("<h3>Console Info</h3>");
+ StringBuffer sb = new StringBuffer();
+ sb.append("<table>");
+ sb.append("<tr>");
+ sb.append("<td colspan=2><h3>Console Info</h3></td>");
+ sb.append("</tr>");
- layoutPanel.add(console);
+ sb.append("<tr>");
+ sb.append("<td>Version: </td>");
+ sb.append("<td>"+Version.VERSION+"</td>");
+ sb.append("</tr>");
- Grid g1 = new Grid(2,2);
- g1.setWidget(0,0, new Label("Build:"));
- g1.setText(0,1, "jBPM Console");
+ sb.append("<tr>");
+ sb.append("<td colspan=2><br/></td>");
+ sb.append("</tr>");
- g1.setWidget(1,0, new Label("Version:"));
- g1.setText(1,1, Version.VERSION);
- layoutPanel.add(g1);
-
+ sb.append("<tr>");
+ sb.append("<td colspan=2><h3>Server Info</h3></td>");
+ sb.append("</tr>");
- // server info
- HTML server = new HTML("<h3>Server Info</h3>");
- layoutPanel.add(server);
+ sb.append("<tr>");
+ sb.append("<td>Host: </td>");
+ sb.append("<td>"+appContext.getConfig().getConsoleServerUrl()+"</td>");
+ sb.append("</tr>");
- Grid g2 = new Grid(1,2);
- g2.setWidget(0,0, new Label("Host:"));
- g2.setText(0,1, appContext.getConfig().getConsoleServerUrl());
+ sb.append("</table>");
+ layoutPanel.add(new HTML(sb.toString()));
ServerStatusView serverStatus = new ServerStatusView(appContext);
-
- layoutPanel.add(g2);
layoutPanel.add(serverStatus); // Doesn't render in grid
+
-
tabPanel.add(layoutPanel, "System Overview");
this.add(tabPanel, new BorderLayoutData(BorderLayout.Region.CENTER));
Modified: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/common/AbstractRESTAction.java
===================================================================
--- projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/common/AbstractRESTAction.java 2009-05-11 12:02:14 UTC (rev 4777)
+++ projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/common/AbstractRESTAction.java 2009-05-11 16:08:06 UTC (rev 4778)
@@ -53,6 +53,8 @@
final String url = getUrl(object);
RequestBuilder builder = new RequestBuilder(getRequestMethod(), URL.encode(url));
+ ConsoleLog.debug(getRequestMethod() +": " + url);
+
try
{
controller.handleEvent( LoadingStatusAction.ON );
Modified: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/DefinitionListView.java
===================================================================
--- projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/DefinitionListView.java 2009-05-11 12:02:14 UTC (rev 4777)
+++ projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/DefinitionListView.java 2009-05-11 16:08:06 UTC (rev 4778)
@@ -31,12 +31,14 @@
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.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.LazyPanel;
+import org.jboss.bpm.console.client.util.ConsoleLog;
import org.jboss.bpm.console.client.icons.ConsoleIconBundle;
import org.jboss.bpm.console.client.common.AbstractView;
@@ -146,6 +148,28 @@
}
)
);
+
+ toolBar.addSeparator();
+
+ toolBar.add(
+ new ToolButton("Delete", new ClickListener() {
+ public void onClick(Widget sender) {
+ // force loading
+ ProcessDefinitionRef definitionRef = getSelection();
+ if(definitionRef!=null)
+ {
+ controller.handleEvent(
+ new Event(DeleteDefinitionAction.ID, definitionRef)
+ );
+ }
+ else
+ {
+ MessageBox.alert("Missing selection", "Please select a process definition");
+ }
+ }
+ }
+ )
+ );
toolBox.add(toolBar, new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL));
Added: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/DeleteDefinitionAction.java
===================================================================
--- projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/DeleteDefinitionAction.java (rev 0)
+++ projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/DeleteDefinitionAction.java 2009-05-11 16:08:06 UTC (rev 4778)
@@ -0,0 +1,67 @@
+/*
+ * 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.process;
+
+import org.jboss.bpm.console.client.common.AbstractRESTAction;
+import org.jboss.bpm.console.client.ApplicationContext;
+import com.google.gwt.http.client.RequestBuilder;
+import com.google.gwt.http.client.Response;
+import com.mvc4g.client.Controller;
+import com.mvc4g.client.Event;
+import org.jboss.bpm.console.client.model.ProcessDefinitionRef;
+
+/**
+ * @author Heiko.Braun <heiko.braun(a)jboss.com>
+ */
+public class DeleteDefinitionAction extends AbstractRESTAction
+{
+ public final static String ID = DeleteDefinitionAction.class.getName();
+
+ public DeleteDefinitionAction(ApplicationContext appContetext)
+ {
+ super(appContetext);
+ }
+
+ public String getId()
+ {
+ return ID;
+ }
+
+ public String getUrl(Object event)
+ {
+ ProcessDefinitionRef procRef = (ProcessDefinitionRef)event;
+ return appContext.getUrlBuilder().getRemoveDefinitionURL(procRef.getId());
+ }
+
+ public RequestBuilder.Method getRequestMethod()
+ {
+ return RequestBuilder.POST;
+ }
+
+ public void handleSuccessfulResponse(final Controller controller, final Object event, Response response)
+ {
+ // refresh
+ controller.handleEvent(
+ new Event(LoadDefinitionsAction.ID, null)
+ );
+ }
+}
Modified: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/ProcessEditor.java
===================================================================
--- projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/ProcessEditor.java 2009-05-11 12:02:14 UTC (rev 4777)
+++ projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/ProcessEditor.java 2009-05-11 16:08:06 UTC (rev 4778)
@@ -105,7 +105,8 @@
registerAction(LoadInstancesAction.ID, new LoadInstancesAction(appContext));
registerAction(StartNewInstanceAction.ID, new StartNewInstanceAction(appContext));
registerAction(StateChangeAction.ID, new StateChangeAction(appContext));
-
+ registerAction(DeleteDefinitionAction.ID, new DeleteDefinitionAction(appContext));
+
// display tab, needs to visible for correct rendering
tabPanel.selectTab(0);
Modified: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/AssignedTasksView.java
===================================================================
--- projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/AssignedTasksView.java 2009-05-11 12:02:14 UTC (rev 4777)
+++ projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/AssignedTasksView.java 2009-05-11 16:08:06 UTC (rev 4778)
@@ -53,6 +53,7 @@
private final ApplicationContext appContext;
private WindowPanel windowPanel;
+ private Frame frame;
public AssignedTasksView(ApplicationContext appContext)
{
@@ -200,7 +201,11 @@
windowPanel.addWindowCloseListener(new WindowCloseListener() {
public void onWindowClosed() {
- windowPanel = null;
+ windowPanel = null;
+ frame = null;
+ controller.handleEvent(
+ new Event(LoadTasksAction.ID, null)
+ );
}
public String onWindowClosing() {
@@ -209,7 +214,7 @@
});
// iframe
- Frame frame = new Frame();
+ frame = new Frame();
frame.setUrl(task.getUrl());
DOM.setStyleAttribute(frame.getElement(), "border", "none");
Modified: projects/gwt-console/trunk/gui/war/src/main/resources/org/jboss/bpm/console/public/console.css
===================================================================
--- projects/gwt-console/trunk/gui/war/src/main/resources/org/jboss/bpm/console/public/console.css 2009-05-11 12:02:14 UTC (rev 4777)
+++ projects/gwt-console/trunk/gui/war/src/main/resources/org/jboss/bpm/console/public/console.css 2009-05-11 16:08:06 UTC (rev 4778)
@@ -196,6 +196,7 @@
text-decoration:underline;
}
+/* start - override gwt-log styles */
.log-panel {
background-color: #ECF2FC;
border: 0px solid black;
@@ -217,3 +218,13 @@
visibility:hidden;
}
+/* end - override gwt-log styles */
+
+.bpm-info-table {
+ border:0px solid;
+ width:100%;
+ background:#F8F8F8;
+ padding:5px;
+}
+
+
Modified: projects/gwt-console/trunk/server/server-core/src/main/webapp/WEB-INF/web.xml
===================================================================
--- projects/gwt-console/trunk/server/server-core/src/main/webapp/WEB-INF/web.xml 2009-05-11 12:02:14 UTC (rev 4777)
+++ projects/gwt-console/trunk/server/server-core/src/main/webapp/WEB-INF/web.xml 2009-05-11 16:08:06 UTC (rev 4778)
@@ -46,7 +46,7 @@
<web-resource-collection>
<web-resource-name>Resteasy</web-resource-name>
<url-pattern>/rs/process/*</url-pattern>
- <url-pattern>/rs/task/*</url-pattern>
+ <!--url-pattern>/rs/task/*</url-pattern https://jira.jboss.org/jira/browse/JBPM-2229 -->
<url-pattern>/rs/tasks/*</url-pattern>
<url-pattern>/rs/identity/*</url-pattern>
</web-resource-collection>
Added: projects/gwt-console/trunk/server/server-core/src/main/webapp/login.html
===================================================================
--- projects/gwt-console/trunk/server/server-core/src/main/webapp/login.html (rev 0)
+++ projects/gwt-console/trunk/server/server-core/src/main/webapp/login.html 2009-05-11 16:08:06 UTC (rev 4778)
@@ -0,0 +1,9 @@
+<html>
+<body>
+<form method="POST" action="j_security_check">
+ User: <input type="text" name="j_username"><br>
+ Password: <input type="password" name="j_password"><br/>
+ <input type="submit"/>
+</form>
+</body>
+</html>
\ No newline at end of file
Added: projects/gwt-console/trunk/server/server-core/src/main/webapp/login_failed.html
===================================================================
--- projects/gwt-console/trunk/server/server-core/src/main/webapp/login_failed.html (rev 0)
+++ projects/gwt-console/trunk/server/server-core/src/main/webapp/login_failed.html 2009-05-11 16:08:06 UTC (rev 4778)
@@ -0,0 +1,5 @@
+<html>
+<body>
+Login failed!
+</body>
+</html>
\ No newline at end of file
16 years, 11 months
- 1
- 0
JBoss JBPM SVN: r4777 - in jbpm4/trunk: modules/distro and 1 other directory.
by do-not-reply＠jboss.org
Author: tom.baeyens(a)jboss.com
Date: 2009-05-11 08:02:14 -0400 (Mon, 11 May 2009)
New Revision: 4777
Removed:
jbpm4/trunk/bin/
jbpm4/trunk/hudson/
jbpm4/trunk/profiles.xml.example
Modified:
jbpm4/trunk/modules/distro/pom.xml
jbpm4/trunk/pom.xml
Log:
cleanup of old hudson stuff and mvn profile
Modified: jbpm4/trunk/modules/distro/pom.xml
===================================================================
--- jbpm4/trunk/modules/distro/pom.xml 2009-05-11 12:01:09 UTC (rev 4776)
+++ jbpm4/trunk/modules/distro/pom.xml 2009-05-11 12:02:14 UTC (rev 4777)
@@ -52,12 +52,6 @@
<artifactId>jbpm-console-form-plugin</artifactId>
<version>${version}</version>
</dependency>
- <dependency>
- <groupId>org.jbpm.jbpm4</groupId>
- <artifactId>jbpm-console-integration</artifactId>
- <classifier>config</classifier>
- <version>${version}</version>
- </dependency>
<dependency>
<groupId>org.jbpm.jbpm4</groupId>
<artifactId>jbpm-jboss4</artifactId>
Modified: jbpm4/trunk/pom.xml
===================================================================
--- jbpm4/trunk/pom.xml 2009-05-11 12:01:09 UTC (rev 4776)
+++ jbpm4/trunk/pom.xml 2009-05-11 12:02:14 UTC (rev 4777)
@@ -48,6 +48,7 @@
<cactus.version>13-1.7.1</cactus.version>
<freemarker.version>2.3.15</freemarker.version>
<gwt.console.version>1.0.0-SNAPSHOT</gwt.console.version>
+ <jbpm.gpd.version>4.0.0-SNAPSHOT</jbpm.gpd.version>
<hibernate.version>3.3.1.GA</hibernate.version>
<slf4j.version>1.5.2</slf4j.version>
<hsqldb.version>1.8.0.7</hsqldb.version>
@@ -96,39 +97,32 @@
</dependency>
<dependency>
<groupId>org.jbpm.jbpm4</groupId>
- <artifactId>jbpm-enterprise</artifactId>
- <classifier>config</classifier>
- <version>${version}</version>
- </dependency>
- <dependency>
- <groupId>org.jbpm.jbpm4</groupId>
<artifactId>jbpm-examples</artifactId>
<version>${version}</version>
</dependency>
<dependency>
<groupId>org.jbpm.jbpm4</groupId>
- <artifactId>jbpm-jboss5</artifactId>
+ <artifactId>jbpm-jpdl</artifactId>
<version>${version}</version>
</dependency>
<dependency>
<groupId>org.jbpm.jbpm4</groupId>
- <artifactId>jbpm-jboss5</artifactId>
- <classifier>config</classifier>
+ <artifactId>jbpm-log</artifactId>
<version>${version}</version>
</dependency>
<dependency>
<groupId>org.jbpm.jbpm4</groupId>
- <artifactId>jbpm-jpdl</artifactId>
+ <artifactId>jbpm-pvm</artifactId>
<version>${version}</version>
</dependency>
<dependency>
<groupId>org.jbpm.jbpm4</groupId>
- <artifactId>jbpm-log</artifactId>
+ <artifactId>jbpm-test-base</artifactId>
<version>${version}</version>
</dependency>
<dependency>
<groupId>org.jbpm.jbpm4</groupId>
- <artifactId>jbpm-pvm</artifactId>
+ <artifactId>jbpm-test-db</artifactId>
<version>${version}</version>
</dependency>
<dependency>
@@ -138,14 +132,24 @@
</dependency>
<dependency>
<groupId>org.jbpm.jbpm4</groupId>
- <artifactId>jbpm-test-base</artifactId>
+ <artifactId>jbpm-jboss5</artifactId>
<version>${version}</version>
</dependency>
- <dependency>
- <groupId>org.jbpm.jbpm4</groupId>
- <artifactId>jbpm-test-db</artifactId>
- <version>${version}</version>
- </dependency>
+ <dependency>
+ <groupId>org.jbpm.jbpm4</groupId>
+ <artifactId>jbpm-console-integration</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jbpm.jbpm4</groupId>
+ <artifactId>jbpm-console-form-plugin</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jbpm.jbpm4</groupId>
+ <artifactId>jbpm-jboss4</artifactId>
+ <version>${version}</version>
+ </dependency>
<!-- GWT console -->
@@ -178,7 +182,7 @@
<groupId>org.jbpm.jbpm4</groupId>
<artifactId>jbpm-gpd</artifactId>
<type>zip</type>
- <version>${version}</version>
+ <version>${jbpm.gpd.version}</version>
</dependency>
<!-- External dependencies -->
Deleted: jbpm4/trunk/profiles.xml.example
===================================================================
--- jbpm4/trunk/profiles.xml.example 2009-05-11 12:01:09 UTC (rev 4776)
+++ jbpm4/trunk/profiles.xml.example 2009-05-11 12:02:14 UTC (rev 4777)
@@ -1,63 +0,0 @@
-<profilesXml xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/profiles-1.0.0.xsd">
-
- <profiles>
-
- <!-- This profile can also be defined in ~/.m2/settings.xml -->
-
- <profile>
- <id>jboss-home-profile</id>
- <activation>
- <property>
- <name>user.name</name>
- </property>
- </activation>
- <properties>
-
- <!--
- JBOSS_HOME FOR INTEGRATION TESTS
- -->
-
- <jboss422.home>/jboss-4.2.2.GA</jboss422.home>
- <jboss423.home>/jboss-4.2.3.GA</jboss423.home>
- <jboss500.home>/jboss-5.0.0.GA</jboss500.home>
-
- <!--
- DEFAULT CONNECTION SETTINGS FOR THE JBPM QA ENV
- -->
- <jdbc.mysql.server>localhost</jdbc.mysql.server>
- <jdbc.mysql.port>3306</jdbc.mysql.port>
- <jdbc.mysql.database>jbpm4</jdbc.mysql.database>
- <jdbc.mysql.url>jdbc:mysql://${jdbc.mysql.server}:${jdbc.mysql.port}/${jdbc.mysql.database}</jdbc.mysql.url>
- <jdbc.mysql.username>jbpmtest</jdbc.mysql.username>
- <jdbc.mysql.password></jdbc.mysql.password>
-
- <jdbc.postgresql.server>localhost</jdbc.postgresql.server>
- <jdbc.postgresql.port>5432</jdbc.postgresql.port>
- <jdbc.postgresql.database>jbpm4</jdbc.postgresql.database>
- <jdbc.postgresql.url>jdbc:postgresql://${jdbc.postgresql.server}:${jdbc.postgresql.port}/${jdbc.postgresql.database}</jdbc.postgresql.url>
- <jdbc.postgresql.username>jbpmtest</jdbc.postgresql.username>
- <jdbc.postgresql.password></jdbc.postgresql.password>
-
- <jdbc.sybase.server>localhost</jdbc.sybase.server>
- <jdbc.sybase.port>5000</jdbc.sybase.port>
- <jdbc.sybase.database>jbpm4</jdbc.sybase.database>
- <jdbc.sybase.url>jdbc:sybase:Tds:${jdbc.sybase.server}:${jdbc.sybase.port}/${jdbc.sybase.database}</jdbc.sybase.url>
- <jdbc.sybase.username>jbpmtest</jdbc.sybase.username>
- <jdbc.sybase.password>jbpmtest</jdbc.sybase.password>
- <jdbc.sybase.driver>com.sybase.jdbc3.jdbc.SybDriver</jdbc.sybase.driver>
- <jdbc.sybase.datasource>com.sybase.jdbc3.jdbc.SybXADataSource</jdbc.sybase.datasource>
-
- <jdbc.oracle.server>localhost</jdbc.oracle.server>
- <jdbc.oracle.port>1521</jdbc.oracle.port>
- <jdbc.oracle.database>XE</jdbc.oracle.database>
- <jdbc.oracle.username>jbpmtest</jdbc.oracle.username>
- <jdbc.oracle.password>jbpmtest</jdbc.oracle.password>
- <jdbc.oracle.url>jdbc:oracle:thin:${jdbc.oracle.username}/${jdbc.oracle.password}@${jdbc.oracle.server}:${jdbc.oracle.port}:${jdbc.oracle.database}</jdbc.oracle.url>
- </properties>
- </profile>
-
- </profiles>
-
-</profilesXml>
16 years, 11 months
- 1
- 0
JBoss JBPM SVN: r4776 - jbpm4/branches/jbpm-4.0.0.Beta2/modules/distro/src/main/files.
by do-not-reply＠jboss.org
Author: tom.baeyens(a)jboss.com
Date: 2009-05-11 08:01:09 -0400 (Mon, 11 May 2009)
New Revision: 4776
Modified:
jbpm4/branches/jbpm-4.0.0.Beta2/modules/distro/src/main/files/readme.html
Log:
updated beta 2 release notes
Modified: jbpm4/branches/jbpm-4.0.0.Beta2/modules/distro/src/main/files/readme.html
===================================================================
--- jbpm4/branches/jbpm-4.0.0.Beta2/modules/distro/src/main/files/readme.html 2009-05-11 10:19:04 UTC (rev 4775)
+++ jbpm4/branches/jbpm-4.0.0.Beta2/modules/distro/src/main/files/readme.html 2009-05-11 12:01:09 UTC (rev 4776)
@@ -6,7 +6,6 @@
<h1>Readme</h1>
<p>Currently the userguide and devguide only show well in <a href="http://www.mozilla.com/firefox">firefox</a>.
- We'll fix this in one of the next versions.
See <a href="https://jira.jboss.org/jira/browse/JBPM-1895">JBPM-1895</a>.
</p>
@@ -35,6 +34,198 @@
</tr>
</table>
+
+ <h1>Release Notes - JBoss jBPM - Version jBPM 4.0.0.Beta2</h1>
+
+
+<h2> Bug
+</h2>
+<ul>
+<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2158'>JBPM-2158</a>] - ClassCastException when start a processDeifinition which is not in the RepositoryCache.
+</li>
+<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2222'>JBPM-2222</a>] - StackOverflowError in HistoryActivityInstanceQueryImpl
+</li>
+</ul>
+
+<h2> Feature Request
+</h2>
+<ul>
+<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-1926'>JBPM-1926</a>] - Remove dependency on jBPM3
+</li>
+<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2101'>JBPM-2101</a>] - TX interceptor with 'required' semantics
+</li>
+</ul>
+
+<h2> Task
+</h2>
+<ul>
+<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-1459'>JBPM-1459</a>] - getDefaultTransition
+</li>
+<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2015'>JBPM-2015</a>] - Update to hibernate 3.3.1.GA
+</li>
+<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2058'>JBPM-2058</a>] - email templates
+</li>
+<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2123'>JBPM-2123</a>] - rename exclusive to decision
+</li>
+<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2134'>JBPM-2134</a>] - remove execution mgmt methods from ActivityExecution
+</li>
+<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2150'>JBPM-2150</a>] - Update hibernate oracle dialect
+</li>
+<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2159'>JBPM-2159</a>] - recreate jbpm.jar file
+</li>
+<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2162'>JBPM-2162</a>] - revert process archive deployment in examples
+</li>
+<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2163'>JBPM-2163</a>] - configuration phase 2
+</li>
+<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2165'>JBPM-2165</a>] - rename xsd
+</li>
+<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2168'>JBPM-2168</a>] - align query methods with hibernate
+</li>
+<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2170'>JBPM-2170</a>] - ant task for deployment
+</li>
+<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2171'>JBPM-2171</a>] - clarifying api by introducing ProcessInstance interface
+</li>
+<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2173'>JBPM-2173</a>] - rename api packages to org.jbpm.api
+</li>
+<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2175'>JBPM-2175</a>] - add xsd back to distribution
+</li>
+<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2176'>JBPM-2176</a>] - allow for easy creation of demo data
+</li>
+<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2177'>JBPM-2177</a>] - expose activity coordinates programmatically
+</li>
+<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2179'>JBPM-2179</a>] - Include GWT console Beta3
+</li>
+<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2180'>JBPM-2180</a>] - add attribute form to task
+</li>
+<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2181'>JBPM-2181</a>] - remove cfg.xsd
+</li>
+<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2182'>JBPM-2182</a>] - change jpdl namespace
+</li>
+<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2204'>JBPM-2204</a>] - sub-process images in the userguide
+</li>
+</ul>
+
+<h2> Sub-task
+</h2>
+<ul>
+<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2025'>JBPM-2025</a>] - add sub-process
+</li>
+<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2027'>JBPM-2027</a>] - add event listeners
+</li>
+<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2029'>JBPM-2029</a>] - add timers
+</li>
+</ul>
+
+<h2> Bug
+</h2>
+<ul>
+<li>[<a href='https://jira.jboss.org/jira/browse/GPD-311'>GPD-311</a>] - subelements of transition are removed when saving
+</li>
+</ul>
+
+<h2> Task
+</h2>
+<ul>
+<li>[<a href='https://jira.jboss.org/jira/browse/GPD-282'>GPD-282</a>] - Implement jPDL properties mechanism for jBPM 4
+</li>
+<li>[<a href='https://jira.jboss.org/jira/browse/GPD-310'>GPD-310</a>] - remove empty transition names
+</li>
+<li>[<a href='https://jira.jboss.org/jira/browse/GPD-314'>GPD-314</a>] - activity renamings
+</li>
+<li>[<a href='https://jira.jboss.org/jira/browse/GPD-315'>GPD-315</a>] - make pallete consistent
+</li>
+<li>[<a href='https://jira.jboss.org/jira/browse/GPD-320'>GPD-320</a>] - save process image
+</li>
+<li>[<a href='https://jira.jboss.org/jira/browse/GPD-322'>GPD-322</a>] - create sub-process image in userguide
+</li>
+</ul>
+
+<h2> Sub-task
+</h2>
+<ul>
+<li>[<a href='https://jira.jboss.org/jira/browse/GPD-317'>GPD-317</a>] - swimlane configuration
+</li>
+<li>[<a href='https://jira.jboss.org/jira/browse/GPD-318'>GPD-318</a>] - event listener configuration
+</li>
+<li>[<a href='https://jira.jboss.org/jira/browse/GPD-319'>GPD-319</a>] - timer configuration
+</li>
+</ul>
+
+ <h1>Release notes for jBPM 4.0.0.Beta1</h1>
+
+
+<h2> Bug
+</h2>
+<ul>
+<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2109'>JBPM-2109</a>] - Server shutdown undeployment calls have unmet dependency
+</li>
+<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2120'>JBPM-2120</a>] - javax.el.* API conflict in AS 5
+</li>
+<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2144'>JBPM-2144</a>] - Oracle JDBC properties are not replaced in distro
+</li>
+<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2145'>JBPM-2145</a>] - oracle-ds doesn't work on JDK 6
+</li>
+<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2149'>JBPM-2149</a>] - Storing the archive location exceeds max character limitation
+</li>
+<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2151'>JBPM-2151</a>] - no environment to get org.jbpm.session.RepositorySession
+</li>
+</ul>
+
+<h2> Feature Request
+</h2>
+<ul>
+<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-1999'>JBPM-1999</a>] - Add the notion of "outcome" to the base task model
+</li>
+<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2010'>JBPM-2010</a>] - Variables scoped to the execution should available to tasks as well
+</li>
+<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2054'>JBPM-2054</a>] - Introduce REST friendly ID's
+</li>
+<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2082'>JBPM-2082</a>] - Instance ID doesn't reveal the process version
+</li>
+</ul>
+
+<h2> Task
+</h2>
+<ul>
+<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2030'>JBPM-2030</a>] - Leverage examples as integration test suite
+</li>
+<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2073'>JBPM-2073</a>] - Update the screenshots of the examples
+</li>
+<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2075'>JBPM-2075</a>] - revisit deployment
+</li>
+<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2077'>JBPM-2077</a>] - config tool
+</li>
+<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2080'>JBPM-2080</a>] - finish task activity
+</li>
+<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2104'>JBPM-2104</a>] - task example scenarios
+</li>
+<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2108'>JBPM-2108</a>] - Provide deployers for jboss 4 & 5
+</li>
+<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2113'>JBPM-2113</a>] - Re-introduce database config and DDL scripts in distro
+</li>
+<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2118'>JBPM-2118</a>] - add task variable methods
+</li>
+<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2152'>JBPM-2152</a>] - Document the jboss integration
+</li>
+</ul>
+
+<h2> Sub-task
+</h2>
+<ul>
+<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2024'>JBPM-2024</a>] - add swimlanes
+</li>
+</ul>
+
+<h2> Task
+</h2>
+<ul>
+<li>[<a href='https://jira.jboss.org/jira/browse/GPD-290'>GPD-290</a>] - Multipage Editor (xml/graphical)
+</li>
+<li>[<a href='https://jira.jboss.org/jira/browse/GPD-303'>GPD-303</a>] - Update the screenshots of the examples
+</li>
+</ul>
+
+
<h1>Release notes for jBPM 4.0.0.Alpha2</h1>
<h2> Bug
@@ -136,7 +327,6 @@
</li>
</ul>
-
<h1>Release notes for jBPM 4.0.0.Alpha1</h1>
<p>Finally.. phew !</p>
</body>
16 years, 11 months
- 1
- 0