You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ode.apache.org by sa...@apache.org on 2016/09/24 10:19:25 UTC
[1/3] ode git commit: fix for NoSuchElement Exception during
deployment
Repository: ode
Updated Branches:
refs/heads/ODE-1060 3d31943f6 -> 44a1f7df4
fix for NoSuchElement Exception during deployment
Project: http://git-wip-us.apache.org/repos/asf/ode/repo
Commit: http://git-wip-us.apache.org/repos/asf/ode/commit/818fbf7d
Tree: http://git-wip-us.apache.org/repos/asf/ode/tree/818fbf7d
Diff: http://git-wip-us.apache.org/repos/asf/ode/diff/818fbf7d
Branch: refs/heads/ODE-1060
Commit: 818fbf7da2eb67117760f79568cb9b2f4f23d42a
Parents: 3d31943
Author: sathwik <sa...@apache.org>
Authored: Wed Sep 14 11:26:28 2016 +0530
Committer: sathwik <sa...@apache.org>
Committed: Wed Sep 14 11:26:28 2016 +0530
----------------------------------------------------------------------
.../main/java/org/apache/ode/dao/jpa/BPELDAOConnectionImpl.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ode/blob/818fbf7d/dao-jpa/src/main/java/org/apache/ode/dao/jpa/BPELDAOConnectionImpl.java
----------------------------------------------------------------------
diff --git a/dao-jpa/src/main/java/org/apache/ode/dao/jpa/BPELDAOConnectionImpl.java b/dao-jpa/src/main/java/org/apache/ode/dao/jpa/BPELDAOConnectionImpl.java
index f161d6e..e4c2fe0 100644
--- a/dao-jpa/src/main/java/org/apache/ode/dao/jpa/BPELDAOConnectionImpl.java
+++ b/dao-jpa/src/main/java/org/apache/ode/dao/jpa/BPELDAOConnectionImpl.java
@@ -109,7 +109,7 @@ public class BPELDAOConnectionImpl implements BpelDAOConnection {
public ProcessDAO getProcess(QName processId) {
List l = _em.createQuery("select x from ProcessDAOImpl x where x._processId = ?1")
.setParameter(1, processId.toString()).getResultList();
- if (l.size() == 0) return null;
+ if (l.isEmpty()) return null;
ProcessDAOImpl p = (ProcessDAOImpl) l.get(0);
return p;
}
[3/3] ode git commit: ODE-1060: put javadoc for snapshots
Posted by sa...@apache.org.
ODE-1060: put javadoc for snapshots
Project: http://git-wip-us.apache.org/repos/asf/ode/repo
Commit: http://git-wip-us.apache.org/repos/asf/ode/commit/44a1f7df
Tree: http://git-wip-us.apache.org/repos/asf/ode/tree/44a1f7df
Diff: http://git-wip-us.apache.org/repos/asf/ode/diff/44a1f7df
Branch: refs/heads/ODE-1060
Commit: 44a1f7df4653ed0586fc77e85038ba8d9c0dbc31
Parents: 3406020
Author: sathwik <sa...@apache.org>
Authored: Sat Sep 24 13:19:57 2016 +0530
Committer: sathwik <sa...@apache.org>
Committed: Sat Sep 24 13:19:57 2016 +0530
----------------------------------------------------------------------
ci-build.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ode/blob/44a1f7df/ci-build.sh
----------------------------------------------------------------------
diff --git a/ci-build.sh b/ci-build.sh
index e76f3c0..09c8e05 100755
--- a/ci-build.sh
+++ b/ci-build.sh
@@ -38,7 +38,7 @@ FINAL_COMMAND="$CREATE_USER_COMMAND && $BUNDLER_COMMAND && $BUILDR_COMMAND"
## For release set these arguments with proper values
-## export JAVADOC=ON
+export JAVADOC=off
## export BUILDR_ENV=production
## export NEXT_VERSION=
## export GNUPGHOME="$HOME/.gnupg"
[2/3] ode git commit: ODE-1060: Added env parameters needs for release
Posted by sa...@apache.org.
ODE-1060: Added env parameters needs for release
Project: http://git-wip-us.apache.org/repos/asf/ode/repo
Commit: http://git-wip-us.apache.org/repos/asf/ode/commit/34060209
Tree: http://git-wip-us.apache.org/repos/asf/ode/tree/34060209
Diff: http://git-wip-us.apache.org/repos/asf/ode/diff/34060209
Branch: refs/heads/ODE-1060
Commit: 340602096737ad79eadd77d0581badac48ede4ec
Parents: 818fbf7
Author: sathwik <sa...@apache.org>
Authored: Sat Sep 24 11:48:22 2016 +0530
Committer: sathwik <sa...@apache.org>
Committed: Sat Sep 24 11:48:22 2016 +0530
----------------------------------------------------------------------
ci-build.sh | 35 ++++++++++++++++++++++++++++++-----
1 file changed, 30 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ode/blob/34060209/ci-build.sh
----------------------------------------------------------------------
diff --git a/ci-build.sh b/ci-build.sh
index 76adcc9..e76f3c0 100755
--- a/ci-build.sh
+++ b/ci-build.sh
@@ -15,7 +15,7 @@
#!/bin/sh
-docker pull vanto/apache-buildr:latest-jruby-jdk7
+docker pull sathwik/apache-buildr:latest-jruby-jdk7
export JAVA_OPTS="-Xmx1024M -XX:MaxPermSize=512M"
BUILDR_ARGS="$@"
@@ -25,12 +25,37 @@ HOMEDIR="/home/$CONTAINER_USERNAME"
GROUP_ID=$(id -g)
USER_ID=$( id -u)
-CREATE_USER_COMMAND="groupadd -f -g $GROUP_ID $CONTAINER_GROUPNAME && useradd -u $USER_ID -g $CONTAINER_GROUPNAME $CONTAINER_USERNAME && mkdir --parent $HOMEDIR && chown -R $CONTAINER_USERNAME:$CONTAINER_GROUPNAME $HOMEDIR"
+CREATE_USER_COMMAND="groupadd -f -g $GROUP_ID $CONTAINER_GROUPNAME \
+&& useradd -u $USER_ID -g $CONTAINER_GROUPNAME $CONTAINER_USERNAME \
+&& mkdir --parent $HOMEDIR \
+&& chown -R $CONTAINER_USERNAME:$CONTAINER_GROUPNAME $HOMEDIR"
-BUNDLER_COMMAND="/opt/jruby/bin/jruby -S bundler install --gemfile=/workspace/Gemfile"
+BUNDLER_COMMAND="jruby -S bundler install --gemfile=/workspace/Gemfile"
-BUILDR_COMMAND="su $CONTAINER_USERNAME -c '/opt/jruby/bin/jruby -S buildr $BUILDR_ARGS'"
+BUILDR_COMMAND="su $CONTAINER_USERNAME -c 'buildr $BUILDR_ARGS'"
FINAL_COMMAND="$CREATE_USER_COMMAND && $BUNDLER_COMMAND && $BUILDR_COMMAND"
-docker run --rm -e JAVADOC=no -e JAVA_OPTS -v `pwd`:/workspace -v $HOME/.m2:/home/dummy/.m2 -v $HOME/.buildr:/home/dummy/.buildr -v /tmp:/tmp --entrypoint bash vanto/apache-buildr:latest-jruby-jdk7 -c "$FINAL_COMMAND"
+
+## For release set these arguments with proper values
+## export JAVADOC=ON
+## export BUILDR_ENV=production
+## export NEXT_VERSION=
+## export GNUPGHOME="$HOME/.gnupg"
+## export GPG_USER=
+## export GPG_PASS=
+
+#mount volume for release -v $GNUPGHOME:/home/dummy/.gnupg
+
+docker run --rm \
+ -e JAVADOC=$JAVADOC \
+ -e NEXT_VERSION=$NEXT_VERSION \
+ -e GPG_USER=$GPG_USER \
+ -e GPG_PASS=$GPG_PASS \
+ -e BUILDR_ENV=$BUILDR_ENV \
+ -e JAVA_OPTS \
+ -v `pwd`:/workspace \
+ -v $HOME/.m2:/home/dummy/.m2 \
+ -v $HOME/.buildr:/home/dummy/.buildr \
+ -v /tmp:/tmp \
+ --entrypoint bash sathwik/apache-buildr:latest-jruby-jdk7 -c "$FINAL_COMMAND";