August 2009 - jbpm-commits - Jboss List Archives

by do-not-reply＠jboss.org

Author: jcoleman(a)redhat.com Date: 2009-08-12 07:05:27 -0400 (Wed, 12 Aug 2009) New Revision: 5469 Added: jbpm3/tags/jbpm-3.2.7.CR1/ Log: Create 3.2.7 CR1 tag from jbpm-3.2-soa branch Copied: jbpm3/tags/jbpm-3.2.7.CR1 (from rev 5468, jbpm3/branches/jbpm-3.2-soa)

14 years, 9 months

1
0
0 / 0

JBoss JBPM SVN: r5468 - in jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources: org/jbpm/context/exe/variableinstance and 1 other directories.

by do-not-reply＠jboss.org

Author: alex.guizar(a)jboss.com Date: 2009-08-12 03:48:24 -0400 (Wed, 12 Aug 2009) New Revision: 5468 Added: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/context/exe/variableinstance/HibernateStringInstance.db2.hbm.xml jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/db/hibernate.types.db2.hbm.xml Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/hibernate.mapping.db2.xml Log: [JBPM-2115] apply column type change from varchar to clob again, reverse r5460 Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/hibernate.mapping.db2.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/hibernate.mapping.db2.xml 2009-08-12 07:06:07 UTC (rev 5467) +++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/hibernate.mapping.db2.xml 2009-08-12 07:48:24 UTC (rev 5468) @@ -5,8 +5,8 @@  <mapping resource="org/jbpm/db/hibernate.queries.hbm.xml" /> -  - <mapping resource="org/jbpm/db/hibernate.types.hbm.xml" /> +  + <mapping resource="org/jbpm/db/hibernate.types.db2.hbm.xml" /> <!-- hql queries used in simulation for querying historical data. uncomment if you want to use the GetSimulationInputCommand @@ -91,7 +91,7 @@ <mapping resource="org/jbpm/context/exe/variableinstance/DateInstance.hbm.xml"/> <mapping resource="org/jbpm/context/exe/variableinstance/DoubleInstance.hbm.xml"/> <mapping resource="org/jbpm/context/exe/variableinstance/HibernateLongInstance.hbm.xml"/> - <mapping resource="org/jbpm/context/exe/variableinstance/HibernateStringInstance.hbm.xml"/> + <mapping resource="org/jbpm/context/exe/variableinstance/HibernateStringInstance.db2.hbm.xml"/> <mapping resource="org/jbpm/context/exe/variableinstance/LongInstance.hbm.xml"/> <mapping resource="org/jbpm/context/exe/variableinstance/NullInstance.hbm.xml"/> <mapping resource="org/jbpm/context/exe/variableinstance/StringInstance.hbm.xml"/> Copied: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/context/exe/variableinstance/HibernateStringInstance.db2.hbm.xml (from rev 5459, jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/context/exe/variableinstance/HibernateStringInstance.db2.hbm.xml) =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/context/exe/variableinstance/HibernateStringInstance.db2.hbm.xml (rev 0) +++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/context/exe/variableinstance/HibernateStringInstance.db2.hbm.xml 2009-08-12 07:48:24 UTC (rev 5468) @@ -0,0 +1,16 @@ +<?xml version="1.0"?> + +<!DOCTYPE hibernate-mapping PUBLIC + "-//Hibernate/Hibernate Mapping DTD 3.0//EN" + "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> + +<hibernate-mapping auto-import="false" default-access="field"> + <subclass name="org.jbpm.context.exe.variableinstance.HibernateStringInstance" + extends="org.jbpm.context.exe.VariableInstance" + discriminator-value="I"> + <any name="value" id-type="text" cascade="save-update"> + <column name="STRINGIDCLASS_" /> + <column name="STRINGVALUE_" length="4000"/> + </any> + </subclass> +</hibernate-mapping> Copied: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/db/hibernate.types.db2.hbm.xml (from rev 5459, jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/db/hibernate.types.db2.hbm.xml) =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/db/hibernate.types.db2.hbm.xml (rev 0) +++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/db/hibernate.types.db2.hbm.xml 2009-08-12 07:48:24 UTC (rev 5468) @@ -0,0 +1,8 @@ +<?xml version="1.0"?> +<!DOCTYPE hibernate-mapping PUBLIC + "-//Hibernate/Hibernate Mapping DTD 3.0//EN" + "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> + +<hibernate-mapping> + <typedef name="longstring" class="org.hibernate.type.TextType" /> +</hibernate-mapping> \ No newline at end of file

14 years, 9 months

1
0
0 / 0

JBoss JBPM SVN: r5467 - jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/util and 1 other directories.

by do-not-reply＠jboss.org

