Skip to content
Snippets Groups Projects
Commit 97520f2d authored by BIGARET Sebastien's avatar BIGARET Sebastien
Browse files

Merge branch 'release-1.3' into dev

* release-1.3:
  Updated release date
  i18n minor update
  Quick fix: move all generated files into the dir. named after program's id
  Updated CHANGES
  Preparing v1.3
parents 852e0b11 5f010298
No related branches found
No related tags found
No related merge requests found
v1.3
----
- Added an additional way of specifying the current workspace directory.
Workspace directory is searched (in that order):
- in the system property 'praxis.workspace',
- in the user's preferences, under key client/last_workspace,
- in the configuration under key 'workspace_directory'.
NB: the 2nd option is not used for the moment being.
- The current execution engines now store the files produced by every program - The current execution engines now store the files produced by every program
in their own directory --one directory per program. in their own directory --one directory per program.
......
...@@ -347,7 +347,7 @@ common.cnx_rejected.client_already_connected_title = Connection failed ...@@ -347,7 +347,7 @@ common.cnx_rejected.client_already_connected_title = Connection failed
sc.xmlwarnings.prg_desc_does_not_exists = The workflow used a program named ''{0}'' which is not available anymore. sc.xmlwarnings.prg_desc_does_not_exists = The workflow used a program named ''{0}'' which is not available anymore.
sc.xmlwarnings.prg_desc_replace_by_alternative = The workflow used a program named ''{0}'' which is not available anymore.\n\ sc.xmlwarnings.prg_desc_replace_by_alternative = The workflow used a program named ''{0}'' which is not available anymore.\n\
It has been replaced with the programme ''{1}''.\n\ It has been replaced with the programme ''{1}''.\n\
It is possible that this version is not fully compatible with the older one; if necessary, warnings will be displayed afterwards \ It is possible that this version is not fully compatible with the older one; if necessary, warnings will be displayed hereafter \
to give the full details on these possible incompatibilities. to give the full details on these possible incompatibilities.
sc.xmlwarnings.prg_declares_invalid_param = The program ''{0}'' used a parameter named ''{1}'' which is not valid anymore \ sc.xmlwarnings.prg_declares_invalid_param = The program ''{0}'' used a parameter named ''{1}'' which is not valid anymore \
(the value for this parameter was: ''{2}''). (the value for this parameter was: ''{2}'').
......
...@@ -6,13 +6,13 @@ package eu.telecom_bretagne.praxis.common; ...@@ -6,13 +6,13 @@ package eu.telecom_bretagne.praxis.common;
*/ */
public abstract class ReleaseInfo public abstract class ReleaseInfo
{ {
public static final String release = "1.2.1"; public static final String release = "1.3";
public static final int revision = 0; public static final int revision = 0;
public static final int application_revision = Configuration.getInt("revision"); public static final int application_revision = Configuration.getInt("revision");
public static final String release_date = "2010-09-29"; public static final String release_date = "2010-12-01";
/** /**
* Returns a array of three strings: the release, the application_revision number, and the release date * Returns a array of three strings: the release, the application_revision number, and the release date
......
...@@ -245,6 +245,11 @@ public class ShellExecutionEngine ...@@ -245,6 +245,11 @@ public class ShellExecutionEngine
renameOutputFiles(prgID, executionDirectory, prgResult); renameOutputFiles(prgID, executionDirectory, prgResult);
removeInputFiles(prgID, executionDirectory); removeInputFiles(prgID, executionDirectory);
/* move all extra files into the prgID/ directory */
// TODO quick fix here, renameOutputFiles() should probably take care of this, e.g. being cleanup/handleOutputFiles() instead
for (File f: executionDirectory.listFiles())
if (f.isFile() && ( ! "script.txt".equals(f.getName()) ) && (!sentFiles.contains(f.getName())))
Utile.renameFile(f, new File(new File(executionDirectory, prgID), f.getName())); // TODO set WARNING state if it returns false?
result.mergeWith(prgResult); result.mergeWith(prgResult);
prgResult.dumpContent(executionDirectory); prgResult.dumpContent(executionDirectory);
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment