JBoss JBPM SVN: r4966 - jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx.
by do-not-reply＠jboss.org
Author: ainze
Date: 2009-05-31 06:21:34 -0400 (Sun, 31 May 2009)
New Revision: 4966
Modified:
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/SpringTransactionInterceptor.java
Log:
standard transaction is not required
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/SpringTransactionInterceptor.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/SpringTransactionInterceptor.java 2009-05-31 08:49:11 UTC (rev 4965)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/SpringTransactionInterceptor.java 2009-05-31 10:21:34 UTC (rev 4966)
@@ -43,7 +43,7 @@
public class SpringTransactionInterceptor extends Interceptor {
private static final Log log = Log.getLog(SpringTransactionInterceptor.class.getName());
-
+
private boolean useCurrent;
@SuppressWarnings("unchecked")
@@ -54,21 +54,19 @@
}
StandardTransaction standardTransaction = environment.get(StandardTransaction.class);
- if (standardTransaction == null) {
- throw new JbpmException("no standard-transaction in environment");
- }
PlatformTransactionManager platformTransactionManager = environment.get(PlatformTransactionManager.class);
if (platformTransactionManager == null) {
throw new JbpmException("No platformTransaction manager defined.");
}
-
-
- standardTransaction.begin();
+ if (standardTransaction != null) {
+ standardTransaction.begin();
+ }
+
try {
DefaultTransactionDefinition definition = new DefaultTransactionDefinition();
-
+
if (useCurrent) {
definition.setPropagationBehavior(TransactionDefinition.PROPAGATION_MANDATORY);
}
@@ -76,16 +74,20 @@
TransactionTemplate template = new TransactionTemplate(platformTransactionManager, definition);
TransactionCallback transactionCallback = new CommandTransactionCallback<T>(command, next, platformTransactionManager);
T t = (T) template.execute(transactionCallback);
-
+
Session session = environment.get(Session.class);
session.flush();
return t;
} catch (RuntimeException e) {
- standardTransaction.setRollbackOnly();
+ if (standardTransaction != null) {
+ standardTransaction.setRollbackOnly();
+ }
throw e;
} finally {
- standardTransaction.complete();
+ if (standardTransaction != null) {
+ standardTransaction.complete();
+ }
}
}
14 years, 11 months
- 1
- 0
JBoss JBPM SVN: r4965 - in jbpm4/branches/jimma/modules/migration/src: main/java/org/jbpm/jpdl/internal/convert/util and 2 other directories.
by do-not-reply＠jboss.org
Author: jim.ma
Date: 2009-05-31 04:49:11 -0400 (Sun, 31 May 2009)
New Revision: 4965
Added:
jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/util/EventsConverter.java
jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/util/TimerConverter.java
jbpm4/branches/jimma/modules/migration/src/test/resources/timer.xml
Removed:
jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/util/EventConverter.java
Modified:
jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/JpdlConverter.java
jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/util/DecisionConverter.java
jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/util/EndStateConverter.java
jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/util/EventActionConverter.java
jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/util/ForkConverter.java
jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/util/JoinConverter.java
jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/util/NodeConverter.java
jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/util/StartStateConverter.java
jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/util/StateConverter.java
jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/util/SwimlaneConverter.java
jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/util/TaskNodeConverter.java
jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/util/TransitionConverter.java
jbpm4/branches/jimma/modules/migration/src/test/java/org/jbpm/jpdl/internal/convert/JpdlConverterTest.java
Log:
Added TimerConverter and enabled event conversion in fork, state and other elments
Modified: jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/JpdlConverter.java
===================================================================
--- jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/JpdlConverter.java 2009-05-30 19:15:30 UTC (rev 4964)
+++ jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/JpdlConverter.java 2009-05-31 08:49:11 UTC (rev 4965)
@@ -32,9 +32,13 @@
import java.net.URL;
import java.util.Iterator;
+import java.util.List;
import java.util.Map;
import java.util.Set;
+import java.util.concurrent.CopyOnWriteArrayList;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.jbpm.graph.def.Event;
import org.jbpm.graph.def.Node;
import org.jbpm.graph.def.ProcessDefinition;
@@ -46,7 +50,7 @@
import org.jbpm.graph.node.TaskNode;
import org.jbpm.jpdl.internal.convert.util.DecisionConverter;
import org.jbpm.jpdl.internal.convert.util.EndStateConverter;
-import org.jbpm.jpdl.internal.convert.util.EventConverter;
+import org.jbpm.jpdl.internal.convert.util.EventsConverter;
import org.jbpm.jpdl.internal.convert.util.ForkConverter;
import org.jbpm.jpdl.internal.convert.util.JoinConverter;
import org.jbpm.jpdl.internal.convert.util.NodeConverter;
@@ -54,19 +58,22 @@
import org.jbpm.jpdl.internal.convert.util.StateConverter;
import org.jbpm.jpdl.internal.convert.util.SwimlaneConverter;
import org.jbpm.jpdl.internal.convert.util.TaskNodeConverter;
+import org.jbpm.jpdl.xml.JpdlXmlReader;
+import org.jbpm.jpdl.xml.Problem;
+import org.jbpm.jpdl.xml.ProblemListener;
+import org.jbpm.jpdl4.model.On;
import org.jbpm.jpdl4.model.Process;
import org.jbpm.taskmgmt.def.Swimlane;
import org.jbpm.taskmgmt.def.TaskMgmtDefinition;
import org.xml.sax.InputSource;
-public class JpdlConverter {
- private ConverterContext context;
- public JpdlConverter(ConverterContext ctx) {
- context = ctx;
- }
+public class JpdlConverter implements ProblemListener {
+ public List<Problem> problems = new CopyOnWriteArrayList<Problem>();
+
+ private static final long serialVersionUID = 1L;
+ private static final Log log = LogFactory.getLog(JpdlXmlReader.class);
- public Process run() throws ConvertException {
- URL url = (URL) context.get(ConverterContext.PROCESS_FILE_URL);
+ public Process run(URL url) throws ConvertException {
Jpdl3Reader reader = new Jpdl3Reader(new InputSource(url.toString()));
ProcessDefinition processDef = reader.readProcessDefinition();
if (!reader.isValid()) {
@@ -132,28 +139,27 @@
process.getSwimlaneAndOnAndTimer().add(NodeConverter.run(tmpNode));
break;
case Decision :
- org.jbpm.graph.node.Decision decision = (org.jbpm.graph.node.Decision)node;
- process.getSwimlaneAndOnAndTimer().add(DecisionConverter.run(decision));
+ try {
+ org.jbpm.graph.node.Decision decision = (org.jbpm.graph.node.Decision) node;
+ process.getSwimlaneAndOnAndTimer().add(DecisionConverter.run(decision));
+ } catch (Exception e) {
+ log.error("Failed to convert Decision node [" + node.getName() + "}", e);
+ Problem problem = new Problem(Problem.LEVEL_ERROR, e.getMessage());
+ this.addProblem(problem);
+ }
}
}
//Process Event
- Map events = def.getEvents();
- if (events != null) {
- Set entries= events.entrySet();
- for (Object entry : entries) {
- Event event = ((Map.Entry<String, Event>)entry).getValue();
- org.jbpm.jpdl4.model.On on = EventConverter.run(event);
- process.getSwimlaneAndOnAndTimer().add(on);
- }
- }
+ List<On> ons = EventsConverter.run(def.getEvents());
+ process.getSwimlaneAndOnAndTimer().addAll(ons);
return process;
}
-
-
-
-
+ public void addProblem(Problem problem) {
+ this.problems.add(problem);
+ }
+
}
Modified: jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/util/DecisionConverter.java
===================================================================
--- jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/util/DecisionConverter.java 2009-05-30 19:15:30 UTC (rev 4964)
+++ jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/util/DecisionConverter.java 2009-05-31 08:49:11 UTC (rev 4965)
@@ -21,20 +21,62 @@
*/
package org.jbpm.jpdl.internal.convert.util;
+import java.lang.reflect.Field;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.jbpm.graph.def.Event;
import org.jbpm.graph.def.Transition;
import org.jbpm.graph.node.Decision;
+import org.jbpm.instantiation.Delegation;
+import org.jbpm.jpdl.internal.convert.ConvertException;
+import org.jbpm.jpdl4.model.On;
import org.jbpm.jpdl4.model.Process;
+import org.jbpm.jpdl4.model.WireObjectType;
public class DecisionConverter {
- public static Process.Decision run(Decision node) {
+ public static Process.Decision run(Decision node) throws Exception {
Process.Decision result = new Process.Decision();
result.setName(node.getName());
- //TODO: talk to Tom to find out if we should support separate DecisionCondition's
- //node.getDecisionConditions()
+ //Process transition
for (Transition trans : node.getLeavingTransitions()) {
result.getTransition().add(TransitionConverter.run(trans, Process.Decision.Transition.class));
- }
+ }
+ //process the class handler
+ try {
+ Field field = Decision.class.getDeclaredField("decisionDelegation");
+ //There is no getDelegation(),set the accessible to true to get the Delegation object
+ field.setAccessible(true);
+ Object obj = field.get(node);
+ if (obj != null) {
+ Delegation del = (Delegation) obj;
+ WireObjectType wireType = new WireObjectType();
+ wireType.setClazz(del.getClassName());
+ result.setHandler(wireType);
+ }
+ } catch (Exception e) {
+ throw new ConvertException("Failed to read the handler calss name from Decision node [" + node.getName() +']', e);
+ }
+
+ try {
+ Field field = Decision.class.getDeclaredField("decisionExpression");
+ //There is no getExpression(),set the accessible to true to get the Delegation object
+ field.setAccessible(true);
+ Object obj = field.get(node);
+ if (obj != null) {
+ String expression = (String) obj;
+ result.setExpr(expression);
+ }
+ } catch (Exception e) {
+ throw new ConvertException("Failed to read the expression attribute from Decision node [" + node.getName() +']', e);
+ }
+
+ List<On> ons = EventsConverter.run(node.getEvents());
+ result.getOn().addAll(ons);
+ //TODO: process exceptions
+
return result;
}
-}
+}
\ No newline at end of file
Modified: jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/util/EndStateConverter.java
===================================================================
--- jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/util/EndStateConverter.java 2009-05-30 19:15:30 UTC (rev 4964)
+++ jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/util/EndStateConverter.java 2009-05-31 08:49:11 UTC (rev 4965)
@@ -21,13 +21,17 @@
*/
package org.jbpm.jpdl.internal.convert.util;
+import java.util.List;
+
import org.jbpm.graph.node.EndState;
+import org.jbpm.jpdl4.model.On;
import org.jbpm.jpdl4.model.Process;
public class EndStateConverter {
public static Process.End run(EndState endState) {
Process.End end = new Process.End();
end.setName(endState.getName());
+ //TODO: process exception
return end;
}
}
Modified: jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/util/EventActionConverter.java
===================================================================
--- jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/util/EventActionConverter.java 2009-05-30 19:15:30 UTC (rev 4964)
+++ jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/util/EventActionConverter.java 2009-05-31 08:49:11 UTC (rev 4965)
@@ -1,3 +1,24 @@
+/*
+ * 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.jpdl.internal.convert.util;
import java.util.Set;
@@ -11,7 +32,8 @@
import org.jbpm.jpdl4.model.JavaType;
import org.jbpm.jpdl4.model.ObjectFactory;
import org.jbpm.jpdl4.model.ScriptType;
-
+import org.jbpm.jpdl4.model.Timer;
+import org.jbpm.scheduler.def.CreateTimerAction;
public class EventActionConverter {
public static JAXBElement<?> run(Action action) {
JAXBElement<?> result = null;
Deleted: jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/util/EventConverter.java
===================================================================
--- jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/util/EventConverter.java 2009-05-30 19:15:30 UTC (rev 4964)
+++ jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/util/EventConverter.java 2009-05-31 08:49:11 UTC (rev 4965)
@@ -1,35 +0,0 @@
-package org.jbpm.jpdl.internal.convert.util;
-
-import java.util.List;
-
-import org.jbpm.graph.def.Action;
-import org.jbpm.graph.def.Event;
-import org.jbpm.jpdl4.model.On;
-
-public class EventConverter {
- public static On run(Event event) {
- On result = new On();
- //process-start and process-end
- result.setEvent(convertEnvetType(event.getEventType()));
- List<Action> actions = (List<Action>)event.getActions();
- for (Action action : actions) {
- result.getEventListenerGroup().add(EventActionConverter.run(action));
- }
-
- //There is no corresponding element in jpdl3 map to event listener...
- return result;
-
- }
-
- private static String convertEnvetType(String type) {
- if (type.toLowerCase().equals("process-start")) {
- return "start";
- }
- if (type.toLowerCase().equals("process-end")) {
- return "end";
- }
-
- return null;
- }
-
-}
Added: jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/util/EventsConverter.java
===================================================================
--- jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/util/EventsConverter.java (rev 0)
+++ jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/util/EventsConverter.java 2009-05-31 08:49:11 UTC (rev 4965)
@@ -0,0 +1,75 @@
+/*
+ * 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.jpdl.internal.convert.util;
+
+import java.util.List;
+import java.util.Map;
+
+import org.jbpm.graph.def.Action;
+import org.jbpm.graph.def.Event;
+import org.jbpm.jpdl4.model.On;
+import org.jbpm.scheduler.def.CreateTimerAction;
+
+public class EventsConverter {
+ public static List<On> run(Map<String,Event> eventsMap) {
+ List<On> results = new java.util.concurrent.CopyOnWriteArrayList<On>();
+ if (eventsMap != null && !eventsMap.isEmpty()) {
+ for (Event event : eventsMap.values()) {
+ if (event.getEventType().equals(Event.EVENTTYPE_NODE_LEAVE)) {
+ continue;
+ }
+ org.jbpm.jpdl4.model.On on = run(event);
+ results.add(on);
+ }
+ }
+ return results;
+ }
+
+
+ public static On run(Event event) {
+ On result = new On();
+ //process-start and process-end
+ result.setEvent(convertEnvetType(event.getEventType()));
+ List<Action> actions = (List<Action>)event.getActions();
+ for (Action action : actions) {
+ if (action instanceof CreateTimerAction) {
+ result.setTimer(TimerConverter.run((CreateTimerAction)action));
+ } else {
+ result.getEventListenerGroup().add(EventActionConverter.run(action));
+ }
+ }
+ return result;
+
+ }
+
+ private static String convertEnvetType(String type) {
+ if (type.toLowerCase().equals("process-start")) {
+ return "start";
+ }
+ if (type.toLowerCase().equals("process-end")) {
+ return "end";
+ }
+
+ return type;
+ }
+
+}
Modified: jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/util/ForkConverter.java
===================================================================
--- jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/util/ForkConverter.java 2009-05-30 19:15:30 UTC (rev 4964)
+++ jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/util/ForkConverter.java 2009-05-31 08:49:11 UTC (rev 4965)
@@ -21,7 +21,10 @@
*/
package org.jbpm.jpdl.internal.convert.util;
+import java.util.List;
+
import org.jbpm.graph.def.Transition;
+import org.jbpm.jpdl4.model.On;
import org.jbpm.jpdl4.model.TransitionType;
import org.jbpm.jpdl4.model.Process.Fork;;
@@ -34,6 +37,10 @@
TransitionType transType = TransitionConverter.run(trans, TransitionType.class);
result.getTransition().add(transType);
}
+
+ //TODO: process exceptions
+ List<On> ons = EventsConverter.run(node.getEvents());
+ result.getOn().addAll(ons);
return result;
}
Modified: jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/util/JoinConverter.java
===================================================================
--- jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/util/JoinConverter.java 2009-05-30 19:15:30 UTC (rev 4964)
+++ jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/util/JoinConverter.java 2009-05-31 08:49:11 UTC (rev 4965)
@@ -21,7 +21,10 @@
*/
package org.jbpm.jpdl.internal.convert.util;
+import java.util.List;
+
import org.jbpm.graph.def.Transition;
+import org.jbpm.jpdl4.model.On;
import org.jbpm.jpdl4.model.TransitionType;
import org.jbpm.jpdl4.model.Process.Join;
@@ -33,6 +36,9 @@
join.getTransition().add(
TransitionConverter.run(trans, TransitionType.class));
}
+ //TODO: process exceptions
+ List<On> ons = EventsConverter.run(node.getEvents());
+ join.getOn().addAll(ons);
return join;
}
Modified: jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/util/NodeConverter.java
===================================================================
--- jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/util/NodeConverter.java 2009-05-30 19:15:30 UTC (rev 4964)
+++ jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/util/NodeConverter.java 2009-05-31 08:49:11 UTC (rev 4965)
@@ -1,3 +1,24 @@
+/*
+ * 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.jpdl.internal.convert.util;
import java.util.Set;
@@ -34,7 +55,7 @@
}
}
}
- return result;
+
}
if (action instanceof Action) {
@@ -50,6 +71,9 @@
return result;
}
//TODO:convert other action types:create-timer,cancel-timer, mail
+ //TODO: Process exceptions
+ //TODO: Process events
+ //TODO: process timers
return null;
Modified: jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/util/StartStateConverter.java
===================================================================
--- jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/util/StartStateConverter.java 2009-05-30 19:15:30 UTC (rev 4964)
+++ jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/util/StartStateConverter.java 2009-05-31 08:49:11 UTC (rev 4965)
@@ -22,10 +22,12 @@
package org.jbpm.jpdl.internal.convert.util;
import java.util.Iterator;
+import java.util.List;
import java.util.Map;
import org.jbpm.graph.def.Transition;
import org.jbpm.graph.node.StartState;
+import org.jbpm.jpdl4.model.On;
import org.jbpm.jpdl4.model.Process;
import org.jbpm.jpdl4.model.TransitionType;
@@ -33,13 +35,18 @@
public static Process.Start run(StartState jpdl3start) {
Process.Start start = new Process.Start();
start.setName(jpdl3start.getName());
- Iterator iterator = jpdl3start.getLeavingTransitionsMap().entrySet()
- .iterator();
+
+ Iterator iterator = jpdl3start.getLeavingTransitionsMap().entrySet().iterator();
while (iterator.hasNext()) {
Map.Entry entry = (Map.Entry) iterator.next();
Transition trans = (Transition) entry.getValue();
start.getTransition().add(TransitionConverter.run(trans, TransitionType.class));
}
+ //TODO: process Task
+ List<On> ons = EventsConverter.run(jpdl3start.getEvents());
+ start.getOn().addAll(ons);
+ //TODO: process exceptions
+
return start;
}
}
Modified: jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/util/StateConverter.java
===================================================================
--- jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/util/StateConverter.java 2009-05-30 19:15:30 UTC (rev 4964)
+++ jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/util/StateConverter.java 2009-05-31 08:49:11 UTC (rev 4965)
@@ -22,24 +22,30 @@
package org.jbpm.jpdl.internal.convert.util;
import java.util.Iterator;
+import java.util.List;
import java.util.Map;
+import java.util.Set;
+import org.jbpm.graph.def.Event;
import org.jbpm.graph.def.Transition;
import org.jbpm.graph.node.State;
+import org.jbpm.jpdl4.model.On;
import org.jbpm.jpdl4.model.Process;
public class StateConverter {
- public static Process.State run(State jpdl3state) {
+ public static Process.State run(State node) {
Process.State state = new Process.State();
- state.setName(jpdl3state.getName());
- Iterator iterator = jpdl3state.getLeavingTransitionsMap().entrySet().iterator();
+ state.setName(node.getName());
+ Iterator iterator = node.getLeavingTransitionsMap().entrySet().iterator();
while (iterator.hasNext()) {
Map.Entry entry = (Map.Entry)iterator.next();
Transition trans = (Transition)entry.getValue();
state.getTransition().add((Process.State.Transition)TransitionConverter.run(trans, Process.State.Transition.class));
}
-
+ List<On> ons = EventsConverter.run(node.getEvents());
+ state.getOn().addAll(ons);
+ //TODO: process exceptions
return state;
}
Modified: jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/util/SwimlaneConverter.java
===================================================================
--- jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/util/SwimlaneConverter.java 2009-05-30 19:15:30 UTC (rev 4964)
+++ jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/util/SwimlaneConverter.java 2009-05-31 08:49:11 UTC (rev 4965)
@@ -1,3 +1,24 @@
+/*
+ * 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.jpdl.internal.convert.util;
import org.jbpm.instantiation.Delegation;
import org.jbpm.jpdl4.model.Swimlane;
Modified: jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/util/TaskNodeConverter.java
===================================================================
--- jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/util/TaskNodeConverter.java 2009-05-30 19:15:30 UTC (rev 4964)
+++ jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/util/TaskNodeConverter.java 2009-05-31 08:49:11 UTC (rev 4965)
@@ -1,10 +1,33 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
package org.jbpm.jpdl.internal.convert.util;
+import java.util.List;
import java.util.Set;
import org.jbpm.graph.node.TaskNode;
import org.jbpm.instantiation.Delegation;
import org.jbpm.jpdl4.model.ObjectFactory;
+import org.jbpm.jpdl4.model.On;
import org.jbpm.jpdl4.model.Process;
import org.jbpm.jpdl4.model.WireObjectType;
import org.jbpm.taskmgmt.def.Task;
@@ -55,6 +78,9 @@
}
}
+ //TODO: Process exceptions
+ //TODO: Process events
+ //TODO: Process Timers
return result;
}
Added: jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/util/TimerConverter.java
===================================================================
--- jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/util/TimerConverter.java (rev 0)
+++ jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/util/TimerConverter.java 2009-05-31 08:49:11 UTC (rev 4965)
@@ -0,0 +1,54 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jbpm.jpdl.internal.convert.util;
+
+import org.jbpm.instantiation.Delegation;
+import org.jbpm.jpdl4.model.JavaType;
+import org.jbpm.jpdl4.model.ObjectFactory;
+import org.jbpm.jpdl4.model.ScriptType;
+import org.jbpm.jpdl4.model.Timer;
+import org.jbpm.scheduler.def.CreateTimerAction;
+
+public class TimerConverter {
+ public static Timer run(CreateTimerAction node) {
+ Timer timer = new Timer();
+ timer.setDuedate(node.getDueDate());
+ timer.setRepeat(node.getRepeat());
+ if (node.getTimerAction().getActionExpression() != null) {
+ ScriptType scriptType = new ScriptType();
+ scriptType.setExpr(node.getTimerAction().getActionExpression());
+ timer.getEventListenerGroup().add(new ObjectFactory().createOnScript(scriptType));
+ }
+ if (node.getTimerAction().getActionDelegation()!= null) {
+ Delegation delegation = node.getTimerAction().getActionDelegation();
+ String className = delegation.getClassName();
+ JavaType javaType = new ObjectFactory().createJavaType();
+ javaType.setClazz(className);
+ javaType.setMethod("execute");
+ timer.getEventListenerGroup().add(new ObjectFactory().createOnJava(javaType));
+
+ }
+
+ return timer;
+ }
+
+}
Modified: jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/util/TransitionConverter.java
===================================================================
--- jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/util/TransitionConverter.java 2009-05-30 19:15:30 UTC (rev 4964)
+++ jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/util/TransitionConverter.java 2009-05-31 08:49:11 UTC (rev 4965)
@@ -31,6 +31,7 @@
import org.jbpm.jpdl4.model.JavaType;
import org.jbpm.jpdl4.model.ObjectFactory;
import org.jbpm.jpdl4.model.Process;
+import org.jbpm.jpdl4.model.ScriptType;
import org.jbpm.jpdl4.model.TransitionType;
import org.jbpm.jpdl4.model.Process.Decision.Transition.Condition;
@@ -48,12 +49,13 @@
Process.Decision.Transition decTrans = (Process.Decision.Transition)transType;
if (transition.getCondition() != null) {
Condition condition = new Condition();
- condition.setExpr(transition.getCondition());
- decTrans.getCondition().add(condition);
+ //Revisit: check if jbpm4 can process both expression and script
+ condition.setExpr(transition.getCondition());
+ decTrans.getCondition().add(condition);
}
}
- // get the actions
+ // process transition events
if (transition.getEvents() != null) {
Iterator ite = transition.getEvents().entrySet().iterator();
while (ite.hasNext()) {
@@ -63,19 +65,29 @@
if (entry.getValue().getActions() != null) {
for (Action action : (List<Action>) entry.getValue()
.getActions()) {
- JavaType javaType = new JavaType();
- javaType.setClazz(action.getActionDelegation()
- .getClassName());
- // TODO:Check this java method
- javaType.setMethod("execute");
- transType.getEventListenerGroup().add(
- objectFactory.createOnJava(javaType));
+ if (action.getActionDelegation() != null) {
+ JavaType javaType = new JavaType();
+ javaType.setClazz(action.getActionDelegation()
+ .getClassName());
+ // TODO:Check this java method
+ javaType.setMethod("execute");
+ transType.getEventListenerGroup().add(
+ objectFactory.createOnJava(javaType));
+ }
+
+ if (action.getActionExpression() != null) {
+ ScriptType scriptType = new ScriptType();
+ scriptType.setExpr(action.getActionExpression());
+ transType.getEventListenerGroup().add(objectFactory.createOnScript(scriptType));
+
+ }
}
}
}
}
}
+
transType.setName(transition.getName());
transType.setTo(transition.getTo().getName());
return (T)transType;
Modified: jbpm4/branches/jimma/modules/migration/src/test/java/org/jbpm/jpdl/internal/convert/JpdlConverterTest.java
===================================================================
--- jbpm4/branches/jimma/modules/migration/src/test/java/org/jbpm/jpdl/internal/convert/JpdlConverterTest.java 2009-05-30 19:15:30 UTC (rev 4964)
+++ jbpm4/branches/jimma/modules/migration/src/test/java/org/jbpm/jpdl/internal/convert/JpdlConverterTest.java 2009-05-31 08:49:11 UTC (rev 4965)
@@ -42,7 +42,6 @@
public void runBusinessTrip() throws Exception {
testConvert("businesstrip.xml");
}
-
@Test
public void testDescision() throws Exception {
testConvert("testDecision.xml");
@@ -52,15 +51,16 @@
testConvert("process-event.xml");
}
+ @Test
+ public void testTimer() throws Exception {
+ testConvert("timer.xml");
+ }
-
public void testConvert(String resourcefile) throws Exception {
URL url = getClass().getClassLoader().getResource(resourcefile);
- ConverterContext context = new ConverterContext();
- context.put(ConverterContext.PROCESS_FILE_URL, url);
//Convert to process file to jpdl4
- JpdlConverter converter = new JpdlConverter(context);
- org.jbpm.jpdl4.model.Process process = converter.run();
+ JpdlConverter converter = new JpdlConverter();
+ org.jbpm.jpdl4.model.Process process = converter.run(url);
Jpdl4Writer writer = new Jpdl4Writer();
java.io.ByteArrayOutputStream bout = new java.io.ByteArrayOutputStream();
writer.write(process, bout, false);
@@ -68,9 +68,9 @@
//Validate it with Jpdl4Parser
String jpdl4xml = new String(bout.toByteArray());
+ //System.out.println(jpdl4xml);
List<Problem> problems = new JpdlParser().createParse().setString(jpdl4xml).execute().getProblems();
Assert.assertEquals(problems.toString(), 0, problems.size());
}
-
}
Added: jbpm4/branches/jimma/modules/migration/src/test/resources/timer.xml
===================================================================
--- jbpm4/branches/jimma/modules/migration/src/test/resources/timer.xml (rev 0)
+++ jbpm4/branches/jimma/modules/migration/src/test/resources/timer.xml 2009-05-31 08:49:11 UTC (rev 4965)
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<process-definition
+ xmlns="urn:jbpm.org:jpdl-3.2"
+ name="simple">
+ <start-state name="start">
+ <transition name="to_state" to="first">
+ <action name="action" class="com.sample.action.MessageActionHandler">
+ <message>Going to the first state!</message>
+ </action>
+ </transition>
+ </start-state>
+ <state name="first">
+ <timer duedate="2 business minutes">
+ <action name="timer-action1" class="com.sample.action.MessageActionHandler"/>
+ </timer>
+ <event type="task-create">
+ <create-timer duedate="3 business minutes">
+ <action name="timer-action2" class="com.sample.action.MessageActionHandler2"/>
+ </create-timer>
+ <action class="org.jbpm.AnotherEventAction"/>
+ </event>
+ <transition name="to_end" to="end">
+ <action name="action" class="com.sample.action.MessageActionHandler">
+ <message>About to finish!</message>
+ </action>
+ </transition>
+ </state>
+ <end-state name="end"></end-state>
+</process-definition>
\ No newline at end of file
14 years, 11 months
- 1
- 0
JBoss JBPM SVN: r4964 - in projects/gwt-console/trunk: gui/war and 1 other directory.
by do-not-reply＠jboss.org
Author: heiko.braun(a)jboss.com
Date: 2009-05-30 15:15:30 -0400 (Sat, 30 May 2009)
New Revision: 4964
Modified:
projects/gwt-console/trunk/README.txt
projects/gwt-console/trunk/gui/war/README.txt
Log:
Updated docs
Modified: projects/gwt-console/trunk/README.txt
===================================================================
--- projects/gwt-console/trunk/README.txt 2009-05-30 19:05:24 UTC (rev 4963)
+++ projects/gwt-console/trunk/README.txt 2009-05-30 19:15:30 UTC (rev 4964)
@@ -16,7 +16,7 @@
mvn clean install
-2) Make sure both jBPM and the server module are installed on JBoss AS instance
+2) Make sure both process engine and the server module are installed on JBoss AS instance
See http://www.jboss.org/community/docs/DOC-12863
@@ -28,8 +28,8 @@
Troubleshooting
---------------
-Please post any questions to the jbpm developer forum.
-(http://www.jboss.com/index.html?module=bb&op=viewforum&f=219)
+Please post any questions to the gwt-console developer forum.
+(http://www.jboss.org/index.html?module=bb&op=viewforum&f=295)
Have fun.
Modified: projects/gwt-console/trunk/gui/war/README.txt
===================================================================
--- projects/gwt-console/trunk/gui/war/README.txt 2009-05-30 19:05:24 UTC (rev 4963)
+++ projects/gwt-console/trunk/gui/war/README.txt 2009-05-30 19:15:30 UTC (rev 4964)
@@ -23,8 +23,10 @@
Produces a war file in target/gwt-console.war,
which can be deployed to a running jboss instance.
-Please post any questions to the jbpm developer forum.
-(http://www.jboss.com/index.html?module=bb&op=viewforum&f=219)
+Problems?
+---------
+Please post any questions to the gwt-console developer forum.
+(http://www.jboss.org/index.html?module=bb&op=viewforum&f=295)
Have fun.
14 years, 11 months
- 1
- 0
JBoss JBPM SVN: r4963 - in jbpm4/trunk/modules/examples/src/test: resources/org/jbpm/examples and 1 other directories.
by do-not-reply＠jboss.org
Author: heiko.braun(a)jboss.com
Date: 2009-05-30 15:05:24 -0400 (Sat, 30 May 2009)
New Revision: 4963
Added:
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/taskform/
jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/taskform/
jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/taskform/accept_message.ftl
jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/taskform/reject_message.ftl
jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/taskform/request_vacation.ftl
jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/taskform/vacation2.jpdl.xml
jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/taskform/vacation2.png
jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/taskform/verify_request.ftl
Log:
Fix JBPM-2243: Task form example
Added: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/taskform/accept_message.ftl
===================================================================
--- jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/taskform/accept_message.ftl (rev 0)
+++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/taskform/accept_message.ftl 2009-05-30 19:05:24 UTC (rev 4963)
@@ -0,0 +1,12 @@
+<html>
+<body>
+
+<h2>Your vacation request has been accepted</h2>
+Number of days: ${number_of_days}
+
+<form action="${form.action}" method="POST" enctype="multipart/form-data">
+ <input type="submit" name="Done"/>
+</form>
+
+</body>
+</html>
\ No newline at end of file
Added: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/taskform/reject_message.ftl
===================================================================
--- jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/taskform/reject_message.ftl (rev 0)
+++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/taskform/reject_message.ftl 2009-05-30 19:05:24 UTC (rev 4963)
@@ -0,0 +1,10 @@
+<html>
+<body>
+
+<h2>Your vacation request has been rejected</h2>
+Reason: ${reason}
+<form action="${form.action}" method="POST" enctype="multipart/form-data">
+ <input type="submit" name="Done"/>
+</form>
+</body>
+</html>
\ No newline at end of file
Added: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/taskform/request_vacation.ftl
===================================================================
--- jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/taskform/request_vacation.ftl (rev 0)
+++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/taskform/request_vacation.ftl 2009-05-30 19:05:24 UTC (rev 4963)
@@ -0,0 +1,18 @@
+<html>
+<body>
+
+<h2>How many days would you like to go on vacation?</h2>
+<form action="${form.action}" method="POST" enctype="multipart/form-data">
+<select name="number_of_days">
+ <option value="3">3 days</option>
+ <option value="5">5 days</option>
+ <option value="10">10 days</option>
+</select><br>
+
+<#list outcome.values as transition>
+ <input type="submit" name="outcome" value="${transition}">
+</#list>
+
+</form>
+</body>
+</html>
\ No newline at end of file
Added: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/taskform/vacation2.jpdl.xml
===================================================================
--- jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/taskform/vacation2.jpdl.xml (rev 0)
+++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/taskform/vacation2.jpdl.xml 2009-05-30 19:05:24 UTC (rev 4963)
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<process name="vacation2" xmlns="http://jbpm.org/4.0/jpdl">
+ <start g="274,13,48,48" name="start1">
+ <transition g="-109,-18" name="to number_of_days" to="request_vacation"/>
+ </start>
+ <end g="185,364,48,48" name="vacation_rejected"/>
+ <task candidate-users="peter,mary" g="237,97,126,52" name="request_vacation">
+ <transition g="-99,-18" name="to grant_vacation" to="verify_request"/>
+ </task>
+ <task candidate-users="mike" g="247,193,101,52" name="verify_request">
+ <transition g="-84,-1" name="reject" to="reject_message"/>
+ <transition g="32,-4" name="accept" to="accept_message"/>
+ </task>
+ <task candidate-groups="sales" g="148,273,118,52" name="reject_message">
+ <transition g="-51,-9" name="done_rejected" to="vacation_rejected"/>
+ </task>
+ <task candidate-groups="sales" g="371,274,108,52" name="accept_message">
+ <transition g="-46,-18" name="done_accepted" to="vacation_accepted"/>
+ </task>
+ <end g="408,359,48,48" name="vacation_accepted"/>
+</process>
\ No newline at end of file
Added: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/taskform/vacation2.png
===================================================================
(Binary files differ)
Property changes on: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/taskform/vacation2.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/taskform/verify_request.ftl
===================================================================
--- jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/taskform/verify_request.ftl (rev 0)
+++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/taskform/verify_request.ftl 2009-05-30 19:05:24 UTC (rev 4963)
@@ -0,0 +1,15 @@
+<html>
+<body>
+
+<h2>Your employee would like to go on vacation</h2>
+<form action="${form.action}" method="POST" enctype="multipart/form-data">
+Number of days: ${number_of_days}<br/>
+<hr>
+In case you reject, please provide a reason:<br/>
+<input type="textarea" name="reason"/><br/>
+<#list outcome.values as transition>
+ <input type="submit" name="outcome" value="${transition}">
+</#list>
+</form>
+</body>
+</html>
\ No newline at end of file
14 years, 11 months
- 1
- 0
JBoss JBPM SVN: r4962 - jbpm4/trunk.
by do-not-reply＠jboss.org
Author: heiko.braun(a)jboss.com
Date: 2009-05-30 14:36:38 -0400 (Sat, 30 May 2009)
New Revision: 4962
Modified:
jbpm4/trunk/pom.xml
Log:
Update to console 1.0.0.CR1
Modified: jbpm4/trunk/pom.xml
===================================================================
--- jbpm4/trunk/pom.xml 2009-05-30 18:32:32 UTC (rev 4961)
+++ jbpm4/trunk/pom.xml 2009-05-30 18:36:38 UTC (rev 4962)
@@ -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.CR1</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>
14 years, 11 months
- 1
- 0
JBoss JBPM SVN: r4961 - jbpm4/trunk/modules/integration/report/src/main/resources.
by do-not-reply＠jboss.org
Author: heiko.braun(a)jboss.com
Date: 2009-05-30 14:32:32 -0400 (Sat, 30 May 2009)
New Revision: 4961
Modified:
jbpm4/trunk/modules/integration/report/src/main/resources/overall_activity.rptdesign
jbpm4/trunk/modules/integration/report/src/main/resources/process_summary.rptdesign
Log:
Fix column name problem for HSQLDB
Modified: jbpm4/trunk/modules/integration/report/src/main/resources/overall_activity.rptdesign
===================================================================
--- jbpm4/trunk/modules/integration/report/src/main/resources/overall_activity.rptdesign 2009-05-30 17:29:08 UTC (rev 4960)
+++ jbpm4/trunk/modules/integration/report/src/main/resources/overall_activity.rptdesign 2009-05-30 18:32:32 UTC (rev 4961)
@@ -12,6 +12,12 @@
<encrypted-property name="odaPassword" encryptionID="base64">amJwbQ==</encrypted-property>
<property name="odaJndiName">java:/JbpmDS</property>
</oda-data-source>
+ <oda-data-source extensionID="org.eclipse.birt.report.data.oda.jdbc" name="HSQLDB" id="248">
+ <property name="odaDriverClass">org.hsqldb.jdbcDriver</property>
+ <property name="odaURL">jdbc:hsqldb:hsql://localhost:1701</property>
+ <property name="odaUser">sa</property>
+ <property name="odaJndiName">java:/JbpmDS</property>
+ </oda-data-source>
</data-sources>
<data-sets>
<oda-data-set extensionID="org.eclipse.birt.report.data.oda.jdbc.JdbcSelectDataSet" name="process_definitions" id="9">
@@ -56,12 +62,12 @@
</structure>
</list-property>
</structure>
- <property name="dataSource">MySQL</property>
+ <property name="dataSource">HSQLDB</property>
<list-property name="resultSet">
<structure>
<property name="position">1</property>
<property name="name">dpl</property>
- <property name="nativeName">dpl</property>
+ <property name="nativeName">DPL</property>
<property name="dataType">decimal</property>
<property name="nativeDataType">-5</property>
</structure>
@@ -73,10 +79,10 @@
<property name="nativeDataType">12</property>
</structure>
</list-property>
- <property name="queryText">SELECT d.DBID_ as dpl, p.STRINGVAL_ as processId FROM JBPM4_DEPLOYMENT d, JBPM4_DEPLOYPROP p
+ <property name="queryText">SELECT d.DBID_ as "dpl", p.STRINGVAL_ as "processId" FROM JBPM4_DEPLOYMENT d, JBPM4_DEPLOYPROP p
WHERE p.KEY_='pdid'
AND d.DBID_=p.DEPLOYMENT_
- GROUP BY dpl,processId
+ GROUP BY "dpl","processId"
LIMIT 10</property>
<xml-property name="designerValues"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
<model:DesignValues xmlns:design="http://www.eclipse.org/datatools/connectivity/oda/design" xmlns:model="http://www.eclipse.org/birt/report/model/adapter/odaModel">
@@ -169,7 +175,7 @@
</structure>
</list-property>
</structure>
- <property name="dataSource">MySQL</property>
+ <property name="dataSource">HSQLDB</property>
<list-property name="resultSet">
<structure>
<property name="position">1</property>
@@ -186,7 +192,9 @@
<property name="nativeDataType">12</property>
</structure>
</list-property>
- <property name="queryText">SELECT distinct(ID_) as instanceId, PROCDEFID_ FROM JBPM4_HIST_PROCINST J WHERE END_ IS NULL</property>
+ <property name="queryText">SELECT distinct(ID_) as "instanceId", PROCDEFID_
+ FROM JBPM4_HIST_PROCINST J
+ WHERE END_ IS NULL</property>
<xml-property name="designerValues"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
<model:DesignValues xmlns:design="http://www.eclipse.org/datatools/connectivity/oda/design" xmlns:model="http://www.eclipse.org/birt/report/model/adapter/odaModel">
<Version>1.0</Version>
@@ -278,7 +286,7 @@
</structure>
</list-property>
</structure>
- <property name="dataSource">MySQL</property>
+ <property name="dataSource">HSQLDB</property>
<list-property name="resultSet">
<structure>
<property name="position">1</property>
@@ -295,7 +303,8 @@
<property name="nativeDataType">12</property>
</structure>
</list-property>
- <property name="queryText">SELECT distinct(ID_) as instanceId, PROCDEFID_ FROM JBPM4_HIST_PROCINST J </property>
+ <property name="queryText">SELECT distinct(ID_) as "instanceId",
+PROCDEFID_ FROM JBPM4_HIST_PROCINST J </property>
</oda-data-set>
<oda-data-set extensionID="org.eclipse.birt.report.data.oda.jdbc.JdbcSelectDataSet" name="number_executions" id="126">
<list-property name="computedColumns">
@@ -325,7 +334,7 @@
<structure>
<property name="position">1</property>
<property name="name">numExecutions</property>
- <property name="dataType">decimal</property>
+ <property name="dataType">integer</property>
</structure>
<structure>
<property name="position">2</property>
@@ -339,14 +348,14 @@
</structure>
</list-property>
</structure>
- <property name="dataSource">MySQL</property>
+ <property name="dataSource">HSQLDB</property>
<list-property name="resultSet">
<structure>
<property name="position">1</property>
<property name="name">numExecutions</property>
<property name="nativeName">numExecutions</property>
- <property name="dataType">decimal</property>
- <property name="nativeDataType">-5</property>
+ <property name="dataType">integer</property>
+ <property name="nativeDataType">4</property>
</structure>
<structure>
<property name="position">2</property>
@@ -356,10 +365,10 @@
<property name="nativeDataType">12</property>
</structure>
</list-property>
- <property name="queryText">SELECT count(PROCDEFID_) as numExecutions, PROCDEFID_
+ <property name="queryText">SELECT count(PROCDEFID_) as "numExecutions", PROCDEFID_
FROM JBPM4_HIST_PROCINST J
GROUP BY PROCDEFID_
- ORDER BY numExecutions DESC
+ ORDER BY "numExecutions" DESC
limit 15</property>
<xml-property name="designerValues"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
<model:DesignValues xmlns:design="http://www.eclipse.org/datatools/connectivity/oda/design" xmlns:model="http://www.eclipse.org/birt/report/model/adapter/odaModel">
@@ -535,7 +544,7 @@
</structure>
</list-property>
</structure>
- <property name="dataSource">MySQL</property>
+ <property name="dataSource">HSQLDB</property>
<list-property name="resultSet">
<structure>
<property name="position">1</property>
Modified: jbpm4/trunk/modules/integration/report/src/main/resources/process_summary.rptdesign
===================================================================
--- jbpm4/trunk/modules/integration/report/src/main/resources/process_summary.rptdesign 2009-05-30 17:29:08 UTC (rev 4960)
+++ jbpm4/trunk/modules/integration/report/src/main/resources/process_summary.rptdesign 2009-05-30 18:32:32 UTC (rev 4961)
@@ -10,6 +10,7 @@
<property name="dataType">string</property>
<property name="paramType">simple</property>
<text-property name="promptText">Please enter an process definition ID</text-property>
+ <property name="isRequired">true</property>
<property name="controlType">text-box</property>
<property name="distinct">true</property>
<structure name="format">
@@ -25,6 +26,12 @@
<encrypted-property name="odaPassword" encryptionID="base64">amJwbQ==</encrypted-property>
<property name="odaJndiName">java:/JbpmDS</property>
</oda-data-source>
+ <oda-data-source extensionID="org.eclipse.birt.report.data.oda.jdbc" name="HSQLDB" id="275">
+ <property name="odaDriverClass">org.hsqldb.jdbcDriver</property>
+ <property name="odaURL">jdbc:hsqldb:hsql://localhost:1701</property>
+ <property name="odaUser">sa</property>
+ <property name="odaJndiName">java:/JbpmDS</property>
+ </oda-data-source>
</data-sources>
<data-sets>
<oda-data-set extensionID="org.eclipse.birt.report.data.oda.jdbc.JdbcSelectDataSet" name="active_instances" id="126">
@@ -132,7 +139,7 @@
</structure>
</list-property>
</structure>
- <property name="dataSource">MySQL</property>
+ <property name="dataSource">HSQLDB</property>
<list-property name="parameters">
<structure>
<property name="name">id</property>
@@ -255,7 +262,7 @@
</structure>
</list-property>
</structure>
- <property name="dataSource">MySQL</property>
+ <property name="dataSource">HSQLDB</property>
<list-property name="parameters">
<structure>
<property name="name">id</property>
@@ -529,7 +536,7 @@
</structure>
</list-property>
</structure>
- <property name="dataSource">MySQL</property>
+ <property name="dataSource">HSQLDB</property>
<list-property name="parameters">
<structure>
<property name="name">id</property>
@@ -556,7 +563,7 @@
<property name="nativeDataType">-5</property>
</structure>
</list-property>
- <property name="queryText">SELECT ID_ as instanceId, DURATION_
+ <property name="queryText">SELECT ID_ as "instanceId", DURATION_
FROM JBPM4_HIST_PROCINST J
WHERE PROCDEFID_= ?
and STATE_ NOT LIKE 'active'
@@ -653,7 +660,7 @@
</structure>
</list-property>
</structure>
- <property name="dataSource">MySQL</property>
+ <property name="dataSource">HSQLDB</property>
<list-property name="resultSet">
<structure>
<property name="position">1</property>
14 years, 11 months
- 1
- 0
JBoss JBPM SVN: r4960 - projects/gwt-console/tags.
by do-not-reply＠jboss.org
Author: heiko.braun(a)jboss.com
Date: 2009-05-30 13:29:08 -0400 (Sat, 30 May 2009)
New Revision: 4960
Added:
projects/gwt-console/tags/gwt-console-1.0.0.CR1/
Log:
CR1
Copied: projects/gwt-console/tags/gwt-console-1.0.0.CR1 (from rev 4959, projects/gwt-console/trunk)
14 years, 11 months
- 1
- 0
JBoss JBPM SVN: r4959 - in projects/gwt-console/trunk: gui/profiles and 4 other directories.
by do-not-reply＠jboss.org
Author: heiko.braun(a)jboss.com
Date: 2009-05-30 13:28:22 -0400 (Sat, 30 May 2009)
New Revision: 4959
Modified:
projects/gwt-console/trunk/gui/profiles/profiles.iml
projects/gwt-console/trunk/gui/war/gui-war.iml
projects/gwt-console/trunk/gui/workspace-api/workspace-api.iml
projects/gwt-console/trunk/gwt-parent.iml
projects/gwt-console/trunk/server/server-core/server-core.iml
projects/gwt-console/trunk/server/server-integration/server-integration.iml
Log:
idea prj files
Modified: projects/gwt-console/trunk/gui/profiles/profiles.iml
===================================================================
--- projects/gwt-console/trunk/gui/profiles/profiles.iml 2009-05-30 17:24:50 UTC (rev 4958)
+++ projects/gwt-console/trunk/gui/profiles/profiles.iml 2009-05-30 17:28:22 UTC (rev 4959)
@@ -4,7 +4,10 @@
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
+ <sourceFolder url="file://$MODULE_DIR$/drools/src/main/java" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/drools/src/main/resources" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/jbpm/src/main/java" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/jbpm/src/main/resources" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
Modified: projects/gwt-console/trunk/gui/war/gui-war.iml
===================================================================
--- projects/gwt-console/trunk/gui/war/gui-war.iml 2009-05-30 17:24:50 UTC (rev 4958)
+++ projects/gwt-console/trunk/gui/war/gui-war.iml 2009-05-30 17:28:22 UTC (rev 4959)
@@ -11,9 +11,9 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="module" module-name="gwt-rpc" />
- <orderEntry type="module" module-name="gwt-parent" />
- <orderEntry type="module" module-name="workspace-api" />
+ <orderEntry type="module" module-name="gwt-rpc" exported="" />
+ <orderEntry type="module" module-name="gwt-parent" exported="" />
+ <orderEntry type="module" module-name="workspace-api" exported="" />
<orderEntry type="module-library" exported="">
<library name="M2 Dep: javax.xml.bind:jaxb-api:jar:2.1:compile">
<CLASSES>
@@ -173,37 +173,37 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntry type="module-library">
- <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic-incubator:jar:0.10.0.CR1:compile">
+ <orderEntry type="module-library" exported="">
+ <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic:jar:0.1.10:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic-incubator/0.10.0.CR1/gwt-mosaic-incubator-0.10.0.CR1.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic/0.1.10/gwt-mosaic-0.1.10.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
- <orderEntry type="module-library">
- <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic-dnd:jar:0.10.0.CR1:compile">
+ <orderEntry type="module-library" exported="">
+ <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic-dnd:jar:0.1.10:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic-dnd/0.10.0.CR1/gwt-mosaic-dnd-0.10.0.CR1.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic-dnd/0.1.10/gwt-mosaic-dnd-0.1.10.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
- <orderEntry type="module-library">
- <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic:jar:0.10.0.CR1:compile">
+ <orderEntry type="module-library" exported="">
+ <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic-gwtx:jar:0.1.10:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic/0.10.0.CR1/gwt-mosaic-0.10.0.CR1.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic-gwtx/0.1.10/gwt-mosaic-gwtx-0.1.10.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
- <orderEntry type="module-library">
- <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic-gwtx:jar:0.10.0.CR1:compile">
+ <orderEntry type="module-library" exported="">
+ <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic-incubator:jar:0.1.10:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic-gwtx/0.10.0.CR1/gwt-mosaic-gwtx-0.10.0.CR1.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic-incubator/0.1.10/gwt-mosaic-incubator-0.1.10.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
Modified: projects/gwt-console/trunk/gui/workspace-api/workspace-api.iml
===================================================================
--- projects/gwt-console/trunk/gui/workspace-api/workspace-api.iml 2009-05-30 17:24:50 UTC (rev 4958)
+++ projects/gwt-console/trunk/gui/workspace-api/workspace-api.iml 2009-05-30 17:28:22 UTC (rev 4959)
@@ -6,7 +6,6 @@
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/target/generated-sources" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
@@ -144,36 +143,36 @@
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic-incubator:jar:0.10.0.CR1:compile">
+ <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic:jar:0.1.10:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic-incubator/0.10.0.CR1/gwt-mosaic-incubator-0.10.0.CR1.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic/0.1.10/gwt-mosaic-0.1.10.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic-dnd:jar:0.10.0.CR1:compile">
+ <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic-dnd:jar:0.1.10:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic-dnd/0.10.0.CR1/gwt-mosaic-dnd-0.10.0.CR1.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic-dnd/0.1.10/gwt-mosaic-dnd-0.1.10.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic:jar:0.10.0.CR1:compile">
+ <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic-gwtx:jar:0.1.10:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic/0.10.0.CR1/gwt-mosaic-0.10.0.CR1.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic-gwtx/0.1.10/gwt-mosaic-gwtx-0.1.10.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic-gwtx:jar:0.10.0.CR1:compile">
+ <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic-incubator:jar:0.1.10:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic-gwtx/0.10.0.CR1/gwt-mosaic-gwtx-0.10.0.CR1.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic-incubator/0.1.10/gwt-mosaic-incubator-0.1.10.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
Modified: projects/gwt-console/trunk/gwt-parent.iml
===================================================================
--- projects/gwt-console/trunk/gwt-parent.iml 2009-05-30 17:24:50 UTC (rev 4958)
+++ projects/gwt-console/trunk/gwt-parent.iml 2009-05-30 17:28:22 UTC (rev 4959)
@@ -4,6 +4,10 @@
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
+ <sourceFolder url="file://$MODULE_DIR$/gui/profiles/drools/src/main/java" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/gui/profiles/drools/src/main/resources" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/gui/profiles/jbpm/src/main/java" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/gui/profiles/jbpm/src/main/resources" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/gui/war/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/gui/war/src/main/resources" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/gui/war/src/test/java" isTestSource="true" />
@@ -20,6 +24,9 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="module" module-name="gui-war" exported="" />
+ <orderEntry type="module" module-name="server-integration" exported="" />
+ <orderEntry type="module" module-name="report-server" exported="" />
<orderEntry type="module" module-name="workspace-api" exported="" />
<orderEntry type="module-library" exported="">
<library name="M2 Dep: junit:junit:jar:3.8.1:test">
@@ -326,6 +333,206 @@
<SOURCES />
</library>
</orderEntry>
+ <orderEntry type="module-library" exported="">
+ <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic-dnd:jar:0.1.10:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic-dnd/0.1.10/gwt-mosaic-dnd-0.1.10.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library" exported="">
+ <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic-gwtx:jar:0.1.10:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic-gwtx/0.1.10/gwt-mosaic-gwtx-0.1.10.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library" exported="">
+ <library name="M2 Dep: org.eclipse.birt:chartengineapi:jar:2.3.2:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/eclipse/birt/chartengineapi/2.3.2/chartengineapi-2.3.2.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library" exported="">
+ <library name="M2 Dep: org.eclipse.emf:common:jar:2.4.0:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/eclipse/emf/common/2.4.0/common-2.4.0.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library" exported="">
+ <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic-incubator:jar:0.1.10:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic-incubator/0.1.10/gwt-mosaic-incubator-0.1.10.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library" exported="">
+ <library name="M2 Dep: org.eclipse.birt:scriptapi:jar:2.3.2:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/eclipse/birt/scriptapi/2.3.2/scriptapi-2.3.2.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library" exported="">
+ <library name="M2 Dep: org.eclipse.birt:engineapi:jar:2.3.2:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/eclipse/birt/engineapi/2.3.2/engineapi-2.3.2.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library" exported="">
+ <library name="M2 Dep: commons-codec:commons-codec:jar:1.3:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/commons-codec/commons-codec/1.3/commons-codec-1.3.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/commons-codec/commons-codec/1.3/commons-codec-1.3-sources.jar!/" />
+ </SOURCES>
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library" exported="">
+ <library name="M2 Dep: org.eclipse.birt:coreapi:jar:2.3.2:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/eclipse/birt/coreapi/2.3.2/coreapi-2.3.2.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library" exported="">
+ <library name="M2 Dep: rhino:js:jar:1.6R2:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/rhino/js/1.6R2/js-1.6R2.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library" exported="">
+ <library name="M2 Dep: org.eclipse.emf:ecore:jar:2.4.2:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/eclipse/emf/ecore/2.4.2/ecore-2.4.2.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library" exported="">
+ <library name="M2 Dep: org.w3c:flute:jar:1.2:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/w3c/flute/1.2/flute-1.2.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library" exported="">
+ <library name="M2 Dep: com.ibm.icu:icu4j:jar:3.8.1:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/com/ibm/icu/icu4j/3.8.1/icu4j-3.8.1.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library" exported="">
+ <library name="M2 Dep: org.eclipse.birt:modelapi:jar:2.3.2:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/eclipse/birt/modelapi/2.3.2/modelapi-2.3.2.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library" exported="">
+ <library name="M2 Dep: commons-discovery:commons-discovery:jar:0.2:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/commons-discovery/commons-discovery/0.2/commons-discovery-0.2.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library" exported="">
+ <library name="M2 Dep: org.eclipse.birt:dataadapterapi:jar:2.3.2:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/eclipse/birt/dataadapterapi/2.3.2/dataadapterapi-2.3.2.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library" exported="">
+ <library name="M2 Dep: org.eclipse.emf:ecore-xmi:jar:2.4.1:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/eclipse/emf/ecore-xmi/2.4.1/ecore-xmi-2.4.1.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library" exported="">
+ <library name="M2 Dep: commons-cli:commons-cli:jar:1.0:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/commons-cli/commons-cli/1.0/commons-cli-1.0.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library" exported="">
+ <library name="M2 Dep: org.eclipse.birt:dteapi:jar:2.3.2:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/eclipse/birt/dteapi/2.3.2/dteapi-2.3.2.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library" exported="">
+ <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic:jar:0.1.10:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic/0.1.10/gwt-mosaic-0.1.10.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library" exported="">
+ <library name="M2 Dep: org.w3c:sac:jar:1.3:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/w3c/sac/1.3/sac-1.3.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library" exported="">
+ <library name="M2 Dep: com.lowagie:itext:jar:1.3:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/com/lowagie/itext/1.3/itext-1.3.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
<orderEntryProperties />
</component>
</module>
Modified: projects/gwt-console/trunk/server/server-core/server-core.iml
===================================================================
--- projects/gwt-console/trunk/server/server-core/server-core.iml 2009-05-30 17:24:50 UTC (rev 4958)
+++ projects/gwt-console/trunk/server/server-core/server-core.iml 2009-05-30 17:28:22 UTC (rev 4959)
@@ -10,9 +10,10 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="module" module-name="gwt-parent" />
- <orderEntry type="module" module-name="server-integration" />
- <orderEntry type="module" module-name="gwt-rpc" />
+ <orderEntry type="module" module-name="gwt-rpc" exported="" />
+ <orderEntry type="module" module-name="gwt-parent" exported="" />
+ <orderEntry type="module" module-name="server-integration" exported="" />
+ <orderEntry type="module" module-name="report-server" exported="" />
<orderEntry type="module-library" exported="">
<library name="M2 Dep: org.slf4j:slf4j-simple:jar:1.5.2:compile">
<CLASSES>
@@ -253,7 +254,170 @@
</SOURCES>
</library>
</orderEntry>
- <orderEntry type="module" module-name="report-server" />
+ <orderEntry type="module-library" exported="">
+ <library name="M2 Dep: org.eclipse.birt:modelapi:jar:2.3.2:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/eclipse/birt/modelapi/2.3.2/modelapi-2.3.2.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library" exported="">
+ <library name="M2 Dep: commons-discovery:commons-discovery:jar:0.2:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-discovery/commons-discovery/0.2/commons-discovery-0.2.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library" exported="">
+ <library name="M2 Dep: org.eclipse.birt:dataadapterapi:jar:2.3.2:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/eclipse/birt/dataadapterapi/2.3.2/dataadapterapi-2.3.2.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library" exported="">
+ <library name="M2 Dep: org.eclipse.birt:chartengineapi:jar:2.3.2:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/eclipse/birt/chartengineapi/2.3.2/chartengineapi-2.3.2.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library" exported="">
+ <library name="M2 Dep: org.eclipse.emf:common:jar:2.4.0:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/eclipse/emf/common/2.4.0/common-2.4.0.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library" exported="">
+ <library name="M2 Dep: org.eclipse.emf:ecore-xmi:jar:2.4.1:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/eclipse/emf/ecore-xmi/2.4.1/ecore-xmi-2.4.1.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library" exported="">
+ <library name="M2 Dep: commons-cli:commons-cli:jar:1.0:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-cli/commons-cli/1.0/commons-cli-1.0.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library" exported="">
+ <library name="M2 Dep: org.eclipse.birt:scriptapi:jar:2.3.2:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/eclipse/birt/scriptapi/2.3.2/scriptapi-2.3.2.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library" exported="">
+ <library name="M2 Dep: org.eclipse.birt:engineapi:jar:2.3.2:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/eclipse/birt/engineapi/2.3.2/engineapi-2.3.2.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library" exported="">
+ <library name="M2 Dep: org.eclipse.birt:dteapi:jar:2.3.2:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/eclipse/birt/dteapi/2.3.2/dteapi-2.3.2.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library" exported="">
+ <library name="M2 Dep: commons-codec:commons-codec:jar:1.3:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-codec/commons-codec/1.3/commons-codec-1.3.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-codec/commons-codec/1.3/commons-codec-1.3-sources.jar!/" />
+ </SOURCES>
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library" exported="">
+ <library name="M2 Dep: org.w3c:sac:jar:1.3:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/w3c/sac/1.3/sac-1.3.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library" exported="">
+ <library name="M2 Dep: org.eclipse.birt:coreapi:jar:2.3.2:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/eclipse/birt/coreapi/2.3.2/coreapi-2.3.2.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library" exported="">
+ <library name="M2 Dep: rhino:js:jar:1.6R2:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/rhino/js/1.6R2/js-1.6R2.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library" exported="">
+ <library name="M2 Dep: com.lowagie:itext:jar:1.3:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/com/lowagie/itext/1.3/itext-1.3.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library" exported="">
+ <library name="M2 Dep: org.eclipse.emf:ecore:jar:2.4.2:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/eclipse/emf/ecore/2.4.2/ecore-2.4.2.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library" exported="">
+ <library name="M2 Dep: org.w3c:flute:jar:1.2:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/w3c/flute/1.2/flute-1.2.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library" exported="">
+ <library name="M2 Dep: com.ibm.icu:icu4j:jar:3.8.1:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/com/ibm/icu/icu4j/3.8.1/icu4j-3.8.1.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
<orderEntryProperties />
</component>
</module>
Modified: projects/gwt-console/trunk/server/server-integration/server-integration.iml
===================================================================
--- projects/gwt-console/trunk/server/server-integration/server-integration.iml 2009-05-30 17:24:50 UTC (rev 4958)
+++ projects/gwt-console/trunk/server/server-integration/server-integration.iml 2009-05-30 17:28:22 UTC (rev 4959)
@@ -8,7 +8,8 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="module" module-name="gwt-parent" />
+ <orderEntry type="module" module-name="gwt-rpc" exported="" />
+ <orderEntry type="module" module-name="gwt-parent" exported="" />
<orderEntry type="module-library" exported="">
<library name="M2 Dep: javax.xml.bind:jaxb-api:jar:2.1:provided">
<CLASSES>
@@ -78,7 +79,6 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntry type="module" module-name="gwt-rpc" />
<orderEntryProperties />
</component>
</module>
14 years, 11 months
- 1
- 0
JBoss JBPM SVN: r4958 - in projects/report-server/tags/report-server-1.0.0.CR1: core and 1 other directories.
by do-not-reply＠jboss.org
Author: heiko.braun(a)jboss.com
Date: 2009-05-30 13:24:50 -0400 (Sat, 30 May 2009)
New Revision: 4958
Modified:
projects/report-server/tags/report-server-1.0.0.CR1/core/pom.xml
projects/report-server/tags/report-server-1.0.0.CR1/pom.xml
projects/report-server/tags/report-server-1.0.0.CR1/server/pom.xml
Log:
Version 1.0.0.CR1
Modified: projects/report-server/tags/report-server-1.0.0.CR1/core/pom.xml
===================================================================
--- projects/report-server/tags/report-server-1.0.0.CR1/core/pom.xml 2009-05-30 17:22:28 UTC (rev 4957)
+++ projects/report-server/tags/report-server-1.0.0.CR1/core/pom.xml 2009-05-30 17:24:50 UTC (rev 4958)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.bpm</groupId>
<artifactId>report-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.CR1</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: projects/report-server/tags/report-server-1.0.0.CR1/pom.xml
===================================================================
--- projects/report-server/tags/report-server-1.0.0.CR1/pom.xml 2009-05-30 17:22:28 UTC (rev 4957)
+++ projects/report-server/tags/report-server-1.0.0.CR1/pom.xml 2009-05-30 17:24:50 UTC (rev 4958)
@@ -4,7 +4,7 @@
<name>JBoss BPM - Reporting (BIRT Integration)</name>
<groupId>org.jboss.bpm</groupId>
<artifactId>report-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.CR1</version>
<packaging>pom</packaging>
<!-- Parent -->
Modified: projects/report-server/tags/report-server-1.0.0.CR1/server/pom.xml
===================================================================
--- projects/report-server/tags/report-server-1.0.0.CR1/server/pom.xml 2009-05-30 17:22:28 UTC (rev 4957)
+++ projects/report-server/tags/report-server-1.0.0.CR1/server/pom.xml 2009-05-30 17:24:50 UTC (rev 4958)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.bpm</groupId>
<artifactId>report-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.CR1</version>
<relativePath>../pom.xml</relativePath>
</parent>
14 years, 11 months
- 1
- 0
JBoss JBPM SVN: r4957 - projects/report-server/tags.
by do-not-reply＠jboss.org
Author: heiko.braun(a)jboss.com
Date: 2009-05-30 13:22:28 -0400 (Sat, 30 May 2009)
New Revision: 4957
Added:
projects/report-server/tags/report-server-1.0.0.CR1/
Log:
CR1
Copied: projects/report-server/tags/report-server-1.0.0.CR1 (from rev 4956, projects/report-server/trunk)
14 years, 11 months
- 1
- 0