syncope-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ilgro...@apache.org
Subject [3/3] syncope git commit: [SYNCOPE-656] Merge from 1_2_X + adaptation
Date Thu, 02 Apr 2015 07:48:42 GMT
[SYNCOPE-656] Merge from 1_2_X + adaptation


Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/f76826f6
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/f76826f6
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/f76826f6

Branch: refs/heads/master
Commit: f76826f6e521aa7ca227fdbe135f3a6771161eab
Parents: 87fe732 aea1c87
Author: Francesco Chicchiriccò <ilgrosso@apache.org>
Authored: Thu Apr 2 09:48:33 2015 +0200
Committer: Francesco Chicchiriccò <ilgrosso@apache.org>
Committed: Thu Apr 2 09:48:33 2015 +0200

----------------------------------------------------------------------
 deb/console/src/deb/control/conffiles |  2 ++
 deb/core/src/deb/control/conffiles    | 21 ++++++++++++++++++++-
 2 files changed, 22 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/syncope/blob/f76826f6/deb/console/src/deb/control/conffiles
----------------------------------------------------------------------
diff --cc deb/console/src/deb/control/conffiles
index 12c85c3,a6de20f..82acdf8
--- a/deb/console/src/deb/control/conffiles
+++ b/deb/console/src/deb/control/conffiles
@@@ -1,1 -1,3 +1,3 @@@
 -/etc/tomcat7/Catalina/localhost/syncope-console.xml
 -/etc/apache-syncope/authorizations.xml
 +/etc/tomcat8/Catalina/localhost/syncope-console.xml
++/etc/apache-syncope/consoleContext.xml
+ /etc/apache-syncope/console.properties

http://git-wip-us.apache.org/repos/asf/syncope/blob/f76826f6/deb/core/src/deb/control/conffiles
----------------------------------------------------------------------
diff --cc deb/core/src/deb/control/conffiles
index 32f4f94,7d72c2f..a8458f8
--- a/deb/core/src/deb/control/conffiles
+++ b/deb/core/src/deb/control/conffiles
@@@ -1,1 -1,17 +1,20 @@@
- /etc/tomcat8/Catalina/localhost/syncope-core.xml
 -/etc/tomcat7/Catalina/localhost/syncope.xml
++/etc/tomcat8/Catalina/localhost/syncope.xml
+ /etc/apache-syncope/connid.properties
+ /etc/apache-syncope/content.xml
 -/etc/apache-syncope/indexes.xml
++/etc/apache-syncope/coreContext.xml
++/etc/apache-syncope/log4j2.xml
++/etc/apache-syncope/logic.properties
+ /etc/apache-syncope/mail.properties
+ /etc/apache-syncope/persistence.properties
 -/etc/apache-syncope/rest.properties
++/etc/apache-syncope/provisioning.properties
++/etc/apache-syncope/roleRoutes.xml
+ /etc/apache-syncope/security.properties
++/etc/apache-syncope/userRoutes.xml
+ /etc/apache-syncope/userWorkflow.bpmn20.xml
 -/etc/apache-syncope/views.xml
+ /etc/apache-syncope/workflow.properties
 -/etc/apache-syncope/mailTempates/confirmPasswordReset.html.vm
 -/etc/apache-syncope/mailTempates/confirmPasswordReset.txt.vm
 -/etc/apache-syncope/mailTempates/optin.html.vm
 -/etc/apache-syncope/mailTempates/optin.txt.vm
 -/etc/apache-syncope/mailTempates/requestPasswordReset.html.vm
 -/etc/apache-syncope/mailTempates/requestPasswordReset.txt.vm
++/etc/apache-syncope/mailTemplates/confirmPasswordReset.html.vm
++/etc/apache-syncope/mailTemplates/confirmPasswordReset.txt.vm
++/etc/apache-syncope/mailTemplates/optin.html.vm
++/etc/apache-syncope/mailTemplates/optin.txt.vm
++/etc/apache-syncope/mailTemplates/requestPasswordReset.html.vm
++/etc/apache-syncope/mailTemplates/requestPasswordReset.txt.vm


Mime
View raw message