Author: tdraier
Date: Mon Jun 18 19:26:36 2007
New Revision: 17628
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17628&repname=
=3Djahia
Log:
fixed worklow cache when updating workflow mode, =
fixed export of workflow mode
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/importexpo=
rt/ExportEngine.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/hibernate/manager/=
JahiaWorkflowManager.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/importexp=
ort/ImportExportBaseService.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/workflow/=
WorkflowService.java
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/impo=
rtexport/ExportEngine.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/engines/importexport/ExportEngine.java&rev=
=3D17628&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/importexpo=
rt/ExportEngine.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/importexpo=
rt/ExportEngine.java Mon Jun 18 19:26:36 2007
@@ -120,6 +120,7 @@
params.put(ImportExportService.VIEW_ACL, new Boolean(!"false".equa=
ls(processingContext.getParameter("viewAcl"))));
params.put(ImportExportService.VIEW_METADATA, new Boolean(!"false"=
.equals(processingContext.getParameter("viewMetadata"))));
params.put(ImportExportService.VIEW_JAHIALINKS, new Boolean(!"fals=
e".equals(processingContext.getParameter("viewLinks"))));
+ params.put(ImportExportService.VIEW_WORKFLOW, new Boolean("true".e=
quals(processingContext.getParameter("viewWorkflow"))));
boolean enforceLanguage =3D "true".equals(processingContext.getPar=
ameter("enforceLanguage"));
=
ImportExportService ie =3D ServicesRegistry.getInstance().getImpor=
tExportService();
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/hibernate/ma=
nager/JahiaWorkflowManager.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/hibernate/manager/JahiaWorkflowManager.java=
&rev=3D17628&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/hibernate/manager/=
JahiaWorkflowManager.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/hibernate/manager/=
JahiaWorkflowManager.java Mon Jun 18 19:26:36 2007
@@ -149,5 +149,6 @@
=
public void clearMainObject(String objectKey) {
dao.clearMainObject(objectKey);
+ fast.flush();
}
}
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/imp=
ortexport/ImportExportBaseService.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/services/importexport/ImportExportBaseServi=
ce.java&rev=3D17628&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/importexp=
ort/ImportExportBaseService.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/importexp=
ort/ImportExportBaseService.java Mon Jun 18 19:26:36 2007
@@ -1165,10 +1165,9 @@
private void exportWF(ContentObject obj, AttributesImpl attr) throws J=
ahiaException {
WorkflowService service =3D ServicesRegistry.getInstance().getWork=
flowService();
=
- Map m =3D service.getDbEntry((ContentObjectKey) obj.getObjectKey()=
);
- Integer mode =3D (Integer) m.get(WorkflowService.FIELD_MODE);
- if (mode !=3D null ) {
- switch(mode.intValue()) {
+ if (service.isModeDifferentFromDefault((ContentObjectKey) obj.getO=
bjectKey())) {
+ int mode =3D service.getWorkflowMode(obj);
+ switch(mode) {
case WorkflowService.INACTIVE:
attr.addAttribute(JAHIA_URI, "workflow", "jahia:workfl=
ow", "CDATA", "inactive");
return;
@@ -1177,8 +1176,8 @@
return;
case WorkflowService.EXTERNAL:
attr.addAttribute(JAHIA_URI, "workflow", "jahia:workfl=
ow", "CDATA", "external");
- String name =3D (String) m.get(WorkflowService.FIELD_E=
XTERNAL_NAME);
- String processId =3D (String) m.get(WorkflowService.FI=
ELD_EXTERNAL_PROCESS);
+ String name =3D service.getExternalWorkflowName(obj);
+ String processId =3D service.getExternalWorkflowProces=
sId(obj);
attr.addAttribute(JAHIA_URI, "workflowName", "jahia:wo=
rkflowName", "CDATA", name);
attr.addAttribute(JAHIA_URI, "workflowProcess", "jahia=
:workflowProcess", "CDATA", processId);
ExternalWorkflow workflow =3D service.getExternalWorkf=
low(name);
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/wor=
kflow/WorkflowService.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/services/workflow/WorkflowService.java&rev=
=3D17628&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/workflow/=
WorkflowService.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/workflow/=
WorkflowService.java Mon Jun 18 19:26:36 2007
@@ -299,6 +299,22 @@
}
}
=
+ public boolean isModeDifferentFromDefault(ContentObjectKey object) thr=
ows JahiaException {
+ if (ContentFieldKey.FIELD_TYPE.equals(object.getType())) { return =
false; }
+ Map m =3D getDbEntry(object);
+ Integer mode =3D (Integer) m.get(WorkflowService.FIELD_MODE);
+ if (mode !=3D null) {
+ if (mode.intValue() =3D=3D EXTERNAL || mode.intValue() =3D=3D =
INACTIVE) {
+ return true;
+ }
+ int i =3D evalWorkflowMode(object, object);
+ if (i !=3D mode.intValue()) {
+ return true;
+ }
+ }
+ return false;
+ }
+
public int getInheritedMode(ContentObject object)
throws JahiaException {
return getInheritedMode((ContentObjectKey) object.getObjectKey());
@@ -877,11 +893,9 @@
if (checkParents) {
ContentObjectKey parent =3D getParent(object);
if (parent !=3D null && getMainLinkObject(parent).equals(k)) {
- linked.add(parent);
getLinkedContentObjects(parent, keys, linked, unlinked, fa=
lse, true);
}
}
-
}
=
// private void getLinkedContentObjects(ContentObjectKey object, Set ke=
ys, List linked, List unlinked, boolean descendInAllSubGroups, boolean chec=
kParents) throws JahiaException{
@@ -925,7 +939,7 @@
}
=
=
- public Map getDbEntry(ContentObjectKey object) {
+ private Map getDbEntry(ContentObjectKey object) {
return workflowManager.getWorkflowEntry(object.toString());
}
=
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
