syncope-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ilgro...@apache.org
Subject svn commit: r1534986 [6/6] - in /syncope/trunk: ./ common/ common/src/main/java/org/apache/syncope/common/ common/src/main/java/org/apache/syncope/common/mod/ common/src/main/java/org/apache/syncope/common/report/ common/src/main/java/org/apache/syncop...
Date Wed, 23 Oct 2013 11:16:24 GMT
Propchange: syncope/trunk/core/src/main/webapp/js/jquery.js
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: syncope/trunk/core/src/main/webapp/js/jquery.js
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: syncope/trunk/core/src/main/webapp/js/jquery.js
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/ReportTestITCase.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/ReportTestITCase.java?rev=1534986&r1=1534985&r2=1534986&view=diff
==============================================================================
--- syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/ReportTestITCase.java (original)
+++ syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/ReportTestITCase.java Wed
Oct 23 11:16:23 2013
@@ -33,7 +33,7 @@ import org.apache.http.HttpStatus;
 import org.apache.syncope.common.SyncopeConstants;
 import org.apache.syncope.common.report.UserReportletConf;
 import org.apache.syncope.common.services.ReportService;
-import org.apache.syncope.common.services.ReportletConfClasses;
+import org.apache.syncope.common.types.ReportletConfClasses;
 import org.apache.syncope.common.to.ReportExecTO;
 import org.apache.syncope.common.to.ReportTO;
 import org.apache.syncope.common.types.ReportExecExportFormat;

Modified: syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/ResourceTestITCase.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/ResourceTestITCase.java?rev=1534986&r1=1534985&r2=1534986&view=diff
==============================================================================
--- syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/ResourceTestITCase.java
(original)
+++ syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/ResourceTestITCase.java
Wed Oct 23 11:16:23 2013
@@ -162,7 +162,6 @@ public class ResourceTestITCase extends 
         assertNotNull(actual);
 
         // check the existence
-
         actual = resourceService.read(resourceName);
         assertNotNull(actual);
     }
@@ -291,7 +290,6 @@ public class ResourceTestITCase extends 
         assertNotNull(actual);
 
         // check the existence
-
         actual = resourceService.read(resourceName);
         assertNotNull(actual);
         assertNotNull(actual.getPasswordPolicy());
@@ -412,10 +410,12 @@ public class ResourceTestITCase extends 
     @Test
     public void listByType() {
         List<ResourceTO> actuals = resourceService.list(105L);
-
         assertNotNull(actuals);
-        assertEquals(1, actuals.size());
-        assertNotNull(actuals.get(0));
+
+        for (ResourceTO resourceTO : actuals) {
+            assertNotNull(resourceTO);
+            assertEquals(105L, resourceTO.getConnectorId().longValue());
+        }
     }
 
     @Test

Modified: syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/WorkflowTestITCase.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/WorkflowTestITCase.java?rev=1534986&r1=1534985&r2=1534986&view=diff
==============================================================================
--- syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/WorkflowTestITCase.java
(original)
+++ syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/WorkflowTestITCase.java
Wed Oct 23 11:16:23 2013
@@ -21,8 +21,7 @@ package org.apache.syncope.core.rest;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 
-import org.apache.syncope.common.services.WorkflowTasks;
-
+import org.apache.syncope.common.types.WorkflowTasks;
 import org.apache.syncope.common.to.WorkflowDefinitionTO;
 import org.apache.syncope.common.types.AttributableType;
 import org.apache.syncope.core.workflow.ActivitiDetector;

Modified: syncope/trunk/legal_ext/LICENSE
URL: http://svn.apache.org/viewvc/syncope/trunk/legal_ext/LICENSE?rev=1534986&r1=1534985&r2=1534986&view=diff
==============================================================================
--- syncope/trunk/legal_ext/LICENSE (original)
+++ syncope/trunk/legal_ext/LICENSE Wed Oct 23 11:16:23 2013
@@ -765,6 +765,7 @@ This is licensed under the AL 2.0, see a
 
 For jQuery (http://jquery.com/):
 
+jquery.js
 jquery-ui.js
 jquery-ui.css
 
@@ -781,6 +782,15 @@ This is licensed under the terms of the 
 
 ==
 
+For highlight.js (http://highlightjs.org/):
+
+highlight.pack.js
+highlight.css
+
+This is licensed under the BSD license, see above.
+
+==
+
 For javax.ws.rs-api (http://www.oracle.com/):
 This is licensed under CDDL 1.0, see above.
 

Modified: syncope/trunk/legal_ext/NOTICE
URL: http://svn.apache.org/viewvc/syncope/trunk/legal_ext/NOTICE?rev=1534986&r1=1534985&r2=1534986&view=diff
==============================================================================
--- syncope/trunk/legal_ext/NOTICE (original)
+++ syncope/trunk/legal_ext/NOTICE Wed Oct 23 11:16:23 2013
@@ -116,6 +116,11 @@ Copyright (C) 2012 by Marijn Haverbeke <
 
 ==
 
+This product includes the Javascript syntax highlighter.
+Copyright (c) 2006, Ivan Sagalaev
+
+==
+
 This product includes software developed by Oracle Corporation.
 Copyright (C) 2012 http://www.oracle.com/
 All rights reserved.

Modified: syncope/trunk/pom.xml
URL: http://svn.apache.org/viewvc/syncope/trunk/pom.xml?rev=1534986&r1=1534985&r2=1534986&view=diff
==============================================================================
--- syncope/trunk/pom.xml (original)
+++ syncope/trunk/pom.xml Wed Oct 23 11:16:23 2013
@@ -309,9 +309,9 @@ under the License.
         
     <hc.client.version>4.2.6</hc.client.version>
 
-    <activiti.version>5.13</activiti.version>
+    <activiti.version>5.14</activiti.version>
 
-    <cxf.version>2.7.7</cxf.version>	
+    <cxf.version>2.7.8-SNAPSHOT</cxf.version>	
     <spring.version>3.2.4.RELEASE</spring.version>
     <spring-security.version>3.1.4.RELEASE</spring-security.version>
     <jackson.version>2.2.3</jackson.version>



Mime
View raw message