syncope-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ilgro...@apache.org
Subject svn commit: r1614338 - in /syncope/trunk: ./ legal_ext/LICENSE src/site/xdoc/architecture.xml src/site/xdoc/features.xml
Date Tue, 29 Jul 2014 13:17:29 GMT
Author: ilgrosso
Date: Tue Jul 29 13:17:28 2014
New Revision: 1614338

URL: http://svn.apache.org/r1614338
Log:
Merge from 1_2_X

Modified:
    syncope/trunk/   (props changed)
    syncope/trunk/legal_ext/LICENSE
    syncope/trunk/src/site/xdoc/architecture.xml
    syncope/trunk/src/site/xdoc/features.xml

Propchange: syncope/trunk/
------------------------------------------------------------------------------
  Merged /syncope/branches/1_2_X:r1613363-1614337

Modified: syncope/trunk/legal_ext/LICENSE
URL: http://svn.apache.org/viewvc/syncope/trunk/legal_ext/LICENSE?rev=1614338&r1=1614337&r2=1614338&view=diff
==============================================================================
--- syncope/trunk/legal_ext/LICENSE (original)
+++ syncope/trunk/legal_ext/LICENSE Tue Jul 29 13:17:28 2014
@@ -304,7 +304,7 @@ This is licensed under the AL 2.0, see a
 
 ==
 
-For ConnId (http://tirasa.github.io/ConnId/):
+For ConnId (http://connid.tirasa.net/):
 This is licensed under CDDL 1.0.
 
 COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0

Modified: syncope/trunk/src/site/xdoc/architecture.xml
URL: http://svn.apache.org/viewvc/syncope/trunk/src/site/xdoc/architecture.xml?rev=1614338&r1=1614337&r2=1614338&view=diff
==============================================================================
--- syncope/trunk/src/site/xdoc/architecture.xml (original)
+++ syncope/trunk/src/site/xdoc/architecture.xml Tue Jul 29 13:17:28 2014
@@ -104,7 +104,7 @@ under the License.
       <subsection name="Connectors layer">
         <p>
           The Connector layer is implemented with 
-          <a href="http://tirasa.github.com/ConnId/" target="_blank">ConnId</a>;
ConnId is designed to separate the 
+          <a href="http://connid.tirasa.net" target="_blank">ConnId</a>; ConnId
is designed to separate the 
           implementation of an application from the dependencies of the system that the application
is attempting to 
           connect to.
         </p>

Modified: syncope/trunk/src/site/xdoc/features.xml
URL: http://svn.apache.org/viewvc/syncope/trunk/src/site/xdoc/features.xml?rev=1614338&r1=1614337&r2=1614338&view=diff
==============================================================================
--- syncope/trunk/src/site/xdoc/features.xml (original)
+++ syncope/trunk/src/site/xdoc/features.xml Tue Jul 29 13:17:28 2014
@@ -51,7 +51,7 @@ under the License.
     <section name="Domain Integration">
       <ul>
         <li>Highly configurable communication with external resources powered by  
         
-          <a href="http://tirasa.github.com/ConnId/" target="_blank">ConnId</a>
+          <a href="http://connid.tirasa.net" target="_blank">ConnId</a>
         </li>
         <li>Identity propagation towards external resources</li>
         <li>Reconciliation / Bulk load from external resources</li>



Mime
View raw message