Antoine Taillefer | 9 Feb 20:31

nuxeo-diff: NXP-8596: First step: add DiffDisplayService to allow diffDisplay contributions

Description:
    NXP-8596: First step: add DiffDisplayService to allow diffDisplay contributions

Repository: nuxeo-diff
Branch: master
Author: Antoine Taillefer <ataillefer <at> nuxeo.com>
Date: 2012-02-09T11:31:18-08:00
URL: https://github.com/nuxeo/nuxeo-diff/commit/3af23941d1404a44eb8d140d3dcea138396099a3
JIRA: https://jira.nuxeo.com/browse/NXP-8596
Files:
A src/main/java/org/nuxeo/ecm/diff/model/DiffBlockDefinition.java
A src/main/java/org/nuxeo/ecm/diff/model/DiffDisplayBlock.java
A src/main/java/org/nuxeo/ecm/diff/model/DiffDisplayField.java
A src/main/java/org/nuxeo/ecm/diff/model/DiffFieldDefinition.java
A src/main/java/org/nuxeo/ecm/diff/model/impl/ComplexDiffDisplayField.java
A src/main/java/org/nuxeo/ecm/diff/model/impl/DiffBlockDefinitionImpl.java
A src/main/java/org/nuxeo/ecm/diff/model/impl/DiffDisplayBlockImpl.java
A src/main/java/org/nuxeo/ecm/diff/model/impl/DiffFieldDefinitionImpl.java
A src/main/java/org/nuxeo/ecm/diff/model/impl/ListDiffDisplayField.java
A src/main/java/org/nuxeo/ecm/diff/model/impl/SimpleDiffDisplayField.java
A src/main/java/org/nuxeo/ecm/diff/service/DiffDisplayService.java
A src/main/java/org/nuxeo/ecm/diff/service/impl/DiffBlockDescriptor.java
A src/main/java/org/nuxeo/ecm/diff/service/impl/DiffDisplayDescriptor.java
A src/main/java/org/nuxeo/ecm/diff/service/impl/DiffDisplayServiceImpl.java
A src/main/java/org/nuxeo/ecm/diff/service/impl/DiffFieldDescriptor.java
A src/main/java/org/nuxeo/ecm/diff/web/DiffActionsBean.java
A src/main/resources/OSGI-INF/diff-actions-contrib.xml
A src/main/resources/OSGI-INF/diff-display-service.xml
A src/main/resources/OSGI-INF/diff-widgets-contrib.xml
A src/test/java/org/nuxeo/ecm/diff/service/TestDiffDisplayService.java
(Continue reading)

Antoine Taillefer | 9 Feb 19:35

nuxeo-services: NXP-8840: add constructor taking a widget name and a category

Description:
    NXP-8840: add constructor taking a widget name and a category

Repository: nuxeo-services
Branch: master
Author: Antoine Taillefer <ataillefer <at> nuxeo.com>
Date: 2012-02-09T10:32:55-08:00
URL: https://github.com/nuxeo/nuxeo-services/commit/f2c76b2253c30417db22644827e4b3fa0d25b7bc
JIRA: https://jira.nuxeo.com/browse/NXP-8840
Files:
M nuxeo-platform-forms-layout-api/src/main/java/org/nuxeo/ecm/platform/forms/layout/api/impl/LayoutRowDefinitionImpl.java

diff --git
a/nuxeo-platform-forms-layout-api/src/main/java/org/nuxeo/ecm/platform/forms/layout/api/impl/LayoutRowDefinitionImpl.java b/nuxeo-platform-forms-layout-api/src/main/java/org/nuxeo/ecm/platform/forms/layout/api/impl/LayoutRowDefinitionImpl.java
index 959a662..2cceafc 100644
--- a/nuxeo-platform-forms-layout-api/src/main/java/org/nuxeo/ecm/platform/forms/layout/api/impl/LayoutRowDefinitionImpl.java
+++ b/nuxeo-platform-forms-layout-api/src/main/java/org/nuxeo/ecm/platform/forms/layout/api/impl/LayoutRowDefinitionImpl.java
@@ -28,8 +28,9 @@
  * Default implementation for a layout row definition.
  * <p>
  * Useful to compute rows independently from the layout service.
- *
+ * 
  * @author Anahide Tchertchian
