nuxeo-jsf: NXP-8758: searchDocument parameter should be taken into account when merging two content views

Description:
    NXP-8758: searchDocument parameter should be taken into account when merging two content views

Repository: nuxeo-jsf
Branch: master
Author: Mariana Cedica <mcedica <at> nuxeo.com>
Date: 2012-02-01T01:33:42-08:00
URL: https://github.com/nuxeo/nuxeo-jsf/commit/1595b43e800e2485dad0d4eb589282242808b380
JIRA: https://jira.nuxeo.com/browse/NXP-8758
Files:
M nuxeo-platform-contentview-jsf/src/main/java/org/nuxeo/ecm/platform/contentview/jsf/ContentViewServiceImpl.java

diff --git
a/nuxeo-platform-contentview-jsf/src/main/java/org/nuxeo/ecm/platform/contentview/jsf/ContentViewServiceImpl.java b/nuxeo-platform-contentview-jsf/src/main/java/org/nuxeo/ecm/platform/contentview/jsf/ContentViewServiceImpl.java
index 9b4c349..fafec37 100644
--- a/nuxeo-platform-contentview-jsf/src/main/java/org/nuxeo/ecm/platform/contentview/jsf/ContentViewServiceImpl.java
+++ b/nuxeo-platform-contentview-jsf/src/main/java/org/nuxeo/ecm/platform/contentview/jsf/ContentViewServiceImpl.java
@@ -446,6 +446,11 @@ protected ContentViewDescriptor mergeContentViews(
             oldDesc.showFilterForm = showFilterForm;
         }

+        String searchDocument = newDesc.getSearchDocumentBinding();
+        if (searchDocument != null) {
+            oldDesc.searchDocument = searchDocument;
+        }
+
         return oldDesc;
     }

nuxeo-jsf: NXP-8758: searchDocument parameter should be taken into account when merging two content views

Description:
    NXP-8758: searchDocument parameter should be taken into account when merging two content views

Repository: nuxeo-jsf
Branch: 5.5.0
Author: Mariana Cedica <mcedica <at> nuxeo.com>
Date: 2012-02-01T01:37:30-08:00
URL: https://github.com/nuxeo/nuxeo-jsf/commit/3b8ed7c52386c932de02f1bc8666efa7bd0e4a8f
JIRA: https://jira.nuxeo.com/browse/NXP-8758
Files:
M nuxeo-platform-contentview-jsf/src/main/java/org/nuxeo/ecm/platform/contentview/jsf/ContentViewServiceImpl.java

diff --git
a/nuxeo-platform-contentview-jsf/src/main/java/org/nuxeo/ecm/platform/contentview/jsf/ContentViewServiceImpl.java b/nuxeo-platform-contentview-jsf/src/main/java/org/nuxeo/ecm/platform/contentview/jsf/ContentViewServiceImpl.java
index 9b4c349..fafec37 100644
--- a/nuxeo-platform-contentview-jsf/src/main/java/org/nuxeo/ecm/platform/contentview/jsf/ContentViewServiceImpl.java
+++ b/nuxeo-platform-contentview-jsf/src/main/java/org/nuxeo/ecm/platform/contentview/jsf/ContentViewServiceImpl.java
@@ -446,6 +446,11 @@ protected ContentViewDescriptor mergeContentViews(
             oldDesc.showFilterForm = showFilterForm;
         }

+        String searchDocument = newDesc.getSearchDocumentBinding();
+        if (searchDocument != null) {
+            oldDesc.searchDocument = searchDocument;
+        }
+
         return oldDesc;
     }

nuxeo-web-mobile: NXP-8565: Add Post Comment

Description:
    NXP-8565: Add Post Comment

Repository: nuxeo-web-mobile
Branch: master
Author: Benjamin JALON <bjalon <at> nuxeo.com>
Date: 2012-02-01T02:21:29-08:00
URL: https://github.com/nuxeo/nuxeo-web-mobile/commit/54def0519ff12838a5e1d8d7bbbd0b8be2866e69
JIRA: https://jira.nuxeo.com/browse/NXP-8565
Files:
M nuxeo-web-mobile/src/main/java/org/nuxeo/ecm/mobile/webengine/document/CommentAdapter.java
M nuxeo-web-mobile/src/main/resources/skin/views/Comment/index.ftl

