[jbpm-commits] JBoss JBPM SVN: r6815 - in projects/jsf-console/branches/jsf-console-3.2-soa: console and 4 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Fri Nov 12 06:07:45 EST 2010
Author: alex.guizar at jboss.com
Date: 2010-11-12 06:07:44 -0500 (Fri, 12 Nov 2010)
New Revision: 6815
Added:
projects/jsf-console/branches/jsf-console-3.2-soa/console-tomcat/
projects/jsf-console/branches/jsf-console-3.2-soa/console-tomcat/.classpath
projects/jsf-console/branches/jsf-console-3.2-soa/console-tomcat/.project
projects/jsf-console/branches/jsf-console-3.2-soa/console-tomcat/pom.xml
projects/jsf-console/branches/jsf-console-3.2-soa/console-tomcat/src/
projects/jsf-console/branches/jsf-console-3.2-soa/console-tomcat/src/main/
Modified:
projects/jsf-console/branches/jsf-console-3.2-soa/console/pom.xml
projects/jsf-console/branches/jsf-console-3.2-soa/gpd-deployer/src/main/java/org/jbpm/web/ProcessUploadServlet.java
projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/pom.xml
projects/jsf-console/branches/jsf-console-3.2-soa/pom.xml
Log:
JBPM-2978 support tomcat as deployment target
Modified: projects/jsf-console/branches/jsf-console-3.2-soa/console/pom.xml
===================================================================
--- projects/jsf-console/branches/jsf-console-3.2-soa/console/pom.xml 2010-11-10 22:27:35 UTC (rev 6814)
+++ projects/jsf-console/branches/jsf-console-3.2-soa/console/pom.xml 2010-11-12 11:07:44 UTC (rev 6815)
@@ -33,15 +33,5 @@
</dependency>
<!-- Provided Dependencies -->
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jbpm.jbpm3</groupId>
- <artifactId>jbpm-jpdl</artifactId>
- <scope>provided</scope>
- </dependency>
</dependencies>
</project>
Property changes on: projects/jsf-console/branches/jsf-console-3.2-soa/console-tomcat
___________________________________________________________________
Name: svn:ignore
+ .settings
target
Added: projects/jsf-console/branches/jsf-console-3.2-soa/console-tomcat/.classpath
===================================================================
--- projects/jsf-console/branches/jsf-console-3.2-soa/console-tomcat/.classpath (rev 0)
+++ projects/jsf-console/branches/jsf-console-3.2-soa/console-tomcat/.classpath 2010-11-12 11:07:44 UTC (rev 6815)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
+ <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
Added: projects/jsf-console/branches/jsf-console-3.2-soa/console-tomcat/.project
===================================================================
--- projects/jsf-console/branches/jsf-console-3.2-soa/console-tomcat/.project (rev 0)
+++ projects/jsf-console/branches/jsf-console-3.2-soa/console-tomcat/.project 2010-11-12 11:07:44 UTC (rev 6815)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>console-tomcat</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.maven.ide.eclipse.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.maven.ide.eclipse.maven2Nature</nature>
+ </natures>
+</projectDescription>
Added: projects/jsf-console/branches/jsf-console-3.2-soa/console-tomcat/pom.xml
===================================================================
--- projects/jsf-console/branches/jsf-console-3.2-soa/console-tomcat/pom.xml (rev 0)
+++ projects/jsf-console/branches/jsf-console-3.2-soa/console-tomcat/pom.xml 2010-11-12 11:07:44 UTC (rev 6815)
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<!-- ====================================================================== -->
+<!-- jBPM: Workflow in Java -->
+<!-- -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- ====================================================================== -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <packaging>war</packaging>
+ <name>jBPM3 - Tomcat Console</name>
+ <groupId>org.jbpm.jbpm3</groupId>
+ <artifactId>jsf-console-tomcat</artifactId>
+
+ <parent>
+ <artifactId>jsf-console-parent</artifactId>
+ <groupId>org.jbpm.jbpm3</groupId>
+ <version>3.2.10-SNAPSHOT</version>
+ </parent>
+
+ <dependencies>
+ <!-- jBPM dependencies -->
+ <dependency>
+ <groupId>org.jbpm.jbpm3</groupId>
+ <artifactId>jsf-console</artifactId>
+ <version>${project.version}</version>
+ <type>war</type>
+ </dependency>
+
+ <!-- Thirdparty Dependencies -->
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
+ </dependency>
+ </dependencies>
+</project>
\ No newline at end of file
Property changes on: projects/jsf-console/branches/jsf-console-3.2-soa/console-tomcat/pom.xml
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: projects/jsf-console/branches/jsf-console-3.2-soa/gpd-deployer/src/main/java/org/jbpm/web/ProcessUploadServlet.java
===================================================================
--- projects/jsf-console/branches/jsf-console-3.2-soa/gpd-deployer/src/main/java/org/jbpm/web/ProcessUploadServlet.java 2010-11-10 22:27:35 UTC (rev 6814)
+++ projects/jsf-console/branches/jsf-console-3.2-soa/gpd-deployer/src/main/java/org/jbpm/web/ProcessUploadServlet.java 2010-11-12 11:07:44 UTC (rev 6815)
@@ -49,7 +49,7 @@
* <p>
* Deploys process definitions zipped and posted as multipart requests.
* </p>
- * <h3>Configuration</h3> Servlet context initialization parameters
+ * <h3>Servlet context parameters</h3>
* <table border="1">
* <tr>
* <th>Name</th>
@@ -58,7 +58,7 @@
* </tr>
* <tr>
* <td>jbpm.configuration.resource</td>
- * <td>name of classpath resource containing the configuration</td>
+ * <td>classpath resource containing the jBPM configuration</td>
* <td>jbpm.cfg.xml</td>
* </tr>
* </table>
@@ -184,8 +184,7 @@
jbpmContext.setRollbackOnly();
log.error("failed to deploy " + processDefinition, e);
- response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR,
- "Failed to deploy process");
+ response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, "Failed to deploy process");
}
}
Modified: projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/pom.xml
===================================================================
--- projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/pom.xml 2010-11-10 22:27:35 UTC (rev 6814)
+++ projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/pom.xml 2010-11-12 11:07:44 UTC (rev 6815)
@@ -20,7 +20,6 @@
<groupId>org.jbpm.jbpm3</groupId>
<artifactId>jsf-console-parent</artifactId>
<version>3.2.10-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
</parent>
<!-- Dependencies -->
@@ -47,6 +46,11 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>org.jbpm.jbpm3</groupId>
+ <artifactId>jbpm-jpdl</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>javax.faces</groupId>
<artifactId>jsf-api</artifactId>
<scope>provided</scope>
@@ -56,8 +60,6 @@
<artifactId>servlet-api</artifactId>
<scope>provided</scope>
</dependency>
-
- <!-- Runtime Dependencies -->
</dependencies>
<!-- Plugins -->
@@ -87,5 +89,4 @@
</plugin>
</plugins>
</build>
-
</project>
Modified: projects/jsf-console/branches/jsf-console-3.2-soa/pom.xml
===================================================================
--- projects/jsf-console/branches/jsf-console-3.2-soa/pom.xml 2010-11-10 22:27:35 UTC (rev 6814)
+++ projects/jsf-console/branches/jsf-console-3.2-soa/pom.xml 2010-11-12 11:07:44 UTC (rev 6815)
@@ -34,22 +34,15 @@
<modules>
<module>console</module>
<module>console-jee5</module>
+ <module>console-tomcat</module>
<module>jbpm4jsf</module>
<module>gpd-deployer</module>
</modules>
<!-- Properties -->
<properties>
- <commons.fileupload.version>1.2.1</commons.fileupload.version>
- <commons.io.version>1.4</commons.io.version>
- <commons.logging.version>1.1.1</commons.logging.version>
- <javax.el.version>1.0</javax.el.version>
<javax.faces.version>1.2_13</javax.faces.version>
- <javax.servlet.version>2.5</javax.servlet.version>
- <jbpm.version>3.2.8</jbpm.version>
- <jboss.gravel.version>1.0.0.GA</jboss.gravel.version>
- <junit.version>3.8.1</junit.version>
- <sun.facelets.version>1.1.15</sun.facelets.version>
+ <jbpm.version>3.2.9</jbpm.version>
</properties>
<!-- DependencyManagement -->
@@ -71,27 +64,27 @@
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
- <version>${commons.fileupload.version}</version>
+ <version>1.2.1</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>${commons.io.version}</version>
+ <version>1.4</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- <version>${commons.logging.version}</version>
+ <version>1.1.1</version>
</dependency>
<dependency>
<groupId>com.sun.facelets</groupId>
<artifactId>jsf-facelets</artifactId>
- <version>${sun.facelets.version}</version>
+ <version>1.1.15</version>
</dependency>
<dependency>
<groupId>javax.el</groupId>
<artifactId>el-api</artifactId>
- <version>${javax.el.version}</version>
+ <version>1.0</version>
</dependency>
<dependency>
<groupId>javax.faces</groupId>
@@ -106,12 +99,12 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
- <version>${javax.servlet.version}</version>
+ <version>2.5</version>
</dependency>
<dependency>
<groupId>org.jboss.gravel</groupId>
<artifactId>gravel</artifactId>
- <version>${jboss.gravel.version}</version>
+ <version>1.0.0.GA</version>
</dependency>
</dependencies>
</dependencyManagement>
More information about the jbpm-commits
mailing list