+ * @author Antoine Taillefer
  * @since 5.4
  */
 public class LayoutRowDefinitionImpl implements LayoutRowDefinition {
@@ -51,13 +52,23 @@ protected LayoutRowDefinitionImpl() {
         super();
(Continue reading)

Olivier Grisel | 9 Feb 17:50

nuxeo-platform-replication: mv .hgignore .gitignore

Description:
    mv .hgignore .gitignore

Repository: nuxeo-platform-replication
Branch: 5.4.2
Author: Olivier Grisel <olivier.grisel <at> ensta.org>
Date: 2012-02-09T08:50:00-08:00
URL: https://github.com/nuxeo/nuxeo-platform-replication/commit/c4739344d11a9da6b4479511892fcd9d54f06e78

Files:
A .gitignore
D .hgignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..4ecb4e8
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,8 @@
+.classpath
+.metadata
+.project
+.settings
+bin
+target
+*~
+*.orig
diff --git a/.hgignore b/.hgignore
deleted file mode 100644
index be60186..0000000
(Continue reading)

Florent Guillaume | 9 Feb 16:46

nuxeo-features: NXP-8828: fix unit tests

Description:
    NXP-8828: fix unit tests

Repository: nuxeo-features
Branch: 5.5.0
Author: Florent Guillaume <fg <at> nuxeo.com>
Date: 2012-02-09T07:46:11-08:00
URL: https://github.com/nuxeo/nuxeo-features/commit/f0468a1ff96340cb98f2d0fa7d4b13969a9b014a
JIRA: https://jira.nuxeo.com/browse/NXP-8828
Files:
M nuxeo-platform-userworkspace/nuxeo-platform-userworkspace-core/src/main/java/org/nuxeo/ecm/platform/userworkspace/core/service/DefaultUserWorkspaceServiceImpl.java

diff --git
a/nuxeo-platform-userworkspace/nuxeo-platform-userworkspace-core/src/main/java/org/nuxeo/ecm/platform/userworkspace/core/service/DefaultUserWorkspaceServiceImpl.java b/nuxeo-platform-userworkspace/nuxeo-platform-userworkspace-core/src/main/java/org/nuxeo/ecm/platform/userworkspace/core/service/DefaultUserWorkspaceServiceImpl.java
index 2a96af9..f36b3ae 100644
--- a/nuxeo-platform-userworkspace/nuxeo-platform-userworkspace-core/src/main/java/org/nuxeo/ecm/platform/userworkspace/core/service/DefaultUserWorkspaceServiceImpl.java
+++ b/nuxeo-platform-userworkspace/nuxeo-platform-userworkspace-core/src/main/java/org/nuxeo/ecm/platform/userworkspace/core/service/DefaultUserWorkspaceServiceImpl.java
@@ -302,6 +302,8 @@ public static String buildUserWorkspaceTitle(String userName) {
             userManager = Framework.getService(UserManager.class);
         } catch (Exception e) {
             log.debug("failed to get user service", e);
+        }
+        if (userManager == null) {
             return userName;
         }

_______________________________________________
ECM-checkins mailing list
(Continue reading)

Florent Guillaume | 9 Feb 16:45

nuxeo-features: NXP-8828: fix unit tests

Description:
    NXP-8828: fix unit tests

Repository: nuxeo-features
Branch: master
Author: Florent Guillaume <fg <at> nuxeo.com>
Date: 2012-02-09T07:45:41-08:00
URL: https://github.com/nuxeo/nuxeo-features/commit/a367068e319f8a68a9f8cf78a53043d4bc4afa34
JIRA: https://jira.nuxeo.com/browse/NXP-8828
Files:
M nuxeo-platform-userworkspace/nuxeo-platform-userworkspace-core/src/main/java/org/nuxeo/ecm/platform/userworkspace/core/service/DefaultUserWorkspaceServiceImpl.java

diff --git
a/nuxeo-platform-userworkspace/nuxeo-platform-userworkspace-core/src/main/java/org/nuxeo/ecm/platform/userworkspace/core/service/DefaultUserWorkspaceServiceImpl.java b/nuxeo-platform-userworkspace/nuxeo-platform-userworkspace-core/src/main/java/org/nuxeo/ecm/platform/userworkspace/core/service/DefaultUserWorkspaceServiceImpl.java
index bd0cf59..149646d 100644
--- a/nuxeo-platform-userworkspace/nuxeo-platform-userworkspace-core/src/main/java/org/nuxeo/ecm/platform/userworkspace/core/service/DefaultUserWorkspaceServiceImpl.java
+++ b/nuxeo-platform-userworkspace/nuxeo-platform-userworkspace-core/src/main/java/org/nuxeo/ecm/platform/userworkspace/core/service/DefaultUserWorkspaceServiceImpl.java
@@ -301,6 +301,8 @@ public static String buildUserWorkspaceTitle(String userName) {
             userManager = Framework.getService(UserManager.class);
         } catch (Exception e) {
             log.debug("failed to get user service", e);
+        }
+        if (userManager == null) {
             return userName;
         }

_______________________________________________
ECM-checkins mailing list
(Continue reading)

Julien Carsique | 9 Feb 16:44

nuxeo-distribution: NXP-8839 - build all by default

Description:
    NXP-8839 - build all by default

Repository: nuxeo-distribution
Branch: master
Author: Julien Carsique <jcarsique <at> nuxeo.com>
Date: 2012-02-09T07:43:35-08:00
URL: https://github.com/nuxeo/nuxeo-distribution/commit/53779819ec77c961f71e76e112c08f8a9c175a4d
JIRA: https://jira.nuxeo.com/browse/NXP-8839
Files:
M nuxeo-distribution-tomcat/src/main/assemble/assembly.xml

diff --git a/nuxeo-distribution-tomcat/src/main/assemble/assembly.xml b/nuxeo-distribution-tomcat/src/main/assemble/assembly.xml
index b9f515b..52d8fb9 100644
--- a/nuxeo-distribution-tomcat/src/main/assemble/assembly.xml
+++ b/nuxeo-distribution-tomcat/src/main/assemble/assembly.xml
@@ -8,18 +8,28 @@

   <target name="init" unless="init.done">
     <tstamp />
-    <condition property="build.core">
+    <condition property="build.all">
       <or>
-        <isset property="maven.profile.nuxeo-coreserver" />
         <isset property="maven.profile.all" />
         <isset property="maven.profile.all-distributions" />
+        <not>
+          <or>
+            <isset property="maven.profile.nuxeo-cap" />
+            <isset property="maven.profile.nuxeo-coreserver" />
(Continue reading)

Thomas Roger | 9 Feb 15:58

nuxeo-dm: NXP-8066: use <nxdir:chainSelectOutput /> in coverage and subjects widgets in view mode

Description:
    NXP-8066: use <nxdir:chainSelectOutput /> in coverage and subjects widgets in view mode

Repository: nuxeo-dm
Branch: 5.4.2
Author: Thomas Roger <troger <at> nuxeo.com>
Date: 2012-02-09T06:58:20-08:00
URL: https://github.com/nuxeo/nuxeo-dm/commit/fbeb5d1cc1022fdf25bea2887953a102ba37bf8f
JIRA: https://jira.nuxeo.com/browse/NXP-8066
Files:
M nuxeo-platform-webapp/src/main/resources/web/nuxeo.war/widgets/coverage_widget.xhtml
M nuxeo-platform-webapp/src/main/resources/web/nuxeo.war/widgets/subjects_widget.xhtml

diff --git
a/nuxeo-platform-webapp/src/main/resources/web/nuxeo.war/widgets/coverage_widget.xhtml b/nuxeo-platform-webapp/src/main/resources/web/nuxeo.war/widgets/coverage_widget.xhtml
index ad2b842..70cfd5e 100644
--- a/nuxeo-platform-webapp/src/main/resources/web/nuxeo.war/widgets/coverage_widget.xhtml
+++ b/nuxeo-platform-webapp/src/main/resources/web/nuxeo.war/widgets/coverage_widget.xhtml
@@ -21,26 +21,18 @@
 </c:if>
 <c:if test="#{widget.mode == 'pdf'}">
   <nxp:html>
-    <nxdir:chainSelect id="#{widget.id}_viewselect" size="2" value="#{field}"
-      displayValueOnly="true">
-      <nxdir:chainSelectListbox index="0" size="0" directoryName="continent"
-        localize="true" id="#{widget.id}_continent" displayObsoleteEntries="true" />
-      <nxdir:chainSelectListbox size="0" directoryName="country" index="1"
-        localize="true" id="#{widget.id}_country" displayObsoleteEntries="true" />
-      <nxdir:chainSelectStatus display="value" id="#{widget.id}_status" />
-    </nxdir:chainSelect>
(Continue reading)

Florent Guillaume | 9 Feb 15:42

nuxeo-dm: NXP-8828: Provide user feedback when login fails due to database issues

Description:
    NXP-8828: Provide user feedback when login fails due to database issues

Repository: nuxeo-dm
Branch: 5.5.0
Author: Florent Guillaume <fg <at> nuxeo.com>
Date: 2012-02-09T06:41:09-08:00
URL: https://github.com/nuxeo/nuxeo-dm/commit/7a4371579695072a02f7c8e638c98ed0ee1c5c8f
JIRA: https://jira.nuxeo.com/browse/NXP-8828
Files:
M nuxeo-platform-webapp/src/main/resources/web/nuxeo.war/login.jsp

diff --git a/nuxeo-platform-webapp/src/main/resources/web/nuxeo.war/login.jsp b/nuxeo-platform-webapp/src/main/resources/web/nuxeo.war/login.jsp
index c482947..2d52f09 100644
--- a/nuxeo-platform-webapp/src/main/resources/web/nuxeo.war/login.jsp
+++ b/nuxeo-platform-webapp/src/main/resources/web/nuxeo.war/login.jsp
@@ -385,7 +385,12 @@ function focusOn(eltId) {
               </tr>
               <tr>
                 <td colspan="2">
-                  <c:if test="${param.loginFailed}">
+                  <c:if test="${param.connectionFailed}">
+                    <div class="errorMessage">
+                      <fmt:message bundle="${messages}" key="label.login.connectionFailed" />
+                    </div>
+                  </c:if>
+                  <c:if test="${param.loginFailed == 'true' and param.connectionFailed != 'true'}">
                     <div class="errorMessage">
                       <fmt:message bundle="${messages}" key="label.login.invalidUsernameOrPassword" />
                     </div>
(Continue reading)

Florent Guillaume | 9 Feb 15:42

nuxeo-features: NXP-8828: Provide user feedback when login fails due to database issues

Description:
    NXP-8828: Provide user feedback when login fails due to database issues

Repository: nuxeo-features
Branch: 5.5.0
Author: Florent Guillaume <fg <at> nuxeo.com>
Date: 2012-02-09T06:41:33-08:00
URL: https://github.com/nuxeo/nuxeo-features/commit/cb921701ce548b334019767798acd4517ed8f21e
JIRA: https://jira.nuxeo.com/browse/NXP-8828
Files:
M nuxeo-platform-lang/src/main/resources/web/nuxeo.war/WEB-INF/classes/messages.properties
M nuxeo-platform-lang/src/main/resources/web/nuxeo.war/WEB-INF/classes/messages_en.properties
M nuxeo-platform-lang/src/main/resources/web/nuxeo.war/WEB-INF/classes/messages_fr.properties

diff --git
a/nuxeo-platform-lang/src/main/resources/web/nuxeo.war/WEB-INF/classes/messages.properties b/nuxeo-platform-lang/src/main/resources/web/nuxeo.war/WEB-INF/classes/messages.properties
index 995fcf2..b7b1656 100644
--- a/nuxeo-platform-lang/src/main/resources/web/nuxeo.war/WEB-INF/classes/messages.properties
+++ b/nuxeo-platform-lang/src/main/resources/web/nuxeo.war/WEB-INF/classes/messages.properties
@@ -1049,6 +1049,7 @@ label.log.comment.assignedToGroup=Assigned to group
 label.log.comment.assignedToUser=Assigned to
 label.loggedAsUser=#{facesContext.externalContext.userPrincipal.name}
 label.login.IEExtension=IE Extension
+label.login.connectionFailed=Failed to connect to authentication database
 label.login.copyright=Copyright \u00A9 2001-2011 Nuxeo and respective authors.
 label.login.documentation=Documentation
 label.login.firefoxExtension=Firefox Extension
diff --git
a/nuxeo-platform-lang/src/main/resources/web/nuxeo.war/WEB-INF/classes/messages_en.properties b/nuxeo-platform-lang/src/main/resources/web/nuxeo.war/WEB-INF/classes/messages_en.properties
index cb81806..3ece49b 100644
(Continue reading)

Florent Guillaume | 9 Feb 15:42

nuxeo-services: NXP-8828: Provide user feedback when login fails due to database issues

Description:
    NXP-8828: Provide user feedback when login fails due to database issues

Repository: nuxeo-services
Branch: 5.5.0
Author: Florent Guillaume <fg <at> nuxeo.com>
Date: 2012-02-09T06:42:03-08:00
URL: https://github.com/nuxeo/nuxeo-services/commit/79d429b3af6e272e2e2f731b2504bbb4e9eab7cc
JIRA: https://jira.nuxeo.com/browse/NXP-8828
Files:
M nuxeo-platform-directory/nuxeo-platform-directory-core/src/main/java/org/nuxeo/ecm/directory/DirectoryServiceImpl.java
M nuxeo-platform-directory/nuxeo-platform-directory-ldap/src/main/java/org/nuxeo/ecm/directory/ldap/LDAPDirectory.java
M nuxeo-platform-directory/nuxeo-platform-directory-sql/src/main/java/org/nuxeo/ecm/directory/sql/SQLDirectory.java
M nuxeo-platform-directory/nuxeo-platform-directory-sql/src/main/java/org/nuxeo/ecm/directory/sql/SQLDirectoryProxy.java
M nuxeo-platform-directory/nuxeo-platform-directory-sql/src/main/java/org/nuxeo/ecm/directory/sql/SQLSession.java
M nuxeo-platform-login/src/main/java/org/nuxeo/ecm/platform/login/NuxeoLoginModule.java
M nuxeo-platform-usermanager-core/src/main/java/org/nuxeo/ecm/platform/usermanager/UserManagerImpl.java
M nuxeo-platform-usermanager-core/src/main/java/org/nuxeo/ecm/platform/usermanager/UserService.java
M nuxeo-platform-web-common/src/main/java/org/nuxeo/ecm/platform/ui/web/auth/NXAuthConstants.java
M nuxeo-platform-web-common/src/main/java/org/nuxeo/ecm/platform/ui/web/auth/NuxeoAuthenticationFilter.java
M nuxeo-platform-web-common/src/main/java/org/nuxeo/ecm/platform/ui/web/auth/plugins/AnonymousAuthenticator.java
M nuxeo-platform-web-common/src/main/java/org/nuxeo/ecm/platform/ui/web/auth/plugins/FormAuthenticator.java

diff --git
a/nuxeo-platform-directory/nuxeo-platform-directory-core/src/main/java/org/nuxeo/ecm/directory/DirectoryServiceImpl.java b/nuxeo-platform-directory/nuxeo-platform-directory-core/src/main/java/org/nuxeo/ecm/directory/DirectoryServiceImpl.java
index dd37117..931ab15 100644
--- a/nuxeo-platform-directory/nuxeo-platform-directory-core/src/main/java/org/nuxeo/ecm/directory/DirectoryServiceImpl.java
+++ b/nuxeo-platform-directory/nuxeo-platform-directory-core/src/main/java/org/nuxeo/ecm/directory/DirectoryServiceImpl.java
@@ -27,6 +27,7 @@

(Continue reading)

Florent Guillaume | 9 Feb 15:30

nuxeo-dm: NXP-8828: Provide user feedback when login fails due to database issues

Description:
    NXP-8828: Provide user feedback when login fails due to database issues

Repository: nuxeo-dm
Branch: master
Author: Florent Guillaume <fg <at> nuxeo.com>
Date: 2012-02-09T06:30:33-08:00
URL: https://github.com/nuxeo/nuxeo-dm/commit/a0285e892814812cb924213fd1dead8b6568fdcf
JIRA: https://jira.nuxeo.com/browse/NXP-8828
Files:
M nuxeo-platform-webapp/src/main/resources/web/nuxeo.war/login.jsp

diff --git a/nuxeo-platform-webapp/src/main/resources/web/nuxeo.war/login.jsp b/nuxeo-platform-webapp/src/main/resources/web/nuxeo.war/login.jsp
index 11a3920..d277c31 100644
--- a/nuxeo-platform-webapp/src/main/resources/web/nuxeo.war/login.jsp
+++ b/nuxeo-platform-webapp/src/main/resources/web/nuxeo.war/login.jsp
@@ -380,7 +380,12 @@ body {
               </tr>
               <tr>
                 <td colspan="2">
-                  <c:if test="${param.loginFailed}">
+                  <c:if test="${param.connectionFailed}">
+                    <div class="errorMessage">
+                      <fmt:message bundle="${messages}" key="label.login.connectionFailed" />
+                    </div>
+                  </c:if>
+                  <c:if test="${param.loginFailed == 'true' and param.connectionFailed != 'true'}">
                     <div class="errorMessage">
                       <fmt:message bundle="${messages}" key="label.login.invalidUsernameOrPassword" />
                     </div>
(Continue reading)


Gmane