Author: boisvert
Date: Mon Sep 18 16:04:49 2006
New Revision: 447619
URL: http://svn.apache.org/viewvc?view=rev&rev=447619
Log:
Remove dead code
Modified:
incubator/ode/trunk/bpel-parser/src/main/java/org/apache/ode/bpel/parser/BpelParser.java
incubator/ode/trunk/bpel-parser/src/main/java/org/apache/ode/sax/fsa/bpel_1_1/Bpel11ProcessState.java
incubator/ode/trunk/bpel-parser/src/main/java/org/apache/ode/sax/fsa/bpel_1_1/Bpel11WaitActivityState.java
incubator/ode/trunk/bpel-parser/src/main/java/org/apache/ode/sax/fsa/bpel_2_0/BpelFromState.java
incubator/ode/trunk/bpel-parser/src/main/java/org/apache/ode/sax/fsa/bpel_2_0/BpelProcessState.java
Modified:
incubator/ode/trunk/bpel-parser/src/main/java/org/apache/ode/bpel/parser/BpelParser.java
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-parser/src/main/java/org/apache/ode/bpel/parser/BpelParser.java?view=diff&rev=447619&r1=447618&r2=447619
==============================================================================
---
incubator/ode/trunk/bpel-parser/src/main/java/org/apache/ode/bpel/parser/BpelParser.java
(original)
+++
incubator/ode/trunk/bpel-parser/src/main/java/org/apache/ode/bpel/parser/BpelParser.java
Mon Sep 18 16:04:49 2006
@@ -18,22 +18,17 @@
*/
package org.apache.ode.bpel.parser;
+import java.io.IOException;
+import java.net.URL;
+
import org.apache.ode.bom.api.Process;
import org.apache.ode.sax.fsa.FsaHandler;
import org.apache.ode.utils.XMLParserUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
import org.xml.sax.XMLReader;
-import java.io.IOException;
-import java.net.URL;
-
class BpelParser {
-
- private static final Log __log = LogFactory.getLog(BpelParser.class);
-
public static final String WSDL = "http://schemas.xmlsoap.org/wsdl/";;
public static final String WSBPEL2_PLINK =
"http://schemas.xmlsoap.org/ws/2004/03/partner-link/";;
Modified:
incubator/ode/trunk/bpel-parser/src/main/java/org/apache/ode/sax/fsa/bpel_1_1/Bpel11ProcessState.java
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-parser/src/main/java/org/apache/ode/sax/fsa/bpel_1_1/Bpel11ProcessState.java?view=diff&rev=447619&r1=447618&r2=447619
==============================================================================
---
incubator/ode/trunk/bpel-parser/src/main/java/org/apache/ode/sax/fsa/bpel_1_1/Bpel11ProcessState.java
(original)
+++
incubator/ode/trunk/bpel-parser/src/main/java/org/apache/ode/sax/fsa/bpel_1_1/Bpel11ProcessState.java
Mon Sep 18 16:04:49 2006
@@ -20,27 +20,26 @@
import java.util.Iterator;
-import org.apache.ode.bom.api.*;
+import org.apache.ode.bom.api.CorrelationSet;
+import org.apache.ode.bom.api.OnAlarm;
+import org.apache.ode.bom.api.OnEvent;
+import org.apache.ode.bom.api.PartnerLink;
import org.apache.ode.bom.api.Process;
+import org.apache.ode.bom.api.Variable;
import org.apache.ode.bom.impl.nodes.ProcessImpl;
import org.apache.ode.bpel.parser.BpelProcessState;
-import org.apache.ode.sax.fsa.*;
import org.apache.ode.sax.evt.StartElement;
import org.apache.ode.sax.evt.XmlAttributes;
-import org.apache.ode.sax.evt.attspec.FilterSpec;
-import org.apache.ode.sax.evt.attspec.XmlAttributeSpec;
+import org.apache.ode.sax.fsa.ParseContext;
+import org.apache.ode.sax.fsa.ParseError;
+import org.apache.ode.sax.fsa.ParseException;
+import org.apache.ode.sax.fsa.State;
+import org.apache.ode.sax.fsa.StateFactory;
class Bpel11ProcessState extends BaseBpelState implements BpelProcessState {
private static final StateFactory _factory = new Factory();
- // TODO still required?
- private static final XmlAttributeSpec spec = new FilterSpec(
- new String[] {"name","targetNamespace"},
- new String[]
{"queryLanguage","expressionLanguage","suppressJoinFailure",
- "enableInstanceCompensation","abstractProcess"}
- );
-
private Process _process;
Bpel11ProcessState(StartElement se, ParseContext pc) throws ParseException {
@@ -48,8 +47,6 @@
XmlAttributes atts = se.getAttributes();
String name = atts.getValue("name");
String tns = atts.getValue("targetNamespace");
- // TODO still required?
- short suppressJoinFailure;
_process = new ProcessImpl();
if (se.getLocation() != null) {
Modified:
incubator/ode/trunk/bpel-parser/src/main/java/org/apache/ode/sax/fsa/bpel_1_1/Bpel11WaitActivityState.java
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-parser/src/main/java/org/apache/ode/sax/fsa/bpel_1_1/Bpel11WaitActivityState.java?view=diff&rev=447619&r1=447618&r2=447619
==============================================================================
---
incubator/ode/trunk/bpel-parser/src/main/java/org/apache/ode/sax/fsa/bpel_1_1/Bpel11WaitActivityState.java
(original)
+++
incubator/ode/trunk/bpel-parser/src/main/java/org/apache/ode/sax/fsa/bpel_1_1/Bpel11WaitActivityState.java
Mon Sep 18 16:04:49 2006
@@ -21,12 +21,15 @@
import org.apache.ode.bom.api.Activity;
import org.apache.ode.bom.impl.nodes.ExpressionImpl;
import org.apache.ode.bom.impl.nodes.WaitActivityImpl;
-import org.apache.ode.sax.fsa.*;
import org.apache.ode.sax.evt.StartElement;
import org.apache.ode.sax.evt.XmlAttributes;
import org.apache.ode.sax.evt.attspec.FilterSpec;
-import org.apache.ode.sax.evt.attspec.OrSpec;
import org.apache.ode.sax.evt.attspec.XmlAttributeSpec;
+import org.apache.ode.sax.fsa.ParseContext;
+import org.apache.ode.sax.fsa.ParseError;
+import org.apache.ode.sax.fsa.ParseException;
+import org.apache.ode.sax.fsa.State;
+import org.apache.ode.sax.fsa.StateFactory;
class Bpel11WaitActivityState extends Bpel11BaseActivityState {
@@ -34,8 +37,6 @@
new String[] {"for"},BPEL11_BASE_ACTIVITY_ATTS);
private static final XmlAttributeSpec UNTIL = new FilterSpec(
new String[] {"until"},BPEL11_BASE_ACTIVITY_ATTS);
- // TODO still required?
- private static final XmlAttributeSpec ALARMSPEC = new OrSpec(FOR,UNTIL);
private static final StateFactory _factory = new Factory();
Modified:
incubator/ode/trunk/bpel-parser/src/main/java/org/apache/ode/sax/fsa/bpel_2_0/BpelFromState.java
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-parser/src/main/java/org/apache/ode/sax/fsa/bpel_2_0/BpelFromState.java?view=diff&rev=447619&r1=447618&r2=447619
==============================================================================
---
incubator/ode/trunk/bpel-parser/src/main/java/org/apache/ode/sax/fsa/bpel_2_0/BpelFromState.java
(original)
+++
incubator/ode/trunk/bpel-parser/src/main/java/org/apache/ode/sax/fsa/bpel_2_0/BpelFromState.java
Mon Sep 18 16:04:49 2006
@@ -41,7 +41,6 @@
import org.apache.ode.sax.fsa.StateFactory;
import org.apache.ode.utils.NSContext;
import org.w3c.dom.Element;
-import org.xml.sax.Locator;
class BpelFromState extends BaseBpelState {
@@ -51,7 +50,6 @@
private NSContext _nsctx;
private String _expressionLanguage;
- private Locator _locator;
private ExpressionImpl _expr;
private DOMGenerator _domGenerator;
private StartElement _se;
@@ -67,7 +65,6 @@
XmlAttributeSpec VAR_PROP = new FilterSpec(
new String[] {"variable","property"},new String[] {});
_se = se;
- _locator = se.getLocation();
_nsctx = se.getNamespaceContext();
XmlAttributes atts = se.getAttributes();
_expressionLanguage = atts.getValue("expressionLanguage");
Modified:
incubator/ode/trunk/bpel-parser/src/main/java/org/apache/ode/sax/fsa/bpel_2_0/BpelProcessState.java
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-parser/src/main/java/org/apache/ode/sax/fsa/bpel_2_0/BpelProcessState.java?view=diff&rev=447619&r1=447618&r2=447619
==============================================================================
---
incubator/ode/trunk/bpel-parser/src/main/java/org/apache/ode/sax/fsa/bpel_2_0/BpelProcessState.java
(original)
+++
incubator/ode/trunk/bpel-parser/src/main/java/org/apache/ode/sax/fsa/bpel_2_0/BpelProcessState.java
Mon Sep 18 16:04:49 2006
@@ -18,6 +18,8 @@
*/
package org.apache.ode.sax.fsa.bpel_2_0;
+import java.util.Iterator;
+
import org.apache.ode.bom.api.BpelObject;
import org.apache.ode.bom.api.CorrelationSet;
import org.apache.ode.bom.api.OnAlarm;
@@ -28,28 +30,16 @@
import org.apache.ode.bom.impl.nodes.ProcessImpl;
import org.apache.ode.sax.evt.StartElement;
import org.apache.ode.sax.evt.XmlAttributes;
-import org.apache.ode.sax.evt.attspec.FilterSpec;
-import org.apache.ode.sax.evt.attspec.XmlAttributeSpec;
import org.apache.ode.sax.fsa.ParseContext;
import org.apache.ode.sax.fsa.ParseError;
import org.apache.ode.sax.fsa.ParseException;
import org.apache.ode.sax.fsa.State;
import org.apache.ode.sax.fsa.StateFactory;
-import java.net.URL;
-import java.util.Iterator;
-
class BpelProcessState extends BaseBpelState implements
org.apache.ode.bpel.parser.BpelProcessState {
private static final StateFactory _factory = new Factory();
- // TODO: still needed?
- private static final XmlAttributeSpec spec = new FilterSpec(
- new String[] {"name","targetNamespace"},
- new String[]
{"queryLanguage","expressionLanguage","suppressJoinFailure",
- "abstractProcess"}
- );
-
private Process _process;
BpelProcessState(StartElement se, ParseContext pc) throws ParseException {
@@ -76,10 +66,6 @@
XmlAttributes atts = se.getAttributes();
String name = atts.getValue("name");
String tns = atts.getValue("targetNamespace");
- // TODO: still needed?
- short suppressJoinFailure;
- // TODO: Come back and fix this!
- URL url = null;
_process = new ProcessImpl();
_process.setBpelVersion(Process.BPEL_V200);
