gmane.comp.cms.nuxeo.scm
http://blog.gmane.org/gmane.comp.cms.nuxeo.scm
hourly
1
1901-01-01T00:00+00:00
Gmane
http://gmane.org/img/gmane-25t.png
http://gmane.org
-
nuxeo-distribution: NXP-9268: FixinstallAfterRestart issue + addmp-init and mp-purge commands(branch< at >master)
http://comments.gmane.org/gmane.comp.cms.nuxeo.scm/73229
<pre>Message:
NXP-9268: Fix installAfterRestart issue + add mp-init and mp-purge commands
Repository: nuxeo-distribution
Branch: master
Author: Mathieu Guillaume <mg< at >nuxeo.com>
Date: 2012-05-26T01:45:31-07:00
URL: https://github.com/nuxeo/nuxeo-distribution/commit/a89caff426b3d9cf95c2f475dc741c63cf867dcd
JIRA: https://jira.nuxeo.com/browse/NXP-9268
Files:
M nuxeo-distribution-jboss/src/main/assemble/assembly.xml
M nuxeo-distribution-tomcat/src/main/assemble/assembly.xml
M nuxeo-launcher/src/main/java/org/nuxeo/launcher/NuxeoLauncher.java
M nuxeo-launcher/src/main/java/org/nuxeo/launcher/connect/ConnectBroker.java
M nuxeo-startup-wizard/src/main/java/org/nuxeo/wizard/download/PackageDownloader.java
diff --git a/nuxeo-distribution-jboss/src/main/assemble/assembly.xml b/nuxeo-distribution-jboss/src/main/assemble/assembly.xml
index d5d3944..171fb5a 100644
--- a/nuxeo-distribution-jboss/src/main/assemble/assembly.xml
+++ b/nuxeo-distribution-jboss/src/main/assemble/assembly.xml
< at >< at > -140,18 +140,17 < at >< at >
<move file="${maven.project.build.directory}/nuxeo-marketplace-social-collaboration-${nuxeo.distribution.version}.zip"
tofile="${jboss}/setupWizardDownloads/${SCMPMD5}" />
- <echo file="${jboss}/server/default/data/NXRuntime/data/installAfterRestart-DM.log">file:setupWizardDownloads/${VPCBMPMD5}
-file:setupWizardDownloads/${DMMPMD5}
+ <echo file="${jboss}/server/default/data/NXRuntime/data/installAfterRestart-DM.log">init
+install nuxeo-dm
</echo>
- <echo file="${jboss}/server/default/data/NXRuntime/data/installAfterRestart-SC.log">file:setupWizardDownloads/${VPCBMPMD5}
-file:setupWizardDownloads/${DMMPMD5}
-file:setupWizardDownloads/${SCMPMD5}
+ <echo file="${jboss}/server/default/data/NXRuntime/data/installAfterRestart-SC.log">init
+install nuxeo-social-collaboration
</echo>
- <echo file="${jboss}/server/default/data/NXRuntime/data/installAfterRestart-DAM.log">file:setupWizardDownloads/${VPCBMPMD5}
-file:setupWizardDownloads/${DAMMPMD5}
+ <echo file="${jboss}/server/default/data/NXRuntime/data/installAfterRestart-DAM.log">init
+install nuxeo-dam
</echo>
- <echo file="${jboss}/server/default/data/NXRuntime/data/installAfterRestart-CMF.log">file:setupWizardDownloads/${VPCBCMFMPMD5}
-file:setupWizardDownloads/${CMFMPMD5}
+ <echo file="${jboss}/server/default/data/NXRuntime/data/installAfterRestart-CMF.log">init
+install nuxeo-cmf
</echo>
</target>
diff --git a/nuxeo-distribution-tomcat/src/main/assemble/assembly.xml b/nuxeo-distribution-tomcat/src/main/assemble/assembly.xml
index 89f13fe..40d7581 100644
--- a/nuxeo-distribution-tomcat/src/main/assemble/assembly.xml
+++ b/nuxeo-distribution-tomcat/src/main/assemble/assembly.xml
< at >< at > -199,18 +199,17 < at >< at >
<move file="${maven.project.build.directory}/nuxeo-marketplace-social-collaboration-${nuxeo.distribution.version}.zip"
tofile="${tomcat}/setupWizardDownloads/${SCMPMD5}" />
- <echo file="${tomcat}/nxserver/data/installAfterRestart-DM.log">file:setupWizardDownloads/${VPCBMPMD5}
-file:setupWizardDownloads/${DMMPMD5}
+ <echo file="${tomcat}/nxserver/data/installAfterRestart-DM.log">init
+install nuxeo-dm
</echo>
- <echo file="${tomcat}/nxserver/data/installAfterRestart-SC.log">file:setupWizardDownloads/${VPCBMPMD5}
-file:setupWizardDownloads/${DMMPMD5}
-file:setupWizardDownloads/${SCMPMD5}
+ <echo file="${tomcat}/nxserver/data/installAfterRestart-SC.log">init
+install nuxeo-social-collaboration
</echo>
- <echo file="${tomcat}/nxserver/data/installAfterRestart-DAM.log">file:setupWizardDownloads/${VPCBMPMD5}
-file:setupWizardDownloads/${DAMMPMD5}
+ <echo file="${tomcat}/nxserver/data/installAfterRestart-DAM.log">init
+install nuxeo-dam
</echo>
- <echo file="${tomcat}/nxserver/data/installAfterRestart-CMF.log">file:setupWizardDownloads/${VPCBCMFMPMD5}
-file:setupWizardDownloads/${CMFMPMD5}
+ <echo file="${tomcat}/nxserver/data/installAfterRestart-CMF.log">init
+install nuxeo-cmf
</echo>
</target>
diff --git a/nuxeo-launcher/src/main/java/org/nuxeo/launcher/NuxeoLauncher.java b/nuxeo-launcher/src/main/java/org/nuxeo/launcher/NuxeoLauncher.java
index 5cb8b91..88c5598 100644
--- a/nuxeo-launcher/src/main/java/org/nuxeo/launcher/NuxeoLauncher.java
+++ b/nuxeo-launcher/src/main/java/org/nuxeo/launcher/NuxeoLauncher.java
< at >< at > -632,7 +632,9 < at >< at > public static void launch(final NuxeoLauncher launcher) throws IOException,
if (launcher.command == null) {
return;
}
- if ("mp-add".equalsIgnoreCase(launcher.command)
+ if ("mp-init".equalsIgnoreCase(launcher.command)
+ || "mp-purge".equalsIgnoreCase(launcher.command)
+ || "mp-add".equalsIgnoreCase(launcher.command)
|| "mp-install".equalsIgnoreCase(launcher.command)
|| "mp-uninstall".equalsIgnoreCase(launcher.command)
|| "mp-remove".equalsIgnoreCase(launcher.command)
< at >< at > -697,6 +699,10 < at >< at > public void run() {
commandSucceeded = launcher.pack();
} else if ("mp-list".equalsIgnoreCase(launcher.command)) {
launcher.pkgList();
+ } else if ("mp-init".equalsIgnoreCase(launcher.command)) {
+ launcher.pkgInit();
+ } else if ("mp-purge".equalsIgnoreCase(launcher.command)) {
+ launcher.pkgPurge();
} else if ("mp-add".equalsIgnoreCase(launcher.command)) {
if (launcher.hasOption(OPTION_NODEPS)) {
commandSucceeded = launcher.pkgAdd(params);
< at >< at > -1514,6 +1520,7 < at >< at > public static void printLongHelp() {
log.error("\tpack <target>\t\tBuild a static archive. Same as the \"pack\" Shell script.");
log.error("\tshowconf\t\tDisplay the instance configuration.");
log.error("\tmp-list\t\t\tList marketplace packages.");
+ log.error("\tmp-init\t\t\tPre-cache marketplace packages from the distribution.");
log.error("\tmp-update\t\tUpdate cache of marketplace packages list.");
log.error("\tmp-add\t\t\tAdd marketplace package(s) to local cache. You must provide the package file(s) as parameter.");
log.error("\tmp-install\t\tRun marketplace package installation. "
< at >< at > -1522,6 +1529,7 < at >< at > public static void printLongHelp() {
log.error("\tmp-uninstall\t\tUninstall marketplace package(s). You must provide the package ID(s) as parameter (see \"mp-list\" command).");
log.error("\tmp-remove\t\tRemove marketplace package(s). You must provide the package ID(s) as parameter (see \"mp-list\" command).");
log.error("\tmp-reset\t\tReset all packages to DOWNLOADED state. May be useful after a manual server upgrade.");
+ log.error("\tmp-purge\t\t\tUninstall and remove all packages from the local cache.");
}
/**
< at >< at > -1890,4 +1898,31 < at >< at > protected boolean pkgRefreshCache() throws IOException, PackageException {
return true;
}
+ /**
+ * Add packages from the distribution to the local cache
+ *
+ * < at >throws PackageException
+ * < at >throws IOException
+ *
+ * < at >since 5.6
+ *
+ */
+ protected void pkgInit() throws IOException, PackageException {
+ ConnectBroker pkgman = getConnectBroker();
+ pkgman.addDistributionPackages();
+ }
+
+ /**
+ * Uninstall and remove all packages from the local cache
+ *
+ * < at >throws PackageException
+ * < at >throws IOException
+ *
+ * < at >since 5.6
+ *
+ */
+ protected boolean pkgPurge() throws PackageException, IOException {
+ ConnectBroker pkgman = getConnectBroker();
+ return pkgman.pkgPurge();
+ }
}
diff --git a/nuxeo-launcher/src/main/java/org/nuxeo/launcher/connect/ConnectBroker.java b/nuxeo-launcher/src/main/java/org/nuxeo/launcher/connect/ConnectBroker.java
index bb1ed5d..93c93f1 100644
--- a/nuxeo-launcher/src/main/java/org/nuxeo/launcher/connect/ConnectBroker.java
+++ b/nuxeo-launcher/src/main/java/org/nuxeo/launcher/connect/ConnectBroker.java
< at >< at > -107,7 +107,6 < at >< at > public ConnectBroker(Environment env) throws IOException, PackageException {
+ env.getProperty(Environment.DISTRIBUTION_VERSION);
distributionMPDir = env.getProperty(PARAM_MP_DIR,
DISTRIBUTION_MP_DIR_DEFAULT);
- addDistributionPackages();
}
public String getCLID() throws NoCLID {
< at >< at > -327,18 +326,12 < at >< at > protected void addDistributionPackage(String md5) {
if (distributionFile.exists()) {
try {
pkgAdd(distributionFile.getCanonicalPath());
- FileUtils.deleteQuietly(distributionFile);
} catch (IOException e) {
log.warn("Could not add distribution file " + md5);
}
}
}
- protected void deleteDistributionPackage(String md5) {
- File distributionFile = new File(distributionMPDir, md5);
- FileUtils.deleteQuietly(distributionFile);
- }
-
public void addDistributionPackages() {
Map<String, PackageDefinition> distributionPackages = getDistributionDefinitions(getDistributionFilenames());
if (distributionPackages.isEmpty()) {
< at >< at > -366,9 +359,6 < at >< at > public void addDistributionPackages() {
pkgRemove(localPackage.getId());
addDistributionPackage(md5);
}
- } else {
- // Package is already in cache
- deleteDistributionPackage(md5);
}
} else {
// No package with this Id is in cache
< at >< at > -470,6 +460,14 < at >< at > public boolean pkgReset() {
}
}
+ public boolean pkgPurge() throws PackageException {
+ List<String> localIds = new ArrayList<String>();
+ for (LocalPackage pkg : service.getPackages()) {
+ localIds.add(pkg.getId());
+ }
+ return pkgRequest(null, null, null, localIds);
+ }
+
public LocalPackage pkgUninstall(String pkgId) {
CommandInfo cmdInfo = new CommandInfo();
cmdInfo.name = CommandInfo.CMD_UNINSTALL;
< at >< at > -746,10 +744,14 < at >< at > public boolean executePending(File commandsFile, boolean doExecute,
} else if (split.length == 1) {
if (line.length() > 0 && !line.startsWith("#")) {
if (doExecute) {
- if (useResolver) {
- pkgsToInstall.add(line);
+ if ("init".equals(line)) {
+ addDistributionPackages();
} else {
- pkgInstall(line);
+ if (useResolver) {
+ pkgsToInstall.add(line);
+ } else {
+ pkgInstall(line);
+ }
}
} else {
CommandInfo cmdInfo = new CommandInfo();
diff --git a/nuxeo-startup-wizard/src/main/java/org/nuxeo/wizard/download/PackageDownloader.java b/nuxeo-startup-wizard/src/main/java/org/nuxeo/wizard/download/PackageDownloader.java
index 2b80231..e2588e2 100644
--- a/nuxeo-startup-wizard/src/main/java/org/nuxeo/wizard/download/PackageDownloader.java
+++ b/nuxeo-startup-wizard/src/main/java/org/nuxeo/wizard/download/PackageDownloader.java
< at >< at > -413,21 +413,22 < at >< at > protected File getLocalPackagesDescriptor() {
public void scheduleDownloadedPackagesForInstallation(
String installationFilePath) throws IOException {
List<String> fileEntries = new ArrayList<String>();
+ fileEntries.add("init");
List<DownloadPackage> pkgs = downloadOptions.getPkg4Download();
List<String> pkgInstallIds = new ArrayList<String>();
for (DownloadPackage pkg : pkgs) {
if (pkg.isAlreadyInLocal()) {
- File file = pkg.getLocalFile();
- fileEntries.add("install file:" + file.getAbsolutePath());
+ fileEntries.add("install " + pkg.getId());
pkgInstallIds.add(pkg.getId());
} else {
for (PendingDownload download : pendingDownloads) {
if (download.getPkg().equals(pkg)) {
if (download.getStatus() == PendingDownload.VERIFIED) {
File file = download.getDowloadingFile();
- fileEntries.add("install file:"
+ fileEntries.add("add file:"
+ file.getAbsolutePath());
+ fileEntries.add("install " + pkg.getId());
pkgInstallIds.add(pkg.getId());
} else {
log.error("One selected package has not been downloaded : "
< at >< at > -438,15 +439,6 < at >< at > public void scheduleDownloadedPackagesForInstallation(
}
}
- // make downloaded packages available in Admin Center for later offline
- // usage
- for (DownloadPackage pkg : downloadOptions.getAllPackages()) {
- if (!pkgInstallIds.contains(pkg.getId()) && !needToDownload(pkg)) {
- fileEntries.add("add file:"
- + pkg.getLocalFile().getAbsolutePath());
- }
- }
-
File installLog = new File(installationFilePath);
if (fileEntries.size() > 0) {
if (!installLog.exists()) {
< at >< at > -458,6 +450,7 < at >< at > public void scheduleDownloadedPackagesForInstallation(
}
FileUtils.writeLines(installLog, fileEntries);
} else {
+ // Should not happen as the file always has "init"
if (installLog.exists()) {
installLog.delete();
}
_______________________________________________
ECM-checkins mailing list
ECM-checkins-FQDHc1wsLCVb90+sfpvX0g< at >public.gmane.org
http://lists.nuxeo.com/mailman/listinfo/ecm-checkins
</pre>
Mathieu Guillaume
2012-05-26T08:45:56
-
nuxeo-diff: NXP-8596: Add a diffDisplay contrib forthe Folder doctype (branch< at >master)
http://comments.gmane.org/gmane.comp.cms.nuxeo.scm/73228
<pre>Message:
NXP-8596: Add a diffDisplay contrib for the Folder doc type
Repository: nuxeo-diff
Branch: master
Author: Antoine Taillefer <ataillefer< at >nuxeo.com>
Date: 2012-05-25T21:38:35-07:00
URL: https://github.com/nuxeo/nuxeo-diff/commit/bd15faeb12be663b34df4c36e4a509af697d8da9
JIRA: https://jira.nuxeo.com/browse/NXP-8596
Files:
M nuxeo-diff-jsf/src/main/resources/OSGI-INF/diff-display-contrib.xml
M nuxeo-diff-jsf/src/test/java/org/nuxeo/ecm/diff/service/TestDiffDisplayContrib.java
M nuxeo-diff-jsf/src/test/java/org/nuxeo/ecm/diff/service/TestDiffDisplayContribOverride.java
diff --git a/nuxeo-diff-jsf/src/main/resources/OSGI-INF/diff-display-contrib.xml b/nuxeo-diff-jsf/src/main/resources/OSGI-INF/diff-display-contrib.xml
index f71d11a..46f7922 100644
--- a/nuxeo-diff-jsf/src/main/resources/OSGI-INF/diff-display-contrib.xml
+++ b/nuxeo-diff-jsf/src/main/resources/OSGI-INF/diff-display-contrib.xml
< at >< at > -12,6 +12,13 < at >< at >
<extension target="org.nuxeo.ecm.diff.service.DiffDisplayService"
point="diffDisplay">
+ <diffDisplay type="Folder">
+ <diffBlocks>
+ <diffBlock name="heading" />
+ <diffBlock name="dublincore" />
+ </diffBlocks>
+ </diffDisplay>
+
<diffDisplay type="File">
<diffBlocks>
<diffBlock name="heading" />
diff --git a/nuxeo-diff-jsf/src/test/java/org/nuxeo/ecm/diff/service/TestDiffDisplayContrib.java b/nuxeo-diff-jsf/src/test/java/org/nuxeo/ecm/diff/service/TestDiffDisplayContrib.java
index f2fd16e..5e12935 100644
--- a/nuxeo-diff-jsf/src/test/java/org/nuxeo/ecm/diff/service/TestDiffDisplayContrib.java
+++ b/nuxeo-diff-jsf/src/test/java/org/nuxeo/ecm/diff/service/TestDiffDisplayContrib.java
< at >< at > -89,7 +89,8 < at >< at > public void testDiffDisplayContrib() {
// Check diffDisplay contribs
Map<String, List<String>> diffDisplays = diffDisplayService.getDiffDisplays();
assertNotNull(diffDisplays);
- assertEquals(2, diffDisplays.size());
+ assertEquals(3, diffDisplays.size());
+ assertTrue(diffDisplays.containsKey("Folder"));
assertTrue(diffDisplays.containsKey("File"));
assertTrue(diffDisplays.containsKey("Note"));
< at >< at > -97,14 +98,13 < at >< at > public void testDiffDisplayContrib() {
List<String> diffDisplay = diffDisplayService.getDiffDisplay("Test");
assertNull(diffDisplay);
- // Check File diffDisplay contrib
- diffDisplay = diffDisplayService.getDiffDisplay("File");
+ // Check Folder diffDisplay contrib
+ diffDisplay = diffDisplayService.getDiffDisplay("Folder");
assertNotNull(diffDisplay);
List<String> expectedDiffDisplay = new ArrayList<String>();
expectedDiffDisplay.add("heading");
expectedDiffDisplay.add("dublincore");
- expectedDiffDisplay.add("files");
assertEquals(expectedDiffDisplay, diffDisplay);
// Check that order is taken into account
< at >< at > -113,6 +113,16 < at >< at > public void testDiffDisplayContrib() {
expectedDiffDisplay.add(diffBlockRef);
assertFalse(expectedDiffDisplay.equals(diffDisplay));
+ // Check File diffDisplay contrib
+ diffDisplay = diffDisplayService.getDiffDisplay("File");
+ assertNotNull(diffDisplay);
+
+ expectedDiffDisplay = new ArrayList<String>();
+ expectedDiffDisplay.add("heading");
+ expectedDiffDisplay.add("dublincore");
+ expectedDiffDisplay.add("files");
+ assertEquals(expectedDiffDisplay, diffDisplay);
+
// Check Note diffDisplay contrib
diffDisplay = diffDisplayService.getDiffDisplay("Note");
assertNotNull(diffDisplay);
diff --git a/nuxeo-diff-jsf/src/test/java/org/nuxeo/ecm/diff/service/TestDiffDisplayContribOverride.java b/nuxeo-diff-jsf/src/test/java/org/nuxeo/ecm/diff/service/TestDiffDisplayContribOverride.java
index a34626c..51be418 100644
--- a/nuxeo-diff-jsf/src/test/java/org/nuxeo/ecm/diff/service/TestDiffDisplayContribOverride.java
+++ b/nuxeo-diff-jsf/src/test/java/org/nuxeo/ecm/diff/service/TestDiffDisplayContribOverride.java
< at >< at > -95,17 +95,27 < at >< at > public void testDiffDisplayContrib() {
// Check diffDisplay contribs
Map<String, List<String>> diffDisplays = diffDisplayService.getDiffDisplays();
assertNotNull(diffDisplays);
- assertEquals(3, diffDisplays.size());
+ assertEquals(4, diffDisplays.size());
+ assertTrue(diffDisplays.containsKey("Folder"));
assertTrue(diffDisplays.containsKey("File"));
assertTrue(diffDisplays.containsKey("Note"));
assertTrue(diffDisplays.containsKey("SampleType"));
- // Check overridden File diffDisplay contrib
- List<String> diffDisplay = diffDisplayService.getDiffDisplay("File");
+ // Check non overridden Folder diffDisplay contrib
+ List<String> diffDisplay = diffDisplayService.getDiffDisplay("Folder");
assertNotNull(diffDisplay);
List<String> expectedDiffDisplay = new ArrayList<String>();
expectedDiffDisplay.add("heading");
+ expectedDiffDisplay.add("dublincore");
+ assertEquals(expectedDiffDisplay, diffDisplay);
+
+ // Check overridden File diffDisplay contrib
+ diffDisplay = diffDisplayService.getDiffDisplay("File");
+ assertNotNull(diffDisplay);
+
+ expectedDiffDisplay = new ArrayList<String>();
+ expectedDiffDisplay.add("heading");
expectedDiffDisplay.add("files");
expectedDiffDisplay.add("testNoFields");
assertEquals(expectedDiffDisplay, diffDisplay);
_______________________________________________
ECM-checkins mailing list
ECM-checkins-FQDHc1wsLCVb90+sfpvX0g< at >public.gmane.org
http://lists.nuxeo.com/mailman/listinfo/ecm-checkins
</pre>
Antoine Taillefer
2012-05-26T04:39:47
-
nuxeo-diff: NXP-9379: Add diff action on the currentsectionselection (branch< at >master)
http://comments.gmane.org/gmane.comp.cms.nuxeo.scm/73227
<pre>Message:
NXP-9379: Add diff action on the current section selection
Repository: nuxeo-diff
Branch: master
Author: Antoine Taillefer <ataillefer< at >nuxeo.com>
Date: 2012-05-25T21:27:28-07:00
URL: https://github.com/nuxeo/nuxeo-diff/commit/a9ee0bbc1d117f1acdac43a7ebf1e6e6bb222a26
JIRA: https://jira.nuxeo.com/browse/NXP-9379
Files:
M nuxeo-diff-jsf/src/main/java/org/nuxeo/ecm/diff/web/DiffActionsBean.java
M nuxeo-diff-jsf/src/main/resources/OSGI-INF/diff-actions-contrib.xml
diff --git a/nuxeo-diff-jsf/src/main/java/org/nuxeo/ecm/diff/web/DiffActionsBean.java b/nuxeo-diff-jsf/src/main/java/org/nuxeo/ecm/diff/web/DiffActionsBean.java
index ccafde0..224c395 100644
--- a/nuxeo-diff-jsf/src/main/java/org/nuxeo/ecm/diff/web/DiffActionsBean.java
+++ b/nuxeo-diff-jsf/src/main/java/org/nuxeo/ecm/diff/web/DiffActionsBean.java
< at >< at > -107,6 +107,18 < at >< at > public boolean getCanDiffCurrentTrashSelection() {
/**
* Checks if the diff action is available for the
+ * {< at >link DocumentsListsManager#CURRENT_DOCUMENT_SECTION_SELECTION} working
+ * list.
+ *
+ * < at >return true if can diff the current section selection
+ */
+ public boolean getCanDiffCurrentSectionSelection() {
+
+ return getCanDiffWorkingList(DocumentsListsManager.CURRENT_DOCUMENT_SECTION_SELECTION);
+ }
+
+ /**
+ * Checks if the diff action is available for the
* {< at >link VersionDocumentsListsConstants#CURRENT_VERSION_SELECTION} working
* list.
*
< at >< at > -169,6 +181,18 < at >< at > public String prepareCurrentTrashSelectionDiff() throws ClientException {
}
/**
+ * Prepares a diff of the current section selection.
+ *
+ * < at >return the view id
+ * < at >throws ClientException the client exception
+ */
+ public String prepareCurrentSectionSelectionDiff() throws ClientException {
+
+ diffSelectionType = DiffSelectionType.content.name();
+ return prepareWorkingListDiff(DocumentsListsManager.CURRENT_DOCUMENT_SECTION_SELECTION);
+ }
+
+ /**
* Prepares a diff of the current version selection.
*
* < at >return the view id
diff --git a/nuxeo-diff-jsf/src/main/resources/OSGI-INF/diff-actions-contrib.xml b/nuxeo-diff-jsf/src/main/resources/OSGI-INF/diff-actions-contrib.xml
index 8eeedd8..278ba7f 100644
--- a/nuxeo-diff-jsf/src/main/resources/OSGI-INF/diff-actions-contrib.xml
+++ b/nuxeo-diff-jsf/src/main/resources/OSGI-INF/diff-actions-contrib.xml
< at >< at > -19,6 +19,14 < at >< at >
<filter-id>canDiffCurrentTrashSelection</filter-id>
</action>
+ <!-- Section actions -->
+ <action id="CURRENT_SECTION_SELECTION_DIFF"
+ link="#{diffActions.prepareCurrentSectionSelectionDiff}" label="command.clipboard.diff"
+ order="100">
+ <category>CURRENT_SELECTION_SECTIONS_LIST</category>
+ <filter-id>canDiffCurrentSectionSelection</filter-id>
+ </action>
+
<!-- Worklist actions -->
<action id="CURRENT_DEFAULT_SELECTION_DIFF"
link="#{diffActions.prepareCurrentDefaultSelectionDiff}" label="command.clipboard.diff"
< at >< at > -59,6 +67,13 < at >< at >
</rule>
</filter>
+ <filter id="canDiffCurrentSectionSelection">
+ <rule grant="true">
+ <condition>#{diffActions.canDiffCurrentSectionSelection}
+ </condition>
+ </rule>
+ </filter>
+
<filter id="canDiffCurrentVersionSelection">
<rule grant="true">
<condition>#{diffActions.canDiffCurrentVersionSelection}
_______________________________________________
ECM-checkins mailing list
ECM-checkins-FQDHc1wsLCVb90+sfpvX0g< at >public.gmane.org
http://lists.nuxeo.com/mailman/listinfo/ecm-checkins
</pre>
Antoine Taillefer
2012-05-26T04:27:36
-
nuxeo-diff: NXP-8596: Add missing label for the uiddiffBlock(branch< at >master)
http://comments.gmane.org/gmane.comp.cms.nuxeo.scm/73226
<pre>Message:
NXP-8596: Add missing label for the uid diffBlock
Repository: nuxeo-diff
Branch: master
Author: Antoine Taillefer <ataillefer< at >nuxeo.com>
Date: 2012-05-25T21:02:41-07:00
URL: https://github.com/nuxeo/nuxeo-diff/commit/95c243d1146babb25c71a18c5c6ede4be522d637
JIRA: https://jira.nuxeo.com/browse/NXP-8596
Files:
M nuxeo-diff-jsf/src/main/resources/OSGI-INF/l10n/messages.properties
M nuxeo-diff-jsf/src/main/resources/OSGI-INF/l10n/messages_en.properties
M nuxeo-diff-jsf/src/main/resources/OSGI-INF/l10n/messages_fr.properties
diff --git a/nuxeo-diff-jsf/src/main/resources/OSGI-INF/l10n/messages.properties b/nuxeo-diff-jsf/src/main/resources/OSGI-INF/l10n/messages.properties
index fd47979..1751479 100644
--- a/nuxeo-diff-jsf/src/main/resources/OSGI-INF/l10n/messages.properties
+++ b/nuxeo-diff-jsf/src/main/resources/OSGI-INF/l10n/messages.properties
< at >< at > -12,6 +12,7 < at >< at > document.diff.backToCurrentDoc=Back to current document
document.diff.backToVersions=Back to archived versions
document.diff.backToTrash=Back to trash
+label.diffBlock.uid=Version
label.diffBlock.heading=Summary
label.diffBlock.dublincore=Dublincore
label.diffBlock.files=Content
diff --git a/nuxeo-diff-jsf/src/main/resources/OSGI-INF/l10n/messages_en.properties b/nuxeo-diff-jsf/src/main/resources/OSGI-INF/l10n/messages_en.properties
index fd47979..1751479 100644
--- a/nuxeo-diff-jsf/src/main/resources/OSGI-INF/l10n/messages_en.properties
+++ b/nuxeo-diff-jsf/src/main/resources/OSGI-INF/l10n/messages_en.properties
< at >< at > -12,6 +12,7 < at >< at > document.diff.backToCurrentDoc=Back to current document
document.diff.backToVersions=Back to archived versions
document.diff.backToTrash=Back to trash
+label.diffBlock.uid=Version
label.diffBlock.heading=Summary
label.diffBlock.dublincore=Dublincore
label.diffBlock.files=Content
diff --git a/nuxeo-diff-jsf/src/main/resources/OSGI-INF/l10n/messages_fr.properties b/nuxeo-diff-jsf/src/main/resources/OSGI-INF/l10n/messages_fr.properties
index 81c3247..000d3ed 100644
--- a/nuxeo-diff-jsf/src/main/resources/OSGI-INF/l10n/messages_fr.properties
+++ b/nuxeo-diff-jsf/src/main/resources/OSGI-INF/l10n/messages_fr.properties
< at >< at > -12,6 +12,7 < at >< at > document.diff.backToCurrentDoc=Retour au document courant
document.diff.backToVersions=Retour aux versions archiv\u00e9es
document.diff.backToTrash=Retour \u00e0 la corbeille
+label.diffBlock.uid=Version
label.diffBlock.heading=Sommaire
label.diffBlock.dublincore=Dublincore
label.diffBlock.files=Contenu
pZmZCbG9ja_______________________________________________
ECM-checkins mailing list
ECM-checkins-FQDHc1wsLCVb90+sfpvX0g< at >public.gmane.org
http://lists.nuxeo.com/mailman/listinfo/ecm-checkins
</pre>
Antoine Taillefer
2012-05-26T04:02:54
-
nuxeo-diff: NXP-9158: Always display a 'Back to...'link in the diffresult page (branch< at >master)
http://comments.gmane.org/gmane.comp.cms.nuxeo.scm/73225
<pre>Message:
NXP-9158: Always display a 'Back to...' link in the diff result page
Repository: nuxeo-diff
Branch: master
Author: Antoine Taillefer <ataillefer< at >nuxeo.com>
Date: 2012-05-25T20:51:10-07:00
URL: https://github.com/nuxeo/nuxeo-diff/commit/85887a0c8fc9ecfc80a6e0d843f0db0d03c1154d
JIRA: https://jira.nuxeo.com/browse/NXP-9158
Files:
A nuxeo-diff-jsf/src/main/java/org/nuxeo/ecm/diff/web/DiffSelectionType.java
M nuxeo-diff-jsf/src/main/java/org/nuxeo/ecm/diff/web/DiffActionsBean.java
M nuxeo-diff-jsf/src/main/resources/OSGI-INF/l10n/messages.properties
M nuxeo-diff-jsf/src/main/resources/OSGI-INF/l10n/messages_en.properties
M nuxeo-diff-jsf/src/main/resources/OSGI-INF/l10n/messages_fr.properties
M nuxeo-diff-jsf/src/main/resources/web/nuxeo.war/incl/diff/doc_diff_result.xhtml
diff --git a/nuxeo-diff-jsf/src/main/java/org/nuxeo/ecm/diff/web/DiffActionsBean.java b/nuxeo-diff-jsf/src/main/java/org/nuxeo/ecm/diff/web/DiffActionsBean.java
index cca4c12..a1fab60 100644
--- a/nuxeo-diff-jsf/src/main/java/org/nuxeo/ecm/diff/web/DiffActionsBean.java
+++ b/nuxeo-diff-jsf/src/main/java/org/nuxeo/ecm/diff/web/DiffActionsBean.java
< at >< at > -80,7 +80,7 < at >< at >
protected String selectedVersionId;
- protected boolean isVersionDiff = false;
+ protected String diffSelectionType = DiffSelectionType.content.name();
/**
* Checks if the diff action is available for the
< at >< at > -140,7 +140,7 < at >< at > public boolean getCanDiffWorkingList(String listName) {
*/
public String prepareCurrentDocumentSelectionDiff() throws ClientException {
- isVersionDiff = false;
+ diffSelectionType = DiffSelectionType.content.name();
return prepareWorkingListDiff(DocumentsListsManager.CURRENT_DOCUMENT_SELECTION);
}
< at >< at > -152,7 +152,7 < at >< at > public String prepareCurrentDocumentSelectionDiff() throws ClientException {
*/
public String prepareCurrentVersionSelectionDiff() throws ClientException {
- isVersionDiff = true;
+ diffSelectionType = DiffSelectionType.version.name();
return prepareWorkingListDiff(DocumentsListsManager.CURRENT_VERSION_SELECTION);
}
< at >< at > -164,7 +164,7 < at >< at > public String prepareCurrentVersionSelectionDiff() throws ClientException {
*/
public String prepareCurrentDefaultSelectionDiff() throws ClientException {
- isVersionDiff = false;
+ diffSelectionType = DiffSelectionType.content.name();
return prepareWorkingListDiff(DocumentsListsManager.DEFAULT_WORKING_LIST);
}
< at >< at > -213,7 +213,7 < at >< at > public String prepareCurrentVersionDiff() throws ClientException {
leftDoc = docVersion;
rightDoc = currentDocument;
- isVersionDiff = true;
+ diffSelectionType = DiffSelectionType.version.name();
return DOC_DIFF_VIEW;
}
< at >< at > -423,11 +423,11 < at >< at > public void setRightDoc(DocumentModel rightDoc) {
this.rightDoc = rightDoc;
}
- public boolean isVersionDiff() {
- return isVersionDiff;
+ public String getDiffSelectionType() {
+ return diffSelectionType;
}
- public void setVersionDiff(boolean isVersionDiff) {
- this.isVersionDiff = isVersionDiff;
+ public void setDiffSelectionType(String diffSelectionType) {
+ this.diffSelectionType = diffSelectionType;
}
}
diff --git a/nuxeo-diff-jsf/src/main/java/org/nuxeo/ecm/diff/web/DiffSelectionType.java b/nuxeo-diff-jsf/src/main/java/org/nuxeo/ecm/diff/web/DiffSelectionType.java
new file mode 100644
index 0000000..f2dae1e
--- /dev/null
+++ b/nuxeo-diff-jsf/src/main/java/org/nuxeo/ecm/diff/web/DiffSelectionType.java
< at >< at > -0,0 +1,27 < at >< at >
+/*
+ * (C) Copyright 2012 Nuxeo SA (http://nuxeo.com/) and contributors.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Lesser General Public License
+ * (LGPL) version 2.1 which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/lgpl.html
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * Contributors:
+ * Antoine Taillefer
+ */
+package org.nuxeo.ecm.diff.web;
+
+/**
+ * Enumerates the types of document selection to diff.
+ *
+ * < at >author <a href="mailto:ataillefer< at >nuxeo.com">Antoine Taillefer</a>
+ */
+public enum DiffSelectionType {
+
+ content, version, trash;
+}
diff --git a/nuxeo-diff-jsf/src/main/resources/OSGI-INF/l10n/messages.properties b/nuxeo-diff-jsf/src/main/resources/OSGI-INF/l10n/messages.properties
index 5806ee4..840d8a1 100644
--- a/nuxeo-diff-jsf/src/main/resources/OSGI-INF/l10n/messages.properties
+++ b/nuxeo-diff-jsf/src/main/resources/OSGI-INF/l10n/messages.properties
< at >< at > -8,6 +8,7 < at >< at > document.diff.subTitle=Only the metadatas that are different are displayed.
document.diff.noDiffAvailable=No comparaison is available since no documents have been selected for comparison.
document.diff.emptyDiff=There are no differences between the two documents.
document.diff.refresh=Refresh
+document.diff.backToCurrentDoc=Back to current document
document.diff.backToVersions=Back to archived versions
label.diffBlock.heading=Summary
diff --git a/nuxeo-diff-jsf/src/main/resources/OSGI-INF/l10n/messages_en.properties b/nuxeo-diff-jsf/src/main/resources/OSGI-INF/l10n/messages_en.properties
index 5806ee4..840d8a1 100644
--- a/nuxeo-diff-jsf/src/main/resources/OSGI-INF/l10n/messages_en.properties
+++ b/nuxeo-diff-jsf/src/main/resources/OSGI-INF/l10n/messages_en.properties
< at >< at > -8,6 +8,7 < at >< at > document.diff.subTitle=Only the metadatas that are different are displayed.
document.diff.noDiffAvailable=No comparaison is available since no documents have been selected for comparison.
document.diff.emptyDiff=There are no differences between the two documents.
document.diff.refresh=Refresh
+document.diff.backToCurrentDoc=Back to current document
document.diff.backToVersions=Back to archived versions
label.diffBlock.heading=Summary
diff --git a/nuxeo-diff-jsf/src/main/resources/OSGI-INF/l10n/messages_fr.properties b/nuxeo-diff-jsf/src/main/resources/OSGI-INF/l10n/messages_fr.properties
index 8f040a7..f47ec21 100644
--- a/nuxeo-diff-jsf/src/main/resources/OSGI-INF/l10n/messages_fr.properties
+++ b/nuxeo-diff-jsf/src/main/resources/OSGI-INF/l10n/messages_fr.properties
< at >< at > -8,6 +8,7 < at >< at > document.diff.subTitle=Seules les m\u00e9tadonn\u00e9es qui pr\u00e9sentent une
document.diff.noDiffAvailable=Comparaison indisponible puisqu'aucun document n'a \u00e9t\u00e9 s\u00e9lectionn\u00e9 pour la comparaison.
document.diff.emptyDiff=Il n'y a aucune diff\u00e9rence entre les deux documents.
document.diff.refresh=Rafra\u00eechir
+document.diff.backToCurrentDoc=Retour au document courant
document.diff.backToVersions=Retour aux versions archiv\u00e9es
label.diffBlock.heading=Sommaire
diff --git a/nuxeo-diff-jsf/src/main/resources/web/nuxeo.war/incl/diff/doc_diff_result.xhtml b/nuxeo-diff-jsf/src/main/resources/web/nuxeo.war/incl/diff/doc_diff_result.xhtml
index 3ff2715..c9cf995 100644
--- a/nuxeo-diff-jsf/src/main/resources/web/nuxeo.war/incl/diff/doc_diff_result.xhtml
+++ b/nuxeo-diff-jsf/src/main/resources/web/nuxeo.war/incl/diff/doc_diff_result.xhtml
< at >< at > -37,7 +37,12 < at >< at >
</ui:include>
</td>
<td class="contentDiffColumn">
- <c:if test="#{diffActions.versionDiff}">
+ <c:if test="#{diffActions.diffSelectionType == 'content'}">
+ <nxd:restDocumentLink document="#{currentDocument}" styleClass="docLink">
+ <h:outputText value="#{messages['document.diff.backToCurrentDoc']}" />
+ </nxd:restDocumentLink>
+ </c:if>
+ <c:if test="#{diffActions.diffSelectionType == 'version'}">
<nxd:restDocumentLink document="#{currentDocument}" tab="TAB_CONTENT_HISTORY"
subTab="TAB_VERSIONS" styleClass="docLink">
<h:outputText value="#{messages['document.diff.backToVersions']}" />
_______________________________________________
ECM-checkins mailing list
ECM-checkins-FQDHc1wsLCVb90+sfpvX0g< at >public.gmane.org
http://lists.nuxeo.com/mailman/listinfo/ecm-checkins
</pre>
Antoine Taillefer
2012-05-26T03:53:09
-
nuxeo-diff: NXP-9378: Add diff action on the currenttrash selection(branch< at >master)
http://comments.gmane.org/gmane.comp.cms.nuxeo.scm/73224
<pre>Message:
NXP-9378: Add diff action on the current trash selection
Repository: nuxeo-diff
Branch: master
Author: Antoine Taillefer <ataillefer< at >nuxeo.com>
Date: 2012-05-25T20:52:50-07:00
URL: https://github.com/nuxeo/nuxeo-diff/commit/c715bc28a1081717776c620bd56524e5ca291dea
JIRA: https://jira.nuxeo.com/browse/NXP-9378
Files:
M nuxeo-diff-jsf/src/main/java/org/nuxeo/ecm/diff/web/DiffActionsBean.java
M nuxeo-diff-jsf/src/main/resources/OSGI-INF/diff-actions-contrib.xml
M nuxeo-diff-jsf/src/main/resources/OSGI-INF/l10n/messages.properties
M nuxeo-diff-jsf/src/main/resources/OSGI-INF/l10n/messages_en.properties
M nuxeo-diff-jsf/src/main/resources/OSGI-INF/l10n/messages_fr.properties
M nuxeo-diff-jsf/src/main/resources/web/nuxeo.war/incl/diff/doc_diff_result.xhtml
diff --git a/nuxeo-diff-jsf/src/main/java/org/nuxeo/ecm/diff/web/DiffActionsBean.java b/nuxeo-diff-jsf/src/main/java/org/nuxeo/ecm/diff/web/DiffActionsBean.java
index a1fab60..ccafde0 100644
--- a/nuxeo-diff-jsf/src/main/java/org/nuxeo/ecm/diff/web/DiffActionsBean.java
+++ b/nuxeo-diff-jsf/src/main/java/org/nuxeo/ecm/diff/web/DiffActionsBean.java
< at >< at > -95,6 +95,18 < at >< at > public boolean getCanDiffCurrentDocumentSelection() {
/**
* Checks if the diff action is available for the
+ * {< at >link DocumentsListsManager#CURRENT_DOCUMENT_TRASH_SELECTION} working
+ * list.
+ *
+ * < at >return true if can diff the current document trash selection
+ */
+ public boolean getCanDiffCurrentTrashSelection() {
+
+ return getCanDiffWorkingList(DocumentsListsManager.CURRENT_DOCUMENT_TRASH_SELECTION);
+ }
+
+ /**
+ * Checks if the diff action is available for the
* {< at >link VersionDocumentsListsConstants#CURRENT_VERSION_SELECTION} working
* list.
*
< at >< at > -145,6 +157,18 < at >< at > public String prepareCurrentDocumentSelectionDiff() throws ClientException {
}
/**
+ * Prepares a diff of the current document trash selection.
+ *
+ * < at >return the view id
+ * < at >throws ClientException the client exception
+ */
+ public String prepareCurrentTrashSelectionDiff() throws ClientException {
+
+ diffSelectionType = DiffSelectionType.trash.name();
+ return prepareWorkingListDiff(DocumentsListsManager.CURRENT_DOCUMENT_TRASH_SELECTION);
+ }
+
+ /**
* Prepares a diff of the current version selection.
*
* < at >return the view id
diff --git a/nuxeo-diff-jsf/src/main/resources/OSGI-INF/diff-actions-contrib.xml b/nuxeo-diff-jsf/src/main/resources/OSGI-INF/diff-actions-contrib.xml
index 924746f..8eeedd8 100644
--- a/nuxeo-diff-jsf/src/main/resources/OSGI-INF/diff-actions-contrib.xml
+++ b/nuxeo-diff-jsf/src/main/resources/OSGI-INF/diff-actions-contrib.xml
< at >< at > -12,6 +12,13 < at >< at >
<filter-id>canDiffCurrentDocumentSelection</filter-id>
</action>
+ <!-- Trash actions -->
+ <action id="CURRENT_TRASH_SELECTION_DIFF" link="#{diffActions.prepareCurrentTrashSelectionDiff}"
+ label="command.clipboard.diff" order="100">
+ <category>CURRENT_SELECTION_TRASH_LIST</category>
+ <filter-id>canDiffCurrentTrashSelection</filter-id>
+ </action>
+
<!-- Worklist actions -->
<action id="CURRENT_DEFAULT_SELECTION_DIFF"
link="#{diffActions.prepareCurrentDefaultSelectionDiff}" label="command.clipboard.diff"
< at >< at > -45,6 +52,13 < at >< at >
</rule>
</filter>
+ <filter id="canDiffCurrentTrashSelection">
+ <rule grant="true">
+ <condition>#{diffActions.canDiffCurrentTrashSelection}
+ </condition>
+ </rule>
+ </filter>
+
<filter id="canDiffCurrentVersionSelection">
<rule grant="true">
<condition>#{diffActions.canDiffCurrentVersionSelection}
diff --git a/nuxeo-diff-jsf/src/main/resources/OSGI-INF/l10n/messages.properties b/nuxeo-diff-jsf/src/main/resources/OSGI-INF/l10n/messages.properties
index 840d8a1..fd47979 100644
--- a/nuxeo-diff-jsf/src/main/resources/OSGI-INF/l10n/messages.properties
+++ b/nuxeo-diff-jsf/src/main/resources/OSGI-INF/l10n/messages.properties
< at >< at > -10,6 +10,7 < at >< at > document.diff.emptyDiff=There are no differences between the two documents.
document.diff.refresh=Refresh
document.diff.backToCurrentDoc=Back to current document
document.diff.backToVersions=Back to archived versions
+document.diff.backToTrash=Back to trash
label.diffBlock.heading=Summary
label.diffBlock.dublincore=Dublincore
diff --git a/nuxeo-diff-jsf/src/main/resources/OSGI-INF/l10n/messages_en.properties b/nuxeo-diff-jsf/src/main/resources/OSGI-INF/l10n/messages_en.properties
index 840d8a1..fd47979 100644
--- a/nuxeo-diff-jsf/src/main/resources/OSGI-INF/l10n/messages_en.properties
+++ b/nuxeo-diff-jsf/src/main/resources/OSGI-INF/l10n/messages_en.properties
< at >< at > -10,6 +10,7 < at >< at > document.diff.emptyDiff=There are no differences between the two documents.
document.diff.refresh=Refresh
document.diff.backToCurrentDoc=Back to current document
document.diff.backToVersions=Back to archived versions
+document.diff.backToTrash=Back to trash
label.diffBlock.heading=Summary
label.diffBlock.dublincore=Dublincore
diff --git a/nuxeo-diff-jsf/src/main/resources/OSGI-INF/l10n/messages_fr.properties b/nuxeo-diff-jsf/src/main/resources/OSGI-INF/l10n/messages_fr.properties
index f47ec21..81c3247 100644
--- a/nuxeo-diff-jsf/src/main/resources/OSGI-INF/l10n/messages_fr.properties
+++ b/nuxeo-diff-jsf/src/main/resources/OSGI-INF/l10n/messages_fr.properties
< at >< at > -10,6 +10,7 < at >< at > document.diff.emptyDiff=Il n'y a aucune diff\u00e9rence entre les deux documents
document.diff.refresh=Rafra\u00eechir
document.diff.backToCurrentDoc=Retour au document courant
document.diff.backToVersions=Retour aux versions archiv\u00e9es
+document.diff.backToTrash=Retour \u00e0 la corbeille
label.diffBlock.heading=Sommaire
label.diffBlock.dublincore=Dublincore
diff --git a/nuxeo-diff-jsf/src/main/resources/web/nuxeo.war/incl/diff/doc_diff_result.xhtml b/nuxeo-diff-jsf/src/main/resources/web/nuxeo.war/incl/diff/doc_diff_result.xhtml
index c9cf995..67151cb 100644
--- a/nuxeo-diff-jsf/src/main/resources/web/nuxeo.war/incl/diff/doc_diff_result.xhtml
+++ b/nuxeo-diff-jsf/src/main/resources/web/nuxeo.war/incl/diff/doc_diff_result.xhtml
< at >< at > -48,6 +48,12 < at >< at >
<h:outputText value="#{messages['document.diff.backToVersions']}" />
</nxd:restDocumentLink>
</c:if>
+ <c:if test="#{diffActions.diffSelectionType == 'trash'}">
+ <nxd:restDocumentLink document="#{currentDocument}" tab="TAB_MANAGE"
+ subTab="TAB_TRASH_CONTENT" styleClass="docLink">
+ <h:outputText value="#{messages['document.diff.backToTrash']}" />
+ </nxd:restDocumentLink>
+ </c:if>
</td>
</tr>
</table>
_______________________________________________
ECM-checkins mailing list
ECM-checkins-FQDHc1wsLCVb90+sfpvX0g< at >public.gmane.org
http://lists.nuxeo.com/mailman/listinfo/ecm-checkins
</pre>
Antoine Taillefer
2012-05-26T03:53:09
-
nuxeo-diff: NXP-8596: FixDiffBlockDefinitionImpl#equals(branch< at >master)
http://comments.gmane.org/gmane.comp.cms.nuxeo.scm/73223
<pre>Message:
NXP-8596: Fix DiffBlockDefinitionImpl#equals
Repository: nuxeo-diff
Branch: master
Author: Antoine Taillefer <ataillefer< at >nuxeo.com>
Date: 2012-05-25T20:03:13-07:00
URL: https://github.com/nuxeo/nuxeo-diff/commit/bd0384ab67bf71f69f61e65974c4575cbcf1fd43
JIRA: https://jira.nuxeo.com/browse/NXP-8596
Files:
M nuxeo-diff-jsf/src/main/java/org/nuxeo/ecm/diff/model/impl/DiffBlockDefinitionImpl.java
diff --git a/nuxeo-diff-jsf/src/main/java/org/nuxeo/ecm/diff/model/impl/DiffBlockDefinitionImpl.java b/nuxeo-diff-jsf/src/main/java/org/nuxeo/ecm/diff/model/impl/DiffBlockDefinitionImpl.java
index de70960..bf18677 100644
--- a/nuxeo-diff-jsf/src/main/java/org/nuxeo/ecm/diff/model/impl/DiffBlockDefinitionImpl.java
+++ b/nuxeo-diff-jsf/src/main/java/org/nuxeo/ecm/diff/model/impl/DiffBlockDefinitionImpl.java
< at >< at > -122,16 +122,17 < at >< at > public boolean equals(Object other) {
if (MapUtils.isEmpty(templates) && !MapUtils.isEmpty(otherTemplates)
|| !MapUtils.isEmpty(templates)
&& MapUtils.isEmpty(otherTemplates)
- || !templates.equals(otherTemplates)
+ || (templates != null && !templates.equals(otherTemplates))
|| CollectionUtils.isEmpty(fields)
&& !CollectionUtils.isEmpty(otherFields)
|| !CollectionUtils.isEmpty(fields)
&& CollectionUtils.isEmpty(otherFields)
- || !fields.equals(otherFields) || MapUtils.isEmpty(properties)
+ || (fields != null && !fields.equals(otherFields))
+ || MapUtils.isEmpty(properties)
&& !MapUtils.isEmpty(otherProperties)
|| !MapUtils.isEmpty(properties)
&& MapUtils.isEmpty(otherProperties)
- || !properties.equals(otherProperties)) {
+ || (properties != null && !properties.equals(otherProperties))) {
return false;
}
sEmpty(pro_______________________________________________
ECM-checkins mailing list
ECM-checkins-FQDHc1wsLCVb90+sfpvX0g< at >public.gmane.org
http://lists.nuxeo.com/mailman/listinfo/ecm-checkins
</pre>
Antoine Taillefer
2012-05-26T03:53:08
-
nuxeo-diff: NXP-8596: Add templates and propertiesto the diffBlockdescriptor (branch< at >master)
http://comments.gmane.org/gmane.comp.cms.nuxeo.scm/73222
<pre>Message:
NXP-8596: Add templates and properties to the diffBlock descriptor
Repository: nuxeo-diff
Branch: master
Author: Antoine Taillefer <ataillefer< at >nuxeo.com>
Date: 2012-05-25T18:45:52-07:00
URL: https://github.com/nuxeo/nuxeo-diff/commit/d54da5ab389589a530f2cf4544e3999d5af53c49
JIRA: https://jira.nuxeo.com/browse/NXP-8596
Files:
M nuxeo-diff-jsf/pom.xml
M nuxeo-diff-jsf/src/main/java/org/nuxeo/ecm/diff/model/DiffBlockDefinition.java
M nuxeo-diff-jsf/src/main/java/org/nuxeo/ecm/diff/model/impl/DiffBlockDefinitionImpl.java
M nuxeo-diff-jsf/src/main/java/org/nuxeo/ecm/diff/service/impl/DiffBlockDescriptor.java
M nuxeo-diff-jsf/src/main/java/org/nuxeo/ecm/diff/service/impl/DiffDisplayServiceImpl.java
M nuxeo-diff-jsf/src/main/resources/OSGI-INF/diff-display-contrib.xml
M nuxeo-diff-jsf/src/main/resources/web/nuxeo.war/incl/diff/doc_diff_result.xhtml
M nuxeo-diff-jsf/src/test/java/org/nuxeo/ecm/diff/service/TestDiffDisplayContrib.java
M nuxeo-diff-jsf/src/test/java/org/nuxeo/ecm/diff/service/TestDiffDisplayContribOverride.java
M nuxeo-diff-jsf/src/test/resources/OSGI-INF/test-diff-display-contrib.xml
diff --git a/nuxeo-diff-jsf/pom.xml b/nuxeo-diff-jsf/pom.xml
index 9fdfc50..dfd6ca1 100644
--- a/nuxeo-diff-jsf/pom.xml
+++ b/nuxeo-diff-jsf/pom.xml
< at >< at > -41,7 +41,6 < at >< at >
<dependency>
<groupId>org.nuxeo.ecm.platform</groupId>
<artifactId>nuxeo-platform-forms-layout-core</artifactId>
- <scope>test</scope>
</dependency>
</dependencies>
diff --git a/nuxeo-diff-jsf/src/main/java/org/nuxeo/ecm/diff/model/DiffBlockDefinition.java b/nuxeo-diff-jsf/src/main/java/org/nuxeo/ecm/diff/model/DiffBlockDefinition.java
index 8b715d4..778fa46 100644
--- a/nuxeo-diff-jsf/src/main/java/org/nuxeo/ecm/diff/model/DiffBlockDefinition.java
+++ b/nuxeo-diff-jsf/src/main/java/org/nuxeo/ecm/diff/model/DiffBlockDefinition.java
< at >< at > -18,34 +18,43 < at >< at >
import java.io.Serializable;
import java.util.List;
+import java.util.Map;
/**
* Diff block definition interface.
- *
+ *
* < at >author <a href="mailto:ataillefer< at >nuxeo.com">Antoine Taillefer</a>
* < at >since 5.6
*/
public interface DiffBlockDefinition extends Serializable {
/**
- * Gets the diff block name.
- *
- * < at >return the schema name
+ * Gets the diff block definition name.
*/
String getName();
/**
- * Gets the diff block label.
- *
- * < at >return the label
+ * Returns the template to use in a given mode.
*/
- String getLabel();
+ String getTemplate(String mode);
/**
- * Gets the diff block fields.
- *
- * < at >return the schema fields
+ * Returns a map of templates by mode.
+ */
+ Map<String, String> getTemplates();
+
+ /**
+ * Returns the list of field definitions.
*/
List<DiffFieldDefinition> getFields();
+ /**
+ * Returns a map of properties to use in a given mode.
+ */
+ Map<String, Serializable> getProperties(String layoutMode);
+
+ /**
+ * Returns a map of properties by mode.
+ */
+ Map<String, Map<String, Serializable>> getProperties();
}
diff --git a/nuxeo-diff-jsf/src/main/java/org/nuxeo/ecm/diff/model/impl/DiffBlockDefinitionImpl.java b/nuxeo-diff-jsf/src/main/java/org/nuxeo/ecm/diff/model/impl/DiffBlockDefinitionImpl.java
index b6587c0..de70960 100644
--- a/nuxeo-diff-jsf/src/main/java/org/nuxeo/ecm/diff/model/impl/DiffBlockDefinitionImpl.java
+++ b/nuxeo-diff-jsf/src/main/java/org/nuxeo/ecm/diff/model/impl/DiffBlockDefinitionImpl.java
< at >< at > -16,17 +16,21 < at >< at >
*/
package org.nuxeo.ecm.diff.model.impl;
+import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
+import java.util.Map;
import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.collections.MapUtils;
import org.nuxeo.ecm.diff.model.DiffBlockDefinition;
import org.nuxeo.ecm.diff.model.DiffFieldDefinition;
+import org.nuxeo.ecm.platform.forms.layout.api.BuiltinModes;
+import org.nuxeo.ecm.platform.forms.layout.api.impl.WidgetDefinitionImpl;
/**
* Default implementation of a {< at >link DiffBlockDefinition}.
- *
+ *
* < at >author <a href="mailto:ataillefer< at >nuxeo.com">Antoine Taillefer</a>
* < at >since 5.6
*/
< at >< at > -34,41 +38,58 < at >< at >
private static final long serialVersionUID = 511776842683091931L;
- protected static final String DIFF_DISPLAY_BLOCK_LABEL_PREFIX = "label.diffBlock.";
-
protected String name;
- protected String label;
+ protected Map<String, String> templates;
protected List<DiffFieldDefinition> fields;
- public DiffBlockDefinitionImpl(String name, String label,
- List<DiffFieldDefinition> fields) {
+ protected Map<String, Map<String, Serializable>> properties;
+
+ public DiffBlockDefinitionImpl(String name, Map<String, String> templates,
+ List<DiffFieldDefinition> fields,
+ Map<String, Map<String, Serializable>> properties) {
this.name = name;
- if (StringUtils.isEmpty(label)) {
- this.label = DIFF_DISPLAY_BLOCK_LABEL_PREFIX + name;
- } else {
- this.label = label;
- }
+ this.templates = templates;
if (fields == null) {
this.fields = new ArrayList<DiffFieldDefinition>();
} else {
this.fields = fields;
}
+ this.properties = properties;
}
public String getName() {
return name;
}
- public String getLabel() {
- return label;
+ public String getTemplate(String mode) {
+ if (templates != null) {
+ String template = templates.get(mode);
+ if (template == null) {
+ template = templates.get(BuiltinModes.ANY);
+ }
+ return template;
+ }
+ return null;
+ }
+
+ public Map<String, String> getTemplates() {
+ return templates;
}
public List<DiffFieldDefinition> getFields() {
return fields;
}
+ public Map<String, Serializable> getProperties(String layoutMode) {
+ return WidgetDefinitionImpl.getProperties(properties, layoutMode);
+ }
+
+ public Map<String, Map<String, Serializable>> getProperties() {
+ return properties;
+ }
+
< at >Override
public boolean equals(Object other) {
< at >< at > -88,16 +109,29 < at >< at > public boolean equals(Object other) {
return false;
}
+ Map<String, String> otherTemplates = ((DiffBlockDefinition) other).getTemplates();
List<DiffFieldDefinition> otherFields = ((DiffBlockDefinition) other).getFields();
- if (CollectionUtils.isEmpty(fields)
- && CollectionUtils.isEmpty(otherFields)) {
+ Map<String, Map<String, Serializable>> otherProperties = ((DiffBlockDefinition) other).getProperties();
+ if (MapUtils.isEmpty(templates) && MapUtils.isEmpty(otherTemplates)
+ && CollectionUtils.isEmpty(fields)
+ && CollectionUtils.isEmpty(otherFields)
+ && MapUtils.isEmpty(properties)
+ && MapUtils.isEmpty(otherProperties)) {
return true;
}
- if (CollectionUtils.isEmpty(fields)
+ if (MapUtils.isEmpty(templates) && !MapUtils.isEmpty(otherTemplates)
+ || !MapUtils.isEmpty(templates)
+ && MapUtils.isEmpty(otherTemplates)
+ || !templates.equals(otherTemplates)
+ || CollectionUtils.isEmpty(fields)
&& !CollectionUtils.isEmpty(otherFields)
|| !CollectionUtils.isEmpty(fields)
&& CollectionUtils.isEmpty(otherFields)
- || !fields.equals(otherFields)) {
+ || !fields.equals(otherFields) || MapUtils.isEmpty(properties)
+ && !MapUtils.isEmpty(otherProperties)
+ || !MapUtils.isEmpty(properties)
+ && MapUtils.isEmpty(otherProperties)
+ || !properties.equals(otherProperties)) {
return false;
}
< at >< at > -106,6 +140,6 < at >< at > public boolean equals(Object other) {
< at >Override
public String toString() {
- return name + fields;
+ return name + fields + templates + properties;
}
}
diff --git a/nuxeo-diff-jsf/src/main/java/org/nuxeo/ecm/diff/service/impl/DiffBlockDescriptor.java b/nuxeo-diff-jsf/src/main/java/org/nuxeo/ecm/diff/service/impl/DiffBlockDescriptor.java
index d984ec3..33c74e5 100644
--- a/nuxeo-diff-jsf/src/main/java/org/nuxeo/ecm/diff/service/impl/DiffBlockDescriptor.java
+++ b/nuxeo-diff-jsf/src/main/java/org/nuxeo/ecm/diff/service/impl/DiffBlockDescriptor.java
< at >< at > -12,20 +12,27 < at >< at >
* Lesser General Public License for more details.
*
* Contributors:
- * ataillefer
+ * Antoine Taillefer
*/
package org.nuxeo.ecm.diff.service.impl;
+import java.io.Serializable;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import org.nuxeo.common.xmap.annotation.XNode;
import org.nuxeo.common.xmap.annotation.XNodeList;
+import org.nuxeo.common.xmap.annotation.XNodeMap;
import org.nuxeo.common.xmap.annotation.XObject;
+import org.nuxeo.ecm.platform.forms.layout.api.BuiltinModes;
+import org.nuxeo.ecm.platform.forms.layout.descriptors.PropertiesDescriptor;
+import org.nuxeo.ecm.platform.forms.layout.descriptors.WidgetDescriptor;
/**
* Diff block descriptor.
- *
+ *
* < at >author <a href="mailto:ataillefer< at >nuxeo.com">Antoine Taillefer</a>
* < at >since 5.6
*/
< at >< at > -35,12 +42,15 < at >< at >
< at >XNode("< at >name")
public String name;
- < at >XNode("< at >label")
- public String label;
+ < at >XNodeMap(value = "templates/template", key = "< at >mode", type = HashMap.class, componentType = String.class)
+ Map<String, String> templates = new HashMap<String, String>();
< at >XNodeList(value = "fields/field", type = ArrayList.class, componentType = DiffFieldDescriptor.class)
public List<DiffFieldDescriptor> fields;
+ < at >XNodeMap(value = "properties", key = "< at >mode", type = HashMap.class, componentType = PropertiesDescriptor.class)
+ Map<String, PropertiesDescriptor> properties = new HashMap<String, PropertiesDescriptor>();
+
public String getName() {
return name;
}
< at >< at > -49,12 +59,20 < at >< at > public void setName(String name) {
this.name = name;
}
- public String getLabel() {
- return label;
+ public String getTemplate(String mode) {
+ String template = templates.get(mode);
+ if (template == null) {
+ template = templates.get(BuiltinModes.ANY);
+ }
+ return template;
}
- public void setLabel(String label) {
- this.label = label;
+ public Map<String, String> getTemplates() {
+ return templates;
+ }
+
+ public void setTemplates(Map<String, String> templates) {
+ this.templates = templates;
}
public List<DiffFieldDescriptor> getFields() {
< at >< at > -64,4 +82,16 < at >< at > public void setLabel(String label) {
public void setFields(List<DiffFieldDescriptor> fields) {
this.fields = fields;
}
+
+ public Map<String, Serializable> getProperties(String layoutMode) {
+ return WidgetDescriptor.getProperties(properties, layoutMode);
+ }
+
+ public Map<String, Map<String, Serializable>> getProperties() {
+ return WidgetDescriptor.getProperties(properties);
+ }
+
+ public void setProperties(Map<String, PropertiesDescriptor> properties) {
+ this.properties = properties;
+ }
}
diff --git a/nuxeo-diff-jsf/src/main/java/org/nuxeo/ecm/diff/service/impl/DiffDisplayServiceImpl.java b/nuxeo-diff-jsf/src/main/java/org/nuxeo/ecm/diff/service/impl/DiffDisplayServiceImpl.java
index 3f069ab..2834cd4 100644
--- a/nuxeo-diff-jsf/src/main/java/org/nuxeo/ecm/diff/service/impl/DiffDisplayServiceImpl.java
+++ b/nuxeo-diff-jsf/src/main/java/org/nuxeo/ecm/diff/service/impl/DiffDisplayServiceImpl.java
< at >< at > -94,6 +94,12 < at >< at >
protected static final String DIFF_WIDGET_CATEGORY = "diff";
+ protected static final String DIFF_BLOCK_DEFAULT_TEMPLATE_PATH = "/layouts/layout_diff_template.xhtml";
+
+ protected static final String DIFF_BLOCK_LABEL_PROPERTY_NAME = "label";
+
+ protected static final String DIFF_BLOCK_DEFAULT_LABEL_PREFIX = "label.diffBlock.";
+
protected static final String DIFF_WIDGET_LABEL_PREFIX = "label.";
protected static final String CONTENT_DIFF_LINKS_WIDGET_NAME = "contentDiffLinks";
< at >< at > -395,7 +401,8 < at >< at > protected final void registerDiffBlock(DiffBlockDescriptor descriptor) {
diffBlockContribs.put(
diffBlockName,
new DiffBlockDefinitionImpl(diffBlockName,
- descriptor.getLabel(), fields));
+ descriptor.getTemplates(), fields,
+ descriptor.getProperties()));
}
}
}
< at >< at > -419,8 +426,20 < at >< at > protected final void registerDiffBlock(DiffBlockDescriptor descriptor) {
fieldName));
}
}
- diffBlockDefs.add(new DiffBlockDefinitionImpl(schemaName, null,
- fieldDefs));
+
+ Map<String, String> defaultDiffBlockTemplates = new HashMap<String, String>();
+ defaultDiffBlockTemplates.put(BuiltinModes.ANY,
+ DIFF_BLOCK_DEFAULT_TEMPLATE_PATH);
+
+ Map<String, Map<String, Serializable>> defaultDiffBlockProperties = new HashMap<String, Map<String, Serializable>>();
+ Map<String, Serializable> labelProperty = new HashMap<String, Serializable>();
+ labelProperty.put(DIFF_BLOCK_LABEL_PROPERTY_NAME,
+ DIFF_BLOCK_DEFAULT_LABEL_PREFIX + schemaName);
+ defaultDiffBlockProperties.put(BuiltinModes.ANY, labelProperty);
+
+ diffBlockDefs.add(new DiffBlockDefinitionImpl(schemaName,
+ defaultDiffBlockTemplates, fieldDefs,
+ defaultDiffBlockProperties));
}
}
< at >< at > -566,13 +585,16 < at >< at > protected final DiffDisplayBlock getDiffDisplayBlock(
// Build layout definition
LayoutDefinition layoutDefinition = new LayoutDefinitionImpl(
- diffBlockDefinition.getName(), null, null,
- layoutRowDefinitions, widgetDefinitions);
+ diffBlockDefinition.getName(),
+ diffBlockDefinition.getProperties(),
+ diffBlockDefinition.getTemplates(), layoutRowDefinitions,
+ widgetDefinitions);
// Build diff display block
+ Map<String, Serializable> diffBlockProperties = diffBlockDefinition.getProperties(BuiltinModes.ANY);
DiffDisplayBlock diffDisplayBlock = new DiffDisplayBlockImpl(
- diffBlockDefinition.getLabel(), leftValue, rightValue,
- contentDiffValue, layoutDefinition);
+ (String) diffBlockProperties.get(DIFF_BLOCK_LABEL_PROPERTY_NAME),
+ leftValue, rightValue, contentDiffValue, layoutDefinition);
return diffDisplayBlock;
}
diff --git a/nuxeo-diff-jsf/src/main/resources/OSGI-INF/diff-display-contrib.xml b/nuxeo-diff-jsf/src/main/resources/OSGI-INF/diff-display-contrib.xml
index 247fc1f..f71d11a 100644
--- a/nuxeo-diff-jsf/src/main/resources/OSGI-INF/diff-display-contrib.xml
+++ b/nuxeo-diff-jsf/src/main/resources/OSGI-INF/diff-display-contrib.xml
< at >< at > -34,14 +34,24 < at >< at >
<extension target="org.nuxeo.ecm.diff.service.DiffDisplayService"
point="diffBlock">
- <diffBlock name="heading" label="label.diffBlock.heading">
+ <diffBlock name="heading">
+ <properties mode="any">
+ <property name="label">label.diffBlock.heading</property>
+ </properties>
<fields>
<field schema="dublincore" name="title" />
<field schema="dublincore" name="description" />
</fields>
+ <templates>
+ <template mode="any">/layouts/layout_diff_template.xhtml
+ </template>
+ </templates>
</diffBlock>
- <diffBlock name="dublincore" label="label.diffBlock.dublincore">
+ <diffBlock name="dublincore">
+ <properties mode="any">
+ <property name="label">label.diffBlock.dublincore</property>
+ </properties>
<fields>
<field schema="dublincore" name="nature" />
<field schema="dublincore" name="subjects" />
< at >< at > -57,9 +67,16 < at >< at >
<field schema="dublincore" name="contributors" />
<field schema="dublincore" name="lastContributor" />
</fields>
+ <templates>
+ <template mode="any">/layouts/layout_diff_template.xhtml
+ </template>
+ </templates>
</diffBlock>
- <diffBlock name="files" label="label.diffBlock.files">
+ <diffBlock name="files">
+ <properties mode="any">
+ <property name="label">label.diffBlock.files</property>
+ </properties>
<fields>
<field schema="file" name="content"
displayContentDiffLinks="true" />
< at >< at > -71,21 +88,25 < at >< at >
</items>
</field>
</fields>
+ <templates>
+ <template mode="any">/layouts/layout_diff_template.xhtml
+ </template>
+ </templates>
</diffBlock>
- <diffBlock name="note" label="label.diffBlock.note">
+ <diffBlock name="note">
+ <properties mode="any">
+ <property name="label">label.diffBlock.note</property>
+ </properties>
<fields>
<field schema="note" name="note" displayContentDiffLinks="true" />
</fields>
+ <templates>
+ <template mode="any">/layouts/layout_diff_template.xhtml
+ </template>
+ </templates>
</diffBlock>
- <!-- <diffBlock name="dublincore"> <properties mode="any"> <property
- name="label">label.diffBlock.dublincore</property> </properties> <templates>
- <template mode="any">/layouts/layout_default_template.xhtml </template> </templates>
- <fields> <field schema="dublincore" name="created" category="truc" /> <field
- schema="dublincore" name="modified" /> <field schema="dublincore" name="creator"
- /> <field schema="dublincore" name="lastContributor" /> </fields> </diffBlock> -->
-
</extension>
</component>
diff --git a/nuxeo-diff-jsf/src/main/resources/web/nuxeo.war/incl/diff/doc_diff_result.xhtml b/nuxeo-diff-jsf/src/main/resources/web/nuxeo.war/incl/diff/doc_diff_result.xhtml
index 3400ebe..3ff2715 100644
--- a/nuxeo-diff-jsf/src/main/resources/web/nuxeo.war/incl/diff/doc_diff_result.xhtml
+++ b/nuxeo-diff-jsf/src/main/resources/web/nuxeo.war/incl/diff/doc_diff_result.xhtml
< at >< at > -66,7 +66,7 < at >< at >
</h3>
<div class="boxBody">
<nxl:layout mode="view" definition="#{diffDisplayBlock.layoutDefinition}"
- value="#{diffDisplayBlock}" template="/layouts/layout_diff_template.xhtml"/>
+ value="#{diffDisplayBlock}" />
</div>
</div>
</c:forEach>
diff --git a/nuxeo-diff-jsf/src/test/java/org/nuxeo/ecm/diff/service/TestDiffDisplayContrib.java b/nuxeo-diff-jsf/src/test/java/org/nuxeo/ecm/diff/service/TestDiffDisplayContrib.java
index c719724..05120a9 100644
--- a/nuxeo-diff-jsf/src/test/java/org/nuxeo/ecm/diff/service/TestDiffDisplayContrib.java
+++ b/nuxeo-diff-jsf/src/test/java/org/nuxeo/ecm/diff/service/TestDiffDisplayContrib.java
< at >< at > -22,7 +22,9 < at >< at >
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
+import java.io.Serializable;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
< at >< at > -35,6 +37,7 < at >< at >
import org.nuxeo.ecm.diff.model.impl.DiffBlockDefinitionImpl;
import org.nuxeo.ecm.diff.model.impl.DiffFieldDefinitionImpl;
import org.nuxeo.ecm.diff.model.impl.DiffFieldItemDefinitionImpl;
+import org.nuxeo.ecm.platform.forms.layout.api.BuiltinModes;
import org.nuxeo.runtime.test.runner.Deploy;
import org.nuxeo.runtime.test.runner.Features;
import org.nuxeo.runtime.test.runner.FeaturesRunner;
< at >< at > -148,8 +151,17 < at >< at > public void testDiffBlockContrib() {
List<DiffFieldDefinition> fields = new ArrayList<DiffFieldDefinition>();
fields.add(new DiffFieldDefinitionImpl("dublincore", "title"));
fields.add(new DiffFieldDefinitionImpl("dublincore", "description"));
+
+ Map<String, String> templates = new HashMap<String, String>();
+ templates.put(BuiltinModes.ANY, "/layouts/layout_diff_template.xhtml");
+
+ Map<String, Map<String, Serializable>> properties = new HashMap<String, Map<String, Serializable>>();
+ Map<String, Serializable> labelProperty = new HashMap<String, Serializable>();
+ labelProperty.put("label", "label.diffBlock.heading");
+ properties.put(BuiltinModes.ANY, labelProperty);
+
DiffBlockDefinition expectedDiffBlockDefinition = new DiffBlockDefinitionImpl(
- "heading", null, fields);
+ "heading", templates, fields, properties);
assertEquals(expectedDiffBlockDefinition, diffBlockDefinition);
// Check that order is taken into account
< at >< at > -177,8 +189,10 < at >< at > public void testDiffBlockContrib() {
fields.add(new DiffFieldDefinitionImpl("dublincore", "creator"));
fields.add(new DiffFieldDefinitionImpl("dublincore", "contributors"));
fields.add(new DiffFieldDefinitionImpl("dublincore", "lastContributor"));
+
+ labelProperty.put("label", "label.diffBlock.dublincore");
expectedDiffBlockDefinition = new DiffBlockDefinitionImpl("dublincore",
- null, fields);
+ templates, fields, properties);
assertEquals(expectedDiffBlockDefinition, diffBlockDefinition);
// Check files diffDisplay contrib
< at >< at > -190,8 +204,10 < at >< at > public void testDiffBlockContrib() {
List<DiffFieldItemDefinition> items = new ArrayList<DiffFieldItemDefinition>();
items.add(new DiffFieldItemDefinitionImpl("file", true));
fields.add(new DiffFieldDefinitionImpl("files", "files", items));
+
+ labelProperty.put("label", "label.diffBlock.files");
expectedDiffBlockDefinition = new DiffBlockDefinitionImpl("files",
- null, fields);
+ templates, fields, properties);
assertEquals(expectedDiffBlockDefinition, diffBlockDefinition);
// Check note diffDisplay contrib
< at >< at > -200,8 +216,10 < at >< at > public void testDiffBlockContrib() {
fields = new ArrayList<DiffFieldDefinition>();
fields.add(new DiffFieldDefinitionImpl("note", "note", true));
- expectedDiffBlockDefinition = new DiffBlockDefinitionImpl("note", null,
- fields);
+
+ labelProperty.put("label", "label.diffBlock.note");
+ expectedDiffBlockDefinition = new DiffBlockDefinitionImpl("note",
+ templates, fields, properties);
assertEquals(expectedDiffBlockDefinition, diffBlockDefinition);
}
}
diff --git a/nuxeo-diff-jsf/src/test/java/org/nuxeo/ecm/diff/service/TestDiffDisplayContribOverride.java b/nuxeo-diff-jsf/src/test/java/org/nuxeo/ecm/diff/service/TestDiffDisplayContribOverride.java
index 0384643..107b358 100644
--- a/nuxeo-diff-jsf/src/test/java/org/nuxeo/ecm/diff/service/TestDiffDisplayContribOverride.java
+++ b/nuxeo-diff-jsf/src/test/java/org/nuxeo/ecm/diff/service/TestDiffDisplayContribOverride.java
< at >< at > -21,7 +21,9 < at >< at >
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
+import java.io.Serializable;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
< at >< at > -34,6 +36,7 < at >< at >
import org.nuxeo.ecm.diff.model.impl.DiffBlockDefinitionImpl;
import org.nuxeo.ecm.diff.model.impl.DiffFieldDefinitionImpl;
import org.nuxeo.ecm.diff.model.impl.DiffFieldItemDefinitionImpl;
+import org.nuxeo.ecm.platform.forms.layout.api.BuiltinModes;
import org.nuxeo.runtime.test.runner.Deploy;
import org.nuxeo.runtime.test.runner.Features;
import org.nuxeo.runtime.test.runner.FeaturesRunner;
< at >< at > -159,8 +162,17 < at >< at > public void testDiffBlockContrib() {
List<DiffFieldDefinition> fields = new ArrayList<DiffFieldDefinition>();
fields.add(new DiffFieldDefinitionImpl("dublincore", "title"));
fields.add(new DiffFieldDefinitionImpl("dublincore", "description"));
+
+ Map<String, String> templates = new HashMap<String, String>();
+ templates.put(BuiltinModes.ANY, "/layouts/layout_diff_template.xhtml");
+
+ Map<String, Map<String, Serializable>> properties = new HashMap<String, Map<String, Serializable>>();
+ Map<String, Serializable> labelProperty = new HashMap<String, Serializable>();
+ labelProperty.put("label", "label.diffBlock.heading");
+ properties.put(BuiltinModes.ANY, labelProperty);
+
DiffBlockDefinition expectedDiffBlockDefinition = new DiffBlockDefinitionImpl(
- "heading", null, fields);
+ "heading", templates, fields, properties);
assertEquals(expectedDiffBlockDefinition, diffBlockDefinition);
// Check overridden dublincore diffDisplay contrib
< at >< at > -174,8 +186,10 < at >< at > public void testDiffBlockContrib() {
fields.add(new DiffFieldDefinitionImpl("dublincore", "lastContributor"));
fields.add(new DiffFieldDefinitionImpl("dublincore", "contributors"));
fields.add(new DiffFieldDefinitionImpl("dublincore", "subjects"));
+
+ labelProperty.put("label", "label.diffBlock.dublincore");
expectedDiffBlockDefinition = new DiffBlockDefinitionImpl("dublincore",
- null, fields);
+ templates, fields, properties);
assertEquals(expectedDiffBlockDefinition, diffBlockDefinition);
// Check non overridden files diffDisplay contrib
< at >< at > -187,8 +201,10 < at >< at > public void testDiffBlockContrib() {
List<DiffFieldItemDefinition> items = new ArrayList<DiffFieldItemDefinition>();
items.add(new DiffFieldItemDefinitionImpl("file", true));
fields.add(new DiffFieldDefinitionImpl("files", "files", items));
+
+ labelProperty.put("label", "label.diffBlock.files");
expectedDiffBlockDefinition = new DiffBlockDefinitionImpl("files",
- null, fields);
+ templates, fields, properties);
assertEquals(expectedDiffBlockDefinition, diffBlockDefinition);
// Check non overridden note diffDisplay contrib
< at >< at > -197,8 +213,10 < at >< at > public void testDiffBlockContrib() {
fields = new ArrayList<DiffFieldDefinition>();
fields.add(new DiffFieldDefinitionImpl("note", "note", true));
- expectedDiffBlockDefinition = new DiffBlockDefinitionImpl("note", null,
- fields);
+
+ labelProperty.put("label", "label.diffBlock.note");
+ expectedDiffBlockDefinition = new DiffBlockDefinitionImpl("note",
+ templates, fields, properties);
assertEquals(expectedDiffBlockDefinition, diffBlockDefinition);
// Check new simpleTypes diffDisplay contrib
< at >< at > -213,8 +231,10 < at >< at > public void testDiffBlockContrib() {
fields.add(new DiffFieldDefinitionImpl("simpletypes", "date"));
fields.add(new DiffFieldDefinitionImpl("simpletypes", "htmlText", true));
fields.add(new DiffFieldDefinitionImpl("simpletypes", "multivalued"));
+
+ labelProperty.put("label", "label.diffBlock.simpleTypes");
expectedDiffBlockDefinition = new DiffBlockDefinitionImpl(
- "simpleTypes", null, fields);
+ "simpleTypes", templates, fields, properties);
assertEquals(expectedDiffBlockDefinition, diffBlockDefinition);
// Check new complexTypesAndListOfLists diffDisplay contrib
< at >< at > -235,8 +255,10 < at >< at > public void testDiffBlockContrib() {
fields.add(new DiffFieldDefinitionImpl("complextypes", "complexList",
items));
fields.add(new DiffFieldDefinitionImpl("listoflists", "listOfLists"));
+
+ labelProperty.put("label", "label.diffBlock.complexTypesAndListOfLists");
expectedDiffBlockDefinition = new DiffBlockDefinitionImpl(
- "complexTypesAndListOfLists", null, fields);
+ "complexTypesAndListOfLists", templates, fields, properties);
assertEquals(expectedDiffBlockDefinition, diffBlockDefinition);
}
}
diff --git a/nuxeo-diff-jsf/src/test/resources/OSGI-INF/test-diff-display-contrib.xml b/nuxeo-diff-jsf/src/test/resources/OSGI-INF/test-diff-display-contrib.xml
index e15cafe..ed453d7 100644
--- a/nuxeo-diff-jsf/src/test/resources/OSGI-INF/test-diff-display-contrib.xml
+++ b/nuxeo-diff-jsf/src/test/resources/OSGI-INF/test-diff-display-contrib.xml
< at >< at > -49,7 +49,10 < at >< at >
<diffBlock name="testNoFields" />
<!-- Override dublincore diffBlock -->
- <diffBlock name="dublincore" label="label.diffBlock.dublincore">
+ <diffBlock name="dublincore">
+ <properties mode="any">
+ <property name="label">label.diffBlock.dublincore</property>
+ </properties>
<fields>
<field schema="dublincore" name="created" />
<field schema="dublincore" name="creator" />
< at >< at > -58,10 +61,17 < at >< at >
<field schema="dublincore" name="contributors" />
<field schema="dublincore" name="subjects" />
</fields>
+ <templates>
+ <template mode="any">/layouts/layout_diff_template.xhtml
+ </template>
+ </templates>
</diffBlock>
<!-- simpleTypes diffBlock -->
- <diffBlock name="simpleTypes" label="label.diffBlock.simpleTypes">
+ <diffBlock name="simpleTypes">
+ <properties mode="any">
+ <property name="label">label.diffBlock.simpleTypes</property>
+ </properties>
<fields>
<field schema="simpletypes" name="string" />
<field schema="simpletypes" name="textarea"
< at >< at > -73,11 +83,18 < at >< at >
displayContentDiffLinks="true" />
<field schema="simpletypes" name="multivalued" />
</fields>
+ <templates>
+ <template mode="any">/layouts/layout_diff_template.xhtml
+ </template>
+ </templates>
</diffBlock>
<!-- complexTypesAndListOfLists diffBlock -->
- <diffBlock name="complexTypesAndListOfLists"
- label="label.diffBlock.complexTypesAndListOfLists">
+ <diffBlock name="complexTypesAndListOfLists">
+ <properties mode="any">
+ <property name="label">label.diffBlock.complexTypesAndListOfLists
+ </property>
+ </properties>
<fields>
<field schema="complextypes" name="complex">
<items>
< at >< at > -96,6 +113,10 < at >< at >
</field>
<field schema="listoflists" name="listOfLists" />
</fields>
+ <templates>
+ <template mode="any">/layouts/layout_diff_template.xhtml
+ </template>
+ </templates>
</diffBlock>
</extension>
_______________________________________________
ECM-checkins mailing list
ECM-checkins-FQDHc1wsLCVb90+sfpvX0g< at >public.gmane.org
http://lists.nuxeo.com/mailman/listinfo/ecm-checkins
</pre>
Antoine Taillefer
2012-05-26T03:53:07
-
nuxeo-diff: NXP-8596: Add category to the fielddescriptor(branch< at >master)
http://comments.gmane.org/gmane.comp.cms.nuxeo.scm/73221
<pre>Message:
NXP-8596: Add category to the field descriptor
Repository: nuxeo-diff
Branch: master
Author: Antoine Taillefer <ataillefer< at >nuxeo.com>
Date: 2012-05-25T20:02:20-07:00
URL: https://github.com/nuxeo/nuxeo-diff/commit/66e1157c4c7f55a925eb85038a21569a5f5d678f
JIRA: https://jira.nuxeo.com/browse/NXP-8596
Files:
M nuxeo-diff-jsf/src/main/java/org/nuxeo/ecm/diff/model/DiffFieldDefinition.java
M nuxeo-diff-jsf/src/main/java/org/nuxeo/ecm/diff/model/impl/DiffFieldDefinitionImpl.java
M nuxeo-diff-jsf/src/main/java/org/nuxeo/ecm/diff/service/impl/DiffDisplayServiceImpl.java
M nuxeo-diff-jsf/src/main/java/org/nuxeo/ecm/diff/service/impl/DiffFieldDescriptor.java
M nuxeo-diff-jsf/src/test/java/org/nuxeo/ecm/diff/service/TestDiffDisplayContrib.java
M nuxeo-diff-jsf/src/test/java/org/nuxeo/ecm/diff/service/TestDiffDisplayContribOverride.java
diff --git a/nuxeo-diff-jsf/src/main/java/org/nuxeo/ecm/diff/model/DiffFieldDefinition.java b/nuxeo-diff-jsf/src/main/java/org/nuxeo/ecm/diff/model/DiffFieldDefinition.java
index e3f8c33..9866228 100644
--- a/nuxeo-diff-jsf/src/main/java/org/nuxeo/ecm/diff/model/DiffFieldDefinition.java
+++ b/nuxeo-diff-jsf/src/main/java/org/nuxeo/ecm/diff/model/DiffFieldDefinition.java
< at >< at > -12,7 +12,7 < at >< at >
* Lesser General Public License for more details.
*
* Contributors:
- * ataillefer
+ * Antoine Taillefer
*/
package org.nuxeo.ecm.diff.model;
< at >< at > -28,6 +28,12 < at >< at >
public interface DiffFieldDefinition extends Serializable {
/**
+ * Optional category on the field: if this category is filled, the widget
+ * instance will be looked up with this category in the store
+ */
+ String getCategory();
+
+ /**
* Gets the field schema.
*
* < at >return the field schema
diff --git a/nuxeo-diff-jsf/src/main/java/org/nuxeo/ecm/diff/model/impl/DiffFieldDefinitionImpl.java b/nuxeo-diff-jsf/src/main/java/org/nuxeo/ecm/diff/model/impl/DiffFieldDefinitionImpl.java
index 55d45eb..bb91256 100644
--- a/nuxeo-diff-jsf/src/main/java/org/nuxeo/ecm/diff/model/impl/DiffFieldDefinitionImpl.java
+++ b/nuxeo-diff-jsf/src/main/java/org/nuxeo/ecm/diff/model/impl/DiffFieldDefinitionImpl.java
< at >< at > -12,7 +12,7 < at >< at >
* Lesser General Public License for more details.
*
* Contributors:
- * ataillefer
+ * Antoine Taillefer
*/
package org.nuxeo.ecm.diff.model.impl;
< at >< at > -33,6 +33,8 < at >< at >
private static final long serialVersionUID = 6192730067253949180L;
+ protected String category;
+
protected String schema;
protected String name;
< at >< at > -41,29 +43,34 < at >< at >
protected List<DiffFieldItemDefinition> items;
- public DiffFieldDefinitionImpl(String schema, String name) {
- this(schema, name, false);
+ public DiffFieldDefinitionImpl(String category, String schema, String name) {
+ this(category, schema, name, false);
}
- public DiffFieldDefinitionImpl(String schema, String name,
+ public DiffFieldDefinitionImpl(String category, String schema, String name,
boolean displayContentDiffLinks) {
- this(schema, name, displayContentDiffLinks,
+ this(category, schema, name, displayContentDiffLinks,
new ArrayList<DiffFieldItemDefinition>());
}
- public DiffFieldDefinitionImpl(String schema, String name,
+ public DiffFieldDefinitionImpl(String category, String schema, String name,
List<DiffFieldItemDefinition> items) {
- this(schema, name, false, items);
+ this(category, schema, name, false, items);
}
- public DiffFieldDefinitionImpl(String schema, String name,
+ public DiffFieldDefinitionImpl(String category, String schema, String name,
boolean displayContentDiffLinks, List<DiffFieldItemDefinition> items) {
+ this.category = category;
this.schema = schema;
this.name = name;
this.displayContentDiffLinks = displayContentDiffLinks;
this.items = items;
}
+ public String getCategory() {
+ return category;
+ }
+
public String getSchema() {
return schema;
}
< at >< at > -90,16 +97,21 < at >< at > public boolean equals(Object other) {
return false;
}
+ String otherCategory = ((DiffFieldDefinition) other).getCategory();
String otherSchema = ((DiffFieldDefinition) other).getSchema();
String otherName = ((DiffFieldDefinition) other).getName();
boolean otherDisplayContentDiffLinks = ((DiffFieldDefinition) other).isDisplayContentDiffLinks();
- if (schema == null && otherSchema == null && name == null
- && otherName == null) {
+ if (category == null && otherCategory == null && schema == null
+ && otherSchema == null && name == null && otherName == null) {
return true;
}
if (schema == null || otherSchema == null || name == null
- || otherName == null || !schema.equals(otherSchema)
- || !name.equals(otherName)
+ || otherName == null
+ || (category == null && otherCategory != null)
+ || (category != null && otherCategory == null)
+ || (category != null && !category.equals(otherCategory))
+ || (schema != null && !schema.equals(otherSchema))
+ || (name != null && !name.equals(otherName))
|| displayContentDiffLinks != otherDisplayContentDiffLinks) {
return false;
}
< at >< at > -122,8 +134,17 < at >< at > public boolean equals(Object other) {
< at >Override
public String toString() {
- return schema + ":" + name + " (displayContentDiffLinks: "
- + displayContentDiffLinks + ") "
- + (!CollectionUtils.isEmpty(items) ? items : "");
+ StringBuilder sb = new StringBuilder();
+ sb.append("category=");
+ sb.append(category);
+ sb.append(" / ");
+ sb.append(schema);
+ sb.append(":");
+ sb.append(name);
+ sb.append(" / ");
+ sb.append("displayContentDiffLinks=");
+ sb.append(displayContentDiffLinks);
+ sb.append(!CollectionUtils.isEmpty(items) ? " / " + items : "");
+ return sb.toString();
}
}
diff --git a/nuxeo-diff-jsf/src/main/java/org/nuxeo/ecm/diff/service/impl/DiffDisplayServiceImpl.java b/nuxeo-diff-jsf/src/main/java/org/nuxeo/ecm/diff/service/impl/DiffDisplayServiceImpl.java
index 2834cd4..47b31a1 100644
--- a/nuxeo-diff-jsf/src/main/java/org/nuxeo/ecm/diff/service/impl/DiffDisplayServiceImpl.java
+++ b/nuxeo-diff-jsf/src/main/java/org/nuxeo/ecm/diff/service/impl/DiffDisplayServiceImpl.java
< at >< at > -12,7 +12,7 < at >< at >
* Lesser General Public License for more details.
*
* Contributors:
- * ataillefer
+ * Antoine Taillefer
*/
package org.nuxeo.ecm.diff.service.impl;
< at >< at > -381,6 +381,7 < at >< at > protected final void registerDiffBlock(DiffBlockDescriptor descriptor) {
// Some field descriptors were found => use them to add the
// described fields, taking their order into account.
for (DiffFieldDescriptor fieldDescriptor : fieldDescriptors) {
+ String category = fieldDescriptor.getCategory();
String schema = fieldDescriptor.getSchema();
String name = fieldDescriptor.getName();
boolean displayContentDiffLinks = fieldDescriptor.isDisplayContentDiffLinks();
< at >< at > -393,8 +394,8 < at >< at > protected final void registerDiffBlock(DiffBlockDescriptor descriptor) {
fieldItemDescriptor.getName(),
fieldItemDescriptor.isDisplayContentDiffLinks()));
}
- fields.add(new DiffFieldDefinitionImpl(schema, name,
- displayContentDiffLinks, items));
+ fields.add(new DiffFieldDefinitionImpl(category,
+ schema, name, displayContentDiffLinks, items));
}
}
// TODO: implement merge
< at >< at > -422,8 +423,8 < at >< at > protected final void registerDiffBlock(DiffBlockDescriptor descriptor) {
// Only add the field if it is not excluded
if (diffExcludedFields == null
|| !diffExcludedFields.contains(fieldName)) {
- fieldDefs.add(new DiffFieldDefinitionImpl(schemaName,
- fieldName));
+ fieldDefs.add(new DiffFieldDefinitionImpl(
+ DIFF_WIDGET_CATEGORY, schemaName, fieldName));
}
}
< at >< at > -493,6 +494,10 < at >< at > protected final DiffDisplayBlock getDiffDisplayBlock(
List<DiffFieldDefinition> fieldDefinitions = diffBlockDefinition.getFields();
for (DiffFieldDefinition fieldDefinition : fieldDefinitions) {
+ String category = fieldDefinition.getCategory();
+ if (StringUtils.isEmpty(category)) {
+ category = DIFF_WIDGET_CATEGORY;
+ }
String schemaName = fieldDefinition.getSchema();
String fieldName = fieldDefinition.getName();
boolean displayContentDiffLinks = fieldDefinition.isDisplayContentDiffLinks();
< at >< at > -508,12 +513,13 < at >< at > protected final DiffDisplayBlock getDiffDisplayBlock(
// Set property widget definition
WidgetDefinition propertyWidgetDefinition = getWidgetDefinition(
- propertyName, fieldDiff.getPropertyType(), null,
- fieldItemDefs, false);
+ category, propertyName,
+ fieldDiff.getPropertyType(), null, fieldItemDefs,
+ false);
widgetDefinitions.add(propertyWidgetDefinition);
// Set property widget ref
WidgetReferenceImpl propertyWidgetRef = new WidgetReferenceImpl(
- DIFF_WIDGET_CATEGORY, propertyName);
+ category, propertyName);
widgetReferences.add(propertyWidgetRef);
// Check if must display the content diff links widget
< at >< at > -529,11 +535,12 < at >< at > protected final DiffDisplayBlock getDiffDisplayBlock(
// needed
if (displayContentDiffLinks) {
WidgetDefinition contentDiffLinksWidgetDefinition = getWidgetDefinition(
- propertyName, fieldDiff.getPropertyType(),
- null, fieldItemDefs, true);
+ category, propertyName,
+ fieldDiff.getPropertyType(), null,
+ fieldItemDefs, true);
widgetDefinitions.add(contentDiffLinksWidgetDefinition);
WidgetReferenceImpl contentDiffLinksWidgetRef = new WidgetReferenceImpl(
- DIFF_WIDGET_CATEGORY, propertyName
+ category, propertyName
+ CONTENT_DIFF_LINKS_WIDGET_NAME_SUFFIX);
widgetReferences.add(contentDiffLinksWidgetRef);
}
< at >< at > -1258,8 +1265,8 < at >< at > protected boolean isComplexType(Serializable property) {
// TODO: better separate regular and contentDiffLinksWidget cases (call
// submethods)
- protected final WidgetDefinition getWidgetDefinition(String propertyName,
- String propertyType, Field field,
+ protected final WidgetDefinition getWidgetDefinition(String category,
+ String propertyName, String propertyType, Field field,
List<DiffFieldItemDefinition> complexFieldItemDefs,
boolean isContentDiffLinksWidget) throws ClientException {
< at >< at > -1270,14 +1277,13 < at >< at > protected final WidgetDefinition getWidgetDefinition(String propertyName,
if (!isContentDiffLinksWidget) {
// Look for a specific widget in the "diff" category named with the
// property name
- wDef = getLayoutStore().getWidgetDefinition(DIFF_WIDGET_CATEGORY,
- propertyName);
+ wDef = getLayoutStore().getWidgetDefinition(category, propertyName);
if (wDef == null) {
isGeneric = true;
// Fallback on a generic widget in the "diff" category named
// with the property type
- wDef = getLayoutStore().getWidgetDefinition(
- DIFF_WIDGET_CATEGORY, propertyType);
+ wDef = getLayoutStore().getWidgetDefinition(category,
+ propertyType);
if (wDef == null) {
throw new ClientException(
String.format(
< at >< at > -1289,8 +1295,8 < at >< at > protected final WidgetDefinition getWidgetDefinition(String propertyName,
isGeneric = true;
if (PropertyType.isSimpleType(propertyType)
|| PropertyType.isContentType(propertyType)) {
- wDef = getLayoutStore().getWidgetDefinition(
- DIFF_WIDGET_CATEGORY, CONTENT_DIFF_LINKS_WIDGET_NAME);
+ wDef = getLayoutStore().getWidgetDefinition(category,
+ CONTENT_DIFF_LINKS_WIDGET_NAME);
if (wDef == null) {
throw new ClientException(
String.format(
< at >< at > -1300,8 +1306,8 < at >< at > protected final WidgetDefinition getWidgetDefinition(String propertyName,
} else {
// Get the generic widget in the "diff" category named with
// the property type
- wDef = getLayoutStore().getWidgetDefinition(
- DIFF_WIDGET_CATEGORY, propertyType);
+ wDef = getLayoutStore().getWidgetDefinition(category,
+ propertyType);
if (wDef == null) {
throw new ClientException(
String.format(
< at >< at > -1399,7 +1405,7 < at >< at > protected final WidgetDefinition getWidgetDefinition(String propertyName,
wDef = wDef.clone();
isCloned = true;
}
- wDef.setSubWidgetDefinitions(getSubWidgetDefinitions(
+ wDef.setSubWidgetDefinitions(getSubWidgetDefinitions(category,
propertyName, propertyType, declaringField,
complexFieldItemDefs, isDisplayItemIndexes(wDef),
isContentDiffLinksWidget));
< at >< at > -1433,7 +1439,7 < at >< at > protected final String getFieldDefinitionStyleClassFieldName(
+ DIFF_WIDGET_FIELD_DEFINITION_STYLE_CLASS_SUFFIX;
}
- protected final WidgetDefinition[] getSubWidgetDefinitions(
+ protected final WidgetDefinition[] getSubWidgetDefinitions(String category,
String propertyName, String propertyType, Field field,
List<DiffFieldItemDefinition> complexFieldItemDefs,
boolean isDisplayItemIndexes, boolean isContentDiffLinks)
< at >< at > -1443,8 +1449,9 < at >< at > protected final String getFieldDefinitionStyleClassFieldName(
// Complex
if (PropertyType.isComplexType(propertyType)
&& !PropertyType.isContentType(propertyType)) {
- subWidgetDefs = getComplexSubWidgetDefinitions(propertyName, field,
- complexFieldItemDefs, false, isContentDiffLinks);
+ subWidgetDefs = getComplexSubWidgetDefinitions(category,
+ propertyName, field, complexFieldItemDefs, false,
+ isContentDiffLinks);
}
// Scalar or content list
else if (PropertyType.isScalarListType(propertyType)
< at >< at > -1452,6 +1459,7 < at >< at > else if (PropertyType.isScalarListType(propertyType)
Field listFieldItem = ComplexPropertyHelper.getListFieldItem(field);
subWidgetDefs = initSubWidgetDefinitions(isDisplayItemIndexes, 1);
subWidgetDefs[subWidgetDefs.length - 1] = getWidgetDefinition(
+ category,
getSubPropertyFullName(propertyName,
listFieldItem.getName().getLocalName()),
ComplexPropertyHelper.getFieldType(listFieldItem),
< at >< at > -1463,15 +1471,15 < at >< at > else if (PropertyType.isScalarListType(propertyType)
// Complex list
else if (PropertyType.isComplexListType(propertyType)) {
Field listFieldItem = ComplexPropertyHelper.getListFieldItem(field);
- subWidgetDefs = getComplexSubWidgetDefinitions(propertyName,
- listFieldItem, complexFieldItemDefs, isDisplayItemIndexes,
- isContentDiffLinks);
+ subWidgetDefs = getComplexSubWidgetDefinitions(category,
+ propertyName, listFieldItem, complexFieldItemDefs,
+ isDisplayItemIndexes, isContentDiffLinks);
}
return subWidgetDefs;
}
protected final WidgetDefinition[] getComplexSubWidgetDefinitions(
- String propertyName, Field field,
+ String category, String propertyName, Field field,
List<DiffFieldItemDefinition> complexFieldItemDefs,
boolean isDisplayItemIndexes, boolean isContentDiffLinks)
throws ClientException {
< at >< at > -1486,6 +1494,7 < at >< at > else if (PropertyType.isComplexListType(propertyType)) {
for (Field complexFieldItem : complexFieldItems) {
subWidgetDefs[subWidgetIndex] = getWidgetDefinition(
+ category,
getSubPropertyFullName(propertyName,
complexFieldItem.getName().getLocalName()),
ComplexPropertyHelper.getFieldType(complexFieldItem),
< at >< at > -1515,6 +1524,7 < at >< at > else if (PropertyType.isComplexListType(propertyType)) {
field, complexFieldItemName);
if (complexFieldItem != null) {
subWidgetDefs[subWidgetIndex] = getWidgetDefinition(
+ category,
getSubPropertyFullName(propertyName,
complexFieldItemName),
ComplexPropertyHelper.getFieldType(complexFieldItem),
diff --git a/nuxeo-diff-jsf/src/main/java/org/nuxeo/ecm/diff/service/impl/DiffFieldDescriptor.java b/nuxeo-diff-jsf/src/main/java/org/nuxeo/ecm/diff/service/impl/DiffFieldDescriptor.java
index 90d4f0d..4ba6d60 100644
--- a/nuxeo-diff-jsf/src/main/java/org/nuxeo/ecm/diff/service/impl/DiffFieldDescriptor.java
+++ b/nuxeo-diff-jsf/src/main/java/org/nuxeo/ecm/diff/service/impl/DiffFieldDescriptor.java
< at >< at > -12,7 +12,7 < at >< at >
* Lesser General Public License for more details.
*
* Contributors:
- * ataillefer
+ * Antoine Taillefer
*/
package org.nuxeo.ecm.diff.service.impl;
< at >< at > -22,6 +22,8 < at >< at >
import org.nuxeo.common.xmap.annotation.XNode;
import org.nuxeo.common.xmap.annotation.XNodeList;
import org.nuxeo.common.xmap.annotation.XObject;
+import org.nuxeo.ecm.diff.model.DiffFieldDefinition;
+import org.nuxeo.ecm.diff.model.impl.DiffFieldDefinitionImpl;
/**
* Diff field descriptor.
< at >< at > -32,6 +34,9 < at >< at >
< at >XObject("field")
public class DiffFieldDescriptor {
+ < at >XNode("< at >category")
+ public String category;
+
< at >XNode("< at >schema")
public String schema;
< at >< at > -44,12 +49,12 < at >< at >
< at >XNodeList(value = "items/item", type = ArrayList.class, componentType = DiffFieldItemDescriptor.class)
public List<DiffFieldItemDescriptor> items;
- public String getName() {
- return name;
+ public String getCategory() {
+ return category;
}
- public void setName(String name) {
- this.name = name;
+ public void setCategory(String category) {
+ this.category = category;
}
public String getSchema() {
< at >< at > -60,12 +65,12 < at >< at > public void setSchema(String schema) {
this.schema = schema;
}
- public List<DiffFieldItemDescriptor> getItems() {
- return items;
+ public String getName() {
+ return name;
}
- public void setItems(List<DiffFieldItemDescriptor> items) {
- this.items = items;
+ public void setName(String name) {
+ this.name = name;
}
public boolean isDisplayContentDiffLinks() {
< at >< at > -75,4 +80,17 < at >< at > public boolean isDisplayContentDiffLinks() {
public void setDisplayContentDiffLinks(boolean displayContentDiffLinks) {
this.displayContentDiffLinks = displayContentDiffLinks;
}
+
+ public List<DiffFieldItemDescriptor> getItems() {
+ return items;
+ }
+
+ public void setItems(List<DiffFieldItemDescriptor> items) {
+ this.items = items;
+ }
+
+ public DiffFieldDefinition getDiffFieldDefinition() {
+ return new DiffFieldDefinitionImpl(getCategory(), getSchema(),
+ getName());
+ }
}
diff --git a/nuxeo-diff-jsf/src/test/java/org/nuxeo/ecm/diff/service/TestDiffDisplayContrib.java b/nuxeo-diff-jsf/src/test/java/org/nuxeo/ecm/diff/service/TestDiffDisplayContrib.java
index 05120a9..f2fd16e 100644
--- a/nuxeo-diff-jsf/src/test/java/org/nuxeo/ecm/diff/service/TestDiffDisplayContrib.java
+++ b/nuxeo-diff-jsf/src/test/java/org/nuxeo/ecm/diff/service/TestDiffDisplayContrib.java
< at >< at > -12,7 +12,7 < at >< at >
* Lesser General Public License for more details.
*
* Contributors:
- * ataillefer
+ * Antoine Taillefer
*/
package org.nuxeo.ecm.diff.service;
< at >< at > -149,8 +149,9 < at >< at > public void testDiffBlockContrib() {
assertNotNull(diffBlockDefinition);
List<DiffFieldDefinition> fields = new ArrayList<DiffFieldDefinition>();
- fields.add(new DiffFieldDefinitionImpl("dublincore", "title"));
- fields.add(new DiffFieldDefinitionImpl("dublincore", "description"));
+ fields.add(new DiffFieldDefinitionImpl(null, "dublincore", "title"));
+ fields.add(new DiffFieldDefinitionImpl(null, "dublincore",
+ "description"));
Map<String, String> templates = new HashMap<String, String>();
templates.put(BuiltinModes.ANY, "/layouts/layout_diff_template.xhtml");
< at >< at > -176,19 +177,21 < at >< at > public void testDiffBlockContrib() {
assertNotNull(diffBlockDefinition);
fields = new ArrayList<DiffFieldDefinition>();
- fields.add(new DiffFieldDefinitionImpl("dublincore", "nature"));
- fields.add(new DiffFieldDefinitionImpl("dublincore", "subjects"));
- fields.add(new DiffFieldDefinitionImpl("dublincore", "rights"));
- fields.add(new DiffFieldDefinitionImpl("dublincore", "source"));
- fields.add(new DiffFieldDefinitionImpl("dublincore", "coverage"));
- fields.add(new DiffFieldDefinitionImpl("dublincore", "created"));
- fields.add(new DiffFieldDefinitionImpl("dublincore", "modified"));
- fields.add(new DiffFieldDefinitionImpl("dublincore", "format"));
- fields.add(new DiffFieldDefinitionImpl("dublincore", "language"));
- fields.add(new DiffFieldDefinitionImpl("dublincore", "expired"));
- fields.add(new DiffFieldDefinitionImpl("dublincore", "creator"));
- fields.add(new DiffFieldDefinitionImpl("dublincore", "contributors"));
- fields.add(new DiffFieldDefinitionImpl("dublincore", "lastContributor"));
+ fields.add(new DiffFieldDefinitionImpl(null, "dublincore", "nature"));
+ fields.add(new DiffFieldDefinitionImpl(null, "dublincore", "subjects"));
+ fields.add(new DiffFieldDefinitionImpl(null, "dublincore", "rights"));
+ fields.add(new DiffFieldDefinitionImpl(null, "dublincore", "source"));
+ fields.add(new DiffFieldDefinitionImpl(null, "dublincore", "coverage"));
+ fields.add(new DiffFieldDefinitionImpl(null, "dublincore", "created"));
+ fields.add(new DiffFieldDefinitionImpl(null, "dublincore", "modified"));
+ fields.add(new DiffFieldDefinitionImpl(null, "dublincore", "format"));
+ fields.add(new DiffFieldDefinitionImpl(null, "dublincore", "language"));
+ fields.add(new DiffFieldDefinitionImpl(null, "dublincore", "expired"));
+ fields.add(new DiffFieldDefinitionImpl(null, "dublincore", "creator"));
+ fields.add(new DiffFieldDefinitionImpl(null, "dublincore",
+ "contributors"));
+ fields.add(new DiffFieldDefinitionImpl(null, "dublincore",
+ "lastContributor"));
labelProperty.put("label", "label.diffBlock.dublincore");
expectedDiffBlockDefinition = new DiffBlockDefinitionImpl("dublincore",
< at >< at > -200,10 +203,10 < at >< at > public void testDiffBlockContrib() {
assertNotNull(diffBlockDefinition);
fields = new ArrayList<DiffFieldDefinition>();
- fields.add(new DiffFieldDefinitionImpl("file", "content", true));
+ fields.add(new DiffFieldDefinitionImpl(null, "file", "content", true));
List<DiffFieldItemDefinition> items = new ArrayList<DiffFieldItemDefinition>();
items.add(new DiffFieldItemDefinitionImpl("file", true));
- fields.add(new DiffFieldDefinitionImpl("files", "files", items));
+ fields.add(new DiffFieldDefinitionImpl(null, "files", "files", items));
labelProperty.put("label", "label.diffBlock.files");
expectedDiffBlockDefinition = new DiffBlockDefinitionImpl("files",
< at >< at > -215,7 +218,7 < at >< at > public void testDiffBlockContrib() {
assertNotNull(diffBlockDefinition);
fields = new ArrayList<DiffFieldDefinition>();
- fields.add(new DiffFieldDefinitionImpl("note", "note", true));
+ fields.add(new DiffFieldDefinitionImpl(null, "note", "note", true));
labelProperty.put("label", "label.diffBlock.note");
expectedDiffBlockDefinition = new DiffBlockDefinitionImpl("note",
diff --git a/nuxeo-diff-jsf/src/test/java/org/nuxeo/ecm/diff/service/TestDiffDisplayContribOverride.java b/nuxeo-diff-jsf/src/test/java/org/nuxeo/ecm/diff/service/TestDiffDisplayContribOverride.java
index 107b358..a34626c 100644
--- a/nuxeo-diff-jsf/src/test/java/org/nuxeo/ecm/diff/service/TestDiffDisplayContribOverride.java
+++ b/nuxeo-diff-jsf/src/test/java/org/nuxeo/ecm/diff/service/TestDiffDisplayContribOverride.java
< at >< at > -12,7 +12,7 < at >< at >
* Lesser General Public License for more details.
*
* Contributors:
- * ataillefer
+ * Antoine Taillefer
*/
package org.nuxeo.ecm.diff.service;
< at >< at > -160,8 +160,9 < at >< at > public void testDiffBlockContrib() {
assertNotNull(diffBlockDefinition);
List<DiffFieldDefinition> fields = new ArrayList<DiffFieldDefinition>();
- fields.add(new DiffFieldDefinitionImpl("dublincore", "title"));
- fields.add(new DiffFieldDefinitionImpl("dublincore", "description"));
+ fields.add(new DiffFieldDefinitionImpl(null, "dublincore", "title"));
+ fields.add(new DiffFieldDefinitionImpl(null, "dublincore",
+ "description"));
Map<String, String> templates = new HashMap<String, String>();
templates.put(BuiltinModes.ANY, "/layouts/layout_diff_template.xhtml");
< at >< at > -180,12 +181,14 < at >< at > public void testDiffBlockContrib() {
assertNotNull(diffBlockDefinition);
fields = new ArrayList<DiffFieldDefinition>();
- fields.add(new DiffFieldDefinitionImpl("dublincore", "created"));
- fields.add(new DiffFieldDefinitionImpl("dublincore", "creator"));
- fields.add(new DiffFieldDefinitionImpl("dublincore", "modified"));
- fields.add(new DiffFieldDefinitionImpl("dublincore", "lastContributor"));
- fields.add(new DiffFieldDefinitionImpl("dublincore", "contributors"));
- fields.add(new DiffFieldDefinitionImpl("dublincore", "subjects"));
+ fields.add(new DiffFieldDefinitionImpl(null, "dublincore", "created"));
+ fields.add(new DiffFieldDefinitionImpl(null, "dublincore", "creator"));
+ fields.add(new DiffFieldDefinitionImpl(null, "dublincore", "modified"));
+ fields.add(new DiffFieldDefinitionImpl(null, "dublincore",
+ "lastContributor"));
+ fields.add(new DiffFieldDefinitionImpl(null, "dublincore",
+ "contributors"));
+ fields.add(new DiffFieldDefinitionImpl(null, "dublincore", "subjects"));
labelProperty.put("label", "label.diffBlock.dublincore");
expectedDiffBlockDefinition = new DiffBlockDefinitionImpl("dublincore",
< at >< at > -197,10 +200,10 < at >< at > public void testDiffBlockContrib() {
assertNotNull(diffBlockDefinition);
fields = new ArrayList<DiffFieldDefinition>();
- fields.add(new DiffFieldDefinitionImpl("file", "content", true));
+ fields.add(new DiffFieldDefinitionImpl(null, "file", "content", true));
List<DiffFieldItemDefinition> items = new ArrayList<DiffFieldItemDefinition>();
items.add(new DiffFieldItemDefinitionImpl("file", true));
- fields.add(new DiffFieldDefinitionImpl("files", "files", items));
+ fields.add(new DiffFieldDefinitionImpl(null, "files", "files", items));
labelProperty.put("label", "label.diffBlock.files");
expectedDiffBlockDefinition = new DiffBlockDefinitionImpl("files",
< at >< at > -212,7 +215,7 < at >< at > public void testDiffBlockContrib() {
assertNotNull(diffBlockDefinition);
fields = new ArrayList<DiffFieldDefinition>();
- fields.add(new DiffFieldDefinitionImpl("note", "note", true));
+ fields.add(new DiffFieldDefinitionImpl(null, "note", "note", true));
labelProperty.put("label", "label.diffBlock.note");
expectedDiffBlockDefinition = new DiffBlockDefinitionImpl("note",
< at >< at > -224,13 +227,16 < at >< at > public void testDiffBlockContrib() {
assertNotNull(diffBlockDefinition);
fields = new ArrayList<DiffFieldDefinition>();
- fields.add(new DiffFieldDefinitionImpl("simpletypes", "string"));
- fields.add(new DiffFieldDefinitionImpl("simpletypes", "textarea", true));
- fields.add(new DiffFieldDefinitionImpl("simpletypes", "boolean"));
- fields.add(new DiffFieldDefinitionImpl("simpletypes", "integer"));
- fields.add(new DiffFieldDefinitionImpl("simpletypes", "date"));
- fields.add(new DiffFieldDefinitionImpl("simpletypes", "htmlText", true));
- fields.add(new DiffFieldDefinitionImpl("simpletypes", "multivalued"));
+ fields.add(new DiffFieldDefinitionImpl(null, "simpletypes", "string"));
+ fields.add(new DiffFieldDefinitionImpl(null, "simpletypes", "textarea",
+ true));
+ fields.add(new DiffFieldDefinitionImpl(null, "simpletypes", "boolean"));
+ fields.add(new DiffFieldDefinitionImpl(null, "simpletypes", "integer"));
+ fields.add(new DiffFieldDefinitionImpl(null, "simpletypes", "date"));
+ fields.add(new DiffFieldDefinitionImpl(null, "simpletypes", "htmlText",
+ true));
+ fields.add(new DiffFieldDefinitionImpl(null, "simpletypes",
+ "multivalued"));
labelProperty.put("label", "label.diffBlock.simpleTypes");
expectedDiffBlockDefinition = new DiffBlockDefinitionImpl(
< at >< at > -247,14 +253,16 < at >< at > public void testDiffBlockContrib() {
items.add(new DiffFieldItemDefinitionImpl("integerItem"));
items.add(new DiffFieldItemDefinitionImpl("dateItem"));
items.add(new DiffFieldItemDefinitionImpl("booleanItem"));
- fields.add(new DiffFieldDefinitionImpl("complextypes", "complex", items));
+ fields.add(new DiffFieldDefinitionImpl(null, "complextypes", "complex",
+ items));
items = new ArrayList<DiffFieldItemDefinition>();
items.add(new DiffFieldItemDefinitionImpl("stringItem", true));
items.add(new DiffFieldItemDefinitionImpl("dateItem"));
items.add(new DiffFieldItemDefinitionImpl("integerItem"));
- fields.add(new DiffFieldDefinitionImpl("complextypes", "complexList",
- items));
- fields.add(new DiffFieldDefinitionImpl("listoflists", "listOfLists"));
+ fields.add(new DiffFieldDefinitionImpl(null, "complextypes",
+ "complexList", items));
+ fields.add(new DiffFieldDefinitionImpl(null, "listoflists",
+ "listOfLists"));
labelProperty.put("label", "label.diffBlock.complexTypesAndListOfLists");
expectedDiffBlockDefinition = new DiffBlockDefinitionImpl(
_______________________________________________
ECM-checkins mailing list
ECM-checkins-FQDHc1wsLCVb90+sfpvX0g< at >public.gmane.org
http://lists.nuxeo.com/mailman/listinfo/ecm-checkins
</pre>
Antoine Taillefer
2012-05-26T03:53:08
-
nuxeo-diff: NXP-8596: Use the schema:field notationfor the'note:note' widget field definitions (branch< at >master)
http://comments.gmane.org/gmane.comp.cms.nuxeo.scm/73220
<pre>Message:
NXP-8596: Use the schema:field notation for the 'note:note' widget field definitions
Repository: nuxeo-diff
Branch: master
Author: Antoine Taillefer <ataillefer< at >nuxeo.com>
Date: 2012-05-25T16:46:19-07:00
URL: https://github.com/nuxeo/nuxeo-diff/commit/0fb5cf708e12ecbbc227900ffa54e740ee3e6588
JIRA: https://jira.nuxeo.com/browse/NXP-8596
Files:
M nuxeo-diff-jsf/src/main/resources/OSGI-INF/diff-widgets-contrib.xml
diff --git a/nuxeo-diff-jsf/src/main/resources/OSGI-INF/diff-widgets-contrib.xml b/nuxeo-diff-jsf/src/main/resources/OSGI-INF/diff-widgets-contrib.xml
index 20b18db..6bf9fa1 100644
--- a/nuxeo-diff-jsf/src/main/resources/OSGI-INF/diff-widgets-contrib.xml
+++ b/nuxeo-diff-jsf/src/main/resources/OSGI-INF/diff-widgets-contrib.xml
< at >< at > -158,8 +158,8 < at >< at >
</labels>
<translated>true</translated>
<fields>
- <field schema="note">note/value</field>
- <field schema="note">mime_type/value</field>
+ <field>note:note/value</field>
+ <field>note:mime_type/value</field>
</fields>
<properties mode="any">
<property name="translatedHtml">
"note">note/val_______________________________________________
ECM-checkins mailing list
ECM-checkins-FQDHc1wsLCVb90+sfpvX0g< at >public.gmane.org
http://lists.nuxeo.com/mailman/listinfo/ecm-checkins
</pre>
Antoine Taillefer
2012-05-26T03:53:07
-
nuxeo-distribution: NXP-9268: Automatically adddistribution packagesto local cache (branch< at >master)
http://comments.gmane.org/gmane.comp.cms.nuxeo.scm/73219
<pre>Message:
NXP-9268: Automatically add distribution packages to local cache
Repository: nuxeo-distribution
Branch: master
Author: Mathieu Guillaume <mg< at >nuxeo.com>
Date: 2012-05-25T15:47:29-07:00
URL: https://github.com/nuxeo/nuxeo-distribution/commit/c3794d29f6c66c371d3e3e8e1d095cd93ce639d2
JIRA: https://jira.nuxeo.com/browse/NXP-9268
Files:
M nuxeo-launcher/src/main/java/org/nuxeo/launcher/NuxeoLauncher.java
M nuxeo-launcher/src/main/java/org/nuxeo/launcher/connect/ConnectBroker.java
diff --git a/nuxeo-launcher/src/main/java/org/nuxeo/launcher/NuxeoLauncher.java b/nuxeo-launcher/src/main/java/org/nuxeo/launcher/NuxeoLauncher.java
index b9961bd..5cb8b91 100644
--- a/nuxeo-launcher/src/main/java/org/nuxeo/launcher/NuxeoLauncher.java
+++ b/nuxeo-launcher/src/main/java/org/nuxeo/launcher/NuxeoLauncher.java
< at >< at > -328,14 +328,14 < at >< at > private ProcessManager getOSProcessManager() {
/**
* Do not directly call this method without a call to
* {< at >link #checkNoRunningServer()}
- *
+ *
* < at >see #doStart()
* < at >throws IOException In case of issue with process.
* < at >throws InterruptedException If any thread has interrupted the current
* thread.
*/
protected void start(boolean logProcessOutput) throws IOException,
- InterruptedException {
+ InterruptedException {
List<String> startCommand = new ArrayList<String>();
startCommand.add(getJavaExecutable().getPath());
startCommand.addAll(Arrays.asList(getJavaOptsProperty().split(" ")));
< at >< at > -363,9 +363,9 < at >< at > protected void start(boolean logProcessOutput) throws IOException,
/**
* Gets the java options with Nuxeo properties substituted.
- *
+ *
* It enables usage of property like ${nuxeo.log.dir} inside JAVA_OPTS.
- *
+ *
* < at >return the java options string.
*/
protected String getJavaOptsProperty() {
< at >< at > -388,7 +388,7 < at >< at > protected String getJavaOptsProperty() {
* Check if some server is already running (from another thread) and throw a
* Runtime exception if it finds one. That method will work where
* {< at >link #isRunning()} won't.
- *
+ *
* < at >throws IllegalThreadStateException Thrown if a server is already
* running.
*/
< at >< at > -434,7 +434,7 < at >< at > public void checkNoRunningServer() throws IllegalStateException {
/**
* Will wrap, if necessary, the command within a Shell command
- *
+ *
* < at >param roughCommand Java command which will be run
* < at >return wrapped command depending on the OS
*/
< at >< at > -605,7 +605,7 < at >< at > protected static CommandLine parseOptions(String[] args)
}
public static void main(String[] args) throws ConfigurationException,
- IOException, PackageException {
+ IOException, PackageException {
try {
final NuxeoLauncher launcher = createLauncher(args);
if (launcher.useGui && launcher.getGUI() == null) {
< at >< at > -626,7 +626,7 < at >< at > public static void main(String[] args) throws ConfigurationException,
* < at >throws IOException
*/
public static void launch(final NuxeoLauncher launcher) throws IOException,
- PackageException {
+ PackageException {
int exitStatus = 0;
boolean commandSucceeded = true;
if (launcher.command == null) {
< at >< at > -854,7 +854,7 < at >< at > public void stop() {
/**
* Call {< at >link #doStart(boolean)} with false as parameter.
- *
+ *
* < at >see #doStart(boolean)
* < at >return true if the server started successfully
* < at >throws PackageException
< at >< at > -867,9 +867,9 < at >< at > public boolean doStart() throws PackageException {
* Whereas {< at >link #doStart()} considers the server as started when the
* process is running, {< at >link #doStartAndWait()} waits for effective start
* by watching the logs
- *
+ *
* < at >param logProcessOutput Must process output stream must be logged or not.
- *
+ *
* < at >return true if the server started successfully
* < at >throws PackageException
*/
< at >< at > -963,7 +963,7 < at >< at > protected boolean waitForEffectiveStart() throws InterruptedException {
/**
* Must be called after {< at >link #getStartupSummary()}
- *
+ *
* < at >since 5.5
* < at >return last detected status of running Nuxeo server
*/
< at >< at > -987,7 +987,7 < at >< at > public String getStartupSummary() {
/**
* Starts the server in background.
- *
+ *
* < at >return true if server successfully started
* < at >throws PackageException
*/
< at >< at > -1114,9 +1114,9 < at >< at > protected void printXMLOutput(JAXBContext jaxbContext, Object objectToOutput) {
/**
* Stop stream gobblers contained in the given ArrayList
- *
+ *
* < at >throws InterruptedException
- *
+ *
* < at >since 5.5
* < at >see #logProcessStreams(Process, boolean)
*/
< at >< at > -1188,7 +1188,7 < at >< at > protected void addShutdownHook() {
/**
* Stops the server.
- *
+ *
* Will try to call specific class for a clean stop, retry
* {< at >link #STOP_NB_TRY}, waiting {< at >link #STOP_SECONDS_BEFORE_NEXT_TRY}
* between each try, then kill the process if still running.
< at >< at > -1298,7 +1298,7 < at >< at > private String getPid() throws IOException {
/**
* Configure the server after checking installation
- *
+ *
* < at >throws ConfigurationException If an installation error is detected or if
* configuration fails
*/
< at >< at > -1322,7 +1322,7 < at >< at > private String getDefaultMaxWait() {
* Return process status (running or not) as String, depending on OS
* capability to manage processes. Set status value following
* "http://refspecs.freestandards.org/LSB_4.1.0/LSB-Core-generic/LSB-Core-generic/iniscrptact.html"
- *
+ *
* < at >see #status
*/
public String status() {
< at >< at > -1394,7 +1394,7 < at >< at > public static NuxeoLauncher createLauncher(String[] args)
/**
* Sets from program arguments the launcher command and additional
* parameters.
- *
+ *
* < at >param cmdLine Program arguments; may be used by launcher implementation.
* Must not be null or empty.
*/
< at >< at > -1528,7 +1528,7 < at >< at > public static void printLongHelp() {
* Work best with current nuxeoProcess. If nuxeoProcess is null or has
* exited, then will try to get process ID (so, result in that case depends
* on OS capabilities).
- *
+ *
* < at >return true if current process is running or if a running PID is found
*/
public boolean isRunning() {
< at >< at > -1583,7 +1583,7 < at >< at > public String getURL() {
}
protected ConnectBroker getConnectBroker() throws IOException,
- PackageException {
+ PackageException {
if (connectBroker == null) {
connectBroker = new ConnectBroker(configurationGenerator.getEnv());
}
< at >< at > -1598,7 +1598,7 < at >< at > protected void pkgList() throws IOException, PackageException {
}
protected boolean pkgAdd(String[] pkgNames) throws IOException,
- PackageException {
+ PackageException {
ConnectBroker pkgman = getConnectBroker();
boolean cmdOK = true;
LocalPackage pkg;
< at >< at > -1614,7 +1614,7 < at >< at > protected boolean pkgAdd(String[] pkgNames) throws IOException,
}
protected boolean pkgInstall(String[] pkgIDs) throws IOException,
- PackageException {
+ PackageException {
ConnectBroker pkgman = getConnectBroker();
boolean cmdOK = true;
if (configurationGenerator.isInstallInProgress()) {
< at >< at > -1634,7 +1634,7 < at >< at > protected boolean pkgInstall(String[] pkgIDs) throws IOException,
}
protected boolean pkgUninstall(String[] pkgIDs) throws IOException,
- PackageException {
+ PackageException {
ConnectBroker pkgman = getConnectBroker();
boolean cmdOK = true;
LocalPackage pkg;
< at >< at > -1650,7 +1650,7 < at >< at > protected boolean pkgUninstall(String[] pkgIDs) throws IOException,
}
protected boolean pkgRemove(String[] pkgIDs) throws IOException,
- PackageException {
+ PackageException {
ConnectBroker pkgman = getConnectBroker();
boolean cmdOK = true;
LocalPackage pkg;
< at >< at > -1806,7 +1806,7 < at >< at > protected boolean showConfig() throws IOException, PackageException {
} else {
File testBase = new File(configurationGenerator.getNuxeoHome(),
ConfigurationGenerator.TEMPLATES + File.separator
- + template);
+ + template);
if (testBase.exists()) {
nxConfig.basetemplates.add(template);
log.info("Base template: " + template);
< at >< at > -1867,8 +1867,8 < at >< at > protected boolean pkgRequest(List<String> pkgsToAdd,
configurationGenerator.getInstallFile(), true, true);
}
cmdOK = cmdOK
- && pkgman.pkgRequest(pkgsToAdd, pkgsToInstall,
- pkgsToUninstall, pkgsToRemove);
+ && pkgman.pkgRequest(pkgsToAdd, pkgsToInstall, pkgsToUninstall,
+ pkgsToRemove);
cset = pkgman.getCommandSet();
if (!cmdOK) {
errorValue = 3;
diff --git a/nuxeo-launcher/src/main/java/org/nuxeo/launcher/connect/ConnectBroker.java b/nuxeo-launcher/src/main/java/org/nuxeo/launcher/connect/ConnectBroker.java
index af09a6b..bb1ed5d 100644
--- a/nuxeo-launcher/src/main/java/org/nuxeo/launcher/connect/ConnectBroker.java
+++ b/nuxeo-launcher/src/main/java/org/nuxeo/launcher/connect/ConnectBroker.java
< at >< at > -22,13 +22,25 < at >< at >
import java.io.File;
import java.io.FileNotFoundException;
import java.io.IOException;
+import java.io.InputStream;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.SortedMap;
import java.util.TreeMap;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipException;
+import java.util.zip.ZipFile;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.xpath.XPath;
+import javax.xml.xpath.XPathConstants;
+import javax.xml.xpath.XPathExpression;
+import javax.xml.xpath.XPathFactory;
import org.apache.commons.io.FileUtils;
import org.apache.commons.logging.Log;
< at >< at > -49,11 +61,14 < at >< at >
import org.nuxeo.connect.update.PackageState;
import org.nuxeo.connect.update.ValidationStatus;
import org.nuxeo.connect.update.Version;
+import org.nuxeo.connect.update.model.PackageDefinition;
import org.nuxeo.connect.update.standalone.StandaloneUpdateService;
import org.nuxeo.connect.update.task.Task;
import org.nuxeo.launcher.info.CommandInfo;
import org.nuxeo.launcher.info.CommandSetInfo;
import org.nuxeo.launcher.info.PackageInfo;
+import org.w3c.dom.Document;
+import org.w3c.dom.NodeList;
/**
* < at >since 5.6
< at >< at > -64,6 +79,12 < at >< at >
private static final int PACKAGES_DOWNLOAD_TIMEOUT_SECONDS = 300;
+ public static final String PARAM_MP_DIR = "nuxeo.distribution.marketplace.dir";
+
+ public static final String DISTRIBUTION_MP_DIR_DEFAULT = "setupWizardDownloads";
+
+ public static final String PACKAGES_XML = "packages.xml";
+
private Environment env;
private StandaloneUpdateService service;
< at >< at > -74,6 +95,8 < at >< at >
private String targetPlatform;
+ private String distributionMPDir;
+
public ConnectBroker(Environment env) throws IOException, PackageException {
this.env = env;
service = new StandaloneUpdateService(env);
< at >< at > -82,6 +105,9 < at >< at > public ConnectBroker(Environment env) throws IOException, PackageException {
NuxeoConnectClient.setCallBackHolder(cbHolder);
targetPlatform = env.getProperty(Environment.DISTRIBUTION_NAME) + "-"
+ env.getProperty(Environment.DISTRIBUTION_VERSION);
+ distributionMPDir = env.getProperty(PARAM_MP_DIR,
+ DISTRIBUTION_MP_DIR_DEFAULT);
+ addDistributionPackages();
}
public String getCLID() throws NoCLID {
< at >< at > -226,6 +252,131 < at >< at > protected boolean isLocalPackageFile(String pkgFile) {
return (getLocalPackageFile(pkgFile) != null);
}
+ protected List<String> getDistributionFilenames() {
+ File distributionMPFile = new File(distributionMPDir, PACKAGES_XML);
+ List<String> md5Filenames = new ArrayList<String>();
+ // Try to get md5 files from packages.xml
+ DocumentBuilderFactory docFactory = DocumentBuilderFactory.newInstance();
+ docFactory.setNamespaceAware(true);
+ try {
+ DocumentBuilder builder = docFactory.newDocumentBuilder();
+ Document doc = builder.parse(distributionMPFile);
+ XPathFactory xpFactory = XPathFactory.newInstance();
+ XPath xpath = xpFactory.newXPath();
+ XPathExpression expr = xpath.compile("//package/< at >md5");
+ NodeList nodes = (NodeList) expr.evaluate(doc,
+ XPathConstants.NODESET);
+ for (int i = 0; i < nodes.getLength(); i++) {
+ String md5 = nodes.item(i).getNodeValue();
+ if ((md5 != null) && (md5.length() > 0)) {
+ md5Filenames.add(md5);
+ }
+ }
+ } catch (Exception e) {
+ // Parsing failed - return empty list
+ log.error("Failed parsing " + distributionMPFile, e);
+ return new ArrayList<String>();
+ }
+ return md5Filenames;
+ }
+
+ protected Map<String, PackageDefinition> getDistributionDefinitions(
+ List<String> md5Filenames) {
+ Map<String, PackageDefinition> allDefinitions = new HashMap<String, PackageDefinition>();
+ if (md5Filenames == null) {
+ return allDefinitions;
+ }
+ for (String md5Filename : md5Filenames) {
+ File md5File = new File(distributionMPDir, md5Filename);
+ if (!md5File.exists()) {
+ // distribution file has been deleted
+ continue;
+ }
+ ZipFile zipFile;
+ try {
+ zipFile = new ZipFile(md5File);
+ } catch (ZipException e) {
+ log.warn("Unzip error reading file " + md5File, e);
+ continue;
+ } catch (IOException e) {
+ log.warn("Could not read file " + md5File, e);
+ continue;
+ }
+ try {
+ ZipEntry zipEntry = zipFile.getEntry("package.xml");
+ InputStream in = zipFile.getInputStream(zipEntry);
+ PackageDefinition pd = NuxeoConnectClient.getPackageUpdateService().loadPackage(
+ in);
+ allDefinitions.put(md5Filename, pd);
+ } catch (Exception e) {
+ log.error("Could not read package description", e);
+ continue;
+ } finally {
+ try {
+ zipFile.close();
+ } catch (IOException e) {
+ log.warn("Unexpected error closing file " + md5File, e);
+ }
+ }
+ }
+ return allDefinitions;
+ }
+
+ protected void addDistributionPackage(String md5) {
+ File distributionFile = new File(distributionMPDir, md5);
+ if (distributionFile.exists()) {
+ try {
+ pkgAdd(distributionFile.getCanonicalPath());
+ FileUtils.deleteQuietly(distributionFile);
+ } catch (IOException e) {
+ log.warn("Could not add distribution file " + md5);
+ }
+ }
+ }
+
+ protected void deleteDistributionPackage(String md5) {
+ File distributionFile = new File(distributionMPDir, md5);
+ FileUtils.deleteQuietly(distributionFile);
+ }
+
+ public void addDistributionPackages() {
+ Map<String, PackageDefinition> distributionPackages = getDistributionDefinitions(getDistributionFilenames());
+ if (distributionPackages.isEmpty()) {
+ return;
+ }
+ List<LocalPackage> localPackages = getPkgList();
+ Map<String, LocalPackage> localPackagesById = new HashMap<String, LocalPackage>();
+ if (localPackages != null) {
+ for (LocalPackage pkg : localPackages) {
+ localPackagesById.put(pkg.getId(), pkg);
+ }
+ }
+ for (String md5 : distributionPackages.keySet()) {
+ PackageDefinition md5Pkg = distributionPackages.get(md5);
+ if (localPackagesById.containsKey(md5Pkg.getId())) {
+ // We have the same package Id in the local cache
+ LocalPackage localPackage = localPackagesById.get(md5Pkg.getId());
+ if (localPackage.getVersion().isSnapshot()) {
+ // - For snapshots, until we have timestamp support, assume
+ // distribution version is newer than cached version.
+ // - This may (will) break the server if there are
+ // dependencies/compatibility changes or it the package is
+ // in installed state.
+ if (localPackage.getState() != PackageState.STARTED) {
+ pkgRemove(localPackage.getId());
+ addDistributionPackage(md5);
+ }
+ } else {
+ // Package is already in cache
+ deleteDistributionPackage(md5);
+ }
+ } else {
+ // No package with this Id is in cache
+ addDistributionPackage(md5);
+ }
+ }
+ }
+
public List<LocalPackage> getPkgList() {
try {
return service.getPackages();
_______________________________________________
ECM-checkins mailing list
ECM-checkins-FQDHc1wsLCVb90+sfpvX0g< at >public.gmane.org
http://lists.nuxeo.com/mailman/listinfo/ecm-checkins
</pre>
Mathieu Guillaume
2012-05-25T22:47:34
-
nuxeo-diff: NXP-9377: Refactor to use theDocumentXMLExporter servicerecently moved to nuxeo-core-io(branch< at >master)
http://comments.gmane.org/gmane.comp.cms.nuxeo.scm/73218
<pre>Message:
NXP-9377: Refactor to use the DocumentXMLExporter service recently moved to nuxeo-core-io
Repository: nuxeo-diff
Branch: master
Author: Antoine Taillefer <ataillefer< at >nuxeo.com>
Date: 2012-05-25T10:32:02-07:00
URL: https://github.com/nuxeo/nuxeo-diff/commit/66a1cce1460b23438c4012ded1e70c2d59763174
JIRA: https://jira.nuxeo.com/browse/NXP-9377
Files:
D nuxeo-diff-core/src/main/java/org/nuxeo/ecm/diff/xmlexport/DocumentXMLExporter.java
D nuxeo-diff-core/src/main/java/org/nuxeo/ecm/diff/xmlexport/impl/DocumentXMLExporterImpl.java
D nuxeo-diff-core/src/main/resources/OSGI-INF/document-xml-export-service.xml
M nuxeo-diff-core/src/main/java/org/nuxeo/ecm/diff/service/DocumentDiffService.java
M nuxeo-diff-core/src/main/java/org/nuxeo/ecm/diff/service/impl/DocumentDiffServiceImpl.java
M nuxeo-diff-core/src/main/resources/META-INF/MANIFEST.MF
M nuxeo-diff-core/src/test/java/org/nuxeo/ecm/diff/service/TestDocumentDiff.java
M nuxeo-diff-core/src/test/java/org/nuxeo/ecm/diff/service/TestDocumentDiffNotSameType.java
M nuxeo-diff-jsf/src/test/java/org/nuxeo/ecm/diff/service/TestDiffDisplayService.java
M nuxeo-diff-jsf/src/test/java/org/nuxeo/ecm/diff/service/TestDiffDisplayServiceDefaultDisplay.java
diff --git a/nuxeo-diff-core/src/main/java/org/nuxeo/ecm/diff/service/DocumentDiffService.java b/nuxeo-diff-core/src/main/java/org/nuxeo/ecm/diff/service/DocumentDiffService.java
index 98109f3..1e23e45 100644
--- a/nuxeo-diff-core/src/main/java/org/nuxeo/ecm/diff/service/DocumentDiffService.java
+++ b/nuxeo-diff-core/src/main/java/org/nuxeo/ecm/diff/service/DocumentDiffService.java
< at >< at > -23,11 +23,10 < at >< at >
import org.nuxeo.ecm.core.api.CoreSession;
import org.nuxeo.ecm.core.api.DocumentModel;
import org.nuxeo.ecm.diff.model.DocumentDiff;
-import org.nuxeo.ecm.diff.xmlexport.DocumentXMLExporter;
/**
* Handles a diff between two documents.
- *
+ *
* < at >author <a href="mailto:ataillefer< at >nuxeo.com">Antoine Taillefer</a>
* < at >since 5.6
*/
< at >< at > -36,7 +35,7 < at >< at >
/**
* Makes a diff between leftDoc and rightDoc. Returns a DocumentDiff object
* that wraps the differences, schema by schema and field by field.
- *
+ *
* < at >param session the session
* < at >param leftDoc the left doc
* < at >param rightDoc the right doc
< at >< at > -49,7 +48,7 < at >< at > DocumentDiff diff(CoreSession session, DocumentModel leftDoc,
/**
* Makes a diff between leftXML and rightXML. Returns a DocumentDiff object
* that wraps the differences, schema by schema and field by field.
- *
+ *
* < at >param leftXML the left XML
* < at >param rightXML the right XML
* < at >return the document diff
< at >< at > -58,21 +57,13 < at >< at > DocumentDiff diff(CoreSession session, DocumentModel leftDoc,
DocumentDiff diff(String leftXML, String rightXML) throws ClientException;
/**
- * Gets the document XML exporter service.
- *
- * < at >return the document XML exporter
- * < at >throws ClientException the client exception
- */
- DocumentXMLExporter getDocumentXMLExporter() throws ClientException;
-
- /**
* Configures XMLUnit.
*/
void configureXMLUnit();
/**
* Configures the diff.
- *
+ *
* < at >param diff the diff
*/
void configureDiff(Diff diff);
diff --git a/nuxeo-diff-core/src/main/java/org/nuxeo/ecm/diff/service/impl/DocumentDiffServiceImpl.java b/nuxeo-diff-core/src/main/java/org/nuxeo/ecm/diff/service/impl/DocumentDiffServiceImpl.java
index da5c1d7..bacc827 100644
--- a/nuxeo-diff-core/src/main/java/org/nuxeo/ecm/diff/service/impl/DocumentDiffServiceImpl.java
+++ b/nuxeo-diff-core/src/main/java/org/nuxeo/ecm/diff/service/impl/DocumentDiffServiceImpl.java
< at >< at > -29,10 +29,10 < at >< at >
import org.nuxeo.ecm.core.api.ClientException;
import org.nuxeo.ecm.core.api.CoreSession;
import org.nuxeo.ecm.core.api.DocumentModel;
+import org.nuxeo.ecm.core.io.DocumentXMLExporter;
import org.nuxeo.ecm.diff.model.DocumentDiff;
import org.nuxeo.ecm.diff.model.impl.DocumentDiffImpl;
import org.nuxeo.ecm.diff.service.DocumentDiffService;
-import org.nuxeo.ecm.diff.xmlexport.DocumentXMLExporter;
import org.nuxeo.runtime.api.Framework;
import org.xml.sax.InputSource;
< at >< at > -92,24 +92,6 < at >< at > public DocumentDiff diff(String leftXML, String rightXML)
/**
* {< at >inheritDoc}
*/
- public DocumentXMLExporter getDocumentXMLExporter() throws ClientException {
-
- DocumentXMLExporter docXMLExporter;
-
- try {
- docXMLExporter = Framework.getService(DocumentXMLExporter.class);
- } catch (Exception e) {
- throw ClientException.wrap(e);
- }
- if (docXMLExporter == null) {
- throw new ClientException("DocumentXMLExporter service is null.");
- }
- return docXMLExporter;
- }
-
- /**
- * {< at >inheritDoc}
- */
public void configureXMLUnit() {
XMLUnit.setIgnoreWhitespace(true);
< at >< at > -149,6 +131,29 < at >< at > protected final void exportXML(CoreSession session, DocumentModel leftDoc,
}
/**
+ * Gets the document XML exporter service.
+ *
+ * < at >return the document XML exporter
+ * < at >throws ClientException if the document XML exporter service cannot be
+ * found
+ */
+ protected final DocumentXMLExporter getDocumentXMLExporter()
+ throws ClientException {
+
+ DocumentXMLExporter docXMLExporter;
+
+ try {
+ docXMLExporter = Framework.getService(DocumentXMLExporter.class);
+ } catch (Exception e) {
+ throw ClientException.wrap(e);
+ }
+ if (docXMLExporter == null) {
+ throw new ClientException("DocumentXMLExporter service is null.");
+ }
+ return docXMLExporter;
+ }
+
+ /**
* Processes the XML diff using the XMLUnit Diff feature.
*
* < at >param leftDocXMLInputSource the left doc XML input source
diff --git a/nuxeo-diff-core/src/main/java/org/nuxeo/ecm/diff/xmlexport/DocumentXMLExporter.java b/nuxeo-diff-core/src/main/java/org/nuxeo/ecm/diff/xmlexport/DocumentXMLExporter.java
deleted file mode 100644
index 5fad960..0000000
--- a/nuxeo-diff-core/src/main/java/org/nuxeo/ecm/diff/xmlexport/DocumentXMLExporter.java
+++ /dev/null
< at >< at > -1,67 +0,0 < at >< at >
-/*
- * (C) Copyright 2012 Nuxeo SA (http://nuxeo.com/) and contributors.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the GNU Lesser General Public License
- * (LGPL) version 2.1 which accompanies this distribution, and is available at
- * http://www.gnu.org/licenses/lgpl.html
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * Contributors:
- * ataillefer
- */
-package org.nuxeo.ecm.diff.xmlexport;
-
-import java.io.InputStream;
-import java.io.Serializable;
-
-import org.nuxeo.ecm.core.api.ClientException;
-import org.nuxeo.ecm.core.api.CoreSession;
-import org.nuxeo.ecm.core.api.DocumentModel;
-import org.xml.sax.InputSource;
-
-/**
- * Handles XML export of a document.
- *
- * < at >author <a href="mailto:ataillefer< at >nuxeo.com">Antoine Taillefer</a>
- */
-public interface DocumentXMLExporter extends Serializable {
-
- /**
- * Export document XML as an InputStream.
- *
- * < at >param doc the doc
- * < at >param session the session
- * < at >return the input stream
- * < at >throws ClientException the client exception
- */
- InputStream exportXML(DocumentModel doc, CoreSession session)
- throws ClientException;
-
- /**
- * Export docupent xml as an InputSource.
- *
- * < at >param doc the doc
- * < at >param session the session
- * < at >return the input source
- * < at >throws ClientException the client exception
- */
- InputSource exportXMLAsInputSource(DocumentModel doc, CoreSession session)
- throws ClientException;
-
- /**
- * Export document XML as a byte array.
- *
- * < at >param doc the doc
- * < at >param session the session
- * < at >return the byte[]
- * < at >throws ClientException the client exception
- */
- byte[] exportXMLAsByteArray(DocumentModel doc, CoreSession session)
- throws ClientException;
-
-}
diff --git a/nuxeo-diff-core/src/main/java/org/nuxeo/ecm/diff/xmlexport/impl/DocumentXMLExporterImpl.java b/nuxeo-diff-core/src/main/java/org/nuxeo/ecm/diff/xmlexport/impl/DocumentXMLExporterImpl.java
deleted file mode 100644
index 99325e4..0000000
--- a/nuxeo-diff-core/src/main/java/org/nuxeo/ecm/diff/xmlexport/impl/DocumentXMLExporterImpl.java
+++ /dev/null
< at >< at > -1,101 +0,0 < at >< at >
-/*
- * (C) Copyright 2012 Nuxeo SA (http://nuxeo.com/) and contributors.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the GNU Lesser General Public License
- * (LGPL) version 2.1 which accompanies this distribution, and is available at
- * http://www.gnu.org/licenses/lgpl.html
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * Contributors:
- * ataillefer
- */
-package org.nuxeo.ecm.diff.xmlexport.impl;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
-
-import org.nuxeo.ecm.core.api.ClientException;
-import org.nuxeo.ecm.core.api.CoreSession;
-import org.nuxeo.ecm.core.api.DocumentModel;
-import org.nuxeo.ecm.core.io.DocumentPipe;
-import org.nuxeo.ecm.core.io.DocumentReader;
-import org.nuxeo.ecm.core.io.DocumentWriter;
-import org.nuxeo.ecm.core.io.impl.DocumentPipeImpl;
-import org.nuxeo.ecm.core.io.impl.plugins.TypedSingleDocumentReader;
-import org.nuxeo.ecm.core.io.impl.plugins.XMLDocumentWriter;
-import org.nuxeo.ecm.diff.xmlexport.DocumentXMLExporter;
-import org.xml.sax.InputSource;
-
-/**
- * Implementation of DocumentXMLExporter.
- *
- * < at >author <a href="mailto:ataillefer< at >nuxeo.com">Antoine Taillefer</a>
- */
-public class DocumentXMLExporterImpl implements DocumentXMLExporter {
-
- private static final long serialVersionUID = 4086449614391137730L;
-
- /**
- * {< at >inheritDoc}
- */
- public InputStream exportXML(DocumentModel doc, CoreSession session)
- throws ClientException {
-
- byte[] xmlExportByteArray = exportXMLAsByteArray(doc, session);
- return new ByteArrayInputStream(xmlExportByteArray);
- }
-
- /**
- * {< at >inheritDoc}
- */
- public InputSource exportXMLAsInputSource(DocumentModel doc,
- CoreSession session) throws ClientException {
-
- InputStream xmlExportInputStream = exportXML(doc, session);
- return new InputSource(xmlExportInputStream);
- }
-
- /**
- * Export XML as byte array.
- *
- * < at >param doc the doc
- * < at >param session the session
- * < at >return the byte[]
- * < at >throws ClientException the client exception
- */
- public final byte[] exportXMLAsByteArray(DocumentModel doc,
- CoreSession session) throws ClientException {
-
- ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
- DocumentWriter documentWriter = new XMLDocumentWriter(outputStream);
- DocumentReader documentReader = new TypedSingleDocumentReader(session,
- doc);
-
- DocumentPipe pipe = new DocumentPipeImpl();
- pipe.setReader(documentReader);
- pipe.setWriter(documentWriter);
-
- try {
- pipe.run();
- } catch (Exception e) {
- throw new ClientException(
- "Error while trying to export the document to XML.", e);
- } finally {
- if (documentReader != null) {
- documentReader.close();
- }
- if (documentWriter != null) {
- documentWriter.close();
- }
- }
-
- return outputStream.toByteArray();
- }
-
-}
diff --git a/nuxeo-diff-core/src/main/resources/META-INF/MANIFEST.MF b/nuxeo-diff-core/src/main/resources/META-INF/MANIFEST.MF
index 348b63c..63086b5 100644
--- a/nuxeo-diff-core/src/main/resources/META-INF/MANIFEST.MF
+++ b/nuxeo-diff-core/src/main/resources/META-INF/MANIFEST.MF
< at >< at > -7,5 +7,4 < at >< at > Bundle-Vendor: Nuxeo
Bundle-Version: 5.6
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.nuxeo.diff.core;singleton:=true
-Nuxeo-Component: OSGI-INF/document-xml-export-service.xml,
- OSGI-INF/document-diff-service.xml
+Nuxeo-Component: OSGI-INF/document-diff-service.xml
diff --git a/nuxeo-diff-core/src/main/resources/OSGI-INF/document-xml-export-service.xml b/nuxeo-diff-core/src/main/resources/OSGI-INF/document-xml-export-service.xml
deleted file mode 100644
index 750c9ca..0000000
--- a/nuxeo-diff-core/src/main/resources/OSGI-INF/document-xml-export-service.xml
+++ /dev/null
< at >< at > -1,18 +0,0 < at >< at >
-<?xml version="1.0"?>
-<component name="org.nuxeo.ecm.diff.xmlexport.DocumentXMLExporter">
-
- <documentation>
- This service allows to export a document to XML.
-
- < at >author
- Antoine Taillefer
- </documentation>
-
- <implementation
- class="org.nuxeo.ecm.diff.xmlexport.impl.DocumentXMLExporterImpl" />
-
- <service>
- <provide interface="org.nuxeo.ecm.diff.xmlexport.DocumentXMLExporter" />
- </service>
-
-</component>
diff --git a/nuxeo-diff-core/src/test/java/org/nuxeo/ecm/diff/service/TestDocumentDiff.java b/nuxeo-diff-core/src/test/java/org/nuxeo/ecm/diff/service/TestDocumentDiff.java
index df279c6..1982005 100644
--- a/nuxeo-diff-core/src/test/java/org/nuxeo/ecm/diff/service/TestDocumentDiff.java
+++ b/nuxeo-diff-core/src/test/java/org/nuxeo/ecm/diff/service/TestDocumentDiff.java
< at >< at > -29,6 +29,7 < at >< at >
import org.nuxeo.ecm.core.api.CoreSession;
import org.nuxeo.ecm.core.api.DocumentModel;
import org.nuxeo.ecm.core.api.PathRef;
+import org.nuxeo.ecm.core.io.DocumentXMLExporter;
import org.nuxeo.ecm.core.test.CoreFeature;
import org.nuxeo.ecm.core.test.annotations.Granularity;
import org.nuxeo.ecm.core.test.annotations.RepositoryConfig;
< at >< at > -40,7 +41,6 < at >< at >
import org.nuxeo.ecm.diff.model.impl.ListPropertyDiff;
import org.nuxeo.ecm.diff.model.impl.SimplePropertyDiff;
import org.nuxeo.ecm.diff.test.DocumentDiffRepositoryInit;
-import org.nuxeo.ecm.diff.xmlexport.DocumentXMLExporter;
import org.nuxeo.runtime.test.runner.Deploy;
import org.nuxeo.runtime.test.runner.Features;
import org.nuxeo.runtime.test.runner.FeaturesRunner;
< at >< at > -58,7 +58,8 < at >< at >
< at >RunWith(FeaturesRunner.class)
< at >Features(CoreFeature.class)
< at >RepositoryConfig(repositoryName = "default", init = DocumentDiffRepositoryInit.class, user = "Administrator", cleanup = Granularity.METHOD)
-< at >Deploy({ "org.nuxeo.diff.core", "org.nuxeo.diff.test" })
+< at >Deploy({ "org.nuxeo.ecm.core.io:OSGI-INF/document-xml-exporter-service.xml",
+ "org.nuxeo.diff.core", "org.nuxeo.diff.test" })
public class TestDocumentDiff extends DiffTestCase {
< at >Inject
< at >< at > -67,6 +68,9 < at >< at >
< at >Inject
protected DocumentDiffService docDiffService;
+ < at >Inject
+ protected DocumentXMLExporter docXMLExporter;
+
/**
* Tests doc diff.
*
< at >< at > -566,7 +570,6 < at >< at > public void testInverseDocDiff() throws ClientException {
protected final void createXMLExportTempFile(DocumentModel doc)
throws ClientException {
- DocumentXMLExporter docXMLExporter = docDiffService.getDocumentXMLExporter();
byte[] xmlExportByteArray = docXMLExporter.exportXMLAsByteArray(doc,
session);
diff --git a/nuxeo-diff-core/src/test/java/org/nuxeo/ecm/diff/service/TestDocumentDiffNotSameType.java b/nuxeo-diff-core/src/test/java/org/nuxeo/ecm/diff/service/TestDocumentDiffNotSameType.java
index 50bbf5a..11e4f5c 100644
--- a/nuxeo-diff-core/src/test/java/org/nuxeo/ecm/diff/service/TestDocumentDiffNotSameType.java
+++ b/nuxeo-diff-core/src/test/java/org/nuxeo/ecm/diff/service/TestDocumentDiffNotSameType.java
< at >< at > -51,7 +51,8 < at >< at >
< at >RunWith(FeaturesRunner.class)
< at >Features(CoreFeature.class)
< at >RepositoryConfig(repositoryName = "default", init = DocumentDiffNotSameTypeRepositoryInit.class, user = "Administrator", cleanup = Granularity.METHOD)
-< at >Deploy({ "org.nuxeo.diff.core", "org.nuxeo.diff.test" })
+< at >Deploy({ "org.nuxeo.ecm.core.io:OSGI-INF/document-xml-exporter-service.xml",
+ "org.nuxeo.diff.core", "org.nuxeo.diff.test" })
public class TestDocumentDiffNotSameType extends DiffTestCase {
< at >Inject
diff --git a/nuxeo-diff-jsf/src/test/java/org/nuxeo/ecm/diff/service/TestDiffDisplayService.java b/nuxeo-diff-jsf/src/test/java/org/nuxeo/ecm/diff/service/TestDiffDisplayService.java
index dd98fd5..5e01f21 100644
--- a/nuxeo-diff-jsf/src/test/java/org/nuxeo/ecm/diff/service/TestDiffDisplayService.java
+++ b/nuxeo-diff-jsf/src/test/java/org/nuxeo/ecm/diff/service/TestDiffDisplayService.java
< at >< at > -62,6 +62,7 < at >< at >
< at >Features(CoreFeature.class)
< at >RepositoryConfig(repositoryName = "default", init = DocumentDiffRepositoryInit.class, user = "Administrator", cleanup = Granularity.METHOD)
< at >Deploy({
+ "org.nuxeo.ecm.core.io:OSGI-INF/document-xml-exporter-service.xml",
"org.nuxeo.diff.core",
"org.nuxeo.diff.test",
"org.nuxeo.ecm.platform.forms.layout.core:OSGI-INF/layouts-core-framework.xml",
diff --git a/nuxeo-diff-jsf/src/test/java/org/nuxeo/ecm/diff/service/TestDiffDisplayServiceDefaultDisplay.java b/nuxeo-diff-jsf/src/test/java/org/nuxeo/ecm/diff/service/TestDiffDisplayServiceDefaultDisplay.java
index 3d0bd1b..b9cf661 100644
--- a/nuxeo-diff-jsf/src/test/java/org/nuxeo/ecm/diff/service/TestDiffDisplayServiceDefaultDisplay.java
+++ b/nuxeo-diff-jsf/src/test/java/org/nuxeo/ecm/diff/service/TestDiffDisplayServiceDefaultDisplay.java
< at >< at > -51,6 +51,7 < at >< at >
< at >RunWith(FeaturesRunner.class)
< at >Features(CoreFeature.class)
< at >Deploy({
+ "org.nuxeo.ecm.core.io:OSGI-INF/document-xml-exporter-service.xml",
"org.nuxeo.diff.core",
"org.nuxeo.ecm.platform.forms.layout.core:OSGI-INF/layouts-core-framework.xml",
"org.nuxeo.diff.jsf:OSGI-INF/diff-display-service.xml",
_______________________________________________
ECM-checkins mailing list
ECM-checkins-FQDHc1wsLCVb90+sfpvX0g< at >public.gmane.org
http://lists.nuxeo.com/mailman/listinfo/ecm-checkins
</pre>
Antoine Taillefer
2012-05-25T17:40:42
-
nuxeo-diff: NXP-9371: Remove forgotten debug code(branch< at >master)
http://comments.gmane.org/gmane.comp.cms.nuxeo.scm/73217
<pre>Message:
NXP-9371: Remove forgotten debug code
Repository: nuxeo-diff
Branch: master
Author: Antoine Taillefer <ataillefer< at >nuxeo.com>
Date: 2012-05-25T10:39:23-07:00
URL: https://github.com/nuxeo/nuxeo-diff/commit/666359f04464dcf1b89e5828b4d49dec7428ca85
JIRA: https://jira.nuxeo.com/browse/NXP-9371
Files:
M nuxeo-diff-jsf/src/main/resources/web/nuxeo.war/widgets/list_diff_widget_template.xhtml
diff --git a/nuxeo-diff-jsf/src/main/resources/web/nuxeo.war/widgets/list_diff_widget_template.xhtml b/nuxeo-diff-jsf/src/main/resources/web/nuxeo.war/widgets/list_diff_widget_template.xhtml
index 9070410..60649f2 100644
--- a/nuxeo-diff-jsf/src/main/resources/web/nuxeo.war/widgets/list_diff_widget_template.xhtml
+++ b/nuxeo-diff-jsf/src/main/resources/web/nuxeo.war/widgets/list_diff_widget_template.xhtml
< at >< at > -21,7 +21,6 < at >< at >
</c:if>
<c:if test="#{nxl:isLikeViewMode(widget.mode)}">
- < at >#{widgetProperty_hideSubLabels}< at >
<c:set var="displaySubLabels" value="#{not widgetProperty_hideSubLabels}" />
<table class="diffDisplayTable">
1_______________________________________________
ECM-checkins mailing list
ECM-checkins-FQDHc1wsLCVb90+sfpvX0g< at >public.gmane.org
http://lists.nuxeo.com/mailman/listinfo/ecm-checkins
</pre>
Antoine Taillefer
2012-05-25T17:40:42
-
nuxeo-core: NXP-9373: Add the DocumentXMLExporterservice tonuxeo-core-io (branch< at >master)
http://comments.gmane.org/gmane.comp.cms.nuxeo.scm/73216
<pre>Message:
NXP-9373: Add the DocumentXMLExporter service to nuxeo-core-io
Repository: nuxeo-core
Branch: master
Author: Antoine Taillefer <ataillefer< at >nuxeo.com>
Date: 2012-05-25T10:19:52-07:00
URL: https://github.com/nuxeo/nuxeo-core/commit/a50c4d63bf12341b6d49367f4919c125c502305b
JIRA: https://jira.nuxeo.com/browse/NXP-9373
Files:
A nuxeo-core-io/src/main/java/org/nuxeo/ecm/core/io/DocumentXMLExporter.java
A nuxeo-core-io/src/main/java/org/nuxeo/ecm/core/io/impl/DocumentXMLExporterImpl.java
A nuxeo-core-io/src/main/resources/OSGI-INF/document-xml-exporter-service.xml
M nuxeo-core-io/src/main/resources/META-INF/MANIFEST.MF
diff --git a/nuxeo-core-io/src/main/java/org/nuxeo/ecm/core/io/DocumentXMLExporter.java b/nuxeo-core-io/src/main/java/org/nuxeo/ecm/core/io/DocumentXMLExporter.java
new file mode 100644
index 0000000..99cccb5
--- /dev/null
+++ b/nuxeo-core-io/src/main/java/org/nuxeo/ecm/core/io/DocumentXMLExporter.java
< at >< at > -0,0 +1,70 < at >< at >
+/*
+ * (C) Copyright 2012 Nuxeo SA (http://nuxeo.com/) and contributors.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Lesser General Public License
+ * (LGPL) version 2.1 which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/lgpl.html
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * Contributors:
+ * Antoine Taillefer
+ */
+package org.nuxeo.ecm.core.io;
+
+import java.io.InputStream;
+import java.io.Serializable;
+
+import org.nuxeo.ecm.core.api.ClientException;
+import org.nuxeo.ecm.core.api.CoreSession;
+import org.nuxeo.ecm.core.api.DocumentModel;
+import org.xml.sax.InputSource;
+
+/**
+ * Handles the XML export of a document.
+ *
+ * < at >author <a href="mailto:ataillefer< at >nuxeo.com">Antoine Taillefer</a>
+ * < at >since 5.6
+ */
+public interface DocumentXMLExporter extends Serializable {
+
+ /**
+ * Exports a document to XML as an {< at >link InputStream}.
+ *
+ * < at >param doc the document
+ * < at >param session the core session
+ * < at >return the input stream
+ * < at >throws ClientException if an error occurs while exporting the document
+ * to XML
+ */
+ InputStream exportXML(DocumentModel doc, CoreSession session)
+ throws ClientException;
+
+ /**
+ * Exports a document to XML as an {< at >link InputSource}.
+ *
+ * < at >param doc the document
+ * < at >param session the core session
+ * < at >return the input source
+ * < at >throws ClientException if an error occurs while exporting the document
+ * to XML
+ */
+ InputSource exportXMLAsInputSource(DocumentModel doc, CoreSession session)
+ throws ClientException;
+
+ /**
+ * Exports a document to XML as a byte array.
+ *
+ * < at >param doc the document
+ * < at >param session the core session
+ * < at >return the byte array
+ * < at >throws ClientException if an error occurs while exporting the document
+ * to XML
+ */
+ byte[] exportXMLAsByteArray(DocumentModel doc, CoreSession session)
+ throws ClientException;
+}
diff --git a/nuxeo-core-io/src/main/java/org/nuxeo/ecm/core/io/impl/DocumentXMLExporterImpl.java b/nuxeo-core-io/src/main/java/org/nuxeo/ecm/core/io/impl/DocumentXMLExporterImpl.java
new file mode 100644
index 0000000..7b61022
--- /dev/null
+++ b/nuxeo-core-io/src/main/java/org/nuxeo/ecm/core/io/impl/DocumentXMLExporterImpl.java
< at >< at > -0,0 +1,95 < at >< at >
+/*
+ * (C) Copyright 2012 Nuxeo SA (http://nuxeo.com/) and contributors.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Lesser General Public License
+ * (LGPL) version 2.1 which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/lgpl.html
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * Contributors:
+ * Antoine Taillefer
+ */
+package org.nuxeo.ecm.core.io.impl;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.InputStream;
+
+import org.nuxeo.ecm.core.api.ClientException;
+import org.nuxeo.ecm.core.api.CoreSession;
+import org.nuxeo.ecm.core.api.DocumentModel;
+import org.nuxeo.ecm.core.io.DocumentPipe;
+import org.nuxeo.ecm.core.io.DocumentReader;
+import org.nuxeo.ecm.core.io.DocumentWriter;
+import org.nuxeo.ecm.core.io.DocumentXMLExporter;
+import org.nuxeo.ecm.core.io.impl.plugins.TypedSingleDocumentReader;
+import org.nuxeo.ecm.core.io.impl.plugins.XMLDocumentWriter;
+import org.xml.sax.InputSource;
+
+/**
+ * Default implementation of a {< at >link DocumentXMLExporter}.
+ *
+ * < at >author <a href="mailto:ataillefer< at >nuxeo.com">Antoine Taillefer</a>
+ * < at >since 5.6
+ */
+public class DocumentXMLExporterImpl implements DocumentXMLExporter {
+
+ private static final long serialVersionUID = 4086449614391137730L;
+
+ /**
+ * {< at >inheritDoc}
+ */
+ public InputStream exportXML(DocumentModel doc, CoreSession session)
+ throws ClientException {
+
+ byte[] xmlExportByteArray = exportXMLAsByteArray(doc, session);
+ return new ByteArrayInputStream(xmlExportByteArray);
+ }
+
+ /**
+ * {< at >inheritDoc}
+ */
+ public InputSource exportXMLAsInputSource(DocumentModel doc,
+ CoreSession session) throws ClientException {
+
+ InputStream xmlExportInputStream = exportXML(doc, session);
+ return new InputSource(xmlExportInputStream);
+ }
+
+ /**
+ * {< at >inheritDoc}
+ */
+ public final byte[] exportXMLAsByteArray(DocumentModel doc,
+ CoreSession session) throws ClientException {
+
+ ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+ DocumentWriter documentWriter = new XMLDocumentWriter(outputStream);
+ DocumentReader documentReader = new TypedSingleDocumentReader(session,
+ doc);
+
+ DocumentPipe pipe = new DocumentPipeImpl();
+ pipe.setReader(documentReader);
+ pipe.setWriter(documentWriter);
+
+ try {
+ pipe.run();
+ } catch (Exception e) {
+ throw new ClientException(
+ "Error while trying to export the document to XML.", e);
+ } finally {
+ if (documentReader != null) {
+ documentReader.close();
+ }
+ if (documentWriter != null) {
+ documentWriter.close();
+ }
+ }
+
+ return outputStream.toByteArray();
+ }
+}
diff --git a/nuxeo-core-io/src/main/resources/META-INF/MANIFEST.MF b/nuxeo-core-io/src/main/resources/META-INF/MANIFEST.MF
index f91c232..5311d60 100644
--- a/nuxeo-core-io/src/main/resources/META-INF/MANIFEST.MF
+++ b/nuxeo-core-io/src/main/resources/META-INF/MANIFEST.MF
< at >< at > -28,3 +28,4 < at >< at > Import-Package: javax.security.auth.login,
org.nuxeo.runtime.api,
org.nuxeo.runtime.services.streaming
Bundle-SymbolicName: org.nuxeo.ecm.core.io
+Nuxeo-Component: OSGI-INF/document-xml-exporter-service.xml
diff --git a/nuxeo-core-io/src/main/resources/OSGI-INF/document-xml-exporter-service.xml b/nuxeo-core-io/src/main/resources/OSGI-INF/document-xml-exporter-service.xml
new file mode 100644
index 0000000..81d6bdd
--- /dev/null
+++ b/nuxeo-core-io/src/main/resources/OSGI-INF/document-xml-exporter-service.xml
< at >< at > -0,0 +1,17 < at >< at >
+<?xml version="1.0"?>
+<component name="org.nuxeo.ecm.core.io.DocumentXMLExporter">
+
+ <documentation>
+ This service allows to export a document to XML.
+
+ < at >author
+ Antoine Taillefer
+ </documentation>
+
+ <implementation class="org.nuxeo.ecm.core.io.impl.DocumentXMLExporterImpl" />
+
+ <service>
+ <provide interface="org.nuxeo.ecm.core.io.DocumentXMLExporter" />
+ </service>
+
+</component>
_______________________________________________
ECM-checkins mailing list
ECM-checkins-FQDHc1wsLCVb90+sfpvX0g< at >public.gmane.org
http://lists.nuxeo.com/mailman/listinfo/ecm-checkins
</pre>
Antoine Taillefer
2012-05-25T17:20:02
-
nuxeo-platform-document-routing: NXP-9291: add resumecapability(branch< at >feature-NXP-9289-new-content-routing)
http://comments.gmane.org/gmane.comp.cms.nuxeo.scm/73215
<pre>Message:
NXP-9291: add resume capability
Repository: nuxeo-platform-document-routing
Branch: feature-NXP-9289-new-content-routing
Author: Florent Guillaume <fg< at >nuxeo.com>
Date: 2012-05-25T10:08:26-07:00
URL: https://github.com/nuxeo/nuxeo-platform-document-routing/commit/90a35774c5b202811ce928baab2ca382af8826af
JIRA: https://jira.nuxeo.com/browse/NXP-9291
Files:
M nuxeo-platform-document-routing-api/src/main/java/org/nuxeo/ecm/platform/routing/api/DocumentRouteElement.java
M nuxeo-platform-document-routing-api/src/main/java/org/nuxeo/ecm/platform/routing/api/DocumentRoutingService.java
M nuxeo-platform-document-routing-core/src/main/java/org/nuxeo/ecm/platform/routing/core/api/DocumentRoutingEngineService.java
M nuxeo-platform-document-routing-core/src/main/java/org/nuxeo/ecm/platform/routing/core/impl/AbstractRunner.java
M nuxeo-platform-document-routing-core/src/main/java/org/nuxeo/ecm/platform/routing/core/impl/DocumentRouteElementImpl.java
M nuxeo-platform-document-routing-core/src/main/java/org/nuxeo/ecm/platform/routing/core/impl/DocumentRoutingEngineServiceImpl.java
M nuxeo-platform-document-routing-core/src/main/java/org/nuxeo/ecm/platform/routing/core/impl/DocumentRoutingServiceImpl.java
M nuxeo-platform-document-routing-core/src/main/java/org/nuxeo/ecm/platform/routing/core/impl/ElementRunner.java
M nuxeo-platform-document-routing-core/src/main/java/org/nuxeo/ecm/platform/routing/core/impl/GraphNode.java
M nuxeo-platform-document-routing-core/src/main/java/org/nuxeo/ecm/platform/routing/core/impl/GraphNodeImpl.java
M nuxeo-platform-document-routing-core/src/main/java/org/nuxeo/ecm/platform/routing/core/impl/GraphRunner.java
M nuxeo-platform-document-routing-core/src/main/java/org/nuxeo/ecm/platform/routing/core/impl/StepElementRunner.java
M nuxeo-platform-document-routing-core/src/test/java/org/nuxeo/ecm/platform/routing/test/GraphRouteTest.java
diff --git a/nuxeo-platform-document-routing-api/src/main/java/org/nuxeo/ecm/platform/routing/api/DocumentRouteElement.java b/nuxeo-platform-document-routing-api/src/main/java/org/nuxeo/ecm/platform/routing/api/DocumentRouteElement.java
index 522dc74..4dd501c 100644
--- a/nuxeo-platform-document-routing-api/src/main/java/org/nuxeo/ecm/platform/routing/api/DocumentRouteElement.java
+++ b/nuxeo-platform-document-routing-api/src/main/java/org/nuxeo/ecm/platform/routing/api/DocumentRouteElement.java
< at >< at > -17,6 +17,7 < at >< at >
package org.nuxeo.ecm.platform.routing.api;
import java.io.Serializable;
+import java.util.Map;
import org.nuxeo.ecm.core.api.ClientException;
import org.nuxeo.ecm.core.api.CoreSession;
< at >< at > -118,11 +119,20 < at >< at >
* this is a containter it will run its children.
*
* < at >param session
- * < at >return true is the element is not done
*/
void run(CoreSession session);
/**
+ * Resumes execution on a route node.
+ *
+ * < at >param session the session
+ * < at >param nodeId the node id to resume on
+ * < at >param data the data coming from UI form
+ * < at >since 5.6
+ */
+ void resume(CoreSession session, String nodeId, Map<String, Object> data);
+
+ /**
* Set this element to the validate state and put it in read only mode.
*
* < at >param session
diff --git a/nuxeo-platform-document-routing-api/src/main/java/org/nuxeo/ecm/platform/routing/api/DocumentRoutingService.java b/nuxeo-platform-document-routing-api/src/main/java/org/nuxeo/ecm/platform/routing/api/DocumentRoutingService.java
index 5fa7f2a..f6b8b92 100644
--- a/nuxeo-platform-document-routing-api/src/main/java/org/nuxeo/ecm/platform/routing/api/DocumentRoutingService.java
+++ b/nuxeo-platform-document-routing-api/src/main/java/org/nuxeo/ecm/platform/routing/api/DocumentRoutingService.java
< at >< at > -18,6 +18,7 < at >< at >
package org.nuxeo.ecm.platform.routing.api;
import java.util.List;
+import java.util.Map;
import org.nuxeo.ecm.core.api.ClientException;
import org.nuxeo.ecm.core.api.CoreSession;
< at >< at > -68,6 +69,20 < at >< at > DocumentRoute createNewInstance(DocumentRoute model, String documentId,
CoreSession session);
/**
+ * Resumes a route instance.
+ * <p>
+ * Called by the UI action corresponding to a task button.
+ *
+ * < at >param routeRef the reference to the route instance document
+ * < at >param session the session
+ * < at >param nodeId the node id to resume on
+ * < at >param data the data coming from UI form
+ * < at >since 5.6
+ */
+ void resumeInstance(DocumentRef routeRef, CoreSession session,
+ String nodeId, Map<String, Object> data);
+
+ /**
* Save a route instance as a new model of route.
*
* The place in which the new instance is persisted and its name depends on
diff --git a/nuxeo-platform-document-routing-core/src/main/java/org/nuxeo/ecm/platform/routing/core/api/DocumentRoutingEngineService.java b/nuxeo-platform-document-routing-core/src/main/java/org/nuxeo/ecm/platform/routing/core/api/DocumentRoutingEngineService.java
index c135a3d..41127dd 100644
--- a/nuxeo-platform-document-routing-core/src/main/java/org/nuxeo/ecm/platform/routing/core/api/DocumentRoutingEngineService.java
+++ b/nuxeo-platform-document-routing-core/src/main/java/org/nuxeo/ecm/platform/routing/core/api/DocumentRoutingEngineService.java
< at >< at > -1,5 +1,5 < at >< at >
/*
- * (C) Copyright 2009 Nuxeo SA (http://nuxeo.com/) and contributors.
+ * (C) Copyright 2009-2012 Nuxeo SA (http://nuxeo.com/) and contributors.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the GNU Lesser General Public License
< at >< at > -12,10 +12,13 < at >< at >
* Lesser General Public License for more details.
*
* Contributors:
- * arussel
+ * Alexandre Russel
+ * Florent Guillaume
*/
package org.nuxeo.ecm.platform.routing.core.api;
+import java.util.Map;
+
import org.nuxeo.ecm.core.api.CoreSession;
import org.nuxeo.ecm.platform.routing.api.DocumentRoute;
import org.nuxeo.ecm.platform.routing.api.DocumentRoutingService;
< at >< at > -24,18 +27,27 < at >< at >
* The DocumentRoutingEngineService is responsible for managing the lifecycle of
* the DocumentRoute. This is an internal service, you should use method on the
* {< at >link DocumentRoutingService} to start a route.
- *
- * < at >author arussel
- *
*/
public interface DocumentRoutingEngineService {
/**
- * Start or resume a the route.
+ * Starts a route.
*
- * < at >param routeInstance
- * < at >param session
+ * < at >param routeInstance the route instance
+ * < at >param session the session
*/
void start(DocumentRoute routeInstance, CoreSession session);
+ /**
+ * Resumes a route.
+ *
+ * < at >param routeInstance the route instance
+ * < at >param session the session
+ * < at >param nodeId the node id to resume on
+ * < at >param data the data coming from UI form
+ * < at >since 5.6
+ */
+ void resume(DocumentRoute routeInstance, CoreSession session,
+ String nodeId, Map<String, Object> data);
+
}
diff --git a/nuxeo-platform-document-routing-core/src/main/java/org/nuxeo/ecm/platform/routing/core/impl/AbstractRunner.java b/nuxeo-platform-document-routing-core/src/main/java/org/nuxeo/ecm/platform/routing/core/impl/AbstractRunner.java
index 79868fb..f87480b 100644
--- a/nuxeo-platform-document-routing-core/src/main/java/org/nuxeo/ecm/platform/routing/core/impl/AbstractRunner.java
+++ b/nuxeo-platform-document-routing-core/src/main/java/org/nuxeo/ecm/platform/routing/core/impl/AbstractRunner.java
< at >< at > -1,5 +1,5 < at >< at >
/*
- * (C) Copyright 2010 Nuxeo SA (http://nuxeo.com/) and contributors.
+ * (C) Copyright 2010-2012 Nuxeo SA (http://nuxeo.com/) and contributors.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the GNU Lesser General Public License
< at >< at > -12,12 +12,14 < at >< at >
* Lesser General Public License for more details.
*
* Contributors:
- * Nuxeo - initial API and implementation
+ * Alexandre Russel
+ * Florent Guillaume
*/
package org.nuxeo.ecm.platform.routing.core.impl;
import java.util.ArrayList;
import java.util.List;
+import java.util.Map;
import org.nuxeo.ecm.core.api.ClientException;
import org.nuxeo.ecm.core.api.ClientRuntimeException;
< at >< at > -26,10 +28,6 < at >< at >
import org.nuxeo.ecm.core.api.DocumentModelList;
import org.nuxeo.ecm.platform.routing.api.DocumentRouteElement;
-/**
- * < at >author <a href="mailto:arussel< at >nuxeo.com">Alexandre Russel</a>
- *
- */
public abstract class AbstractRunner implements ElementRunner {
protected List<DocumentRouteElement> getChildrenElement(
< at >< at > -47,6 +45,12 < at >< at >
}
< at >Override
+ public void resume(CoreSession session, DocumentRouteElement element,
+ String nodeId, Map<String, Object> data) {
+ throw new UnsupportedOperationException();
+ }
+
+ < at >Override
public void undo(CoreSession session, DocumentRouteElement element) {
throw new UnsupportedOperationException();
}
diff --git a/nuxeo-platform-document-routing-core/src/main/java/org/nuxeo/ecm/platform/routing/core/impl/DocumentRouteElementImpl.java b/nuxeo-platform-document-routing-core/src/main/java/org/nuxeo/ecm/platform/routing/core/impl/DocumentRouteElementImpl.java
index 854f480..967b364 100644
--- a/nuxeo-platform-document-routing-core/src/main/java/org/nuxeo/ecm/platform/routing/core/impl/DocumentRouteElementImpl.java
+++ b/nuxeo-platform-document-routing-core/src/main/java/org/nuxeo/ecm/platform/routing/core/impl/DocumentRouteElementImpl.java
< at >< at > -18,6 +18,7 < at >< at >
import java.util.ArrayList;
import java.util.List;
+import java.util.Map;
import org.nuxeo.ecm.core.api.ClientException;
import org.nuxeo.ecm.core.api.ClientRuntimeException;
< at >< at > -77,6 +78,12 < at >< at > public void run(CoreSession session) {
}
< at >Override
+ public void resume(CoreSession session, String nodeId,
+ Map<String, Object> data) {
+ runner.resume(session, this, nodeId, data);
+ }
+
+ < at >Override
public DocumentRoute getDocumentRoute(CoreSession session) {
DocumentModel parent = document;
while (true) {
diff --git a/nuxeo-platform-document-routing-core/src/main/java/org/nuxeo/ecm/platform/routing/core/impl/DocumentRoutingEngineServiceImpl.java b/nuxeo-platform-document-routing-core/src/main/java/org/nuxeo/ecm/platform/routing/core/impl/DocumentRoutingEngineServiceImpl.java
index 2f4912b..a0fd78f 100644
--- a/nuxeo-platform-document-routing-core/src/main/java/org/nuxeo/ecm/platform/routing/core/impl/DocumentRoutingEngineServiceImpl.java
+++ b/nuxeo-platform-document-routing-core/src/main/java/org/nuxeo/ecm/platform/routing/core/impl/DocumentRoutingEngineServiceImpl.java
< at >< at > -1,5 +1,5 < at >< at >
/*
- * (C) Copyright 2009 Nuxeo SA (http://nuxeo.com/) and contributors.
+ * (C) Copyright 2009-2012 Nuxeo SA (http://nuxeo.com/) and contributors.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the GNU Lesser General Public License
< at >< at > -12,19 +12,18 < at >< at >
* Lesser General Public License for more details.
*
* Contributors:
- * arussel
+ * Alexandre Russel
+ * Florent Guillaume
*/
package org.nuxeo.ecm.platform.routing.core.impl;
+import java.util.Map;
+
import org.nuxeo.ecm.core.api.CoreSession;
import org.nuxeo.ecm.platform.routing.api.DocumentRoute;
import org.nuxeo.ecm.platform.routing.core.api.DocumentRoutingEngineService;
import org.nuxeo.runtime.model.DefaultComponent;
-/**
- * < at >author arussel
- *
- */
public class DocumentRoutingEngineServiceImpl extends DefaultComponent
implements DocumentRoutingEngineService {
< at >< at > -32,4 +31,11 < at >< at >
public void start(DocumentRoute routeInstance, CoreSession session) {
routeInstance.run(session);
}
+
+ < at >Override
+ public void resume(DocumentRoute routeInstance, CoreSession session,
+ String nodeId, Map<String, Object> data) {
+ routeInstance.resume(session, nodeId, data);
+ }
+
}
diff --git a/nuxeo-platform-document-routing-core/src/main/java/org/nuxeo/ecm/platform/routing/core/impl/DocumentRoutingServiceImpl.java b/nuxeo-platform-document-routing-core/src/main/java/org/nuxeo/ecm/platform/routing/core/impl/DocumentRoutingServiceImpl.java
index 89686ae..eafe1ef 100644
--- a/nuxeo-platform-document-routing-core/src/main/java/org/nuxeo/ecm/platform/routing/core/impl/DocumentRoutingServiceImpl.java
+++ b/nuxeo-platform-document-routing-core/src/main/java/org/nuxeo/ecm/platform/routing/core/impl/DocumentRoutingServiceImpl.java
< at >< at > -138,6 +138,41 < at >< at > public DocumentRoute createNewInstance(DocumentRoute model,
}
< at >Override
+ public void resumeInstance(DocumentRef routeRef, CoreSession session,
+ String nodeId, Map<String, Object> data) {
+ try {
+ new ResumeRouteInstanceRunner(routeRef, session, nodeId, data).runUnrestricted();
+ } catch (ClientException e) {
+ throw new ClientRuntimeException(e);
+ }
+ }
+
+ public static class ResumeRouteInstanceRunner extends UnrestrictedSessionRunner {
+
+ protected DocumentRef routeRef;
+
+ protected String nodeId;
+
+ protected Map<String, Object> data;
+
+ public ResumeRouteInstanceRunner(DocumentRef routeRef,
+ CoreSession session, String nodeId, Map<String, Object> data) {
+ super(session);
+ this.routeRef = routeRef;
+ this.nodeId = nodeId;
+ this.data = data;
+ }
+
+ < at >Override
+ public void run() throws ClientException {
+ DocumentRoutingEngineService engineService = Framework.getLocalService(DocumentRoutingEngineService.class);
+ DocumentModel routeDoc = session.getDocument(routeRef);
+ DocumentRoute routeInstance = routeDoc.getAdapter(DocumentRoute.class);
+ engineService.resume(routeInstance, session, nodeId, data);
+ }
+ }
+
+ < at >Override
public List<DocumentRoute> getAvailableDocumentRouteModel(
CoreSession session) {
DocumentModelList list = null;
diff --git a/nuxeo-platform-document-routing-core/src/main/java/org/nuxeo/ecm/platform/routing/core/impl/ElementRunner.java b/nuxeo-platform-document-routing-core/src/main/java/org/nuxeo/ecm/platform/routing/core/impl/ElementRunner.java
index 07cc3ea..03116fc 100644
--- a/nuxeo-platform-document-routing-core/src/main/java/org/nuxeo/ecm/platform/routing/core/impl/ElementRunner.java
+++ b/nuxeo-platform-document-routing-core/src/main/java/org/nuxeo/ecm/platform/routing/core/impl/ElementRunner.java
< at >< at > -1,5 +1,5 < at >< at >
/*
- * (C) Copyright 2010 Nuxeo SA (http://nuxeo.com/) and contributors.
+ * (C) Copyright 2010-2012 Nuxeo SA (http://nuxeo.com/) and contributors.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the GNU Lesser General Public License
< at >< at > -12,21 +12,22 < at >< at >
* Lesser General Public License for more details.
*
* Contributors:
- * Nuxeo - initial API and implementation
+ * Alexandre Russel
+ * Florent Guillaume
*/
package org.nuxeo.ecm.platform.routing.core.impl;
+import java.util.Map;
+
import org.nuxeo.ecm.core.api.CoreSession;
import org.nuxeo.ecm.platform.routing.api.DocumentRoute;
import org.nuxeo.ecm.platform.routing.api.DocumentRouteElement;
/**
* Runner responsible to run or undo an element of a route.
- *
- * < at >author <a href="mailto:arussel< at >nuxeo.com">Alexandre Russel</a>
- *
*/
public interface ElementRunner {
+
/**
* Run this element. If an exception is thrown while doing, it cancels the
* route.
< at >< at > -34,6 +35,14 < at >< at >
void run(CoreSession session, DocumentRouteElement element);
/**
+ * Resumes this graph route on a given node.
+ *
+ * < at >since 5.6
+ */
+ void resume(CoreSession session, DocumentRouteElement element,
+ String nodeId, Map<String, Object> data);
+
+ /**
* Run the undo chain on this element. If this element is not a step, then
* throw an exception.
*/
diff --git a/nuxeo-platform-document-routing-core/src/main/java/org/nuxeo/ecm/platform/routing/core/impl/GraphNode.java b/nuxeo-platform-document-routing-core/src/main/java/org/nuxeo/ecm/platform/routing/core/impl/GraphNode.java
index dd6b8d7..e6641b1 100644
--- a/nuxeo-platform-document-routing-core/src/main/java/org/nuxeo/ecm/platform/routing/core/impl/GraphNode.java
+++ b/nuxeo-platform-document-routing-core/src/main/java/org/nuxeo/ecm/platform/routing/core/impl/GraphNode.java
< at >< at > -17,6 +17,7 < at >< at >
package org.nuxeo.ecm.platform.routing.core.impl;
import java.util.List;
+import java.util.Map;
import org.apache.commons.lang.builder.ToStringBuilder;
import org.nuxeo.ecm.core.api.ClientException;
< at >< at > -219,6 +220,7 < at >< at > public String toString() {
/**
* Gets the canceled count for this node.
+ *
* < at >return
*/
long getCanceledCount();
< at >< at > -291,4 +293,11 < at >< at > void executeTransitionChain(Transition transition)
*/
List<Transition> evaluateTransitions() throws DocumentRouteException;
+ /**
+ * Sets the graph and node variables.
+ *
+ * < at >param map the map of variables
+ */
+ void setAllVariables(Map<String, Object> map);
+
}
diff --git a/nuxeo-platform-document-routing-core/src/main/java/org/nuxeo/ecm/platform/routing/core/impl/GraphNodeImpl.java b/nuxeo-platform-document-routing-core/src/main/java/org/nuxeo/ecm/platform/routing/core/impl/GraphNodeImpl.java
index 9f59fd7..2c6db87 100644
--- a/nuxeo-platform-document-routing-core/src/main/java/org/nuxeo/ecm/platform/routing/core/impl/GraphNodeImpl.java
+++ b/nuxeo-platform-document-routing-core/src/main/java/org/nuxeo/ecm/platform/routing/core/impl/GraphNodeImpl.java
< at >< at > -235,15 +235,48 < at >< at > protected void setVariables(Map<String, Serializable> map) {
}
}
- protected OperationContext getContext(
- Map<String, Serializable> graphVariables,
- Map<String, Serializable> nodeVariables) {
+ < at >Override
+ public void setAllVariables(Map<String, Object> map) {
+
+ // get variables from node and graph
+ Map<String, Serializable> graphVariables = graph.getVariables();
+ Map<String, Serializable> nodeVariables = getVariables();
+
+ // set variables back into node and graph
+ boolean changedNodeVariables = false;
+ boolean changedGraphVariables = false;
+ for (Entry<String, Object> es : map.entrySet()) {
+ String key = es.getKey();
+ Serializable value = (Serializable) es.getValue();
+ if (nodeVariables.containsKey(key)) {
+ Serializable oldValue = nodeVariables.get(key);
+ if (!ObjectUtils.equals(value, oldValue)) {
+ changedNodeVariables = true;
+ nodeVariables.put(key, value);
+ }
+ } else if (graphVariables.containsKey(key)) {
+ Serializable oldValue = graphVariables.get(key);
+ if (!ObjectUtils.equals(value, oldValue)) {
+ changedGraphVariables = true;
+ graphVariables.put(key, value);
+ }
+ }
+ }
+ if (changedNodeVariables) {
+ setVariables(nodeVariables);
+ }
+ if (changedGraphVariables) {
+ graph.setVariables(graphVariables);
+ }
+ }
+
+ protected OperationContext getContext() {
OperationContext context = new OperationContext(getSession());
context.setCommit(false); // no session save at end
// context.put(DocumentRoutingConstants.OPERATION_STEP_DOCUMENT_KEY,
// element);
- context.putAll(graphVariables);
- context.putAll(nodeVariables);
+ context.putAll(graph.getVariables());
+ context.putAll(getVariables());
// workflow context
// context.put("workflowId", graph.get);
context.put("initiator", "");
< at >< at > -280,10 +313,8 < at >< at > public void executeChain(String chainId, String transitionId)
return;
}
- // get variables from node and graph
- Map<String, Serializable> graphVariables = graph.getVariables();
- Map<String, Serializable> nodeVariables = getVariables();
- OperationContext context = getContext(graphVariables, nodeVariables);
+ // get base context
+ OperationContext context = getContext();
if (transitionId != null) {
context.put("transition", transitionId);
}
< at >< at > -302,32 +333,7 < at >< at > public void executeChain(String chainId, String transitionId)
e);
}
- // set variables back into node and graph
- boolean changedNodeVariables = false;
- boolean changedGraphVariables = false;
- for (Entry<String, Object> es : context.entrySet()) {
- String key = es.getKey();
- Serializable value = (Serializable) es.getValue();
- if (nodeVariables.containsKey(key)) {
- Serializable oldValue = nodeVariables.get(key);
- if (!ObjectUtils.equals(value, oldValue)) {
- changedNodeVariables = true;
- nodeVariables.put(key, value);
- }
- } else if (graphVariables.containsKey(key)) {
- Serializable oldValue = graphVariables.get(key);
- if (!ObjectUtils.equals(value, oldValue)) {
- changedGraphVariables = true;
- graphVariables.put(key, value);
- }
- }
- }
- if (changedNodeVariables) {
- setVariables(nodeVariables);
- }
- if (changedGraphVariables) {
- graph.setVariables(graphVariables);
- }
+ setAllVariables(context);
}
< at >Override
< at >< at > -361,8 +367,7 < at >< at > public void initAddInputTransition(Transition transition) {
public List<Transition> evaluateTransitions() throws DocumentRouteException {
try {
List<Transition> trueTrans = new ArrayList<Transition>();
- OperationContext context = getContext(graph.getVariables(),
- getVariables());
+ OperationContext context = getContext();
for (Transition t : getOutputTransitions()) {
context.put("transition", t.id);
Expression expr = Scripting.newExpression(t.condition);
diff --git a/nuxeo-platform-document-routing-core/src/main/java/org/nuxeo/ecm/platform/routing/core/impl/GraphRunner.java b/nuxeo-platform-document-routing-core/src/main/java/org/nuxeo/ecm/platform/routing/core/impl/GraphRunner.java
index 4d14de3..63ee334 100644
--- a/nuxeo-platform-document-routing-core/src/main/java/org/nuxeo/ecm/platform/routing/core/impl/GraphRunner.java
+++ b/nuxeo-platform-document-routing-core/src/main/java/org/nuxeo/ecm/platform/routing/core/impl/GraphRunner.java
< at >< at > -19,6 +19,7 < at >< at >
import java.util.HashSet;
import java.util.LinkedList;
import java.util.List;
+import java.util.Map;
import java.util.Set;
import org.apache.commons.logging.Log;
< at >< at > -48,31 +49,37 < at >< at >
< at >Override
public void run(CoreSession session, DocumentRouteElement element) {
try {
- startGraph(session, element);
+ GraphRoute graph = (GraphRoute) element;
+ element.setRunning(session);
+ boolean done = runGraph(graph, graph.getStartNode());
+ if (done) {
+ element.setDone(session);
+ }
+ session.save();
} catch (ClientException e) {
throw new ClientRuntimeException(e);
}
}
- protected void startGraph(CoreSession session, DocumentRouteElement element)
- throws ClientException {
- element.setRunning(session);
- GraphRoute graph = (GraphRoute) element;
- boolean done = runGraph(graph, graph.getStartNode());
- if (done) {
- element.setDone(session);
- }
- session.save();
- }
-
- public void resumeGraph(CoreSession session, GraphRoute graph,
- GraphNode node, Object data) throws ClientException {
- // TODO data
- boolean done = runGraph(graph, node);
- if (done) {
- ((DocumentRouteElement) graph).setDone(session);
+ < at >Override
+ public void resume(CoreSession session, DocumentRouteElement element,
+ String nodeId, Map<String, Object> data) {
+ try {
+ GraphRoute graph = (GraphRoute) element;
+ GraphNode node = graph.getNode(nodeId);
+ if (node.getState() != State.SUSPENDED) {
+ throw new DocumentRouteException(
+ "Cannot resume on non-suspended node: " + node);
+ }
+ node.setAllVariables(data);
+ boolean done = runGraph(graph, node);
+ if (done) {
+ element.setDone(session);
+ }
+ session.save();
+ } catch (ClientException e) {
+ throw new ClientRuntimeException(e);
}
- session.save();
}
/**
< at >< at > -124,8 +131,11 < at >< at > protected boolean runGraph(GraphRoute graph, GraphNode initialNode)
}
break;
case SUSPENDED:
- // TODO set the variables from the task form (this node is the
- // one through which the workflow was resumed),
+ if (node != initialNode) {
+ throw new DocumentRouteException(
+ "Executing unexpected SUSPENDED state");
+ }
+ // resuming, variables have been set by resumeGraph
jump = State.RUNNING_OUTPUT;
break;
case RUNNING_OUTPUT:
diff --git a/nuxeo-platform-document-routing-core/src/main/java/org/nuxeo/ecm/platform/routing/core/impl/StepElementRunner.java b/nuxeo-platform-document-routing-core/src/main/java/org/nuxeo/ecm/platform/routing/core/impl/StepElementRunner.java
index 84b7f6d..a731c7b 100644
--- a/nuxeo-platform-document-routing-core/src/main/java/org/nuxeo/ecm/platform/routing/core/impl/StepElementRunner.java
+++ b/nuxeo-platform-document-routing-core/src/main/java/org/nuxeo/ecm/platform/routing/core/impl/StepElementRunner.java
< at >< at > -16,6 +16,8 < at >< at >
*/
package org.nuxeo.ecm.platform.routing.core.impl;
+import java.util.Map;
+
import org.nuxeo.ecm.automation.AutomationService;
import org.nuxeo.ecm.automation.InvalidChainException;
import org.nuxeo.ecm.automation.OperationContext;
< at >< at > -65,6 +67,12 < at >< at > public void run(CoreSession session, DocumentRouteElement element) {
}
}
+ < at >Override
+ public void resume(CoreSession session, DocumentRouteElement element,
+ String nodeId, Map<String, Object> data) {
+ throw new UnsupportedOperationException();
+ }
+
public AutomationService getAutomationService() {
try {
return Framework.getService(AutomationService.class);
diff --git a/nuxeo-platform-document-routing-core/src/test/java/org/nuxeo/ecm/platform/routing/test/GraphRouteTest.java b/nuxeo-platform-document-routing-core/src/test/java/org/nuxeo/ecm/platform/routing/test/GraphRouteTest.java
index d519f67..e76554b 100644
--- a/nuxeo-platform-document-routing-core/src/test/java/org/nuxeo/ecm/platform/routing/test/GraphRouteTest.java
+++ b/nuxeo-platform-document-routing-core/src/test/java/org/nuxeo/ecm/platform/routing/test/GraphRouteTest.java
< at >< at > -17,6 +17,7 < at >< at >
package org.nuxeo.ecm.platform.routing.test;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
< at >< at > -267,6 +268,38 < at >< at > public void testSimpleTransition() throws Exception {
< at >SuppressWarnings("unchecked")
< at >Test
+ public void testResume() throws Exception {
+ assertEquals("file", doc.getTitle());
+ DocumentModel node1 = createNode(routeDoc, "node1");
+ node1.setPropertyValue(GraphNode.PROP_START, Boolean.TRUE);
+ setTransitions(node1,
+ transition("trans12", "node2", "true", "testchain_title1"));
+ node1 = session.saveDocument(node1);
+
+ DocumentModel node2 = createNode(routeDoc, "node2");
+ node2.setPropertyValue(GraphNode.PROP_HAS_TASK, Boolean.TRUE);
+ setTransitions(node2, transition("trans23", "node3", "true"));
+ node2 = session.saveDocument(node2);
+
+ DocumentModel node3 = createNode(routeDoc, "node3");
+ node3.setPropertyValue(GraphNode.PROP_STOP, Boolean.TRUE);
+ node3 = session.saveDocument(node3);
+
+ DocumentRoute route = instantiateAndRun();
+
+ assertFalse(route.isDone());
+
+ // now resume, as if the task was actually executed
+ Map<String, Object> data = new HashMap<String, Object>();
+ routing.resumeInstance(route.getDocument().getRef(), session, "node2",
+ data);
+
+ route.getDocument().refresh();
+ assertTrue(route.isDone());
+ }
+
+ < at >SuppressWarnings("unchecked")
+ < at >Test
public void testForkMergeAll() throws Exception {
DocumentModel node1 = createNode(routeDoc, "node1");
node1.setPropertyValue(GraphNode.PROP_START, Boolean.TRUE);
_______________________________________________
ECM-checkins mailing list
ECM-checkins-FQDHc1wsLCVb90+sfpvX0g< at >public.gmane.org
http://lists.nuxeo.com/mailman/listinfo/ecm-checkins
</pre>
Florent Guillaume
2012-05-25T17:08:33
-
nuxeo-connect: useorg.nuxeo.build:nuxeo-distribution-tools:1.11.1(branch< at >master)
http://comments.gmane.org/gmane.comp.cms.nuxeo.scm/73214
<pre>Message:
use org.nuxeo.build:nuxeo-distribution-tools:1.11.1
Repository: nuxeo-connect
Branch: master
Author: Julien Carsique <jcarsique< at >nuxeo.com>
Date: 2012-05-25T09:36:19-07:00
URL: https://github.com/nuxeo/nuxeo-connect/commit/d2fa27fd9cb0510bf3dd64c162b3897ca14a278d
Files:
M pom.xml
diff --git a/pom.xml b/pom.xml
index cd67bca..4cd623b 100644
--- a/pom.xml
+++ b/pom.xml
< at >< at > -269,7 +269,7 < at >< at >
<plugin>
<groupId>org.nuxeo.build</groupId>
<artifactId>nuxeo-distribution-tools</artifactId>
- <version>1.11</version>
+ <version>1.11.1</version>
<extensions>true</extensions>
</plugin>
<!-- Cannot upgrade after 2.2-beta-1 because of MASSEMBLY-285 -->
rtifac_______________________________________________
ECM-checkins mailing list
ECM-checkins-FQDHc1wsLCVb90+sfpvX0g< at >public.gmane.org
http://lists.nuxeo.com/mailman/listinfo/ecm-checkins
</pre>
Julien Carsique
2012-05-25T17:07:11
-
nuxeo-social-collaboration: NXP-7732: fixwall_template to correctlyuse nuxeoTargetContextPath(branch< at >master)
http://comments.gmane.org/gmane.comp.cms.nuxeo.scm/73213
<pre>Message:
NXP-7732: fix wall_template to correctly use nuxeoTargetContextPath
Repository: nuxeo-social-collaboration
Branch: master
Author: Thomas Roger <troger< at >nuxeo.com>
Pusher: troger <throger< at >gmail.com>
Date: 2012-05-25T09:41:21-07:00
URL: https://github.com/nuxeo/nuxeo-social-collaboration/commit/77a55a77f2912fc144d62dcf0bb73e6eca0fdfd9
JIRA: https://jira.nuxeo.com/browse/NXP-7732
Files:
M nuxeo-wall/src/main/resources/web/nuxeo.war/incl/wall_template.xhtml
diff --git a/nuxeo-wall/src/main/resources/web/nuxeo.war/incl/wall_template.xhtml b/nuxeo-wall/src/main/resources/web/nuxeo.war/incl/wall_template.xhtml
index b67f52c..9d2eff1 100644
--- a/nuxeo-wall/src/main/resources/web/nuxeo.war/incl/wall_template.xhtml
+++ b/nuxeo-wall/src/main/resources/web/nuxeo.war/incl/wall_template.xhtml
< at >< at > -13,7 +13,7 < at >< at >
-
</c:if>
- <nxu:set var="docId" value="#{nxu:test(!empty document, document.id, '')}">
+ <nxu:set var="docPath" value="#{nxu:test(!empty document, document.pathAsString, '')}">
<div class="gadget-wall threeQuarterWidth"></div>
< at >< at > -25,8 +25,8 < at >< at >
{ specUrl: '#{gadgetsBaseURL}/site/gadgets/wall/wall.xml',
title: '',
userPrefs: {
- docId: {
- value: '#{docId}'
+ nuxeoTargetContextPath: {
+ value: '#{docPath}'
},
activityStreamName: {
value: '#{activityStreamName}'
Pgo_______________________________________________
ECM-checkins mailing list
ECM-checkins-FQDHc1wsLCVb90+sfpvX0g< at >public.gmane.org
http://lists.nuxeo.com/mailman/listinfo/ecm-checkins
</pre>
Thomas Roger
2012-05-25T16:41:29
-
nuxeo-social-collaboration: NXP-7732: onlyuse'nuxeoTargetContextPath' preference to define the wallcontext:that's more consistent with other gadgets (branch< at >master)
http://comments.gmane.org/gmane.comp.cms.nuxeo.scm/73212
<pre>Message:
NXP-7732: only use 'nuxeoTargetContextPath' preference to define the wall context: that's more consistent with other gadgets
Repository: nuxeo-social-collaboration
Branch: master
Author: Thomas Roger <troger< at >nuxeo.com>
Pusher: troger <throger< at >gmail.com>
Date: 2012-05-25T09:34:44-07:00
URL: https://github.com/nuxeo/nuxeo-social-collaboration/commit/fcfdc627a1ff7d03485ee10f2ca941d40669f6dd
JIRA: https://jira.nuxeo.com/browse/NXP-7732
Files:
M nuxeo-wall/src/main/java/org/nuxeo/ecm/wall/operations/GetWallActivityStream.java
M nuxeo-wall/src/main/resources/gadget/wall/wall.xml
M nuxeo-wall/src/main/resources/web/nuxeo.war/scripts/opensocial/gadgets/wall.js
diff --git a/nuxeo-wall/src/main/java/org/nuxeo/ecm/wall/operations/GetWallActivityStream.java b/nuxeo-wall/src/main/java/org/nuxeo/ecm/wall/operations/GetWallActivityStream.java
index 8b68285..97dbeea 100644
--- a/nuxeo-wall/src/main/java/org/nuxeo/ecm/wall/operations/GetWallActivityStream.java
+++ b/nuxeo-wall/src/main/java/org/nuxeo/ecm/wall/operations/GetWallActivityStream.java
< at >< at > -79,10 +79,7 < at >< at >
< at >Param(name = "activityStreamName", required = false)
protected String activityStreamName;
- < at >Param(name = "document", required = false)
- protected DocumentModel doc;
-
- < at >Param(name = "contextPath", required = false)
+ < at >Param(name = "contextPath", required = true)
protected String contextPath;
< at >Param(name = "language", required = false)
< at >< at > -105,8 +102,8 < at >< at > public Blob run() throws Exception {
targetLimit = limit.longValue();
}
- if (doc == null && !StringUtils.isBlank(contextPath)) {
- doc = session.getDocument(new PathRef(contextPath));
+ DocumentModel doc = session.getDocument(new PathRef(contextPath));
+ if (StringUtils.isBlank(activityStreamName)) {
// assume we are on a Social workspace
activityStreamName = "socialWorkspaceWallActivityStream";
}
diff --git a/nuxeo-wall/src/main/resources/gadget/wall/wall.xml b/nuxeo-wall/src/main/resources/gadget/wall/wall.xml
index 3c9b6f5..4c03031 100644
--- a/nuxeo-wall/src/main/resources/gadget/wall/wall.xml
+++ b/nuxeo-wall/src/main/resources/gadget/wall/wall.xml
< at >< at > -8,6 +8,7 < at >< at >
<#include "default-oauth-prefs.ftl"/>
</ModulePrefs>
<#include "context-prefs.ftl"/>
+ <UserPref name="activityStreamName" datatype="hidden" default_value="" />
<Content type="html">
<![CDATA[
diff --git a/nuxeo-wall/src/main/resources/web/nuxeo.war/scripts/opensocial/gadgets/wall.js b/nuxeo-wall/src/main/resources/web/nuxeo.war/scripts/opensocial/gadgets/wall.js
index cea4faa..53ce51e 100644
--- a/nuxeo-wall/src/main/resources/web/nuxeo.war/scripts/opensocial/gadgets/wall.js
+++ b/nuxeo-wall/src/main/resources/web/nuxeo.war/scripts/opensocial/gadgets/wall.js
< at >< at > -136,32 +136,18 < at >< at >
var prefs = new gadgets.Prefs();
- var docId = prefs.getString("docId");
var activityStreamName = prefs.getString("activityStreamName");
var documentContextPath = gadgets.util.unescapeString(prefs.getString("nuxeoTargetContextPath"));
- var wallOperationParams, miniMessageOperationParams;
- if (docId !== 'undefined' && docId.length > 0) {
- wallOperationParams = {
- language: prefs.getLang(),
- document: docId,
- activityStreamName: activityStreamName
- };
- miniMessageOperationParams = {
- language: prefs.getLang(),
- document: docId
- };
- } else {
- wallOperationParams = {
- language: prefs.getLang(),
- contextPath: documentContextPath,
- activityStreamName: activityStreamName
- }
- miniMessageOperationParams = {
- language: prefs.getLang(),
- contextPath: documentContextPath
- };
- }
+ var wallOperationParams = {
+ language: prefs.getLang(),
+ contextPath: documentContextPath,
+ activityStreamName: activityStreamName
+ };
+ var miniMessageOperationParams = {
+ language: prefs.getLang(),
+ contextPath: documentContextPath
+ };
var currentActivities = [];
var waitingActivities = [];
_______________________________________________
ECM-checkins mailing list
ECM-checkins-FQDHc1wsLCVb90+sfpvX0g< at >public.gmane.org
http://lists.nuxeo.com/mailman/listinfo/ecm-checkins
</pre>
Thomas Roger
2012-05-25T16:34:55
-
nuxeo: useorg.nuxeo.build:nuxeo-distribution-tools:1.11.1(branch< at >master)
http://comments.gmane.org/gmane.comp.cms.nuxeo.scm/73211
<pre>Message:
use org.nuxeo.build:nuxeo-distribution-tools:1.11.1
Repository: nuxeo
Branch: master
Author: Julien Carsique <jcarsique< at >nuxeo.com>
Date: 2012-05-25T09:32:32-07:00
URL: https://github.com/nuxeo/nuxeo/commit/e75f8c631fdabfb183db325badaafc08126ffd3a
Files:
M pom.xml
diff --git a/pom.xml b/pom.xml
index c5cc996..a196111 100644
--- a/pom.xml
+++ b/pom.xml
< at >< at > -111,7 +111,7 < at >< at >
<nuxeo.features.version>5.6-SNAPSHOT</nuxeo.features.version>
<nuxeo.connect.client.version>1.4-SNAPSHOT</nuxeo.connect.client.version>
- <nuxeo.distribution.tools.version>1.11.1-SNAPSHOT</nuxeo.distribution.tools.version>
+ <nuxeo.distribution.tools.version>1.11.1</nuxeo.distribution.tools.version>
<nuxeo.ftest.version>1.7.1-SNAPSHOT</nuxeo.ftest.version>
<tomcat.version>6.0.35</tomcat.version>
< at >< at > -3915,13 +3915,13 < at >< at >
<banLatest>true</banLatest>
<banRelease>true</banRelease>
<banSnapshots>true</banSnapshots>
- <unCheckedPluginList>org.nuxeo.build:nuxeo-distribution-tools</unCheckedPluginList>
+ <!-- <unCheckedPluginList>org.nuxeo.build:nuxeo-distribution-tools</unCheckedPluginList> -->
</requirePluginVersions>
<requireReleaseDeps>
<message>No Snapshots Allowed!</message>
<onlyWhenRelease>true</onlyWhenRelease>
<excludes>
- <exclude>org.nuxeo.build:nuxeo-distribution-tools</exclude>
+ <!-- <exclude>org.nuxeo.build:nuxeo-distribution-tools</exclude> -->
<exclude>org.nuxeo:nuxeo-ftest:*:zip</exclude>
<exclude>org.nuxeo.connect:nuxeo-connect-client</exclude>
</excludes>
Jl
cXVpcmVSZW_______________________________________________
ECM-checkins mailing list
ECM-checkins-FQDHc1wsLCVb90+sfpvX0g< at >public.gmane.org
http://lists.nuxeo.com/mailman/listinfo/ecm-checkins
</pre>
Julien Carsique
2012-05-25T16:32:51
-
nuxeo-distribution: NXP-9268 - no more racecondition on packagedownload (branch< at >master)
http://comments.gmane.org/gmane.comp.cms.nuxeo.scm/73210
<pre>Message:
NXP-9268 - no more race condition on package download
Repository: nuxeo-distribution
Branch: master
Author: Julien Carsique <jcarsique< at >nuxeo.com>
Date: 2012-05-25T08:56:49-07:00
URL: https://github.com/nuxeo/nuxeo-distribution/commit/77f57a71fb0699c4e1caaf06224261ce694d965c
JIRA: https://jira.nuxeo.com/browse/NXP-9268
Files:
M nuxeo-launcher/src/main/java/org/nuxeo/launcher/connect/ConnectBroker.java
diff --git a/nuxeo-launcher/src/main/java/org/nuxeo/launcher/connect/ConnectBroker.java b/nuxeo-launcher/src/main/java/org/nuxeo/launcher/connect/ConnectBroker.java
index 0374ec0..af09a6b 100644
--- a/nuxeo-launcher/src/main/java/org/nuxeo/launcher/connect/ConnectBroker.java
+++ b/nuxeo-launcher/src/main/java/org/nuxeo/launcher/connect/ConnectBroker.java
< at >< at > -156,12 +156,12 < at >< at > protected boolean matchesPlatform(String requestPkgStr,
List<DownloadablePackage> allPackages,
Map<String, DownloadablePackage> allPackagesByID,
Map<String, List<DownloadablePackage>> allPackagesByName)
- throws PackageException {
+ throws PackageException {
// Try ID match first
if (allPackagesByID.containsKey(requestPkgStr)) {
return Arrays.asList(
allPackagesByID.get(requestPkgStr).getTargetPlatforms()).contains(
- targetPlatform);
+ targetPlatform);
}
// Fallback on name match
List<DownloadablePackage> allPackagesForName = allPackagesByName.get(requestPkgStr);
< at >< at > -421,20 +421,15 < at >< at > public LocalPackage pkgAdd(String packageFileName) {
}
List<String> downloadList = new ArrayList<String>();
downloadList.add(pkgId);
- log.info("Downloading " + packageFileName);
if (!downloadPackages(downloadList)) {
throw new PackageException("Failed to download package "
+ pkgId);
} else {
- // TODO: fix race condition
- try {
- Thread.sleep(1000);
- } catch (InterruptedException e) {
- // Ignore
- }
LocalPackage pkg = service.getPackage(pkgId);
if (pkg == null) {
- log.info("NULL");
+ throw new PackageException(
+ "Failed to find downloaded package in cache "
+ + pkgId);
}
return pkg;
}
< at >< at > -645,10 +640,11 < at >< at > public boolean executePending(File commandsFile, boolean doExecute,
< at >SuppressWarnings("unused")
protected boolean downloadPackages(List<String> packagesToDownload) {
- if (packagesToDownload == null) {
+ if (packagesToDownload == null || packagesToDownload.isEmpty()) {
return true;
}
// Queue downloads
+ log.info("Downloading " + packagesToDownload + "...");
for (String pkg : packagesToDownload) {
try {
getPackageManager().download(pkg);
< at >< at > -678,6 +674,7 < at >< at > protected boolean downloadPackages(List<String> packagesToDownload) {
cmdInfo.exitCode = 1;
downloadOk = false;
} else {
+ log.debug("Completed " + pkg);
cmdInfo.exitCode = 0;
}
}
< at >< at > -758,6 +755,9 < at >< at > public boolean pkgRequest(List<String> pkgsToAdd,
if (!matchesPlatform(requestPackage, allPackages,
allPackagesByID, allPackagesByName)) {
requestPlatform = null;
+ log.warn(String.format(
+ "Relax restriction to target platform %s because of package %s",
+ targetPlatform, requestPackage));
break;
}
}
< at >< at > -768,7 +768,6 < at >< at > public boolean pkgRequest(List<String> pkgsToAdd,
DependencyResolution resolution = getPackageManager().resolveDependencies(
solverInstall, solverRemove, solverUpgrade, requestPlatform);
-
log.info(resolution);
if (resolution.isFailed()) {
return false;
< at >< at > -778,13 +777,6 < at >< at > public boolean pkgRequest(List<String> pkgsToAdd,
log.error("Aborting packages change request");
return false;
}
- // TODO: fix race condition
- try {
- Thread.sleep(1000);
- } catch (InterruptedException e) {
- // Ignore
- }
-
// Uninstall packages
List<String> packageIds = resolution.getRemovePackageIds();
for (String pkgId : packageIds) {
_______________________________________________
ECM-checkins mailing list
ECM-checkins-FQDHc1wsLCVb90+sfpvX0g< at >public.gmane.org
http://lists.nuxeo.com/mailman/listinfo/ecm-checkins
</pre>
Julien Carsique
2012-05-25T16:05:21
-
nuxeo-distribution: add debug script for theLauncher (branch< at >master)
http://comments.gmane.org/gmane.comp.cms.nuxeo.scm/73209
<pre>Message:
add debug script for the Launcher
Repository: nuxeo-distribution
Branch: master
Author: Julien Carsique <jcarsique< at >nuxeo.com>
Date: 2012-05-25T07:52:35-07:00
URL: https://github.com/nuxeo/nuxeo-distribution/commit/340ff9e9688bdcc482ed854f588807d1a90670e7
Files:
A nuxeo-launcher/testDebug.sh
M nuxeo-distribution-resources/src/main/resources/bin/nuxeoctl
diff --git a/nuxeo-distribution-resources/src/main/resources/bin/nuxeoctl b/nuxeo-distribution-resources/src/main/resources/bin/nuxeoctl
index 2026baf..3dd669d 100755
--- a/nuxeo-distribution-resources/src/main/resources/bin/nuxeoctl
+++ b/nuxeo-distribution-resources/src/main/resources/bin/nuxeoctl
< at >< at > -1,6 +1,6 < at >< at >
#!/bin/bash
##
-## (C) Copyright 2010-2011 Nuxeo SAS (http://nuxeo.com/) and contributors.
+## (C) Copyright 2010-2012 Nuxeo SA (http://nuxeo.com/) and contributors.
##
## All rights reserved. This program and the accompanying materials
## are made available under the terms of the GNU Lesser General Public License
< at >< at > -15,6 +15,7 < at >< at >
## Contributors:
## Julien Carsique
## Florent Guillaume
+## Mathieu Guillaume
##
## Shell script calling a multi-OS Nuxeo Java launcher.
## Using explicitely bash to avoid dash which is not POSIX.
diff --git a/nuxeo-launcher/testDebug.sh b/nuxeo-launcher/testDebug.sh
new file mode 100755
index 0000000..21ecd38
--- /dev/null
+++ b/nuxeo-launcher/testDebug.sh
< at >< at > -0,0 +1,24 < at >< at >
+#!/bin/bash
+##
+## (C) Copyright 2012 Nuxeo SA (http://nuxeo.com/) and contributors.
+##
+## All rights reserved. This program and the accompanying materials
+## are made available under the terms of the GNU Lesser General Public License
+## (LGPL) version 2.1 which accompanies this distribution, and is available at
+## http://www.gnu.org/licenses/lgpl.html
+##
+## This library is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+## Lesser General Public License for more details.
+##
+## Contributors:
+## Julien Carsique
+##
+## Script for Launcher debugging purpose: calls nuxeoctl with LAUNCHER_DEBUG option
+## For debugging Nuxeo (not the Nuxeo Launcher), use nuxeoctl's "-d" option
+##
+
+: ${PWD:=$(cd "$(dirname "$0")"/..; pwd -P)}
+export LAUNCHER_DEBUG="-Xdebug -Xrunjdwp:transport=dt_socket,address=8788,server=y,suspend=y"
+./test.sh $< at >
yMjIG_______________________________________________
ECM-checkins mailing list
ECM-checkins-FQDHc1wsLCVb90+sfpvX0g< at >public.gmane.org
http://lists.nuxeo.com/mailman/listinfo/ecm-checkins
</pre>
Julien Carsique
2012-05-25T16:05:21
Search Engine
Search the mailing list at Gmane
query
http://search.gmane.org/?group=$group=gmane.comp.cms.nuxeo.scm