- Isis-fish-commits - mailman.cloud.codelutin.com

r3089 - isis-fish/trunk
by chatellier＠users.labs.libre-entreprise.org 23 Jul '10

23 Jul '10

Author: chatellier Date: 2010-07-23 12:00:12 +0000 (Fri, 23 Jul 2010) New Revision: 3089 Log: Update changelog Modified: isis-fish/trunk/changelog.txt Modified: isis-fish/trunk/changelog.txt =================================================================== --- isis-fish/trunk/changelog.txt 2010-07-22 12:15:31 UTC (rev 3088) +++ isis-fish/trunk/changelog.txt 2010-07-23 12:00:12 UTC (rev 3089) @@ -1,7 +1,9 @@ isis-fish (3.3.0.5) stable; urgency=low - -- jeu. juil. 22 09:32:36 CEST 2010 + * Fix wrong openmap version used + -- ven. juil. 23 14:24:24 CEST 2010 + isis-fish (3.3.0.4) stable; urgency=low * Add more startup information in debug.txt file (arch, R_HOME, PATH)

1 0

r3088 - isis-fish/branches/3.3.0.4-disworksupport/src/main/java/fr/ifremer/isisfish/simulator/launcher
by bleny＠users.labs.libre-entreprise.org 22 Jul '10

22 Jul '10

