svn commit: r1470974 - in /syncope/trunk: ./ console/src/main/java/org/apache/syncope/console/pages/panels/ResourceMappingPanel.java src/site/xdoc/release-process.xml

[fm...@apache.org]

Author: fmartelli
Date: Tue Apr 23 14:11:27 2013
New Revision: 1470974

URL: http://svn.apache.org/r1470974
Log:
merged from 1.1.X

Modified:
    syncope/trunk/   (props changed)
    syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/ResourceMappingPanel.java
    syncope/trunk/src/site/xdoc/release-process.xml

Propchange: syncope/trunk/
------------------------------------------------------------------------------
  Merged /syncope/branches/1_1_X:r1469883-1470973

Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/ResourceMappingPanel.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/ResourceMappingPanel.java?rev=1470974&r1=1470973&r2=1470974&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/ResourceMappingPanel.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/ResourceMappingPanel.java Tue Apr 23 14:11:27 2013
@@ -366,7 +366,7 @@ public class ResourceMappingPanel extend
                 final AjaxTextFieldPanel mandatory = new AjaxTextFieldPanel("mandatoryCondition",
                         new ResourceModel("mandatoryCondition", "mandatoryCondition").getObject(),
                         new PropertyModel<String>(mapItem, "mandatoryCondition"));
-                mandatory.setChoices(Arrays.asList(new String[] {"true", "false"}));
+                mandatory.setChoices(Arrays.asList(new String[]{"true", "false"}));
                 mandatory.setStyleSheet(SHORT_FIELD_STYLE);
                 item.add(mandatory);
 
@@ -525,7 +525,8 @@ public class ResourceMappingPanel extend
 
         List<ConnIdObjectClassTO> objectClasses = connRestClient.getSupportedObjectClasses(connInstanceTO);
 
-        boolean enabled = (AttributableType.USER == attrType && objectClasses.contains(ConnIdObjectClassTO.ACCOUNT))
+        boolean enabled = objectClasses.isEmpty()
+                || (AttributableType.USER == attrType && objectClasses.contains(ConnIdObjectClassTO.ACCOUNT))
                 || (AttributableType.ROLE == attrType && objectClasses.contains(ConnIdObjectClassTO.GROUP));
         this.mappingContainer.setEnabled(enabled);
         this.mappingContainer.setVisible(enabled);

Modified: syncope/trunk/src/site/xdoc/release-process.xml
URL: http://svn.apache.org/viewvc/syncope/trunk/src/site/xdoc/release-process.xml?rev=1470974&r1=1470973&r2=1470974&view=diff
==============================================================================
--- syncope/trunk/src/site/xdoc/release-process.xml (original)
+++ syncope/trunk/src/site/xdoc/release-process.xml Tue Apr 23 14:11:27 2013
@@ -523,7 +523,7 @@ svn commit -m "Promoting the voted relea
 svn co https://dist.apache.org/repos/dist/release/syncope syncope-dist
 cd syncope-dist
 wget -e robots=off -nH --cut-dirs=7 -np --no-check-certificate -m -A *.zip*  -R .asc.sha1,.asc.md5 \
-https://repository.apache.org/content/repositories/releases/org/apache/syncope/syncope/&lt;version&gt;/
+https://repository.apache.org/content/repositories/releases/org/apache/syncope/syncope-root/&lt;version&gt;/
 svn add &lt;version&gt;
 svn rm &lt;any older release artifact (if present)&gt;
 svn commit -m "Promoting the voted release artifacts and cleaning up older releases"