diff --git
a/nuxeo-web-mobile/src/main/java/org/nuxeo/ecm/mobile/webengine/document/CommentAdapter.java b/nuxeo-web-mobile/src/main/java/org/nuxeo/ecm/mobile/webengine/document/CommentAdapter.java
index f976108..b9fc4ed 100644
--- a/nuxeo-web-mobile/src/main/java/org/nuxeo/ecm/mobile/webengine/document/CommentAdapter.java
+++ b/nuxeo-web-mobile/src/main/java/org/nuxeo/ecm/mobile/webengine/document/CommentAdapter.java
@@ -16,43 +16,110 @@
  */
 package org.nuxeo.ecm.mobile.webengine.document;

-import java.util.GregorianCalendar;
+import java.util.Calendar;
 import java.util.List;

 import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.QueryParam;

nuxeo-distribution: NXP-8759: add nuxeo-platform-audit-ws to CAP distribution

Description:
    NXP-8759: add nuxeo-platform-audit-ws to CAP distribution

Repository: nuxeo-distribution
Branch: master
Author: Thomas Roger <troger <at> nuxeo.com>
Date: 2012-02-01T02:40:56-08:00
URL: https://github.com/nuxeo/nuxeo-distribution/commit/25eaea3fe15186e342122181a3cddfd5e73fdb6f
JIRA: https://jira.nuxeo.com/browse/NXP-8759
Files:
M nuxeo-distribution-cap/pom.xml

diff --git a/nuxeo-distribution-cap/pom.xml b/nuxeo-distribution-cap/pom.xml
index 0c237e1..7cab2e1 100644
--- a/nuxeo-distribution-cap/pom.xml
+++ b/nuxeo-distribution-cap/pom.xml
@@ -41,6 +41,10 @@
     </dependency>
     <dependency>
       <groupId>org.nuxeo.ecm.platform</groupId>
+      <artifactId>nuxeo-platform-audit-ws</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.nuxeo.ecm.platform</groupId>
       <artifactId>nuxeo-platform-placeful-api</artifactId>
     </dependency>
     <dependency>

nuxeo-platform-document-routing: NXP-8068: prepare branch for merging, removing already existing operation in automation 5.6-SNAPSHOT

Description:
    NXP-8068: prepare branch for merging, removing already existing operation in automation 5.6-SNAPSHOT

Repository: nuxeo-platform-document-routing
Branch: NXP-8068-integrate-routing-in-dm
Author: Mariana Cedica <mcedica <at> nuxeo.com>
Date: 2012-02-01T02:55:39-08:00
URL: https://github.com/nuxeo/nuxeo-platform-document-routing/commit/c702b462d458f35a9804886488be92f3a7f241f5
JIRA: https://jira.nuxeo.com/browse/NXP-8068
Files:
D nuxeo-platform-document-routing-dm/src/main/java/org/nuxeo/ecm/automation/core/operations/execution/RunInNewTransaction.java
D nuxeo-platform-document-routing-dm/src/main/resources/OSGI-INF/dm-operations-contrib.xml
M nuxeo-platform-document-routing-dm/src/main/resources/META-INF/MANIFEST.MF