Author: bleny Date: 2010-07-22 12:15:31 +0000 (Thu, 22 Jul 2010) New Revision: 3088 Log: logs Modified: isis-fish/branches/3.3.0.4-disworksupport/src/main/java/fr/ifremer/isisfish/simulator/launcher/DisworkSimulatorLauncher.java Modified: isis-fish/branches/3.3.0.4-disworksupport/src/main/java/fr/ifremer/isisfish/simulator/launcher/DisworkSimulatorLauncher.java =================================================================== --- isis-fish/branches/3.3.0.4-disworksupport/src/main/java/fr/ifremer/isisfish/simulator/launcher/DisworkSimulatorLauncher.java 2010-07-22 09:51:37 UTC (rev 3087) +++ isis-fish/branches/3.3.0.4-disworksupport/src/main/java/fr/ifremer/isisfish/simulator/launcher/DisworkSimulatorLauncher.java 2010-07-22 12:15:31 UTC (rev 3088) @@ -268,6 +268,7 @@ if (jobDescription == null) { log.error("unknow Id" + control.getId()); } else { + log.info("updating control for " + jobDescription); try { if (getDaemon().isFinished(jobDescription)) { // downloads the results

1 0

r3087 - in isis-fish/branches/3.3.0.4-disworksupport/src/main: java/fr/ifremer/isisfish java/fr/ifremer/isisfish/simulator/launcher resources
by bleny＠users.labs.libre-entreprise.org 22 Jul '10

22 Jul '10

Author: bleny Date: 2010-07-22 09:51:37 +0000 (Thu, 22 Jul 2010) New Revision: 3087 Log: bugfix, t?\195?\169l?\195?\169chargement de isis depuis le web Modified: isis-fish/branches/3.3.0.4-disworksupport/src/main/java/fr/ifremer/isisfish/IsisConfig.java isis-fish/branches/3.3.0.4-disworksupport/src/main/java/fr/ifremer/isisfish/simulator/launcher/DisworkSimulatorLauncher.java isis-fish/branches/3.3.0.4-disworksupport/src/main/resources/log4j.properties Modified: isis-fish/branches/3.3.0.4-disworksupport/src/main/java/fr/ifremer/isisfish/IsisConfig.java =================================================================== --- isis-fish/branches/3.3.0.4-disworksupport/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2010-07-22 07:44:45 UTC (rev 3086) +++ isis-fish/branches/3.3.0.4-disworksupport/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2010-07-22 09:51:37 UTC (rev 3087) @@ -632,6 +632,10 @@ public void setDisworkBootstrapPort(String ip) { setOption(Option.SIMULATOR_DISWORK_BOOTSTRAP_IP.key, ip); } + + public String getDisworkIsisDownloadURL() { + return getOption(Option.SIMULATOR_DISWORK_ISIS_DOWNLOAD_URL.key); + } /** * Get launch.ui option value. @@ -926,6 +930,10 @@ "projectName", null, "simulationReportMail", null, + // allways use the default value to prevent the download of a too old version + // due to a remaining value in the user config file + "simulation.diswork.isis_download_url", null, + }; if (log.isInfoEnabled()) { @@ -1019,6 +1027,7 @@ SIMULATOR_DISWORK_BOOTSTRAP_IP("simulation.diswork.bootstrap.ip", _("isisfish.config.main.simulation.diswork.bootstrap.ip.description"), ""), SIMULATOR_DISWORK_BOOTSTRAP_PORT("simulation.diswork.bootstrap.port", _("isisfish.config.main.simulation.diswork.bootstrap.port.description"), "19000"), SIMULATOR_DISWORK_PORT("simulation.diswork.port", _("isisfish.config.main.simulation.diswork.port.description"), "19000"), + SIMULATOR_DISWORK_ISIS_DOWNLOAD_URL("simulation.diswork.isis_download_url", _("isisfish.config.main.simulation.diswork.isis_download_url.description"), "http://isis-fish.labs.libre-entreprise.org/download/version3/isis-fish-" + getVersion() + "-bin.zip"), /** Application locale (for i18n init). */ LOCALE("locale", _("isisfish.config.main.locale.description"), "fr_FR"), Modified: isis-fish/branches/3.3.0.4-disworksupport/src/main/java/fr/ifremer/isisfish/simulator/launcher/DisworkSimulatorLauncher.java =================================================================== --- isis-fish/branches/3.3.0.4-disworksupport/src/main/java/fr/ifremer/isisfish/simulator/launcher/DisworkSimulatorLauncher.java 2010-07-22 07:44:45 UTC (rev 3086) +++ isis-fish/branches/3.3.0.4-disworksupport/src/main/java/fr/ifremer/isisfish/simulator/launcher/DisworkSimulatorLauncher.java 2010-07-22 09:51:37 UTC (rev 3087) @@ -51,6 +51,9 @@ public DisworkSimulatorLauncher() {} protected synchronized static DisworkDaemon getDaemon() throws RemoteException { + // lazy creation of the daemon. Thus, daemon will not be run when + // isis is used on caparmor or as diswork application + if (disworkDaemon == null) { DisworkConfig config = new DisworkConfig(); config.setBootstrapIp(IsisFish.config.getDisworkBootstrapIp()); @@ -67,6 +70,7 @@ throw new RemoteException("unable to boot diswork FS", e); } + // retrieving all jobs submitted to this daemon last time isis was run try { for (JobDescription job : getDaemon().getAllJobs(ISIS_APPLICATION_NAME)) { jobs.put(job.getJobName(), job); @@ -81,28 +85,40 @@ return disworkDaemon; } - // TODO 20100628 bleny upload application if needed, whatever the version protected synchronized void submitIsisApplication(String isisVersion) { // method is synchronized so two submission at the same time // will not upload isis twice + log.info("submitting isis-fish " + isisVersion + " to diswork"); + String isisDownloadUrlOption = IsisFish.config.getDisworkIsisDownloadURL(); + + URL isisDownloadUrl = null; + InputStream applicationData = null; try { - log.info("submitting isis-fish " + isisVersion + " to diswork"); - URL url = new URL("http://isis-fish.labs.libre-entreprise.org/download/version3/isis-fish-3.3.…"); + isisDownloadUrl = new URL(isisDownloadUrlOption); + log.debug("downloading isis from " + isisDownloadUrl); + applicationData = isisDownloadUrl.openStream(); getDaemon().submitApplication(ISIS_APPLICATION_NAME, - isisVersion, - url.openStream()); + isisVersion, + applicationData); + + // no exception thrown below, even if it fails we can hope that + // application is already available. If it's not the case, a + // exception will be raised at job submission } catch (MalformedURLException e) { - // hardcoded URL cannot be malformed + log.error("isis can't be downloaded from " + isisDownloadUrlOption + + " malformed URL", e); + } catch (IOException e) { + log.error("unable to download data from " + isisDownloadUrl, e); + IOUtils.closeQuietly(applicationData); } catch (DisworkException e) { - log.error("error while submitting application ", e); - } catch (IOException e) { - log.error("error while submitting application ", e); + log.error("unable to submit application to daemon", e); } } @Override public void simulate(SimulationService simulationService, SimulationItem simulationItem) throws RemoteException { + // check if daemon is available if (closed) { simulationItem.getControl().setText("unable to connect to diswork"); simulationItem.getControl().setStopSimulationRequest(true); @@ -116,19 +132,19 @@ throw new RemoteException("daemon has been closed"); } - + // creating a new job JobDescription jobDescription = new JobDescription(); String simulationId = simulationItem.getControl().getId(); jobDescription.setJobName(simulationId); - // TODO 20100702 bleny use isisVersion - // String isisVersion = simulationItem.getParameter().getIsisFishVersion(); - String isisVersion = "3.3.0.4-SNAPSHOT"; - + // upload isis application to diswork in current version and set it + // as the application for this job + String isisVersion = simulationItem.getParameter().getIsisFishVersion(); simulationItem.getControl().setText("uploading isis " + isisVersion); submitIsisApplication(isisVersion); jobDescription.setApplication(ISIS_APPLICATION_NAME, isisVersion); + // setting input data InputStream simulationZipData; try { simulationZipData = new FileInputStream(simulationItem.getSimulationZip()); @@ -139,10 +155,17 @@ } String simulationZipName = "simulation-" + simulationId + "-preparation.zip"; jobDescription.addInput(simulationZipName, simulationZipData); - + + // setting output data String resultZipName = "simulation-" + simulationId + "-result.zip"; jobDescription.addOutput(resultZipName); + + // setting standard output + String standardOutputName = "simulation-" + simulationId + "-output.txt"; + jobDescription.setStandardOutput(standardOutputName); + jobDescription.addOutput(standardOutputName); + // generating the command-line for this job String isisJarPath = "isis-fish-" + isisVersion + "%sep" + "isis-fish-" + isisVersion + ".jar"; String commandLine = "%java -Xmx2500M -jar" @@ -156,18 +179,16 @@ + " " + simulationZipName + " " + resultZipName; jobDescription.setCommandLine(commandLine); - - String standardOutputName = "simulation-" + simulationId + "-output.txt"; - jobDescription.setStandardOutput(standardOutputName); - jobDescription.addOutput(standardOutputName); - jobs.put(simulationId, jobDescription); - + // finally, submit the job try { log.info("submitting job " + jobDescription.toJSDL()); simulationItem.getControl().setText("submitting job"); getDaemon().submitJob(jobDescription); simulationItem.getControl().setText("job submitted"); + + // adding this job to known job + jobs.put(simulationId, jobDescription); } catch (DisworkException e) { log.error("error while submiting job to diswork", e); throw new RemoteException("error while submiting job to diswork", e); @@ -181,7 +202,7 @@ @Override public int getCheckProgressionInterval() { - return 15; + return 15; // 15 seconds } @Override @@ -201,22 +222,22 @@ OutputStream out = null; try { File tempDir = FileUtil.createTempDirectory("isis-results-" + - jobDescription.getJobName(), null); + jobDescription.getJobName(), ""); Map<String, InputStream> results = getDaemon().getResults(jobDescription); for (String fileName : results.keySet()) { File localFile = new File(tempDir, fileName); - localFile.deleteOnExit(); - log.debug("downloading results in " + localFile.getAbsolutePath()); + log.debug("downloading result in " + localFile.getAbsolutePath()); out = new FileOutputStream(localFile); // copy data from diswork to local FS IOUtils.copy(results.get(fileName), out); if (fileName.endsWith(".zip")) { ZipUtil.uncompress(localFile, SimulationStorage.getSimulationDirectory()); + localFile.deleteOnExit(); } } - // getDaemon().deleteJob(jobDescription); - FileUtil.deleteRecursively(tempDir); + getDaemon().deleteJob(jobDescription); + // FileUtil.deleteRecursively(tempDir); } catch (IOException e) { log.error("unable to write results on the local FS", e); throw new RuntimeException("unable to write results on the local FS", e); @@ -251,6 +272,8 @@ if (getDaemon().isFinished(jobDescription)) { // downloads the results File resultDir = downloadResults(jobDescription); + + // in this dir, look for the control file File controlFile = new File(resultDir, SimulationStorage.CONTROL_FILENAME); log.debug("control file is " + controlFile.getAbsolutePath()); SimulationStorage.readControl(controlFile, control, "stop"); Modified: isis-fish/branches/3.3.0.4-disworksupport/src/main/resources/log4j.properties =================================================================== --- isis-fish/branches/3.3.0.4-disworksupport/src/main/resources/log4j.properties 2010-07-22 07:44:45 UTC (rev 3086) +++ isis-fish/branches/3.3.0.4-disworksupport/src/main/resources/log4j.properties 2010-07-22 09:51:37 UTC (rev 3087) @@ -19,6 +19,7 @@ log4j.logger.simulators=INFO # diswork +log4j.logger.fr.ifremer.isisfish.simulator.launcher.DisworkSimulatorLauncher=DEBUG log4j.logger.org.nuiton.diswork.daemon=DEBUG log4j.logger.org.nuiton.diswork.fs=INFO log4j.logger.org.planx.xmlstore=WARN \ No newline at end of file

1 0

r3086 - in isis-fish/branches/3.3.0.4-disworksupport/src/main: java/fr/ifremer/isisfish/simulator/launcher resources
by bleny＠users.labs.libre-entreprise.org 22 Jul '10

22 Jul '10

Author: bleny Date: 2010-07-22 07:44:45 +0000 (Thu, 22 Jul 2010) New Revision: 3086 Log: bugfix, config log4j Modified: isis-fish/branches/3.3.0.4-disworksupport/src/main/java/fr/ifremer/isisfish/simulator/launcher/DisworkSimulatorLauncher.java isis-fish/branches/3.3.0.4-disworksupport/src/main/resources/log4j.properties Modified: isis-fish/branches/3.3.0.4-disworksupport/src/main/java/fr/ifremer/isisfish/simulator/launcher/DisworkSimulatorLauncher.java =================================================================== --- isis-fish/branches/3.3.0.4-disworksupport/src/main/java/fr/ifremer/isisfish/simulator/launcher/DisworkSimulatorLauncher.java 2010-07-22 07:07:38 UTC (rev 3085) +++ isis-fish/branches/3.3.0.4-disworksupport/src/main/java/fr/ifremer/isisfish/simulator/launcher/DisworkSimulatorLauncher.java 2010-07-22 07:44:45 UTC (rev 3086) @@ -41,6 +41,8 @@ protected static final String ISIS_APPLICATION_NAME = "isis-fish"; protected static DisworkDaemon disworkDaemon; + + protected static boolean closed = false; /** for each job id, the corresponding job description */ protected static Map<String, JobDescription> jobs = @@ -48,7 +50,7 @@ public DisworkSimulatorLauncher() {} - protected synchronized static DisworkDaemon getDaemon() { + protected synchronized static DisworkDaemon getDaemon() throws RemoteException { if (disworkDaemon == null) { DisworkConfig config = new DisworkConfig(); config.setBootstrapIp(IsisFish.config.getDisworkBootstrapIp()); @@ -61,25 +63,28 @@ disworkDaemon = new DisworkDaemon(config); } catch (DisworkException e) { log.error("unable to boot diswork FS"); - throw new RuntimeException("unable to boot diswork FS", e); + closed = true; + throw new RemoteException("unable to boot diswork FS", e); } - } - try { - synchronized (jobs) { - for (JobDescription job : disworkDaemon.getAllJobs(ISIS_APPLICATION_NAME)) { + + try { + for (JobDescription job : getDaemon().getAllJobs(ISIS_APPLICATION_NAME)) { jobs.put(job.getJobName(), job); - } + } + log.debug(jobs.size() + " jobs retrieved from diswork"); + } catch (DisworkException e) { + log.error("unable to boot diswork FS"); + throw new RuntimeException("unable to boot diswork FS", e); } - log.info(jobs.size() + "jobs retrieved from diswork"); - } catch (DisworkException e) { - log.error("unable to boot diswork FS"); - throw new RuntimeException("unable to boot diswork FS", e); } + return disworkDaemon; } // TODO 20100628 bleny upload application if needed, whatever the version - protected void submitIsisApplication(String isisVersion) { + protected synchronized void submitIsisApplication(String isisVersion) { + // method is synchronized so two submission at the same time + // will not upload isis twice try { log.info("submitting isis-fish " + isisVersion + " to diswork"); URL url = new URL("http://isis-fish.labs.libre-entreprise.org/download/version3/isis-fish-3.3.…"); @@ -98,6 +103,19 @@ @Override public void simulate(SimulationService simulationService, SimulationItem simulationItem) throws RemoteException { + if (closed) { + simulationItem.getControl().setText("unable to connect to diswork"); + simulationItem.getControl().setStopSimulationRequest(true); + + // sleep a bit before throwing exception prevent infinite loop + try { + Thread.sleep(1 * 1000); + } catch (InterruptedException e) { + throw new RemoteException("lancher interrupted", e); + } + throw new RemoteException("daemon has been closed"); + } + JobDescription jobDescription = new JobDescription(); String simulationId = simulationItem.getControl().getId(); @@ -180,8 +198,6 @@ protected File downloadResults(JobDescription jobDescription) throws DisworkException { - - OutputStream out = null; try { File tempDir = FileUtil.createTempDirectory("isis-results-" + @@ -215,6 +231,18 @@ @Override public void updateControl(SimulationService simulationService, SimulationControl control) throws RemoteException { + if (closed) { + control.setText("unable to connect to diswork"); + + // sleep a bit before throwing exception prevent infinite loop + try { + Thread.sleep(1 * 1000); + } catch (InterruptedException e) { + throw new RemoteException("lancher interrupted", e); + } + throw new RemoteException("daemon has been closed"); + } + JobDescription jobDescription = jobs.get(control.getId()); if (jobDescription == null) { log.error("unknow Id" + control.getId()); @@ -236,8 +264,23 @@ @Override public void simulationStopRequest(SimulationJob job) throws RemoteException { + if (closed) { + // sleep a bit before throwing exception prevent infinite loop + try { + Thread.sleep(1 * 1000); + } catch (InterruptedException e) { + throw new RemoteException("lancher interrupted", e); + } + throw new RemoteException("daemon has been closed"); + } + try { - getDaemon().deleteJob(jobs.get(job.getId())); + JobDescription jobDescription = jobs.get(job.getId()); + if (jobDescription == null) { + log.warn(job + " is not a know job"); + } else { + getDaemon().deleteJob(jobDescription); + } } catch (DisworkException e) { log.error("error while trying to delete a job", e); throw new RemoteException("error while trying to delete a job", e); @@ -253,9 +296,14 @@ } /** must be called when IsisFish is being closed */ - public static void close() throws DisworkException { + public static void close() throws RemoteException { + closed = true; if (getDaemon() != null) { - getDaemon().close(); + try { + getDaemon().close(); + } catch (DisworkException e) { + throw new RemoteException("unable to close daemon", e); + } } } Modified: isis-fish/branches/3.3.0.4-disworksupport/src/main/resources/log4j.properties =================================================================== --- isis-fish/branches/3.3.0.4-disworksupport/src/main/resources/log4j.properties 2010-07-22 07:07:38 UTC (rev 3085) +++ isis-fish/branches/3.3.0.4-disworksupport/src/main/resources/log4j.properties 2010-07-22 07:44:45 UTC (rev 3086) @@ -8,8 +8,6 @@ # package level log4j.logger.fr.ifremer.isisfish=INFO log4j.logger.org.nuiton=INFO -log4j.logger.org.nuiton.diswork.daemon=DEBUG -log4j.logger.org.nuiton.diswork.fs=INFO log4j.logger.org.nuiton.j2r=DEBUG log4j.logger.analyseplans=INFO log4j.logger.exports=INFO @@ -19,3 +17,8 @@ log4j.logger.sensitivity=INFO log4j.logger.sensitivityexports=INFO log4j.logger.simulators=INFO + +# diswork +log4j.logger.org.nuiton.diswork.daemon=DEBUG +log4j.logger.org.nuiton.diswork.fs=INFO +log4j.logger.org.planx.xmlstore=WARN \ No newline at end of file

1 0

r3085 - in isis-fish/trunk: . src/main/java/fr/ifremer/isisfish
by chatellier＠users.labs.libre-entreprise.org 22 Jul '10

22 Jul '10

Author: chatellier Date: 2010-07-22 07:07:38 +0000 (Thu, 22 Jul 2010) New Revision: 3085 Log: Update version and changelog Modified: isis-fish/trunk/changelog.txt isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java Modified: isis-fish/trunk/changelog.txt =================================================================== --- isis-fish/trunk/changelog.txt 2010-07-21 16:21:17 UTC (rev 3084) +++ isis-fish/trunk/changelog.txt 2010-07-22 07:07:38 UTC (rev 3085) @@ -1,3 +1,7 @@ +isis-fish (3.3.0.5) stable; urgency=low + + -- jeu. juil. 22 09:32:36 CEST 2010 + isis-fish (3.3.0.4) stable; urgency=low * Add more startup information in debug.txt file (arch, R_HOME, PATH) @@ -7,7 +11,7 @@ * Fix parameter edition for non primitive types in user script (Double...) * Add simulation parameter cache to not keep simulation prescript on memory - -- jeu. avril 29 18:47:58 CEST 2010 + -- jeu. juil. 21 19:32:36 CEST 2010 isis-fish (3.3.0.3) stable; urgency=low Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2010-07-21 16:21:17 UTC (rev 3084) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2010-07-22 07:07:38 UTC (rev 3085) @@ -113,7 +113,7 @@ * migration de donnees demande automatiquement un changement de version * d'application. */ - protected final static Version version = new Version(3, 3, 0, 4); + protected final static Version version = new Version(3, 3, 0, 5); protected final static Version databaseVersion = new Version( version.getNumber(0), version.getNumber(1)); protected final static Version apiVersion = new Version(

1 0

r3084 - isis-fish/trunk
by chatellier＠users.labs.libre-entreprise.org 21 Jul '10

21 Jul '10

Author: chatellier Date: 2010-07-21 16:21:17 +0000 (Wed, 21 Jul 2010) New Revision: 3084 Log: [maven-release-plugin] prepare for next development iteration Modified: isis-fish/trunk/pom.xml Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2010-07-21 16:21:14 UTC (rev 3083) +++ isis-fish/trunk/pom.xml 2010-07-21 16:21:17 UTC (rev 3084) @@ -10,7 +10,7 @@ <groupId>fr.ifremer</groupId> <artifactId>isis-fish</artifactId> - <version>3.3.0.4</version> + <version>3.3.0.5-SNAPSHOT</version>  <dependencies> @@ -657,9 +657,9 @@   <scm> - <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/isis-fish/isis-fish/tags/isis-fish-3.3.0.4</connection> - <developerConnection>scm:svn:svn+ssh://chatellier at labs.libre-entreprise.org/svnroot/isis-fish/isis-fish/tags/isis-fish-3.3.0.4</developerConnection> - <url>https://labs.libre-entreprise.org/scm/viewvc.php/isis-fish/tags/isis-fish-3…</url> + <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/isis-fish/isis-fish/trunk</connection> + <developerConnection>scm:svn:svn+ssh://chatellier at labs.libre-entreprise.org/svnroot/isis-fish/isis-fish/trunk</developerConnection> + <url>https://labs.libre-entreprise.org/scm/viewvc.php/isis-fish/trunk/?root=isis…</url> </scm> <repositories>

1 0

r3083 - isis-fish/tags
by chatellier＠users.labs.libre-entreprise.org 21 Jul '10

21 Jul '10

Author: chatellier Date: 2010-07-21 16:21:14 +0000 (Wed, 21 Jul 2010) New Revision: 3083 Log: [maven-release-plugin] copy for tag isis-fish-3.3.0.4 Added: isis-fish/tags/isis-fish-3.3.0.4/

1 0

r3082 - isis-fish/trunk
by chatellier＠users.labs.libre-entreprise.org 21 Jul '10

21 Jul '10

Author: chatellier Date: 2010-07-21 16:21:07 +0000 (Wed, 21 Jul 2010) New Revision: 3082 Log: [maven-release-plugin] prepare release isis-fish-3.3.0.4 Modified: isis-fish/trunk/pom.xml Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2010-07-21 15:51:10 UTC (rev 3081) +++ isis-fish/trunk/pom.xml 2010-07-21 16:21:07 UTC (rev 3082) @@ -10,7 +10,7 @@ <groupId>fr.ifremer</groupId> <artifactId>isis-fish</artifactId> - <version>3.3.0.4-SNAPSHOT</version> + <version>3.3.0.4</version>  <dependencies> @@ -657,9 +657,9 @@   <scm> - <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/isis-fish/isis-fish/trunk</connection> - <developerConnection>scm:svn:svn+ssh://chatellier at labs.libre-entreprise.org/svnroot/isis-fish/isis-fish/trunk</developerConnection> - <url>https://labs.libre-entreprise.org/scm/viewvc.php/isis-fish/trunk/?root=isis…</url> + <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/isis-fish/isis-fish/tags/isis-fish-3.3.0.4</connection> + <developerConnection>scm:svn:svn+ssh://chatellier at labs.libre-entreprise.org/svnroot/isis-fish/isis-fish/tags/isis-fish-3.3.0.4</developerConnection> + <url>https://labs.libre-entreprise.org/scm/viewvc.php/isis-fish/tags/isis-fish-3…</url> </scm> <repositories>

1 0

r3081 - in isis-fish/trunk/src: . license
by chatellier＠users.labs.libre-entreprise.org 21 Jul '10

21 Jul '10

Author: chatellier Date: 2010-07-21 15:51:10 +0000 (Wed, 21 Jul 2010) New Revision: 3081 Log: Add thrid party licenses Added: isis-fish/trunk/src/license/ isis-fish/trunk/src/license/THIRD-PARTY.properties Added: isis-fish/trunk/src/license/THIRD-PARTY.properties =================================================================== --- isis-fish/trunk/src/license/THIRD-PARTY.properties (rev 0) +++ isis-fish/trunk/src/license/THIRD-PARTY.properties 2010-07-21 15:51:10 UTC (rev 3081) @@ -0,0 +1,58 @@ +# Generated by org.nuiton.license.plugin.AddThirdPartyMojo +#------------------------------------------------------------------------------- +# Already used licenses in project : +# - BBN Technologies +# - BSD License +# - BSD licence +# - BSD-style license +# - Common Development and Distribution License (CDDL) v1.0 +# - Common Public License Version 1.0 +# - GNU LESSER GENERAL PUBLIC LICENSE +# - GNU Lesser General Public Licence +# - GNU Lesser General Public License +# - GPL +# - LGPL +# - Lesser General Public License (LGPL) +# - MIT License +# - Mozilla Public License 1.1 (MPL 1.1) +# - The Apache Software License, Version 2.0 +# - The H2 License, Version 1.0 +# - The OpenSymphony Software License 1.1 +# - dom4j +# - http://sqljet.com/ +# - http://svnkit.com/license.html +# - http://www.trilead.com/Products/Trilead_SSH_for_Java/License/ +#------------------------------------------------------------------------------- +# Please fill the missing licenses for dependencies : +# +# +#Wed Jul 21 15:09:24 CEST 2010 +aspectwerkz--aspectwerkz--2.0=GNU Lesser General Public License +aspectwerkz--aspectwerkz-core--2.0=GNU Lesser General Public License +aspectwerkz--aspectwerkz-jdk5--2.0=GNU Lesser General Public License +com.ibm.icu--icu4j--2.6.1=ICU License +com.sun--tools--1.6.0.16=Sun's Binary Code License +commons-jxpath--commons-jxpath--1.3=The Apache Software License, Version 2.0 +commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 +javassist--javassist--3.8.0.GA=GNU Lesser General Public License +javax.help--javahelp--2.0.02=GNU General Public License - Version 2 +javax.transaction--jta--1.1=Java Transaction API (JTA) License +jaxen--jaxen--1.1.1=Jaxen license +jdom--jdom--1.0=JDom license +jgoodies--looks--1.2.2=JGoodies license +jrexx--jrexx--1.1.1=Apache Software License +net.java.dev.jna--jna--3.2.3=GNU Lesser General Public License +opensymphony--ognl--2.6.11=The OpenSymphony Software License, Version 1.1 +org.antlr--antlr-runtime--3.1.3=ANTLR 3 License +org.nuiton.thirdparty--JRI--0.8-0=GNU Lesser General Public License +org.nuiton.thirdparty--REngine--0.6-0=GPL v2 +org.nuiton.thirdparty--Rserve--0.6-0=GPL v2 +org.nuiton.thirdparty--asm--1.5.4-snapshot=ASM License +org.nuiton.thirdparty--asm-attrs--1.5.4-snapshot=ASM License +org.nuiton.thirdparty--asm-util--1.5.4-snapshot=ASM License +org.nuiton.thirdparty--l2fprod-common--0.1=Apache Software License +org.nuiton.thirdparty--rsyntaxtextarea--1.4.0=GNU Lesser General Public License +qdox--qdox--1.4=Apache Software License, Version 2.0 +trove--trove--1.0.2=Lesser General Public License (LGPL) +xalan--xalan--2.6.0=Apache Software License Version 2.0 +xerces--xmlParserAPIs--2.6.2=Apache Software License, Version 1.1

1 0

r3080 - in isis-fish/branches/3.3.0.4-disworksupport/src/main/java/fr/ifremer/isisfish: . simulator/launcher
by bleny＠users.labs.libre-entreprise.org 21 Jul '10

21 Jul '10

Author: bleny Date: 2010-07-21 08:39:56 +0000 (Wed, 21 Jul 2010) New Revision: 3080 Log: fermeture de diswork ?\195?\160 la fermeture de isis Modified: isis-fish/branches/3.3.0.4-disworksupport/src/main/java/fr/ifremer/isisfish/IsisFish.java isis-fish/branches/3.3.0.4-disworksupport/src/main/java/fr/ifremer/isisfish/simulator/launcher/DisworkSimulatorLauncher.java Modified: isis-fish/branches/3.3.0.4-disworksupport/src/main/java/fr/ifremer/isisfish/IsisFish.java =================================================================== --- isis-fish/branches/3.3.0.4-disworksupport/src/main/java/fr/ifremer/isisfish/IsisFish.java 2010-07-20 14:29:06 UTC (rev 3079) +++ isis-fish/branches/3.3.0.4-disworksupport/src/main/java/fr/ifremer/isisfish/IsisFish.java 2010-07-21 08:39:56 UTC (rev 3080) @@ -296,7 +296,6 @@ try { config.doAction(IsisConfig.STEP_BEFORE_EXIT); - // XXX 20100720 bleny is this the good way to proceed ? DisworkSimulatorLauncher.close(); } catch (Exception eee) { Modified: isis-fish/branches/3.3.0.4-disworksupport/src/main/java/fr/ifremer/isisfish/simulator/launcher/DisworkSimulatorLauncher.java =================================================================== --- isis-fish/branches/3.3.0.4-disworksupport/src/main/java/fr/ifremer/isisfish/simulator/launcher/DisworkSimulatorLauncher.java 2010-07-20 14:29:06 UTC (rev 3079) +++ isis-fish/branches/3.3.0.4-disworksupport/src/main/java/fr/ifremer/isisfish/simulator/launcher/DisworkSimulatorLauncher.java 2010-07-21 08:39:56 UTC (rev 3080) @@ -38,8 +38,11 @@ private static final Log log = LogFactory.getLog(DisworkSimulatorLauncher.class); + protected static final String ISIS_APPLICATION_NAME = "isis-fish"; + protected static DisworkDaemon disworkDaemon; + /** for each job id, the corresponding job description */ protected static Map<String, JobDescription> jobs = new HashMap<String, JobDescription>(); @@ -63,7 +66,7 @@ } try { synchronized (jobs) { - for (JobDescription job : disworkDaemon.getAllJobs("isis-fish")) { + for (JobDescription job : disworkDaemon.getAllJobs(ISIS_APPLICATION_NAME)) { jobs.put(job.getJobName(), job); } } @@ -80,7 +83,9 @@ try { log.info("submitting isis-fish " + isisVersion + " to diswork"); URL url = new URL("http://isis-fish.labs.libre-entreprise.org/download/version3/isis-fish-3.3.…"); - getDaemon().submitApplication("isis-fish", isisVersion, url.openStream()); + getDaemon().submitApplication(ISIS_APPLICATION_NAME, + isisVersion, + url.openStream()); } catch (MalformedURLException e) { // hardcoded URL cannot be malformed } catch (DisworkException e) { @@ -104,7 +109,7 @@ simulationItem.getControl().setText("uploading isis " + isisVersion); submitIsisApplication(isisVersion); - jobDescription.setApplication("isis-fish", isisVersion); + jobDescription.setApplication(ISIS_APPLICATION_NAME, isisVersion); InputStream simulationZipData; try { @@ -120,7 +125,7 @@ String resultZipName = "simulation-" + simulationId + "-result.zip"; jobDescription.addOutput(resultZipName); - String isisJarPath = "isis-fish-" + isisVersion + "/isis-fish-" + + String isisJarPath = "isis-fish-" + isisVersion + "%sep" + "isis-fish-" + isisVersion + ".jar"; String commandLine = "%java -Xmx2500M -jar" + " " + isisJarPath @@ -139,7 +144,7 @@ jobDescription.addOutput(standardOutputName); jobs.put(simulationId, jobDescription); - + try { log.info("submitting job " + jobDescription.toJSDL()); simulationItem.getControl().setText("submitting job"); @@ -203,7 +208,8 @@ IOUtils.closeQuietly(out); } - return new File(SimulationStorage.getSimulationDirectory() + File.separator + jobDescription.getJobName()); + return new File(SimulationStorage.getSimulationDirectory() + + File.separator + jobDescription.getJobName()); } @Override @@ -248,7 +254,9 @@ /** must be called when IsisFish is being closed */ public static void close() throws DisworkException { - disworkDaemon.close(); + if (getDaemon() != null) { + getDaemon().close(); + } } }

1 0