You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@batchee.apache.org by ol...@apache.org on 2013/11/14 01:09:00 UTC
[1/3] git commit: use last tomcat plugin version
Updated Branches:
refs/heads/master 89e27919e -> 02a1dc059
use last tomcat plugin version
Project: http://git-wip-us.apache.org/repos/asf/incubator-batchee/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-batchee/commit/f4e69ab6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-batchee/tree/f4e69ab6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-batchee/diff/f4e69ab6
Branch: refs/heads/master
Commit: f4e69ab6ea84621b63cc83b339a2c3cabeae1ebc
Parents: 89e2791
Author: Olivier Lamy <ol...@apache.org>
Authored: Thu Nov 14 11:07:10 2013 +1100
Committer: Olivier Lamy <ol...@apache.org>
Committed: Thu Nov 14 11:07:10 2013 +1100
----------------------------------------------------------------------
gui/servlet/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-batchee/blob/f4e69ab6/gui/servlet/pom.xml
----------------------------------------------------------------------
diff --git a/gui/servlet/pom.xml b/gui/servlet/pom.xml
index 22fa367..26b6859 100644
--- a/gui/servlet/pom.xml
+++ b/gui/servlet/pom.xml
@@ -120,7 +120,7 @@
<plugin> <!-- use mvn clean package tomcat7:run -DskipTests -->
<groupId>org.apache.tomcat.maven</groupId>
<artifactId>tomcat7-maven-plugin</artifactId>
- <version>2.1</version>
+ <version>2.2</version>
<configuration>
<ignorePackaging>true</ignorePackaging>
<path>/</path>
[2/3] git commit: fix possible NPE
Posted by ol...@apache.org.
fix possible NPE
Project: http://git-wip-us.apache.org/repos/asf/incubator-batchee/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-batchee/commit/37efd249
Tree: http://git-wip-us.apache.org/repos/asf/incubator-batchee/tree/37efd249
Diff: http://git-wip-us.apache.org/repos/asf/incubator-batchee/diff/37efd249
Branch: refs/heads/master
Commit: 37efd249a5f01428ebfbd21d9ae4bf8573c1c3fa
Parents: f4e69ab
Author: Olivier Lamy <ol...@apache.org>
Authored: Thu Nov 14 11:07:25 2013 +1100
Committer: Olivier Lamy <ol...@apache.org>
Committed: Thu Nov 14 11:07:25 2013 +1100
----------------------------------------------------------------------
.../java/org/apache/batchee/servlet/JBatchController.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-batchee/blob/37efd249/gui/servlet/src/main/java/org/apache/batchee/servlet/JBatchController.java
----------------------------------------------------------------------
diff --git a/gui/servlet/src/main/java/org/apache/batchee/servlet/JBatchController.java b/gui/servlet/src/main/java/org/apache/batchee/servlet/JBatchController.java
index 7717581..87cf32b 100644
--- a/gui/servlet/src/main/java/org/apache/batchee/servlet/JBatchController.java
+++ b/gui/servlet/src/main/java/org/apache/batchee/servlet/JBatchController.java
@@ -92,20 +92,20 @@ public class JBatchController extends HttpServlet {
req.setAttribute("mapping", mapping);
final String path = req.getPathInfo();
- if (path.startsWith(EXECUTIONS_MAPPING)) {
+ if (path != null && path.startsWith(EXECUTIONS_MAPPING)) {
final String name = URLDecoder.decode(path.substring(EXECUTIONS_MAPPING.length()), "UTF-8");
final int start = extractInt(req, "start", -1);
listExecutions(req, name, executionByPage, start);
- } else if (path.startsWith(STEP_EXECUTIONS_MAPPING)) {
+ } else if (path != null && path.startsWith(STEP_EXECUTIONS_MAPPING)) {
final int executionId = Integer.parseInt(path.substring(STEP_EXECUTIONS_MAPPING.length()));
listStepExecutions(req, executionId);
- } else if (path.startsWith(VIEW_MAPPING)) {
+ } else if (path != null && path.startsWith(VIEW_MAPPING)) {
final String name = URLDecoder.decode(path.substring(VIEW_MAPPING.length()), "UTF-8");
view(req, name);
- } else if (path.startsWith(START_MAPPING)) {
+ } else if (path != null && path.startsWith(START_MAPPING)) {
final String name = URLDecoder.decode(path.substring(START_MAPPING.length()), "UTF-8");
start(req, name);
- } else if (path.startsWith(DO_START_MAPPING)) {
+ } else if (path != null && path.startsWith(DO_START_MAPPING)) {
String name = URLDecoder.decode(path.substring(DO_START_MAPPING.length()), "UTF-8");
if (name.isEmpty()) {
name = req.getParameter(FORM_JOB_NAME);
[3/3] git commit: change comment as it is now fixed in last plugin
release
Posted by ol...@apache.org.
change comment as it is now fixed in last plugin release
Project: http://git-wip-us.apache.org/repos/asf/incubator-batchee/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-batchee/commit/02a1dc05
Tree: http://git-wip-us.apache.org/repos/asf/incubator-batchee/tree/02a1dc05
Diff: http://git-wip-us.apache.org/repos/asf/incubator-batchee/diff/02a1dc05
Branch: refs/heads/master
Commit: 02a1dc059d8fbfbad50d6ffe87ceac48404544fb
Parents: 37efd24
Author: Olivier Lamy <ol...@apache.org>
Authored: Thu Nov 14 11:08:50 2013 +1100
Committer: Olivier Lamy <ol...@apache.org>
Committed: Thu Nov 14 11:08:50 2013 +1100
----------------------------------------------------------------------
gui/servlet/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-batchee/blob/02a1dc05/gui/servlet/pom.xml
----------------------------------------------------------------------
diff --git a/gui/servlet/pom.xml b/gui/servlet/pom.xml
index 26b6859..282b5d8 100644
--- a/gui/servlet/pom.xml
+++ b/gui/servlet/pom.xml
@@ -117,7 +117,7 @@
</execution>
</executions>
</plugin>
- <plugin> <!-- use mvn clean package tomcat7:run -DskipTests -->
+ <plugin> <!-- use mvn tomcat7:run -->
<groupId>org.apache.tomcat.maven</groupId>
<artifactId>tomcat7-maven-plugin</artifactId>
<version>2.2</version>