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

r3494 - in trunk/src/main/java/fr/ifremer/isisfish: . logging logging/console ui vcs
by echatellier＠users.forge.codelutin.com Oct. 27, 2011

Oct. 27, 2011

Author: echatellier Date: 2011-10-27 18:20:11 +0200 (Thu, 27 Oct 2011) New Revision: 3494 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3494 Log: Update new repository url Modified: trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java trunk/src/main/java/fr/ifremer/isisfish/logging/SimulationLoggerUtil.java trunk/src/main/java/fr/ifremer/isisfish/logging/console/LogConsole.java trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeHandler.java trunk/src/main/java/fr/ifremer/isisfish/vcs/VCS.java Modified: trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2011-10-27 13:51:28 UTC (rev 3493) +++ trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2011-10-27 16:20:11 UTC (rev 3494) @@ -164,7 +164,6 @@ /** separateur de liste */ static final public String SEP = ","; - static final public String REPORT_EMAIL = "isis-fish-bugreport(a)lists.labs.libre-entreprise.org"; protected transient File backupSessionDirectory = null; @@ -883,7 +882,7 @@ public static enum Option implements OptionDef { CONFIG_FILE(CONFIG_FILE_NAME, n_("isisfish.config.main.configFileName.description"), CONFIG_FILENAME), - ISIS_HOME_DIRECTORY("isis.home.directory", n_("isisfish.config.main.compileDirectory.description"), getUserHome() + File.separator + "isis-fish" + majorVersion.toString()), + ISIS_HOME_DIRECTORY("isis.home.directory", n_("isisfish.config.main.compileDirectory.description"), getUserHome() + File.separator + "isis-fish-" + majorVersion.toString()), COMPILATION_DIRECTORY("compilation.directory", n_("isisfish.config.main.compileDirectory.description"), "${isis.home.directory}" + File.separator + "isis-build"), MONITORING_DIRECTORY("monitoring.directory", n_("isisfish.config.main.monitoringDirectory.description"), "${isis.home.directory}" + File.separator + "isis-monitoring"), JAVADOC_DIRECTORY("javadoc.directory", n_("isisfish.config.main.javadocDirectory.description"), "${isis.home.directory}" + File.separator + "isis-docs"), @@ -894,7 +893,7 @@ DEFAULT_MAP_FILENAME("default.map.filename", n_("isisfish.config.main.defaultMapFile.description"), "maps/vmap_area_thin.shp"), DEFAULT_TAG_VALUE("default.tagvalue", n_("isisfish.config.main.defaultTagValue.description"), ""), ENCODING("encoding", n_("isisfish.config.main.encoding.description"), "UTF-8"), - JAVADOC_URL("javadoc.url", n_("isisfish.config.main.javadocURL.description"), "http://isis-fish.labs.libre-entreprise.org/isis-fish/apidocs/"), + JAVADOC_URL("javadoc.url", n_("isisfish.config.main.javadocURL.description"), "http://www.isis-fish.org/isis-fish/apidocs/"), SIMULATOR_CLASSFILE("simulator.classfile", n_("isisfish.config.main.defaultSimulator.description"), "DefaultSimulator.java"), /** prevu pour l'architecture de lancement en plugin: local, isis-server, caparmor, ... */ @@ -946,11 +945,11 @@ DATABASE_DIRECTORY("database.directory", n_("isisfish.config.vcs.localDatabasePath.description"), "${isis.home.directory}" + File.separator + "isis-database"), VCS_TYPE(VCS.VCS_TYPE, n_("isisfish.config.vcs.type.description"), VCS.TYPE_SVN), - VCS_PROTOCOL(VCS.VCS_PROTOCOL, n_("isisfish.config.vcs.protocol.description"), "svn"), + VCS_PROTOCOL(VCS.VCS_PROTOCOL, n_("isisfish.config.vcs.protocol.description"), "http"), VCS_USER_NAME(VCS.VCS_USER_NAME, n_("isisfish.config.vcs.userName.description"), ""), VCS_USER_PASSWORD(VCS.VCS_USER_PASSWORD, n_("isisfish.config.vcs.userPassword.description"), ""), - VCS_HOST_NAME(VCS.VCS_HOST_NAME, n_("isisfish.config.vcs.hostName.description"), "labs.libre-entreprise.org"), - VCS_PATH(VCS.VCS_PATH, n_("isisfish.config.vcs.remotePath.description"), "/svnroot/isis-fish-data/"), + VCS_HOST_NAME(VCS.VCS_HOST_NAME, n_("isisfish.config.vcs.hostName.description"), "svn.forge.codelutin.com"), + VCS_PATH(VCS.VCS_PATH, n_("isisfish.config.vcs.remotePath.description"), "/svn/isis-fish-data"), // community vsc COMMUNITY_DATABASE_DIRECTORY("community.database.directory", n_("isisfish.config.vcs.localCommunityDatabasePath.description"), "${isis.home.directory}" + File.separator + "isis-community-database"), Modified: trunk/src/main/java/fr/ifremer/isisfish/logging/SimulationLoggerUtil.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/logging/SimulationLoggerUtil.java 2011-10-27 13:51:28 UTC (rev 3493) +++ trunk/src/main/java/fr/ifremer/isisfish/logging/SimulationLoggerUtil.java 2011-10-27 16:20:11 UTC (rev 3494) @@ -183,10 +183,9 @@ String smtpServer = IsisFish.config.getSmtpServer(); String defaultFrom = IsisFish.config.getUserMail(); - String defaultTo = IsisConfig.REPORT_EMAIL; String title = _("isisfish.simulation.log.console.title", simulationName); - LogConsole.newConsole(logFile, smtpServer, defaultFrom, defaultTo, title); + LogConsole.newConsole(logFile, smtpServer, defaultFrom, null, title); if (log.isInfoEnabled()) { log.info(_("isisfish.simulation.log.showConsole", simulationName)); Modified: trunk/src/main/java/fr/ifremer/isisfish/logging/console/LogConsole.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/logging/console/LogConsole.java 2011-10-27 13:51:28 UTC (rev 3493) +++ trunk/src/main/java/fr/ifremer/isisfish/logging/console/LogConsole.java 2011-10-27 16:20:11 UTC (rev 3494) @@ -280,24 +280,6 @@ }); } - public static void main(String... args) throws Exception { - - IsisStart(); - - File file; - - file = args.length > 0 ? new File(args[0]) : new File("testLogManager.log"); - - String smtpServer = "smtp"; - String from = "dev(a)ynot-home.info"; - String to = "chemit(a)codelutin.com"; - String title = "console de log de '" + file.getName() + "'"; - String label = file.getName(); - - newConsole(file, smtpServer, from, to, title); - - } - protected class UpdateUI implements Runnable { private JScrollBar scrollbar; protected LogConsole console; Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeHandler.java 2011-10-27 13:51:28 UTC (rev 3493) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeHandler.java 2011-10-27 16:20:11 UTC (rev 3494) @@ -88,9 +88,9 @@ protected static final Map<String, String> URLSALIAS = new HashMap<String, String>(); static { - URLSALIAS.put("ISISFISH", "http://isis-fish.labs.libre-entreprise.org/"); + URLSALIAS.put("ISISFISH", "http://www.isis-fish.org/"); URLSALIAS.put("JAVA_API", "http://java.sun.com/javase/6/docs/api/index.html"); - URLSALIAS.put("ISIS_API", "http://isis-fish.labs.libre-entreprise.org/isis-fish/apidocs/index.html"); + URLSALIAS.put("ISIS_API", "http://www.isis-fish.org/isis-fish/apidocs/index.html"); URLSALIAS.put("MATRIX_API", "http://maven-site.nuiton.org/nuiton-matrix/apidocs/index.html"); URLSALIAS.put("TOPIA_API", "http://maven-site.nuiton.org/topia/topia-persistence/apidocs/index.html"); } Modified: trunk/src/main/java/fr/ifremer/isisfish/vcs/VCS.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/vcs/VCS.java 2011-10-27 13:51:28 UTC (rev 3493) +++ trunk/src/main/java/fr/ifremer/isisfish/vcs/VCS.java 2011-10-27 16:20:11 UTC (rev 3494) @@ -78,7 +78,7 @@ public static final String VCS_SSH_KEY_FILE = "vcs.ssh.keyFile";*/ /** - * remote server adresse (ip or serveur name) ex: labs.libre-entreprise.org + * remote server adresse (ip or serveur name) ex: svn.forge.codelutin.com */ public static final String VCS_HOST_NAME = "vcs.hostName";

1 0

r3493 - trunk
by tchemit＠users.forge.codelutin.com Oct. 27, 2011

Oct. 27, 2011

Author: tchemit Date: 2011-10-27 15:51:28 +0200 (Thu, 27 Oct 2011) New Revision: 3493 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3493 Log: use mavenpom4redmine + forge.codelutin.com Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-10-27 13:20:22 UTC (rev 3492) +++ trunk/pom.xml 2011-10-27 13:51:28 UTC (rev 3493) @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> - <artifactId>mavenpom4labs</artifactId> + <artifactId>mavenpom4redmine</artifactId> <version>3.0.4</version> </parent> @@ -407,7 +407,7 @@ <description>Simulateur de pecherie complexe.</description> <inceptionYear>1999</inceptionYear> - <url>http://isis-fish.labs.libre-entreprise.org/isis-fish</url> + <url>http://maven-site.forge.codelutin.com/isis-fish</url> <organization> <name>CodeLutin</name> @@ -447,13 +447,13 @@ </mailingLists> <issueManagement> - <system>gforge</system> - <url>http://labs.libre-entreprise.org/tracker/?group_id=8</url> + <system>redmine</system> + <url>http://forge.codelutin.com/projects/isis-fish/issues</url> </issueManagement> <ciManagement> <system>hudson</system> - <url>http://hudson.codelutin.com/hudson</url> + <url>http://jenkins.forge.codelutin.com/jenkins/job/isis-fish</url> </ciManagement> <developers> @@ -518,7 +518,6 @@ <properties>  <projectId>isis-fish</projectId> - <labs.id>8</labs.id> <siteLocales>fr,en</siteLocales> <maven.jar.main.class>fr.ifremer.isisfish.IsisFish</maven.jar.main.class> <license.licenseName>gpl_v2</license.licenseName> @@ -709,22 +708,22 @@   <scm> - <connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/isis-fish/isis-fish/trunk</connection> - <developerConnection>scm:svn:svn+ssh://chatellier@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:http://svn.forge.codelutin.com/svn/isis-fish/trunk</connection> + <developerConnection>scm:svn:http://svn.forge.codelutin.com/svn/isis-fish/trunk</developerConnection> + <url>http://svn.forge.codelutin.com/svn/isis-fish/trunk</url> </scm> - + <repositories> <repository> <id>nuiton.public</id> - <url>http://maven.nuiton.org/nexus/content/groups/public</url> + <url>http://nexus.nuiton.org/nexus/content/groups/public</url> </repository> </repositories> <pluginRepositories> <pluginRepository> <id>nuiton.plugin.public</id> - <url>http://maven.nuiton.org/nexus/content/groups/public</url> + <url>http://nexu.nuiton.org/nexus/content/groups/public</url> </pluginRepository> </pluginRepositories>

1 0

r3492 - / branches tags trunk
by maven-release＠users.forge.codelutin.com Oct. 27, 2011

Oct. 27, 2011

Author: maven-release Date: 2011-10-27 15:20:22 +0200 (Thu, 27 Oct 2011) New Revision: 3492 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3492 Log: - migrate isis-fish to forge.codelutin.com (apply common svn layout) - remove mod module - remove isis-fish-data module Added: branches/ tags/ trunk/ Removed: isis-fish-data/ isis-fish/ mod/ Property changes on: branches ___________________________________________________________________ Added: svn:mergeinfo + Property changes on: tags ___________________________________________________________________ Added: svn:mergeinfo + Property changes on: trunk ___________________________________________________________________ Added: svn:ignore + maven.log target velocity.log .classpath .project isis-fish.ipr isis-fish.iws isis-fish.iml .settings bin nbproject Inputs_Langoustine Added: svn:mergeinfo +

1 0