syncope-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ilgro...@apache.org
Subject svn commit: r1468809 - in /syncope/trunk: ./ .travis.yml core/src/main/java/org/apache/syncope/core/propagation/impl/PropagationManager.java core/src/main/java/org/apache/syncope/core/util/AttributableUtil.java
Date Wed, 17 Apr 2013 09:18:34 GMT
Author: ilgrosso
Date: Wed Apr 17 09:18:34 2013
New Revision: 1468809

URL: http://svn.apache.org/r1468809
Log:
Merge from 1_1_X

Modified:
    syncope/trunk/   (props changed)
    syncope/trunk/.travis.yml
    syncope/trunk/core/src/main/java/org/apache/syncope/core/propagation/impl/PropagationManager.java
    syncope/trunk/core/src/main/java/org/apache/syncope/core/util/AttributableUtil.java

Propchange: syncope/trunk/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Apr 17 09:18:34 2013
@@ -1,9 +1,5 @@
 target
 .subversion
-.pom.xml.swp
-.CHANGES.swp
-.vi.swp
 .settings
 .project
-.profile.swp
 .travis.yml.swp

Propchange: syncope/trunk/
------------------------------------------------------------------------------
  Merged /syncope/branches/1_0_X:r1468798-1468806
  Merged /syncope/branches/1_1_X:r1468800-1468808

Modified: syncope/trunk/.travis.yml
URL: http://svn.apache.org/viewvc/syncope/trunk/.travis.yml?rev=1468809&r1=1468808&r2=1468809&view=diff
==============================================================================
--- syncope/trunk/.travis.yml (original)
+++ syncope/trunk/.travis.yml Wed Apr 17 09:18:34 2013
@@ -13,12 +13,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-script: mvn clean verify
 language: java
 jdk:
   - openjdk6
+# default install is mvn install --quiet -DskipTests=true
+install: mvn --show-version --errors -P skipTests
+#invoker.streamLogs: we cannot access to log files through Travis web ui, so display everything
in the console
+script: mvn --show-version --errors clean install -Dinvoker.streamLogs=true
 branches:
-  except:
+  only:
     - trunk
     - 1_1_X
     - 1_0_X

Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/propagation/impl/PropagationManager.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/propagation/impl/PropagationManager.java?rev=1468809&r1=1468808&r2=1468809&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/propagation/impl/PropagationManager.java
(original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/propagation/impl/PropagationManager.java
Wed Apr 17 09:18:34 2013
@@ -549,6 +549,9 @@ public class PropagationManager {
                 final ExternalResource resource = resourceDAO.find(resourceName);
                 if (resource == null) {
                     LOG.error("Invalid resource name specified: {}, ignoring...", resourceName);
+                } else if (attrUtil.getMappingItems(resource, MappingPurpose.PROPAGATION).isEmpty())
{
+                    LOG.warn("Requesting propagation for {} but no propagation mapping provided
for {}",
+                            attrUtil.getType(), resource);
                 } else {
                     PropagationTask task = new PropagationTask();
                     task.setResource(resource);

Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/util/AttributableUtil.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/util/AttributableUtil.java?rev=1468809&r1=1468808&r2=1468809&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/util/AttributableUtil.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/util/AttributableUtil.java Wed
Apr 17 09:18:34 2013
@@ -202,7 +202,8 @@ public class AttributableUtil {
 
     public <T extends AbstractMappingItem> List<T> getMappingItems(
             final ExternalResource resource, final MappingPurpose purpose) {
-        List<T> items = Collections.EMPTY_LIST;
+
+        List<T> items = Collections.<T>emptyList();
 
         if (resource != null) {
             switch (type) {



Mime
View raw message