Author: alex.guizar(a)jboss.com Date: 2009-08-12 03:06:07 -0400 (Wed, 12 Aug 2009) New Revision: 5467 Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/ant/DeployProcessTask.java jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/util/ArrayUtil.java projects/jsf-console/branches/jsf-console-3.2-soa/console/src/main/java/org/jbpm/web/ProcessUploadServlet.java Log: [JBPM-2475] sub-process name is not resolved upon deployment with Eclipse or ant-task open jbpm context before parsing in both deploy task and upload servlet Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/ant/DeployProcessTask.java =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/ant/DeployProcessTask.java 2009-08-11 22:47:33 UTC (rev 5466) +++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/ant/DeployProcessTask.java 2009-08-12 07:06:07 UTC (rev 5467) @@ -25,7 +25,6 @@ import java.io.FileInputStream; import java.io.IOException; import java.util.ArrayList; -import java.util.Arrays; import java.util.Iterator; import java.util.List; import java.util.zip.ZipInputStream; @@ -38,100 +37,97 @@ import org.jbpm.JbpmConfiguration; import org.jbpm.JbpmContext; import org.jbpm.graph.def.ProcessDefinition; -import org.jbpm.jpdl.JpdlException; +import org.jbpm.util.ArrayUtil; /** * ant task for deploying process archives. */ public class DeployProcessTask extends MatchingTask { - String jbpmCfg = null; - File process = null; - List fileSets = new ArrayList(); - boolean failOnError = true; + String jbpmCfg; + File process; + List fileSets = new ArrayList(); + boolean failOnError = true; - public void execute() throws BuildException { - // get the JbpmConfiguration - JbpmConfiguration jbpmConfiguration = AntHelper.getJbpmConfiguration(jbpmCfg); - - // if attribute process is set, deploy that process file - if (process!=null) { - deployProcessArchive(jbpmConfiguration, process); - } - - // loop over all files that are specified in the filesets - Iterator iter = fileSets.iterator(); - while (iter.hasNext()) { - FileSet fileSet = (FileSet) iter.next(); - DirectoryScanner dirScanner = fileSet.getDirectoryScanner(getProject()); - File baseDir = dirScanner.getBasedir(); - String[] includedFiles = dirScanner.getIncludedFiles(); - List excludedFiles = Arrays.asList(dirScanner.getExcludedFiles()); + public void execute() throws BuildException { + // get the JbpmConfiguration + JbpmConfiguration jbpmConfiguration = AntHelper.getJbpmConfiguration(jbpmCfg); - for (int i = 0; i < includedFiles.length; i++) { - String fileName = includedFiles[i]; - if (!excludedFiles.contains(fileName)) { - File file = new File(baseDir, fileName); - deployProcessArchive(jbpmConfiguration, file); - } - } - } - } + // if attribute process is set, deploy that process file + if (process != null) { + handleProcessFile(jbpmConfiguration, process); + } - private void deployProcessArchive(JbpmConfiguration jbpmConfiguration, File processFile) { - try { - log("deploying process from archive "+processFile.getName()); - ProcessDefinition processDefinition = parseProcessArchive(processFile); - deployProcessDefinition(processDefinition, jbpmConfiguration); - } - catch (IOException e) { - log("failed to read process archive " + processFile.getName(), e, Project.MSG_ERR); - throw new BuildException(e.getMessage(), e); - } - catch (JpdlException e) { - log("archive " + processFile.getName() + " contains invalid process", e, Project.MSG_ERR); - throw e; - } - } + // iterate over file sets + for (Iterator iter = fileSets.iterator(); iter.hasNext();) { + FileSet fileSet = (FileSet) iter.next(); + DirectoryScanner dirScanner = fileSet.getDirectoryScanner(getProject()); + File baseDir = dirScanner.getBasedir(); + String[] includedFiles = dirScanner.getIncludedFiles(); + String[] excludedFiles = dirScanner.getExcludedFiles(); - private ProcessDefinition parseProcessArchive(File processFile) throws IOException { - ZipInputStream processStream = new ZipInputStream(new FileInputStream(processFile)); - try { - ProcessDefinition processDefinition = ProcessDefinition.parseParZipInputStream(processStream); - log("created process definition " + processDefinition.getName()); - return processDefinition; - } - finally { - processStream.close(); - } - } + for (int i = 0; i < includedFiles.length; i++) { + String fileName = includedFiles[i]; + if (!ArrayUtil.contains(excludedFiles, fileName)) + handleProcessFile(jbpmConfiguration, new File(baseDir, fileName)); + } + } + } - private void deployProcessDefinition(ProcessDefinition processDefinition, JbpmConfiguration jbpmConfiguration) { - JbpmContext jbpmContext = jbpmConfiguration.createJbpmContext(); - try { - jbpmContext.deployProcessDefinition(processDefinition); - log("deployed process " + processDefinition.getName() + " successfully"); - } - catch (RuntimeException e) { - jbpmContext.setRollbackOnly(); - log("failed to deploy process " + processDefinition.getName(), e, Project.MSG_ERR); - throw e; - } - finally { - jbpmContext.close(); - } - } + private void handleProcessFile(JbpmConfiguration jbpmConfiguration, File processFile) { + JbpmContext jbpmContext = jbpmConfiguration.createJbpmContext(); + try { + log("parsing process archive " + processFile.getName()); + ProcessDefinition processDefinition = parseProcessArchive(processFile); + deployProcessDefinition(processDefinition, jbpmContext); + } + catch (IOException e) { + log("error reading process archive " + processFile.getName(), e, Project.MSG_ERR); + if (failOnError) throw new BuildException(e, getLocation()); + } + finally { + jbpmContext.close(); + } + } - public void addFileset(FileSet fileSet) { - this.fileSets.add(fileSet); - } - public void setJbpmCfg(String jbpmCfg) { - this.jbpmCfg = jbpmCfg; - } - public void setProcess(File process) { - this.process = process; - } - public void setFailOnError(boolean failOnError) { - this.failOnError = failOnError; - } + private ProcessDefinition parseProcessArchive(File processFile) throws IOException { + ZipInputStream processStream = new ZipInputStream(new FileInputStream(processFile)); + try { + ProcessDefinition processDefinition = ProcessDefinition.parseParZipInputStream(processStream); + log("parsed process definition " + processDefinition.getName()); + return processDefinition; + } + finally { + processStream.close(); + } + } + + private void deployProcessDefinition(ProcessDefinition processDefinition, + JbpmContext jbpmContext) { + try { + jbpmContext.deployProcessDefinition(processDefinition); + log("process definition " + processDefinition.getName() + " deployed successfully"); + } + catch (RuntimeException e) { + jbpmContext.setRollbackOnly(); + log("failed to deploy process " + processDefinition.getName(), e, Project.MSG_ERR); + if (failOnError) throw new BuildException(e, getLocation()); + } + } + + public void addFileset(FileSet fileSet) { + this.fileSets.add(fileSet); + } + + public void setJbpmCfg(String jbpmCfg) { + this.jbpmCfg = jbpmCfg; + } + + public void setProcess(File process) { + this.process = process; + } + + public void setFailOnError(boolean failOnError) { + this.failOnError = failOnError; + } } Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/util/ArrayUtil.java =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/util/ArrayUtil.java 2009-08-11 22:47:33 UTC (rev 5466) +++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/util/ArrayUtil.java 2009-08-12 07:06:07 UTC (rev 5467) @@ -26,71 +26,95 @@ */ public class ArrayUtil { - private ArrayUtil() { - // hide default constructor to prevent instantiation - } + private ArrayUtil() { + // hide default constructor to prevent instantiation + } - /** - * Returns a string representation of the contents of the specified array. If the array contains - * other arrays as elements, they are converted to strings by the {@link Object#toString} method - * inherited from <tt>Object</tt>, which describes their <i>identities</i> rather than their - * contents. - * <p> - * The value returned by this method is equal to the value that would be returned by - * <tt>Arrays.asList(a).toString()</tt>, unless <tt>a</tt> is <tt>null</tt>, in which case - * <tt>"null"</tt> is returned. - * - * @param a the array whose string representation to return - * @return a string representation of <tt>a</tt> - * @see <a - * href="http://java.sun.com/j2se/1.5.0/docs/api/java/util/Arrays.html#toString(Ob..."> - * java.util.Arrays.toString(Object[])</a> - */ - public static String toString(Object[] a) { - if (a == null) return "null"; - if (a.length == 0) return "[]"; + /** + * Returns a string representation of the contents of the specified array. If the array + * contains other arrays as elements, they are converted to strings by the + * {@link Object#toString} method inherited from <tt>Object</tt>, which describes their + * <i>identities</i> rather than their contents. + * <p> + * The value returned by this method is equal to the value that would be returned by + * <tt>Arrays.asList(a).toString()</tt>, unless the array is <tt>null</tt>, in which case + * <tt>"null"</tt> is returned. + * + * @param a the array whose string representation to return + * @return a string representation of <tt>a</tt> + * @see <a + * href="http://java.sun.com/j2se/1.5.0/docs/api/java/util/Arrays.html#toString(Ob..."> + * java.util.Arrays.toString(Object[])</a> + */ + public static String toString(Object[] a) { + if (a == null) return "null"; + if (a.length == 0) return "[]"; - StringBuffer buf = new StringBuffer(); + StringBuffer buf = new StringBuffer(); + buf.append('[').append(a[0]); - for (int i = 0; i < a.length; i++) { - if (i == 0) - buf.append('['); - else - buf.append(", "); + for (int i = 1; i < a.length; i++) { + buf.append(", ").append(a[i]); + } - buf.append(String.valueOf(a[i])); - } + return buf.append(']').toString(); + } - buf.append("]"); - return buf.toString(); - } + /** + * Returns a string representation of the contents of the specified array. The string + * representation consists of a list of the array's elements, enclosed in square brackets ( + * <tt>"[]"</tt>). Adjacent elements are separated by the characters <tt>", "</tt> (a comma + * followed by a space). Elements are converted to strings by <tt>String.valueOf(long)</tt>. + * Returns <tt>"null"</tt> if the array is <tt>null</tt>. + * + * @param a the array whose string representation to return + * @return a string representation of <tt>a</tt> + * @see <a + * href="http://java.sun.com/j2se/1.5.0/docs/api/java/util/Arrays.html#toString(lo..."> + * java.util.Arrays.toString(long[])</a> + */ + public static String toString(long[] a) { + if (a == null) return "null"; + if (a.length == 0) return "[]"; - /** - * Returns a string representation of the contents of the specified array. The string - * representation consists of a list of the array's elements, enclosed in square brackets ( - * <tt>"[]"</tt>). Adjacent elements are separated by the characters <tt>", "</tt> (a comma - * followed by a space). Elements are converted to strings as by <tt>String.valueOf(long)</tt>. - * Returns <tt>"null"</tt> if <tt>a</tt> is <tt>null</tt>. - * - * @param a the array whose string representation to return - * @return a string representation of <tt>a</tt> - * @see <a href="http://java.sun.com/j2se/1.5.0/docs/api/java/util/Arrays.html#toString(lo..."> - * java.util.Arrays.toString(long[])</a> - */ - public static String toString(long[] a) { - if (a == null) return "null"; - if (a.length == 0) return "[]"; + StringBuffer buf = new StringBuffer(); + buf.append('['); + buf.append(a[0]); - StringBuffer buf = new StringBuffer(); - buf.append('['); - buf.append(a[0]); + for (int i = 1; i < a.length; i++) { + buf.append(", ").append(a[i]); + } - for (int i = 1; i < a.length; i++) { - buf.append(", "); - buf.append(a[i]); - } + return buf.append(']').toString(); + } - buf.append("]"); - return buf.toString(); - } + /** + * Returns the index in the given array of the first occurrence of the specified element, or + * -1 if the array does not contain this element. + * + * @param o element to search for. + * @return the index of the first occurrence of the specified element, or -1 if the array does + * not contain this element. + */ + public static int indexOf(Object[] a, Object o) { + if (o == null) { + for (int i = 0; i < a.length; i++) + if (a[i] == null) return i; + } + else { + for (int i = 0; i < a.length; i++) + if (o.equals(a[i])) return i; + } + return -1; + } + + /** + * Tells whether the given array contains the specified element. + * + * @param o element whose presence in the array is to be tested. + * @return <tt>true</tt> if the array contains the specified element. + */ + public static boolean contains(Object[] a, Object o) { + return indexOf(a, o) != -1; + } } Modified: projects/jsf-console/branches/jsf-console-3.2-soa/console/src/main/java/org/jbpm/web/ProcessUploadServlet.java =================================================================== --- projects/jsf-console/branches/jsf-console-3.2-soa/console/src/main/java/org/jbpm/web/ProcessUploadServlet.java 2009-08-11 22:47:33 UTC (rev 5466) +++ projects/jsf-console/branches/jsf-console-3.2-soa/console/src/main/java/org/jbpm/web/ProcessUploadServlet.java 2009-08-12 07:06:07 UTC (rev 5467) @@ -22,6 +22,9 @@ package org.jbpm.web; import java.io.IOException; +import java.io.PrintWriter; +import java.net.MalformedURLException; +import java.net.URL; import java.util.List; import java.util.zip.ZipInputStream; import org.apache.commons.fileupload.FileItem; @@ -43,95 +46,138 @@ public class ProcessUploadServlet extends javax.servlet.http.HttpServlet { - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = 1L; - private JbpmConfiguration jbpmConfiguration; + private JbpmConfiguration jbpmConfiguration; - public void init() throws ServletException { - String jbpmCfgResource = getServletContext().getInitParameter("jbpm.configuration.resource"); - jbpmConfiguration = JbpmConfiguration.getInstance(jbpmCfgResource); - } + public void init() throws ServletException { + String jbpmCfgResource = getServletContext().getInitParameter("jbpm.configuration.resource"); + jbpmConfiguration = JbpmConfiguration.getInstance(jbpmCfgResource); + } - protected void doGet(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { - log.debug("Handling status request"); - response.getWriter().println("Process upload module is operational"); - } + protected void doGet(HttpServletRequest request, HttpServletResponse response) + throws ServletException, IOException { + if (log.isTraceEnabled()) log.trace("handling status request"); - protected void doPost(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { - log.debug("Handling upload request"); - response.getWriter().println(handleRequest(request)); - } + PrintWriter out = response.getWriter(); + writeHeader(out); + out.println("<h3>Deploy a process</h3>"); + out.println("<form name='deploy-form' method='post' enctype='multipart/form-data'>"); + out.println(" <p>Process Archive: <input name='process-archive' type='file'/>"); + out.println(" <p><input name='deploy-button' type='submit' value='Deploy'/>"); + out.println("</form>"); + writeTrailer(out); + } - private String handleRequest(HttpServletRequest request) { - // check if request is multipart content - if (!ServletFileUpload.isMultipartContent(request)) { - log.debug("Not a multipart request"); - return "Not a multipart request"; - } + protected void doPost(HttpServletRequest request, HttpServletResponse response) + throws ServletException, IOException { + if (log.isTraceEnabled()) log.trace("handling upload request"); - try { - // Create a factory for disk-based file items - FileItemFactory factory = new DiskFileItemFactory(); - // Create a new file upload handler - ServletFileUpload upload = new ServletFileUpload(factory); - // Parse the request - List itemList= upload.parseRequest(request); - log.debug("Upload from GPD"); - if (itemList.isEmpty()) { - log.debug("No process file in the request"); - return "No process file in the request"; - } - FileItem fileItem = (FileItem) itemList.get(0); - if (fileItem.getContentType().indexOf("application/x-zip-compressed") == -1) { - log.debug("Not a process archive"); - return "Not a process archive"; - } - try { - log.debug("Deploying process from archive " + fileItem.getName()); - ProcessDefinition processDefinition = parseProcessArchive(fileItem); - deployProcessDefinition(processDefinition); - return "Deployed process " + processDefinition.getName() + " successfully"; - } - catch (IOException e) { - log.debug("Failed to read process archive", e); - return "IOException"; - } - } - catch (FileUploadException e) { - log.debug("Failed to parse HTTP request", e); - return "FileUploadException"; - } - } + FileItem processItem = parseRequest(request, response); + if (processItem == null) return; // error has been sent - private ProcessDefinition parseProcessArchive(FileItem fileItem) throws IOException { - ZipInputStream processStream = new ZipInputStream(fileItem.getInputStream()); - try { - ProcessDefinition processDefinition = ProcessDefinition.parseParZipInputStream(processStream); - log.debug("Created process " + processDefinition.getName()); - return processDefinition; - } - finally { - processStream.close(); - } - } + JbpmContext jbpmContext = jbpmConfiguration.createJbpmContext(); + try { + ProcessDefinition processDefinition = parseProcessArchive(processItem); + deployProcessDefinition(processDefinition, response); + } + finally { + jbpmContext.close(); + } + } - private void deployProcessDefinition(ProcessDefinition processDefinition) { - JbpmContext jbpmContext = jbpmConfiguration.createJbpmContext(); - try { - jbpmContext.deployProcessDefinition(processDefinition); - log.debug("Deployed process " + processDefinition.getName() + " successfully"); - } - catch (RuntimeException e) { - jbpmContext.setRollbackOnly(); - log.error("Failed to deploy process " + processDefinition.getName(), e); - throw e; - } - finally { - jbpmContext.close(); - } - } + private void writeHeader(PrintWriter out) throws MalformedURLException { + out.println("<html>"); + out.println("<head>"); + out.println("<title>Process Deployment</title>"); + URL css = getServletContext().getResource("/ua/jbpm.css"); + if (css != null) { + out.print("<link rel='stylesheet' type='text/css' href='"); + out.print(css.toString()); + out.println("'/>"); + } + out.println("</head>"); + out.println("<body>"); + } - private static final Log log = LogFactory.getLog(ProcessUploadServlet.class); + private void writeTrailer(PrintWriter out) { + out.println("</body>"); + out.println("</html>"); + } + + private FileItem parseRequest(HttpServletRequest request, HttpServletResponse response) + throws IOException { + // check if request is multipart content + if (!ServletFileUpload.isMultipartContent(request)) { + response.sendError(HttpServletResponse.SC_BAD_REQUEST, "Not a multipart request"); + return null; + } + + // Create a factory for disk-based file items + FileItemFactory factory = new DiskFileItemFactory(); + // Create a new file upload handler + ServletFileUpload upload = new ServletFileUpload(factory); + try { + // Parse the request + List items = upload.parseRequest(request); + if (items.isEmpty()) { + response.sendError(HttpServletResponse.SC_BAD_REQUEST, "Request is empty"); + return null; + } + FileItem item = (FileItem) items.get(0); + if (item.isFormField()) { + response.sendError(HttpServletResponse.SC_BAD_REQUEST, "Field '" + item.getFieldName() + + "' is not an input file"); + return null; + } + return item; + } + catch (FileUploadException e) { + log.error("failed to parse request", e); + response.sendError(HttpServletResponse.SC_BAD_REQUEST, "Failed to parse request"); + return null; + } + } + + private ProcessDefinition parseProcessArchive(FileItem fileItem) throws IOException { + if (log.isTraceEnabled()) log.trace("parsing process archive " + fileItem.getName()); + + ZipInputStream processStream = new ZipInputStream(fileItem.getInputStream()); + try { + ProcessDefinition processDefinition = ProcessDefinition.parseParZipInputStream(processStream); + if (log.isTraceEnabled()) + log.trace("parsed process definition " + processDefinition.getName()); + return processDefinition; + } + finally { + processStream.close(); + } + } + + private void deployProcessDefinition(ProcessDefinition processDefinition, + HttpServletResponse response) throws IOException { + String processName = processDefinition.getName(); + JbpmContext jbpmContext = jbpmConfiguration.getCurrentJbpmContext(); + try { + jbpmContext.deployProcessDefinition(processDefinition); + + if (log.isTraceEnabled()) log.trace("deployed process definition " + processName); + PrintWriter out = response.getWriter(); + writeHeader(out); + out.println("<h3>Deployment report</h3>"); + out.print("<p>Deployed process "); + out.print(processName); + out.println(" successfully</p>"); + writeTrailer(out); + } + catch (RuntimeException e) { + jbpmContext.setRollbackOnly(); + + log.error("failed to deploy process definition " + processName, e); + response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, + "Failed to deploy process"); + } + } + + private static final Log log = LogFactory.getLog(ProcessUploadServlet.class); } \ No newline at end of file

14 years, 9 months

1
0
0 / 0

JBoss JBPM SVN: r5466 - in bbq-root/projects/bbq: projects/bbq and 11 other directories.

by do-not-reply＠jboss.org

Author: tom.baeyens(a)jboss.com Date: 2009-08-11 18:47:33 -0400 (Tue, 11 Aug 2009) New Revision: 5466 Added: bbq-root/projects/bbq/.project bbq-root/projects/bbq/projects/bbq/scripts/bbq.bat bbq-root/projects/bbq/projects/bbq/src/org/ bbq-root/projects/bbq/projects/bbq/src/org/bbq/ bbq-root/projects/bbq/projects/bbq/src/org/bbq/Bbq.java bbq-root/projects/bbq/projects/bbq/src/org/bbq/Configuration.java bbq-root/projects/bbq/projects/bbq/src/org/bbq/FileSystem.java bbq-root/projects/bbq/projects/bbq/src/org/bbq/java/ bbq-root/projects/bbq/projects/bbq/src/org/bbq/java/Javac.java bbq-root/projects/bbq/projects/bbq/src/org/bbq/log/ bbq-root/projects/bbq/projects/bbq/src/org/bbq/log/LogFormatter.java bbq-root/projects/bbq/projects/bbq/src/org/bbq/repository/ bbq-root/projects/bbq/projects/bbq/src/org/bbq/repository/LocalRepository.java bbq-root/projects/bbq/projects/bbq/src/org/bbq/repository/RemoteRepository.java bbq-root/projects/bbq/projects/bbq/src/org/bbq/repository/Repository.java bbq-root/projects/bbq/projects/project-build/src/FileSystems.java bbq-root/projects/bbq/projects/project-build/src/Operations.java bbq-root/projects/bbq/projects/project-build/src/Properties.java bbq-root/projects/bbq/projects/project-build/src/Repositories.java bbq-root/projects/bbq/projects/project-test/.classpath bbq-root/projects/bbq/projects/project-test/.project bbq-root/projects/bbq/projects/project-test/src/ bbq-root/projects/bbq/projects/project/.classpath bbq-root/projects/bbq/projects/project/.project bbq-root/projects/bbq/projects/project/bbq.properties bbq-root/projects/bbq/projects/project/src/ Modified: bbq-root/projects/bbq/projects/bbq/ bbq-root/projects/bbq/projects/project-build/ bbq-root/projects/bbq/projects/project-test/ bbq-root/projects/bbq/projects/project/ Log: initial import Added: bbq-root/projects/bbq/.project =================================================================== --- bbq-root/projects/bbq/.project (rev 0) +++ bbq-root/projects/bbq/.project 2009-08-11 22:47:33 UTC (rev 5466) @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>bbq-root</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + </buildSpec> + <natures> + </natures> +</projectDescription> Property changes on: bbq-root/projects/bbq/.project ___________________________________________________________________ Name: svn:mime-type + text/plain Property changes on: bbq-root/projects/bbq/projects/bbq ___________________________________________________________________ Name: svn:ignore + .settings bin Added: bbq-root/projects/bbq/projects/bbq/scripts/bbq.bat =================================================================== --- bbq-root/projects/bbq/projects/bbq/scripts/bbq.bat (rev 0) +++ bbq-root/projects/bbq/projects/bbq/scripts/bbq.bat 2009-08-11 22:47:33 UTC (rev 5466) @@ -0,0 +1,5 @@ +@echo off + +set BBQ_HOME=C:\wsbbq\bbq + +java -cp %BBQ_HOME%\bin org.bbq.Bbq %* Added: bbq-root/projects/bbq/projects/bbq/src/org/bbq/Bbq.java =================================================================== --- bbq-root/projects/bbq/projects/bbq/src/org/bbq/Bbq.java (rev 0) +++ bbq-root/projects/bbq/projects/bbq/src/org/bbq/Bbq.java 2009-08-11 22:47:33 UTC (rev 5466) @@ -0,0 +1,148 @@ +package org.bbq; + +import java.io.BufferedReader; +import java.io.File; +import java.io.FileInputStream; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.util.ArrayList; +import java.util.List; +import java.util.Properties; +import java.util.logging.LogManager; +import java.util.logging.Logger; + +public class Bbq { + + static Properties properties = new Properties(); + static List<String> operations = new ArrayList<String>(); + + private static Logger log = Logger.getLogger("bbq"); + + public static void main(String[] args) { + try { + readLocalProperties(); + initializeLogging(); + readUserProperties(); + parseArgsAndOperations(args); + logProperties(); + compileBuild(); + executeOperations(); + + } catch (Exception e) { + e.printStackTrace(); + } + } + + private static void executeOperations() { + for (String operation: operations) { + log.info("executing operation "+operation); + } + } + + private static void compileBuild() { + log.info("compiling build"); + String jdkHome = properties.getProperty("jdk.home"); + String javacExecutable = "\""+jdkHome+"/bin/javac\""; + String[] command = new String[]{javacExecutable,"-verbose","-cp","C:/wsbbq/bbq/bin","-d","bin","src/*.java"}; + String buildProjectRoot = properties.getProperty("build.project.root"); + run(new ProcessBuilder(command).directory(new File(buildProjectRoot))); + } + + private static void logProperties() { + log.info("properties:"); + for (Object key: properties.keySet()) { + log.info(" "+key+"="+properties.get(key)); + } + } + + private static void initializeLogging() { + try { + String loggingPropertiesFileName = properties.get("build.project.root")+"/logging.properties"; + File loggingPropertiesFile = new File(loggingPropertiesFileName); + if (loggingPropertiesFile.exists()) { + InputStream inputStream = new FileInputStream(loggingPropertiesFile); + try { + LogManager logManager = LogManager.getLogManager(); + logManager.readConfiguration(inputStream); + } finally { + if (inputStream!=null) { + inputStream.close(); + } + } + } + } catch (Exception e) { + throw new RuntimeException("couldn't initialize logging"); + } + } + + private static void parseArgsAndOperations(String[] args) { + if (args!=null) { + for (String arg : args) { + int indexOfEquals = arg.indexOf('='); + if ( arg.startsWith("-D") + && (arg.length()>3) + && (indexOfEquals!=-1) + ) { + String key = arg.substring(2, indexOfEquals).trim(); + String value = null; + if (arg.length()>indexOfEquals+1) { + value = arg.substring(indexOfEquals+1).trim(); + } + properties.setProperty(key, value); + } else { + operations.add(arg.trim()); + } + } + } + } + + private static void readUserProperties() { + String fileName = System.getProperty("user.home") + "/.bbq/bbq.properties"; + File file = new File(fileName); + if (file.exists()) { + try { + InputStream inputStream = new FileInputStream(file); + try { + properties.load(inputStream); + } finally { + inputStream.close(); + } + } catch (Exception e) { + throw new RuntimeException("couldn read user properties", e); + } + } + } + + private static void readLocalProperties() { + try { + InputStream inputStream = new FileInputStream("bbq.properties"); + try { + properties.load(inputStream); + } finally { + inputStream.close(); + } + } catch (Exception e) { + throw new RuntimeException("couldn read local properties", e); + } + } + + public static void run(ProcessBuilder processBuilder) { + try { + log.info("forking "+processBuilder.command()); + Process process = processBuilder + .redirectErrorStream(true) + .start(); + + BufferedReader processOutput = new BufferedReader(new InputStreamReader(process.getInputStream())); + String line = processOutput.readLine(); + while(line!=null) { + log.info("| "+line); + line = processOutput.readLine(); + } + + } catch (Exception e) { + throw new RuntimeException("couldn't create process", e); + } + } + +} Property changes on: bbq-root/projects/bbq/projects/bbq/src/org/bbq/Bbq.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: bbq-root/projects/bbq/projects/bbq/src/org/bbq/Configuration.java =================================================================== --- bbq-root/projects/bbq/projects/bbq/src/org/bbq/Configuration.java (rev 0) +++ bbq-root/projects/bbq/projects/bbq/src/org/bbq/Configuration.java 2009-08-11 22:47:33 UTC (rev 5466) @@ -0,0 +1,24 @@ +package org.bbq; + +import java.util.Properties; + +public abstract class Configuration { + + static Properties userProperties = new Properties(); + static { + } + + public static String getProperty(String propertyName) { + String value = System.getenv(propertyName); + if (value!=null) { + return value; + } + + value = System.getProperty(propertyName); + if (value!=null) { + return value; + } + + return (String) userProperties.get(propertyName); + } +} Property changes on: bbq-root/projects/bbq/projects/bbq/src/org/bbq/Configuration.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: bbq-root/projects/bbq/projects/bbq/src/org/bbq/FileSystem.java =================================================================== --- bbq-root/projects/bbq/projects/bbq/src/org/bbq/FileSystem.java (rev 0) +++ bbq-root/projects/bbq/projects/bbq/src/org/bbq/FileSystem.java 2009-08-11 22:47:33 UTC (rev 5466) @@ -0,0 +1,11 @@ +package org.bbq; + + +public class FileSystem { + + String rootDirectoryPath; + + public FileSystem(String rootDirectoryPath) { + this.rootDirectoryPath = rootDirectoryPath; + } +} Property changes on: bbq-root/projects/bbq/projects/bbq/src/org/bbq/FileSystem.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: bbq-root/projects/bbq/projects/bbq/src/org/bbq/java/Javac.java =================================================================== --- bbq-root/projects/bbq/projects/bbq/src/org/bbq/java/Javac.java (rev 0) +++ bbq-root/projects/bbq/projects/bbq/src/org/bbq/java/Javac.java 2009-08-11 22:47:33 UTC (rev 5466) @@ -0,0 +1,29 @@ +package org.bbq.java; + +import java.util.List; + +import org.bbq.repository.RemoteRepository; + +public class Javac { + + String sourcePath; + String destination; + List<String> classPath; + + public Javac sourcePath(String sourcePath) { + return this; + } + + public Javac destination(String destination) { + this.destination = destination; + return this; + } + + public Javac repositoryClassPathLib(RemoteRepository repository, String location) { + return this; + } + + public void compile() { + + } +} Property changes on: bbq-root/projects/bbq/projects/bbq/src/org/bbq/java/Javac.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: bbq-root/projects/bbq/projects/bbq/src/org/bbq/log/LogFormatter.java =================================================================== --- bbq-root/projects/bbq/projects/bbq/src/org/bbq/log/LogFormatter.java (rev 0) +++ bbq-root/projects/bbq/projects/bbq/src/org/bbq/log/LogFormatter.java 2009-08-11 22:47:33 UTC (rev 5466) @@ -0,0 +1,72 @@ +package org.bbq.log; + +import java.io.PrintWriter; +import java.io.StringWriter; +import java.text.DateFormat; +import java.text.SimpleDateFormat; +import java.util.HashMap; +import java.util.Map; +import java.util.logging.Formatter; +import java.util.logging.Level; +import java.util.logging.LogRecord; + +public class LogFormatter extends Formatter { + + static final String NEWLINE = System.getProperty("line.separator"); + static final DateFormat dateTimeFormat = new SimpleDateFormat("HH:mm:ss,SSS"); + static final Map<Level, String> levels = new HashMap<Level, String>(); + private static Map<Integer, Integer> indentations = new HashMap<Integer, Integer>(); + + + static { + levels.put(Level.ALL, "ALL"); + levels.put(Level.CONFIG, "CFG"); + levels.put(Level.FINE, "FIN"); + levels.put(Level.FINER, "FNR"); + levels.put(Level.FINEST, "FST"); + levels.put(Level.INFO, "INF"); + levels.put(Level.OFF, "OFF"); + levels.put(Level.SEVERE, "SEV"); + levels.put(Level.WARNING, "WRN"); + } + + public String format(LogRecord logRecord) { + StringWriter msg = new StringWriter(); + if (logRecord.getThrown()!=null) { + msg.append("### EXCEPTION ###########################################"); + msg.append(NEWLINE); + } + msg.append("["); + + String loggerName = logRecord.getLoggerName(); + int dotIndex = loggerName.lastIndexOf('.'); + if (dotIndex!=-1) { + loggerName = loggerName.substring(dotIndex+1); + } + msg.append(loggerName); + + msg.append("] "); + + msg.append(logRecord.getMessage()); + if (logRecord.getThrown()!=null) { + msg.append(NEWLINE); + logRecord.getThrown().printStackTrace(new PrintWriter(msg)); + msg.append("### EXCEPTION ###########################################"); + } + msg.append(NEWLINE); + return msg.toString(); + } + + private int getIndentation(int threadId) { + Integer indentation = indentations.get(threadId); + if (indentation==null) { + indentation = indentations.size(); + indentations.put(threadId, indentation); + } + return indentation; + } + + public static void resetIndentation() { + indentations = new HashMap<Integer, Integer>(); + } +} Property changes on: bbq-root/projects/bbq/projects/bbq/src/org/bbq/log/LogFormatter.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: bbq-root/projects/bbq/projects/bbq/src/org/bbq/repository/LocalRepository.java =================================================================== --- bbq-root/projects/bbq/projects/bbq/src/org/bbq/repository/LocalRepository.java (rev 0) +++ bbq-root/projects/bbq/projects/bbq/src/org/bbq/repository/LocalRepository.java 2009-08-11 22:47:33 UTC (rev 5466) @@ -0,0 +1,10 @@ +package org.bbq.repository; + +public class LocalRepository { + + String rootDirectory; + + public LocalRepository(String rootDirectory) { + this.rootDirectory = rootDirectory; + } +} Property changes on: bbq-root/projects/bbq/projects/bbq/src/org/bbq/repository/LocalRepository.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: bbq-root/projects/bbq/projects/bbq/src/org/bbq/repository/RemoteRepository.java =================================================================== --- bbq-root/projects/bbq/projects/bbq/src/org/bbq/repository/RemoteRepository.java (rev 0) +++ bbq-root/projects/bbq/projects/bbq/src/org/bbq/repository/RemoteRepository.java 2009-08-11 22:47:33 UTC (rev 5466) @@ -0,0 +1,11 @@ +package org.bbq.repository; + + +public class RemoteRepository { + + String remoteUrl; + + public RemoteRepository(String remoteUrl) { + this.remoteUrl = remoteUrl; + } +} Property changes on: bbq-root/projects/bbq/projects/bbq/src/org/bbq/repository/RemoteRepository.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: bbq-root/projects/bbq/projects/bbq/src/org/bbq/repository/Repository.java =================================================================== --- bbq-root/projects/bbq/projects/bbq/src/org/bbq/repository/Repository.java (rev 0) +++ bbq-root/projects/bbq/projects/bbq/src/org/bbq/repository/Repository.java 2009-08-11 22:47:33 UTC (rev 5466) @@ -0,0 +1,8 @@ +package org.bbq.repository; + +import java.io.InputStream; + +public interface Repository { + + InputStream openFile(String location); +} Property changes on: bbq-root/projects/bbq/projects/bbq/src/org/bbq/repository/Repository.java ___________________________________________________________________ Name: svn:mime-type + text/plain Property changes on: bbq-root/projects/bbq/projects/project ___________________________________________________________________ Name: svn:ignore + .settings bin Added: bbq-root/projects/bbq/projects/project/.classpath =================================================================== --- bbq-root/projects/bbq/projects/project/.classpath (rev 0) +++ bbq-root/projects/bbq/projects/project/.classpath 2009-08-11 22:47:33 UTC (rev 5466) @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="src" path="src"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> + <classpathentry kind="output" path="bin"/> +</classpath> Property changes on: bbq-root/projects/bbq/projects/project/.classpath ___________________________________________________________________ Name: svn:mime-type + text/plain Added: bbq-root/projects/bbq/projects/project/.project =================================================================== --- bbq-root/projects/bbq/projects/project/.project (rev 0) +++ bbq-root/projects/bbq/projects/project/.project 2009-08-11 22:47:33 UTC (rev 5466) @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>project</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + </natures> +</projectDescription> Property changes on: bbq-root/projects/bbq/projects/project/.project ___________________________________________________________________ Name: svn:mime-type + text/plain Added: bbq-root/projects/bbq/projects/project/bbq.properties =================================================================== --- bbq-root/projects/bbq/projects/project/bbq.properties (rev 0) +++ bbq-root/projects/bbq/projects/project/bbq.properties 2009-08-11 22:47:33 UTC (rev 5466) @@ -0,0 +1,2 @@ +build.project.root=../project-build +jdk.home=C:/Program Files/Java/jdk1.5.0_14 Property changes on: bbq-root/projects/bbq/projects/project/bbq.properties ___________________________________________________________________ Name: svn:mime-type + text/plain Property changes on: bbq-root/projects/bbq/projects/project-build ___________________________________________________________________ Name: svn:ignore + .settings bin Added: bbq-root/projects/bbq/projects/project-build/src/FileSystems.java =================================================================== --- bbq-root/projects/bbq/projects/project-build/src/FileSystems.java (rev 0) +++ bbq-root/projects/bbq/projects/project-build/src/FileSystems.java 2009-08-11 22:47:33 UTC (rev 5466) @@ -0,0 +1,9 @@ +import org.bbq.FileSystem; + + + +public class FileSystems { + + public static FileSystem software = new FileSystem("C:/Software"); + public static FileSystem buildSpace = new FileSystem("build"); +} Property changes on: bbq-root/projects/bbq/projects/project-build/src/FileSystems.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: bbq-root/projects/bbq/projects/project-build/src/Operations.java =================================================================== --- bbq-root/projects/bbq/projects/project-build/src/Operations.java (rev 0) +++ bbq-root/projects/bbq/projects/project-build/src/Operations.java 2009-08-11 22:47:33 UTC (rev 5466) @@ -0,0 +1,14 @@ +import org.bbq.java.Javac; + +public class Operations { + + public static void compile() { + new Javac() + .sourcePath("src") + .destination("bin") + .repositoryClassPathLib( + Repositories.JBossRepository, + "org/hibernate/hibernate-core/3.3.2.GA/hibernate-core-3.3.2.GA.jar") + .compile(); + } +} Property changes on: bbq-root/projects/bbq/projects/project-build/src/Operations.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: bbq-root/projects/bbq/projects/project-build/src/Properties.java =================================================================== --- bbq-root/projects/bbq/projects/project-build/src/Properties.java (rev 0) +++ bbq-root/projects/bbq/projects/project-build/src/Properties.java 2009-08-11 22:47:33 UTC (rev 5466) @@ -0,0 +1,10 @@ +import org.bbq.Configuration; + + + +public abstract class Properties { + + public static String jdk5Home = Configuration.getProperty("jdk5Home"); + public static String jdk6Home = Configuration.getProperty("jdk6Home"); + +} Property changes on: bbq-root/projects/bbq/projects/project-build/src/Properties.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: bbq-root/projects/bbq/projects/project-build/src/Repositories.java =================================================================== --- bbq-root/projects/bbq/projects/project-build/src/Repositories.java (rev 0) +++ bbq-root/projects/bbq/projects/project-build/src/Repositories.java 2009-08-11 22:47:33 UTC (rev 5466) @@ -0,0 +1,10 @@ +import org.bbq.repository.RemoteRepository; + + + +public class Repositories { + + public static RemoteRepository JBossRepository = + new RemoteRepository("http://repository.jboss.com"); + +} Property changes on: bbq-root/projects/bbq/projects/project-build/src/Repositories.java ___________________________________________________________________ Name: svn:mime-type + text/plain Property changes on: bbq-root/projects/bbq/projects/project-test ___________________________________________________________________ Name: svn:ignore + .settings bin Added: bbq-root/projects/bbq/projects/project-test/.classpath =================================================================== --- bbq-root/projects/bbq/projects/project-test/.classpath (rev 0) +++ bbq-root/projects/bbq/projects/project-test/.classpath 2009-08-11 22:47:33 UTC (rev 5466) @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="src" path="src"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> + <classpathentry kind="output" path="bin"/> +</classpath> Property changes on: bbq-root/projects/bbq/projects/project-test/.classpath ___________________________________________________________________ Name: svn:mime-type + text/plain Added: bbq-root/projects/bbq/projects/project-test/.project =================================================================== --- bbq-root/projects/bbq/projects/project-test/.project (rev 0) +++ bbq-root/projects/bbq/projects/project-test/.project 2009-08-11 22:47:33 UTC (rev 5466) @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>project-test</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + </natures> +</projectDescription> Property changes on: bbq-root/projects/bbq/projects/project-test/.project ___________________________________________________________________ Name: svn:mime-type + text/plain

14 years, 9 months

1
0
0 / 0

JBoss JBPM SVN: r5465 - in bbq-root/projects/bbq: projects and 2 other directories.

by do-not-reply＠jboss.org

Author: tom.baeyens(a)jboss.com Date: 2009-08-11 18:44:53 -0400 (Tue, 11 Aug 2009) New Revision: 5465 Added: bbq-root/projects/bbq/projects/ bbq-root/projects/bbq/projects/bbq/ bbq-root/projects/bbq/projects/bbq/.classpath bbq-root/projects/bbq/projects/bbq/.project bbq-root/projects/bbq/projects/bbq/scripts/ bbq-root/projects/bbq/projects/bbq/src/ bbq-root/projects/bbq/projects/project-build/ bbq-root/projects/bbq/projects/project-build/.classpath bbq-root/projects/bbq/projects/project-build/.project bbq-root/projects/bbq/projects/project-build/bbq.build.properties bbq-root/projects/bbq/projects/project-build/logging.properties bbq-root/projects/bbq/projects/project-build/src/ bbq-root/projects/bbq/projects/project-test/ bbq-root/projects/bbq/projects/project/ Log: initial import Added: bbq-root/projects/bbq/projects/bbq/.classpath =================================================================== --- bbq-root/projects/bbq/projects/bbq/.classpath (rev 0) +++ bbq-root/projects/bbq/projects/bbq/.classpath 2009-08-11 22:44:53 UTC (rev 5465) @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="src" path="src"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> + <classpathentry kind="output" path="bin"/> +</classpath> Property changes on: bbq-root/projects/bbq/projects/bbq/.classpath ___________________________________________________________________ Name: svn:mime-type + text/plain Added: bbq-root/projects/bbq/projects/bbq/.project =================================================================== --- bbq-root/projects/bbq/projects/bbq/.project (rev 0) +++ bbq-root/projects/bbq/projects/bbq/.project 2009-08-11 22:44:53 UTC (rev 5465) @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>bbq</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + </natures> +</projectDescription> Property changes on: bbq-root/projects/bbq/projects/bbq/.project ___________________________________________________________________ Name: svn:mime-type + text/plain Added: bbq-root/projects/bbq/projects/project-build/.classpath =================================================================== --- bbq-root/projects/bbq/projects/project-build/.classpath (rev 0) +++ bbq-root/projects/bbq/projects/project-build/.classpath 2009-08-11 22:44:53 UTC (rev 5465) @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="src" path="src"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> + <classpathentry kind="src" path="/bbq"/> + <classpathentry kind="output" path="bin"/> +</classpath> Property changes on: bbq-root/projects/bbq/projects/project-build/.classpath ___________________________________________________________________ Name: svn:mime-type + text/plain Added: bbq-root/projects/bbq/projects/project-build/.project =================================================================== --- bbq-root/projects/bbq/projects/project-build/.project (rev 0) +++ bbq-root/projects/bbq/projects/project-build/.project 2009-08-11 22:44:53 UTC (rev 5465) @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>project-build</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + </natures> +</projectDescription> Property changes on: bbq-root/projects/bbq/projects/project-build/.project ___________________________________________________________________ Name: svn:mime-type + text/plain Added: bbq-root/projects/bbq/projects/project-build/bbq.build.properties =================================================================== --- bbq-root/projects/bbq/projects/project-build/bbq.build.properties (rev 0) +++ bbq-root/projects/bbq/projects/project-build/bbq.build.properties 2009-08-11 22:44:53 UTC (rev 5465) @@ -0,0 +1,2 @@ +src=src +bin=bin Property changes on: bbq-root/projects/bbq/projects/project-build/bbq.build.properties ___________________________________________________________________ Name: svn:mime-type + text/plain Added: bbq-root/projects/bbq/projects/project-build/logging.properties =================================================================== --- bbq-root/projects/bbq/projects/project-build/logging.properties (rev 0) +++ bbq-root/projects/bbq/projects/project-build/logging.properties 2009-08-11 22:44:53 UTC (rev 5465) @@ -0,0 +1,6 @@ +handlers = java.util.logging.ConsoleHandler + +java.util.logging.ConsoleHandler.level = FINEST +java.util.logging.ConsoleHandler.formatter = org.bbq.log.LogFormatter + +org.bbq.level = FINEST Property changes on: bbq-root/projects/bbq/projects/project-build/logging.properties ___________________________________________________________________ Name: svn:mime-type + text/plain

14 years, 9 months

1
0
0 / 0

JBoss JBPM SVN: r5464 - bbq-root and 1 other directories.

by do-not-reply＠jboss.org

Author: tom.baeyens(a)jboss.com Date: 2009-08-11 18:42:04 -0400 (Tue, 11 Aug 2009) New Revision: 5464 Added: bbq-root/ bbq-root/projects/ bbq-root/projects/bbq/ Log: Share project "bbq-root" into "https://svn.jboss.org/repos/jbpm/projects/bbq"

14 years, 9 months

1
0
0 / 0

JBoss JBPM SVN: r5463 - in jbpm4/trunk/modules/db: scripts and 1 other directory.

by do-not-reply＠jboss.org

Author: alex.guizar(a)jboss.com Date: 2009-08-11 07:15:14 -0400 (Tue, 11 Aug 2009) New Revision: 5463 Added: jbpm4/trunk/modules/db/scripts/antrun-upgrade.xml Modified: jbpm4/trunk/modules/db/pom.xml jbpm4/trunk/modules/db/scripts/antrun-schema.xml Log: [JBPM-1995] build script to calculate jBPM DB differences first stab at upgrade buildfile, fails while creating previous schema Modified: jbpm4/trunk/modules/db/pom.xml =================================================================== --- jbpm4/trunk/modules/db/pom.xml 2009-08-11 09:29:09 UTC (rev 5462) +++ jbpm4/trunk/modules/db/pom.xml 2009-08-11 11:15:14 UTC (rev 5463) @@ -27,6 +27,68 @@ <relativePath>../../pom.xml</relativePath> </parent> + <profiles> + <profile> + <id>upgrade</id> + <activation> + <property> + <name>jbpm.previous.version</name> + </property> + </activation> + + <build> + <plugins> + <plugin> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>previous-version</id> + <phase>generate-resources</phase> + <goals> + <goal>unpack</goal> + </goals> + <configuration> + <artifactItems> + <artifactItem> + <groupId>org.jbpm.jbpm4</groupId> + <artifactId>jbpm-db</artifactId> + <version>${jbpm.previous.version}</version> + </artifactItem> + </artifactItems> + <outputDirectory>${previous.version.directory}</outputDirectory> + </configuration> + </execution> + </executions> + </plugin> + + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>upgrade-script</id> + <phase>process-resources</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <tasks> + <property name="project.output.dir" value="${project.build.outputDirectory}"/> + <property name="previous.version.dir" value="${previous.version.directory}"/> + <ant antfile="scripts/antrun-upgrade.xml" target="upgrade-schema" inheritRefs="yes"/> + </tasks> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + + <properties> + <previous.version.directory>${project.build.directory}/previous</previous.version.directory> + </properties> + </profile> + </profiles> +  <dependencies> <dependency> @@ -45,10 +107,6 @@ <groupId>postgresql</groupId> <artifactId>postgresql</artifactId> </dependency> - <dependency> - <groupId>net.sourceforge.jtds</groupId> - <artifactId>jtds</artifactId> - </dependency> </dependencies> <build> @@ -57,17 +115,15 @@ <artifactId>maven-antrun-plugin</artifactId> <executions> <execution> - <id>create-db-schemas</id> - <phase>process-resources</phase> + <id>create-drop-script</id> + <phase>generate-resources</phase> <goals> <goal>run</goal> </goals> <configuration> <tasks> - <property name="maven.runtime.classpath" refid="maven.runtime.classpath"/> - <ant antfile="scripts/antrun-schema.xml" - target="create-schema"> - </ant> + <property name="project.output.dir" value="${project.build.outputDirectory}"/> + <ant antfile="scripts/antrun-schema.xml" target="create-schema" inheritRefs="yes"/> </tasks> </configuration> </execution> Modified: jbpm4/trunk/modules/db/scripts/antrun-schema.xml =================================================================== --- jbpm4/trunk/modules/db/scripts/antrun-schema.xml 2009-08-11 09:29:09 UTC (rev 5462) +++ jbpm4/trunk/modules/db/scripts/antrun-schema.xml 2009-08-11 11:15:14 UTC (rev 5463) @@ -15,22 +15,17 @@  <target name="create-schema"> - <echo message="${maven.runtime.classpath}"/> - <taskdef name="schemaexport" - classname="org.hibernate.tool.hbm2ddl.SchemaExportTask"> - <classpath path="${maven.runtime.classpath}"/> - </taskdef> + classname="org.hibernate.tool.hbm2ddl.SchemaExportTask" + classpathref="maven.compile.classpath" /> - <mkdir dir="target"/> -  <create-ddl db="hsqldb"/>  <create-ddl db="mysql"/>  - <replace file="target/jbpm.mysql.create.sql" token="BLOB_VALUE_ blob" value="BLOB_VALUE_ longblob" /> + <replace file="${project.output.dir}/jbpm.mysql.create.sql" token="BLOB_VALUE_ blob" value="BLOB_VALUE_ longblob" />  <create-ddl db="oracle"/> @@ -50,22 +45,20 @@ <attribute name="db"/> <sequential> - <echo></echo> <echo>=====================</echo> <echo>Create DDL @{db}</echo> - <schemaexport output="target/jbpm.(a){db}.create.sql" + <schemaexport output="${project.output.dir}/jbpm.(a){db}.create.sql" create="yes" drop="no" config="src/main/config/(a){db}.hibernate.cfg.xml" text="yes" delimiter=";" quiet="yes"/> - <schemaexport output="target/jbpm.(a){db}.drop.sql" + <schemaexport output="${project.output.dir}/jbpm.(a){db}.drop.sql" create="no" drop="yes" config="src/main/config/(a){db}.hibernate.cfg.xml" text="yes" delimiter=";" quiet="yes"/> - <echo>Done.</echo> <echo>=====================</echo> </sequential> </macrodef> Added: jbpm4/trunk/modules/db/scripts/antrun-upgrade.xml =================================================================== --- jbpm4/trunk/modules/db/scripts/antrun-upgrade.xml (rev 0) +++ jbpm4/trunk/modules/db/scripts/antrun-upgrade.xml 2009-08-11 11:15:14 UTC (rev 5463) @@ -0,0 +1,69 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project> + +  +  +  + + <target name="upgrade-schema"> + <taskdef name="schemaupdate" + classname="org.hibernate.tool.hbm2ddl.SchemaUpdateTask" + classpathref="maven.compile.classpath" /> + <taskdef name="schemaexport" + classname="org.hibernate.tool.hbm2ddl.SchemaExportTask" + classpathref="maven.compile.classpath"/> + +  + <upgrade-ddl db="hsqldb"/> + +  + <upgrade-ddl db="mysql"/> + +  + <upgrade-ddl db="oracle"/> + +  + <upgrade-ddl db="postgresql"/> + </target> + +  +  +  + + <macrodef name="upgrade-ddl"> + <attribute name="db" /> + + <sequential> + <echo>=====================</echo> + <echo>Upgrade DDL @{db}</echo> + + <property file="${user.home}/.jbpm4/jdbc/(a){db}.properties" prefix="@{db}"/> + <echo>driver... ${(a){db}.jdbc.driver}</echo> + <echo>url...... ${(a){db}.jdbc.url}</echo> + <echo>username. ${(a){db}.jdbc.username}</echo> + <echo>password. ${(a){db}.jdbc.password}</echo> +  + <sql src="${project.output.dir}/jbpm.(a){db}.drop.sql" url="${(a){db}.jdbc.url}" + driver="${(a){db}.jdbc.driver}" classpathref="maven.compile.classpath" + userid="${(a){db}.jdbc.username}" password="${(a){db}.jdbc.password}" + autocommit="yes" onerror="continue"/> +  + <sql src="${previous.version.dir}/jbpm.(a){db}.create.sql" url="${(a){db}.jdbc.url}" + driver="${(a){db}.jdbc.driver}" classpathref="maven.compile.classpath" + userid="${(a){db}.jdbc.username}" password="${(a){db}.jdbc.password}" + autocommit="yes"/> +  + <schemaupdate outputFile="${project.build.dir}/jbpm.(a){db}.update.sql" + config="src/main/config/(a){db}.hibernate.cfg.xml" + properties="${user.home}/.jbpm4/(a){db}.properties" + text="yes" delimiter=";"/> +  + <sql src="${previous.version.dir}/jbpm.(a){db}.drop.sql" url="${(a){db}.jdbc.url}" + driver="${(a){db}.jdbc.driver}" classpathref="maven.compile.classpath" + userid="${(a){db}.jdbc.username}" password="${(a){db}.jdbc.password}" + autocommit="yes"/> + + <echo>=====================</echo> + </sequential> + </macrodef> +</project> \ No newline at end of file

14 years, 9 months

1
0
0 / 0

JBoss JBPM SVN: r5462 - jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/perf.

by do-not-reply＠jboss.org

Author: alex.guizar(a)jboss.com Date: 2009-08-11 05:29:09 -0400 (Tue, 11 Aug 2009) New Revision: 5462 Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/perf/SimplePerformanceTest.java Log: increase performance test timeout Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/perf/SimplePerformanceTest.java =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/perf/SimplePerformanceTest.java 2009-08-11 05:44:31 UTC (rev 5461) +++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/perf/SimplePerformanceTest.java 2009-08-11 09:29:09 UTC (rev 5462) @@ -68,7 +68,7 @@ long secondTime = System.currentTimeMillis(); launchProcessInstances(MEASURED_INSTANCES); - processJobs((secondTime - firstTime) * (MEASURED_INSTANCES / WARMUP_INSTANCES) + 1); + processJobs((secondTime - firstTime) * (MEASURED_INSTANCES / WARMUP_INSTANCES + 1)); long duration = System.currentTimeMillis() - secondTime; NumberFormat format = NumberFormat.getNumberInstance();

14 years, 9 months

1
0
0 / 0

JBoss JBPM SVN: r5461 - jbpm4/trunk/modules/test-cactus.

by do-not-reply＠jboss.org

Author: alex.guizar(a)jboss.com Date: 2009-08-11 01:44:31 -0400 (Tue, 11 Aug 2009) New Revision: 5461 Modified: jbpm4/trunk/modules/test-cactus/ Log: ignore .settings directory Property changes on: jbpm4/trunk/modules/test-cactus ___________________________________________________________________ Name: svn:ignore - target + target .settings

14 years, 9 months

1
0
0 / 0

JBoss JBPM SVN: r5460 - in jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources: org/jbpm/context/exe/variableinstance and 1 other directories.

by do-not-reply＠jboss.org

Author: alex.guizar(a)jboss.com Date: 2009-08-10 22:02:37 -0400 (Mon, 10 Aug 2009) New Revision: 5460 Removed: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/context/exe/variableinstance/HibernateStringInstance.db2.hbm.xml jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/db/hibernate.types.db2.hbm.xml jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/db/hibernate.types.mysql.hbm.xml Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/hibernate.mapping.db2.xml Log: [JBPM-2115] revert column type change from varchar(4000) to clob(4000) Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/hibernate.mapping.db2.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/hibernate.mapping.db2.xml 2009-08-10 22:32:46 UTC (rev 5459) +++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/hibernate.mapping.db2.xml 2009-08-11 02:02:37 UTC (rev 5460) @@ -5,8 +5,8 @@  <mapping resource="org/jbpm/db/hibernate.queries.hbm.xml" /> -  - <mapping resource="org/jbpm/db/hibernate.types.db2.hbm.xml" /> +  + <mapping resource="org/jbpm/db/hibernate.types.hbm.xml" /> <!-- hql queries used in simulation for querying historical data. uncomment if you want to use the GetSimulationInputCommand @@ -91,7 +91,7 @@ <mapping resource="org/jbpm/context/exe/variableinstance/DateInstance.hbm.xml"/> <mapping resource="org/jbpm/context/exe/variableinstance/DoubleInstance.hbm.xml"/> <mapping resource="org/jbpm/context/exe/variableinstance/HibernateLongInstance.hbm.xml"/> - <mapping resource="org/jbpm/context/exe/variableinstance/HibernateStringInstance.db2.hbm.xml"/> + <mapping resource="org/jbpm/context/exe/variableinstance/HibernateStringInstance.hbm.xml"/> <mapping resource="org/jbpm/context/exe/variableinstance/LongInstance.hbm.xml"/> <mapping resource="org/jbpm/context/exe/variableinstance/NullInstance.hbm.xml"/> <mapping resource="org/jbpm/context/exe/variableinstance/StringInstance.hbm.xml"/> Deleted: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/context/exe/variableinstance/HibernateStringInstance.db2.hbm.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/context/exe/variableinstance/HibernateStringInstance.db2.hbm.xml 2009-08-10 22:32:46 UTC (rev 5459) +++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/context/exe/variableinstance/HibernateStringInstance.db2.hbm.xml 2009-08-11 02:02:37 UTC (rev 5460) @@ -1,16 +0,0 @@ -<?xml version="1.0"?> - -<!DOCTYPE hibernate-mapping PUBLIC - "-//Hibernate/Hibernate Mapping DTD 3.0//EN" - "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> - -<hibernate-mapping auto-import="false" default-access="field"> - <subclass name="org.jbpm.context.exe.variableinstance.HibernateStringInstance" - extends="org.jbpm.context.exe.VariableInstance" - discriminator-value="I"> - <any name="value" id-type="text" cascade="save-update"> - <column name="STRINGIDCLASS_" /> - <column name="STRINGVALUE_" length="4000"/> - </any> - </subclass> -</hibernate-mapping> Deleted: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/db/hibernate.types.db2.hbm.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/db/hibernate.types.db2.hbm.xml 2009-08-10 22:32:46 UTC (rev 5459) +++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/db/hibernate.types.db2.hbm.xml 2009-08-11 02:02:37 UTC (rev 5460) @@ -1,8 +0,0 @@ -<?xml version="1.0"?> -<!DOCTYPE hibernate-mapping PUBLIC - "-//Hibernate/Hibernate Mapping DTD 3.0//EN" - "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> - -<hibernate-mapping> - <typedef name="longstring" class="org.hibernate.type.TextType" /> -</hibernate-mapping> \ No newline at end of file Deleted: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/db/hibernate.types.mysql.hbm.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/db/hibernate.types.mysql.hbm.xml 2009-08-10 22:32:46 UTC (rev 5459) +++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/db/hibernate.types.mysql.hbm.xml 2009-08-11 02:02:37 UTC (rev 5460) @@ -1,8 +0,0 @@ -<?xml version="1.0"?> -<!DOCTYPE hibernate-mapping PUBLIC - "-//Hibernate/Hibernate Mapping DTD 3.0//EN" - "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> - -<hibernate-mapping> - <typedef name="longstring" class="org.hibernate.type.TextType" /> -</hibernate-mapping> \ No newline at end of file

14 years, 9 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

jbpm-commits August 2009