Author: tom.baeyens(a)jboss.com Date: 2008-10-31 13:23:16 -0400 (Fri, 31 Oct 2008) New Revision: 2721 Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/Configuration.java jbpm4/trunk/modules/api/src/main/java/org/jbpm/pvm/env/Environment.java Log: unification api proposals Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/Configuration.java =================================================================== --- jbpm4/trunk/modules/api/src/main/java/org/jbpm/Configuration.java 2008-10-31 16:54:14 UTC (rev 2720) +++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/Configuration.java 2008-10-31 17:23:16 UTC (rev 2721) @@ -41,22 +41,20 @@ Configuration impl; public Configuration() { - this(null); + this((String)null); } public Configuration(String type) { - if (type==null) { + String implementationClassName = getImplementationClassName(type); + if (implementationClassName==null) { throw new PvmException("type is null"); } - String implementationClass = getImplementationClassName(type); - if (implementationClass==null) { - throw new PvmException("type is null"); - } - if ("jbpm".equals(type)) { - impl = instantiate("org.jbpm.cfg.JbpmConfiguration"); - } + impl = instantiate(implementationClassName); } + public Configuration(Configuration base){ + } + private synchronized String getImplementationClassName(String type) { if (implementationClassNames==null) { implementationClassNames = new HashMap<String, String>(); @@ -90,28 +88,34 @@ return Thread.currentThread().getContextClassLoader(); } - public void setXmlString(String xmlString) { + public Configuration setXmlString(String xmlString) { impl.setXmlString(xmlString); + return impl; } - public void setResource(String resource) { + public Configuration setResource(String resource) { impl.setResource(resource); + return impl; } - public void setInputStream(InputStream inputStream) { + public Configuration setInputStream(InputStream inputStream) { impl.setInputStream(inputStream); + return impl; } - public void setInputSource(InputSource inputSource) { + public Configuration setInputSource(InputSource inputSource) { impl.setInputSource(inputSource); + return impl; } - public void setUrl(URL url) { + public Configuration setUrl(URL url) { impl.setUrl(url); + return impl; } - public void setFile(File file) { + public Configuration setFile(File file) { impl.setFile(file); + return impl; } public ProcessEngine buildProcessEngine() { Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/pvm/env/Environment.java =================================================================== --- jbpm4/trunk/modules/api/src/main/java/org/jbpm/pvm/env/Environment.java 2008-10-31 16:54:14 UTC (rev 2720) +++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/pvm/env/Environment.java 2008-10-31 17:23:16 UTC (rev 2721) @@ -258,7 +258,7 @@ * must be pushed in the stack of current environments. * * @see Environment#pop() */ - protected static synchronized void pushEnvironment(Environment environment) { + public static synchronized void pushEnvironment(Environment environment) { Environment current = currentEnvironment.get(); if (current!=null) { getStack().push(current);