diff --git
a/nuxeo-platform-document-routing-dm/src/main/java/org/nuxeo/ecm/automation/core/operations/execution/RunInNewTransaction.java b/nuxeo-platform-document-routing-dm/src/main/java/org/nuxeo/ecm/automation/core/operations/execution/RunInNewTransaction.java
deleted file mode 100644
index 2b14df2..0000000
--- a/nuxeo-platform-document-routing-dm/src/main/java/org/nuxeo/ecm/automation/core/operations/execution/RunInNewTransaction.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * Copyright (c) 2006-2011 Nuxeo SA (http://nuxeo.com/) and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:

desktop-integration/nuxeo-liveedit-ff-protocolhandler: LIVED-223...

Description:
	LIVED-223 Making ffph 0.4.x version compatible with firefox from 3.5.* to 4 (not included)

Branch: 0.4
Changeset: 14:38b519605c8c
User: Sun Seng David TAN <stan@...>
Date: Wed Feb 01 11:29:22 2012 +0100
URL: http://hg.nuxeo.org/desktop-integration/nuxeo-liveedit-ff-protocolhandler/rev/38b519605c8c
JIRA: https://jira.nuxeo.com/browse/LIVED-223

diffstat:

 install.rdf.template |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (17 lines):

diff --git a/install.rdf.template b/install.rdf.template
--- a/install.rdf.template
+++ b/install.rdf.template
@@ -22,11 +22,11 @@
 	<em:targetApplication>
 		<Description>
 			<em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
-			<em:minVersion>5.0</em:minVersion>
+			<em:minVersion>3.5.*</em:minVersion>
 			<!--
 			<em:maxVersion>3.0.*</em:maxVersion>
 			-->
-			<em:maxVersion>7.*</em:maxVersion>

desktop-integration/nuxeo-liveedit-ff-protocolhandler: Added tag...

Description:
	Added tag release-ffph-0.4.13 for changeset 371d9253d303

Branch: 0.4
Changeset: 16:af549bb93be2
User: Sun Seng David TAN <stan@...>
Date: Wed Feb 01 12:22:26 2012 +0100
URL: http://hg.nuxeo.org/desktop-integration/nuxeo-liveedit-ff-protocolhandler/rev/af549bb93be2

diffstat:

 .hgtags |  1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diffs (6 lines):

diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -1,1 +1,2 @@
 7bbf0019a1a71b577342b33f8b369679a70195ea release-ffph-0.4.12
+371d9253d3035d671b5ae52c66f8b4eb9c5abe4f release-ffph-0.4.13

desktop-integration/nuxeo-liveedit-ff-protocolhandler: release-f...

Description:
	release-ffph-0.4.13

Branch: 0.4
Changeset: 15:371d9253d303
User: Sun Seng David TAN <stan@...>
Date: Wed Feb 01 11:31:01 2012 +0100
URL: http://hg.nuxeo.org/desktop-integration/nuxeo-liveedit-ff-protocolhandler/rev/371d9253d303

diffstat:

 make_xpi.sh |  2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diffs (12 lines):

diff --git a/make_xpi.sh b/make_xpi.sh
--- a/make_xpi.sh
+++ b/make_xpi.sh
@@ -1,7 +1,7 @@
 #!/bin/sh

 ./make_jar.sh
-version=0.4.12
+version=0.4.13
 xpiname=nuxeo-liveedit-ff-protocolhandler-$version.xpi
 parname=`pwd`

nuxeo-web-mobile: NXP-8565: Add Profile binding/view

Description:
    NXP-8565: Add Profile binding/view

Repository: nuxeo-web-mobile
Branch: master
Author: Benjamin JALON <bjalon <at> nuxeo.com>
Date: 2012-02-01T05:03:34-08:00
URL: https://github.com/nuxeo/nuxeo-web-mobile/commit/56a359ad4216cf255652c229ca990d15878de9fa
JIRA: https://jira.nuxeo.com/browse/NXP-8565
Files:
A nuxeo-web-mobile/src/main/java/org/nuxeo/ecm/mobile/webengine/Profile.java
A nuxeo-web-mobile/src/main/resources/skin/views/Profile/index.ftl
M nuxeo-web-mobile/pom.xml
M nuxeo-web-mobile/src/main/java/org/nuxeo/ecm/mobile/webengine/MobileApplication.java
M pom.xml

diff --git a/nuxeo-web-mobile/pom.xml b/nuxeo-web-mobile/pom.xml
index 74d3d49..f1602a7 100644
--- a/nuxeo-web-mobile/pom.xml
+++ b/nuxeo-web-mobile/pom.xml
@@ -14,6 +14,10 @@
   <dependencies>
     <dependency>
       <groupId>org.nuxeo.ecm.platform</groupId>
+      <artifactId>nuxeo-user-profile</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.nuxeo.ecm.platform</groupId>
       <artifactId>nuxeo-platform-jbpm-api</artifactId>
     </dependency>

nuxeo-web-mobile: NXP-8565: Rename method

Description:
    NXP-8565: Rename method

Repository: nuxeo-web-mobile
Branch: master
Author: Benjamin JALON <bjalon <at> nuxeo.com>
Date: 2012-02-01T03:59:57-08:00
URL: https://github.com/nuxeo/nuxeo-web-mobile/commit/addc44cdbf1352874a289f4520aab01c1a987fbd
JIRA: https://jira.nuxeo.com/browse/NXP-8565
Files:
M nuxeo-web-mobile/src/main/java/org/nuxeo/ecm/mobile/webengine/Search.java

diff --git a/nuxeo-web-mobile/src/main/java/org/nuxeo/ecm/mobile/webengine/Search.java b/nuxeo-web-mobile/src/main/java/org/nuxeo/ecm/mobile/webengine/Search.java
index 7b7b4fe..d18eb4c 100644
--- a/nuxeo-web-mobile/src/main/java/org/nuxeo/ecm/mobile/webengine/Search.java
+++ b/nuxeo-web-mobile/src/main/java/org/nuxeo/ecm/mobile/webengine/Search.java
@@ -43,7 +43,7 @@

 
     @GET
-    public Object doLogin(@QueryParam("q") String queryString) {
+    public Object doGet(@QueryParam("q") String queryString) {
         CoreSession session = ctx.getCoreSession();
         DocumentModelList docs;
         try {

_______________________________________________
ECM-checkins mailing list