You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2014/10/17 10:03:19 UTC
[1/9] git commit: Ignoring generated POM
Repository: syncope
Updated Branches:
refs/heads/1_2_X 14b9753b5 -> 0b91bf21c
refs/heads/master 05eb51deb -> 3ee04978c
Ignoring generated POM
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/121a177c
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/121a177c
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/121a177c
Branch: refs/heads/1_2_X
Commit: 121a177c03c5f8307ed55461b413552e3af52c67
Parents: 14b9753
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Fri Oct 17 09:42:08 2014 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Fri Oct 17 09:42:08 2014 +0200
----------------------------------------------------------------------
.gitignore | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/121a177c/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 3b36dca..b4d8a76 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ target
maven-eclipse.xml
.externalToolBuilders
+archetype/src/main/resources/archetype-resources/pom.xml
[2/9] git commit: Ignoring generated POM
Posted by il...@apache.org.
Ignoring generated POM
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/121a177c
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/121a177c
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/121a177c
Branch: refs/heads/master
Commit: 121a177c03c5f8307ed55461b413552e3af52c67
Parents: 14b9753
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Fri Oct 17 09:42:08 2014 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Fri Oct 17 09:42:08 2014 +0200
----------------------------------------------------------------------
.gitignore | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/121a177c/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 3b36dca..b4d8a76 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ target
maven-eclipse.xml
.externalToolBuilders
+archetype/src/main/resources/archetype-resources/pom.xml
[9/9] git commit: Merge branch '1_2_X'
Posted by il...@apache.org.
Merge branch '1_2_X'
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/3ee04978
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/3ee04978
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/3ee04978
Branch: refs/heads/master
Commit: 3ee04978c47214020603d0cf9266fa01acf5531d
Parents: 0a85893 0b91bf2
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Fri Oct 17 10:02:58 2014 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Fri Oct 17 10:02:58 2014 +0200
----------------------------------------------------------------------
.../src/main/java/org/apache/syncope/core/report/ReportJob.java | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
[8/9] git commit: Fixing compile warning
Posted by il...@apache.org.
Fixing compile warning
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/0b91bf21
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/0b91bf21
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/0b91bf21
Branch: refs/heads/1_2_X
Commit: 0b91bf21c1820afa49fbf098ec702fa5305b3d7a
Parents: cc0ac6b
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Fri Oct 17 10:02:47 2014 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Fri Oct 17 10:02:47 2014 +0200
----------------------------------------------------------------------
.../src/main/java/org/apache/syncope/core/report/ReportJob.java | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/0b91bf21/core/src/main/java/org/apache/syncope/core/report/ReportJob.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/report/ReportJob.java b/core/src/main/java/org/apache/syncope/core/report/ReportJob.java
index 314c01a..3caf414 100644
--- a/core/src/main/java/org/apache/syncope/core/report/ReportJob.java
+++ b/core/src/main/java/org/apache/syncope/core/report/ReportJob.java
@@ -20,7 +20,6 @@ package org.apache.syncope.core.report;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
-import java.io.StringWriter;
import java.util.Date;
import java.util.zip.Deflater;
import java.util.zip.ZipEntry;
@@ -140,7 +139,6 @@ public class ReportJob implements Job {
// 3. actual report execution
StringBuilder reportExecutionMessage = new StringBuilder();
- StringWriter exceptionWriter = new StringWriter();
try {
// report header
handler.startDocument();
@@ -153,7 +151,8 @@ public class ReportJob implements Job {
Class<Reportlet> reportletClass =
dataBinder.findReportletClassHavingConfClass(reportletConf.getClass());
if (reportletClass != null) {
- Reportlet autowired = (Reportlet) ApplicationContextProvider.getBeanFactory().
+ Reportlet<ReportletConf> autowired =
+ (Reportlet<ReportletConf>) ApplicationContextProvider.getBeanFactory().
createBean(reportletClass, AbstractBeanDefinition.AUTOWIRE_BY_TYPE, false);
autowired.setConf(reportletConf);
[7/9] git commit: Fixing compile warning
Posted by il...@apache.org.
Fixing compile warning
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/0b91bf21
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/0b91bf21
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/0b91bf21
Branch: refs/heads/master
Commit: 0b91bf21c1820afa49fbf098ec702fa5305b3d7a
Parents: cc0ac6b
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Fri Oct 17 10:02:47 2014 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Fri Oct 17 10:02:47 2014 +0200
----------------------------------------------------------------------
.../src/main/java/org/apache/syncope/core/report/ReportJob.java | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/0b91bf21/core/src/main/java/org/apache/syncope/core/report/ReportJob.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/report/ReportJob.java b/core/src/main/java/org/apache/syncope/core/report/ReportJob.java
index 314c01a..3caf414 100644
--- a/core/src/main/java/org/apache/syncope/core/report/ReportJob.java
+++ b/core/src/main/java/org/apache/syncope/core/report/ReportJob.java
@@ -20,7 +20,6 @@ package org.apache.syncope.core.report;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
-import java.io.StringWriter;
import java.util.Date;
import java.util.zip.Deflater;
import java.util.zip.ZipEntry;
@@ -140,7 +139,6 @@ public class ReportJob implements Job {
// 3. actual report execution
StringBuilder reportExecutionMessage = new StringBuilder();
- StringWriter exceptionWriter = new StringWriter();
try {
// report header
handler.startDocument();
@@ -153,7 +151,8 @@ public class ReportJob implements Job {
Class<Reportlet> reportletClass =
dataBinder.findReportletClassHavingConfClass(reportletConf.getClass());
if (reportletClass != null) {
- Reportlet autowired = (Reportlet) ApplicationContextProvider.getBeanFactory().
+ Reportlet<ReportletConf> autowired =
+ (Reportlet<ReportletConf>) ApplicationContextProvider.getBeanFactory().
createBean(reportletClass, AbstractBeanDefinition.AUTOWIRE_BY_TYPE, false);
autowired.setConf(reportletConf);
[5/9] git commit: Upgrade Activiti to 5.16.4
Posted by il...@apache.org.
Upgrade Activiti to 5.16.4
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/cc0ac6bc
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/cc0ac6bc
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/cc0ac6bc
Branch: refs/heads/master
Commit: cc0ac6bcbda7b4abdefaa298da1a3911245b8f9e
Parents: 121a177
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Fri Oct 17 09:50:28 2014 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Fri Oct 17 09:50:28 2014 +0200
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/cc0ac6bc/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 4dbda3c..a42f64d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -321,7 +321,7 @@ under the License.
<commons-lang.version>3.3.2</commons-lang.version>
<commons-codec.version>1.9</commons-codec.version>
- <activiti.version>5.16.3</activiti.version>
+ <activiti.version>5.16.4</activiti.version>
<aspectj.version>1.8.2</aspectj.version>
[4/9] git commit: Upgrade Activiti to 5.16.4
Posted by il...@apache.org.
Upgrade Activiti to 5.16.4
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/cc0ac6bc
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/cc0ac6bc
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/cc0ac6bc
Branch: refs/heads/1_2_X
Commit: cc0ac6bcbda7b4abdefaa298da1a3911245b8f9e
Parents: 121a177
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Fri Oct 17 09:50:28 2014 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Fri Oct 17 09:50:28 2014 +0200
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/cc0ac6bc/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 4dbda3c..a42f64d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -321,7 +321,7 @@ under the License.
<commons-lang.version>3.3.2</commons-lang.version>
<commons-codec.version>1.9</commons-codec.version>
- <activiti.version>5.16.3</activiti.version>
+ <activiti.version>5.16.4</activiti.version>
<aspectj.version>1.8.2</aspectj.version>
[3/9] git commit: Merge branch '1_2_X'
Posted by il...@apache.org.
Merge branch '1_2_X'
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/7240e1f2
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/7240e1f2
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/7240e1f2
Branch: refs/heads/master
Commit: 7240e1f2d29321bdc04805f2e322fcf39f2cddb1
Parents: 05eb51d 121a177
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Fri Oct 17 09:42:31 2014 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Fri Oct 17 09:42:31 2014 +0200
----------------------------------------------------------------------
.gitignore | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
[6/9] git commit: Merge branch '1_2_X'
Posted by il...@apache.org.
Merge branch '1_2_X'
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/0a858935
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/0a858935
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/0a858935
Branch: refs/heads/master
Commit: 0a8589358fa3308cb4601b208f48e2a01870acde
Parents: 7240e1f cc0ac6b
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Fri Oct 17 09:50:35 2014 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Fri Oct 17 09:50:35 2014 +0200
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/0a858935/pom.xml
----------------------------------------------------------------------