11:06 p.m.
Author: alex.guizar(a)jboss.com
Date: 2010-12-20 00:06:54 -0500 (Mon, 20 Dec 2010)
New Revision: 6877
Modified:
jbpm4/trunk/examples/pom.xml
jbpm4/trunk/jpdl/pom.xml
jbpm4/trunk/migration/pom.xml
jbpm4/trunk/migration/src/main/java/org/jbpm/jpdl/internal/convert/Jpdl3Converter.java
jbpm4/trunk/migration/src/main/java/org/jbpm/jpdl/internal/convert/Jpdl3ConverterParser.java
jbpm4/trunk/migration/src/main/java/org/jbpm/jpdl/internal/convert/action/ActionConverterTypes.java
jbpm4/trunk/migration/src/main/java/org/jbpm/jpdl/internal/convert/node/NodeConverterTypes.java
jbpm4/trunk/pvm/pom.xml
jbpm4/trunk/test-db/pom.xml
Log:
JBPM-2985 restore livetribe (javax.script) dependency for jdk5 compatibility;
disentangle commons-logging from jpdl-migration
Modified: jbpm4/trunk/examples/pom.xml
===================================================================
--- jbpm4/trunk/examples/pom.xml 2010-12-18 08:49:40 UTC (rev 6876)
+++ jbpm4/trunk/examples/pom.xml 2010-12-20 05:06:54 UTC (rev 6877)
@@ -188,5 +188,19 @@
</plugins>
</build>
</profile>
+
+ <profile>
+ <id>jdk5</id>
+ <activation>
+ <jdk>1.5</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.livetribe</groupId>
+ <artifactId>livetribe-jsr223</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
</project>
Modified: jbpm4/trunk/jpdl/pom.xml
===================================================================
--- jbpm4/trunk/jpdl/pom.xml 2010-12-18 08:49:40 UTC (rev 6876)
+++ jbpm4/trunk/jpdl/pom.xml 2010-12-20 05:06:54 UTC (rev 6877)
@@ -113,5 +113,20 @@
<skipTests>true</skipTests>
</properties>
</profile>
+
+ <profile>
+ <id>jdk5</id>
+ <activation>
+ <jdk>1.5</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.livetribe</groupId>
+ <artifactId>livetribe-jsr223</artifactId>
+ <scope>runtime</scope>
+ <optional>true</optional>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
</project>
Modified: jbpm4/trunk/migration/pom.xml
===================================================================
--- jbpm4/trunk/migration/pom.xml 2010-12-18 08:49:40 UTC (rev 6876)
+++ jbpm4/trunk/migration/pom.xml 2010-12-20 05:06:54 UTC (rev 6877)
@@ -33,10 +33,6 @@
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
- <dependency>
<groupId>javassist</groupId>
<artifactId>javassist</artifactId>
<scope>test</scope>
@@ -122,5 +118,20 @@
</plugins>
</build>
</profile>
+
+ <profile>
+ <id>jdk5</id>
+ <activation>
+ <jdk>1.5</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.livetribe</groupId>
+ <artifactId>livetribe-jsr223</artifactId>
+ <scope>runtime</scope>
+ <optional>true</optional>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
</project>
Modified:
jbpm4/trunk/migration/src/main/java/org/jbpm/jpdl/internal/convert/Jpdl3Converter.java
===================================================================
---
jbpm4/trunk/migration/src/main/java/org/jbpm/jpdl/internal/convert/Jpdl3Converter.java 2010-12-18
08:49:40 UTC (rev 6876)
+++
jbpm4/trunk/migration/src/main/java/org/jbpm/jpdl/internal/convert/Jpdl3Converter.java 2010-12-20
05:06:54 UTC (rev 6877)
@@ -33,11 +33,12 @@
import java.util.List;
import java.util.Map;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.dom4j.Document;
+import org.dom4j.DocumentException;
import org.dom4j.DocumentHelper;
import org.dom4j.Element;
+
+import org.jbpm.internal.log.Log;
import org.jbpm.jpdl.internal.convert.action.Action;
import org.jbpm.jpdl.internal.convert.action.ActionConverterTypes;
import org.jbpm.jpdl.internal.convert.action.CreateTimerAction;
@@ -212,8 +213,7 @@
verifySwimlaneAssignments();
}
- catch (Exception e) {
- log.error("couldn't parse process definition", e);
+ catch (DocumentException e) {
addProblem(new Problem(Problem.LEVEL_ERROR, "couldn't parse process
definition", e));
}
@@ -882,5 +882,5 @@
return jpdl4Document;
}
- private static final Log log = LogFactory.getLog(Jpdl3Converter.class);
+ private static final Log log = Log.getLog(Jpdl3Converter.class.getName());
}
Modified:
jbpm4/trunk/migration/src/main/java/org/jbpm/jpdl/internal/convert/Jpdl3ConverterParser.java
===================================================================
---
jbpm4/trunk/migration/src/main/java/org/jbpm/jpdl/internal/convert/Jpdl3ConverterParser.java 2010-12-18
08:49:40 UTC (rev 6876)
+++
jbpm4/trunk/migration/src/main/java/org/jbpm/jpdl/internal/convert/Jpdl3ConverterParser.java 2010-12-20
05:06:54 UTC (rev 6877)
@@ -25,17 +25,18 @@
import java.net.URL;
import java.util.ArrayList;
import java.util.HashSet;
-import java.util.Iterator;
import java.util.List;
import java.util.Set;
+import javax.xml.parsers.ParserConfigurationException;
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.dom4j.Document;
+import org.dom4j.DocumentException;
import org.dom4j.io.SAXReader;
+
+import org.jbpm.internal.log.Log;
import org.jbpm.jpdl.internal.convert.problem.Problem;
import org.jbpm.jpdl.internal.convert.problem.ProblemListener;
import org.xml.sax.ErrorHandler;
@@ -44,13 +45,12 @@
import org.xml.sax.SAXParseException;
import org.xml.sax.XMLReader;
-
/**
- * Validate an XML document using JAXP techniques and an XML Schema. This helper
- * class wraps the processing of a schema to aid in schema validation throughout
- * the product.
+ * Validate an XML document using JAXP techniques and an XML Schema. This helper class
wraps the
+ * processing of a schema to aid in schema validation throughout the product.
*
* orginal authors:
+ *
* @author Tom Baeyens
* @author Jim Rigsbee
*/
@@ -58,43 +58,57 @@
private static final long serialVersionUID = 1L;
- static SAXParserFactory saxParserFactory = createSaxParserFactory();
- private static Set schemaResources = getDefaultSchemaResources();
+ private static SAXParserFactory saxParserFactory = createSaxParserFactory();
+ private static Set<String> schemaResources = getDefaultSchemaResources();
private static Object schemaSource;
- public static Document parse(InputSource inputSource, ProblemListener problemListener)
throws Exception {
- Document document = null;
- SAXReader saxReader = createSaxReader(problemListener);
- document = saxReader.read(inputSource);
- return document;
+ public static Document parse(InputSource inputSource, ProblemListener problemListener)
throws DocumentException {
+ try {
+ SAXReader saxReader = createSaxReader(problemListener);
+ return saxReader.read(inputSource);
+ }
+ catch (SAXException e) {
+ throw new DocumentException("failed to create sax reader", e);
+ }
}
- public static SAXReader createSaxReader(ProblemListener problemListener) throws
Exception {
+ public static SAXReader createSaxReader(ProblemListener problemListener) throws
SAXException {
XMLReader xmlReader = createXmlReader();
SAXReader saxReader = new SAXReader(xmlReader);
saxReader.setErrorHandler(new JpdlErrorHandler(problemListener));
return saxReader;
}
-
- public static XMLReader createXmlReader() throws Exception {
- SAXParser saxParser = saxParserFactory.newSAXParser();
+
+ public static XMLReader createXmlReader() throws SAXException {
+ SAXParser saxParser;
+ try {
+ saxParser = saxParserFactory.newSAXParser();
+ }
+ catch (ParserConfigurationException e) {
+ throw new SAXException("failed to create sax parser", e);
+ }
XMLReader xmlReader = saxParser.getXMLReader();
-
+
try {
-
saxParser.setProperty("http://java.sun.com/xml/jaxp/properties/schem...;,
"http://www.w3.org/2001/XMLSchema");
- } catch (SAXException e){
+
saxParser.setProperty("http://java.sun.com/xml/jaxp/properties/schem...;,
+ "http://www.w3.org/2001/XMLSchema");
+ }
+ catch (SAXException e) {
log.warn("couldn't set schema language property", e);
}
try {
-
saxParser.setProperty("http://java.sun.com/xml/jaxp/properties/schem...;,
getSchemaSource());
- } catch (SAXException e){
+
saxParser.setProperty("http://java.sun.com/xml/jaxp/properties/schem...;,
+ getSchemaSource());
+ }
+ catch (SAXException e) {
log.warn("couldn't set schema source property", e);
}
try {
xmlReader.setFeature("http://apache.org/xml/features/validation/dyna...;,
true);
- } catch (SAXException e){
+ }
+ catch (SAXException e) {
log.warn("couldn't set dynamic validation feature", e);
}
return xmlReader;
@@ -102,16 +116,13 @@
private static Object getSchemaSource() {
if (schemaSource == null) {
- List schemaLocations = new ArrayList(schemaResources.size());
- for (Iterator i = schemaResources.iterator(); i.hasNext();) {
- String schemaResource = (String) i.next();
+ List<String> schemaLocations = new
ArrayList<String>(schemaResources.size());
+ for (String schemaResource : schemaResources) {
URL schemaURL =
Jpdl3ConverterParser.class.getClassLoader().getResource(schemaResource);
if (schemaURL != null) {
String schemaLocation = schemaURL.toString();
- if(log.isDebugEnabled()){
- log.debug("schema resource found: " + schemaResource);
- }
schemaLocations.add(schemaLocation);
+ if (log.isDebugEnabled()) log.debug("registered schema resource: " +
schemaResource);
}
}
schemaSource = schemaLocations.toArray(new String[schemaLocations.size()]);
@@ -149,19 +160,19 @@
problemListener.addProblem(problem);
}
}
-
+
public static void addSchemaResource(String resource) {
schemaResources.add(resource);
schemaSource = null;
}
- private static Set getDefaultSchemaResources() {
- Set schemaResources = new HashSet();
+ private static Set<String> getDefaultSchemaResources() {
+ Set<String> schemaResources = new HashSet<String>();
schemaResources.add("org/jbpm/jpdl/xml/jpdl-3.0.xsd");
schemaResources.add("org/jbpm/jpdl/xml/jpdl-3.1.xsd");
schemaResources.add("org/jbpm/jpdl/xml/jpdl-3.2.xsd");
schemaResources.add("org/jbpm/jpdl/xml/jpdl-3.3.xsd");
- schemaResources.add("org/jboss/seam/pageflow-2.0.xsd");
+ schemaResources.add("org/jboss/seam/pageflow-2.2.xsd");
return schemaResources;
}
@@ -172,5 +183,5 @@
return saxParserFactory;
}
- private static final Log log = LogFactory.getLog(Jpdl3ConverterParser.class);
+ private static final Log log = Log.getLog(Jpdl3ConverterParser.class.getName());
}
Modified:
jbpm4/trunk/migration/src/main/java/org/jbpm/jpdl/internal/convert/action/ActionConverterTypes.java
===================================================================
---
jbpm4/trunk/migration/src/main/java/org/jbpm/jpdl/internal/convert/action/ActionConverterTypes.java 2010-12-18
08:49:40 UTC (rev 6876)
+++
jbpm4/trunk/migration/src/main/java/org/jbpm/jpdl/internal/convert/action/ActionConverterTypes.java 2010-12-20
05:06:54 UTC (rev 6877)
@@ -27,11 +27,11 @@
import java.util.Map;
import java.util.Set;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.dom4j.DocumentException;
import org.dom4j.Element;
import org.dom4j.io.SAXReader;
+
+import org.jbpm.internal.log.Log;
import org.jbpm.jpdl.internal.convert.node.NodeConverterTypes;
/**
@@ -63,7 +63,7 @@
}
private static SAXReader reader = new SAXReader();
- static final Log log = LogFactory.getLog(ActionConverterTypes.class);
+ static final Log log = Log.getLog(ActionConverterTypes.class.getName());
static Map<String, Class<? extends Action>> actionTypes =
initialiseActionTypes();
static Map<Class<? extends Action>, String> actionNames =
NodeConverterTypes.createInverseMapping(actionTypes);
Modified:
jbpm4/trunk/migration/src/main/java/org/jbpm/jpdl/internal/convert/node/NodeConverterTypes.java
===================================================================
---
jbpm4/trunk/migration/src/main/java/org/jbpm/jpdl/internal/convert/node/NodeConverterTypes.java 2010-12-18
08:49:40 UTC (rev 6876)
+++
jbpm4/trunk/migration/src/main/java/org/jbpm/jpdl/internal/convert/node/NodeConverterTypes.java 2010-12-20
05:06:54 UTC (rev 6877)
@@ -27,13 +27,13 @@
import java.util.Map;
import java.util.Set;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.dom4j.DocumentException;
import org.dom4j.Element;
import org.dom4j.io.SAXReader;
+import org.jbpm.internal.log.Log;
+
/**
* This originates from jbpm3 code base
*
@@ -57,7 +57,7 @@
return nodeNames.get(type);
}
- private static final Log log = LogFactory.getLog(NodeConverterTypes.class);
+ private static final Log log = Log.getLog(NodeConverterTypes.class.getName());
private static SAXReader reader = new SAXReader();
static Map<String, Class<? extends Node>> nodeTypes =
initialiseNodeTypes();
static Map<Class<? extends Node>, String> nodeNames =
createInverseMapping(nodeTypes);
@@ -78,7 +78,7 @@
String elementTag = nodeTypeElement.attributeValue("element");
String className = nodeTypeElement.attributeValue("class");
try {
- Class<?> nodeClass = NodeConverterTypes.class.forName(className);
+ Class<?> nodeClass = Class.forName(className);
types.put(elementTag, nodeClass.asSubclass(Node.class));
} catch (Exception e) {
Modified: jbpm4/trunk/pvm/pom.xml
===================================================================
--- jbpm4/trunk/pvm/pom.xml 2010-12-18 08:49:40 UTC (rev 6876)
+++ jbpm4/trunk/pvm/pom.xml 2010-12-20 05:06:54 UTC (rev 6877)
@@ -214,18 +214,5 @@
<skipTests>true</skipTests>
</properties>
</profile>
-
- <profile>
- <id>jdk15</id>
- <activation>
- <jdk>1.5</jdk>
- </activation>
- <dependencies>
- <dependency>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
- </dependency>
- </dependencies>
- </profile>
</profiles>
</project>
Modified: jbpm4/trunk/test-db/pom.xml
===================================================================
--- jbpm4/trunk/test-db/pom.xml 2010-12-18 08:49:40 UTC (rev 6876)
+++ jbpm4/trunk/test-db/pom.xml 2010-12-20 05:06:54 UTC (rev 6877)
@@ -212,5 +212,19 @@
</plugins>
</build>
</profile>
+
+ <profile>
+ <id>jdk5</id>
+ <activation>
+ <jdk>1.5</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.livetribe</groupId>
+ <artifactId>livetribe-jsr223</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
</project>