[jbpm-commits] JBoss JBPM SVN: r4621 - in jbpm4/trunk: modules/pvm and 1 other directories.
Author: tom.baeyens(a)jboss.com
Date: 2009-04-26 01:47:15 -0400 (Sun, 26 Apr 2009)
New Revision: 4621
Modified:
jbpm4/trunk/modules/pvm/pom.xml
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/ObjectDescriptor.java
jbpm4/trunk/pom.xml
Log:
JBPM-2163 new configuration, distribution and qa setup
Modified: jbpm4/trunk/modules/pvm/pom.xml
===================================================================
--- jbpm4/trunk/modules/pvm/pom.xml 2009-04-26 05:42:43 UTC (rev 4620)
+++ jbpm4/trunk/modules/pvm/pom.xml 2009-04-26 05:47:15 UTC (rev 4621)
@@ -57,6 +57,10 @@
</dependency>
<dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant</artifactId>
+ </dependency>
+ <dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</dependency>
Modified:
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/ObjectDescriptor.java
===================================================================
---
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/ObjectDescriptor.java 2009-04-26
05:42:43 UTC (rev 4620)
+++
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/ObjectDescriptor.java 2009-04-26
05:47:15 UTC (rev 4621)
@@ -267,6 +267,7 @@
for (Field field: declaredFields) {
if (! Modifier.isStatic(field.getModifiers())) {
String fieldName = field.getName();
+ Class<?> fieldType = field.getType();
Object autoWireValue = null;
if ("environment".equals(fieldName)) {
@@ -281,7 +282,7 @@
autoWireValue = wireContext.get(fieldName);
} else {
- autoWireValue = wireContext.get(field.getType());
+ autoWireValue = wireContext.get(fieldType);
}
// if auto wire value has not been found in current context,
// search in environment
@@ -290,7 +291,7 @@
if (currentEnvironment != null) {
autoWireValue = currentEnvironment.get(fieldName);
if (autoWireValue == null) {
- autoWireValue = currentEnvironment.get(field.getType());
+ autoWireValue = currentEnvironment.get(fieldType);
}
}
}
@@ -301,7 +302,7 @@
ReflectUtil.set(field, object, autoWireValue);
} catch (JbpmException e) {
if(e.getCause() instanceof IllegalArgumentException) {
- log.info("WARNING: couldn't auto wire "+fieldName+"
(of type "+field.getType().getName()+") " +
+ log.info("WARNING: couldn't auto wire "+fieldName+"
(of type "+fieldType.getName()+") " +
"with value "+autoWireValue + " (of type
"+autoWireValue.getClass().getName()+")");
} else {
log.info("WARNING: couldn't auto wire "+fieldName+"
with value "+autoWireValue);
Modified: jbpm4/trunk/pom.xml
===================================================================
--- jbpm4/trunk/pom.xml 2009-04-26 05:42:43 UTC (rev 4620)
+++ jbpm4/trunk/pom.xml 2009-04-26 05:47:15 UTC (rev 4621)
@@ -430,6 +430,7 @@
<id>distro</id>
<modules>
<module>modules/enterprise</module>
+ <module>modules/db</module>
<module>modules/devguide</module>
<module>modules/userguide</module>
<module>modules/distro</module>