You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by an...@apache.org on 2014/08/12 17:20:07 UTC
svn commit: r1617506 - in /syncope/trunk: ./ core-upgrader/
core/src/main/resources/log4j2.xml pom.xml
Author: andreapatricelli
Date: Tue Aug 12 15:20:07 2014
New Revision: 1617506
URL: http://svn.apache.org/r1617506
Log:
merge from branch 1_2_X
Added:
syncope/trunk/core-upgrader/
- copied from r1617505, syncope/branches/1_2_X/core-upgrader/
Modified:
syncope/trunk/ (props changed)
syncope/trunk/core/src/main/resources/log4j2.xml
syncope/trunk/pom.xml
Propchange: syncope/trunk/
------------------------------------------------------------------------------
Merged /syncope/branches/1_2_X:r1617253-1617505
Modified: syncope/trunk/core/src/main/resources/log4j2.xml
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/resources/log4j2.xml?rev=1617506&r1=1617505&r2=1617506&view=diff
==============================================================================
--- syncope/trunk/core/src/main/resources/log4j2.xml (original)
+++ syncope/trunk/core/src/main/resources/log4j2.xml Tue Aug 12 15:20:07 2014
@@ -142,7 +142,7 @@ under the License.
<asyncLogger name="org.apache.cxf" additivity="false" level="ERROR">
<appender-ref ref="rest"/>
</asyncLogger>
-
+
<logger name="syncope.audit" additivity="false" level="DEBUG">
<appender-ref ref="audit"/>
</logger>
Modified: syncope/trunk/pom.xml
URL: http://svn.apache.org/viewvc/syncope/trunk/pom.xml?rev=1617506&r1=1617505&r2=1617506&view=diff
==============================================================================
--- syncope/trunk/pom.xml (original)
+++ syncope/trunk/pom.xml Tue Aug 12 15:20:07 2014
@@ -408,7 +408,7 @@ under the License.
<dependencyManagement>
<dependencies>
-
+
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
@@ -1624,6 +1624,7 @@ under the License.
<module>console</module>
<module>standalone</module>
<module>installer</module>
+ <module>core-upgrader</module>
<module>deb</module>
</modules>
</project>