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

r1805 - in isis-fish/trunk: . src/main/java/fr/ifremer/isisfish/ui/input
by tchemit＠users.labs.libre-entreprise.org Feb. 12, 2009

Feb. 12, 2009

Author: tchemit Date: 2009-02-12 00:16:52 +0000 (Thu, 12 Feb 2009) New Revision: 1805 Modified: isis-fish/trunk/pom.xml isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx Log: do not generate deprecated stuff from ToPIA Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2009-02-11 20:12:09 UTC (rev 1804) +++ isis-fish/trunk/pom.xml 2009-02-12 00:16:52 UTC (rev 1805) @@ -389,6 +389,10 @@ <srcGenDest>${maven.gen.dir}/objectmodel/</srcGenDest> <includes>**/*.objectmodel</includes> <templates>org.codelutin.topia.generator.TopiaMetaGenerator</templates> + <excludeTemplates> + <value>org.codelutin.topia.generator.EntityEnumGenerator</value> + <value>org.codelutin.topia.generator.EntityProviderGenerator</value> + </excludeTemplates> <destDirGen>${maven.gen.dir}/java</destDirGen> <defaultPackage>fr.ifremer.isisfish</defaultPackage> <copyVersionDir>${project.basedir}/src/main/resources/oldmappings/%MODELNAME% Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx 2009-02-11 20:12:09 UTC (rev 1804) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx 2009-02-12 00:16:52 UTC (rev 1805) @@ -66,7 +66,6 @@ import javax.swing.tree.TreePath; import org.codelutin.topia.persistence.TopiaEntity; import org.codelutin.topia.TopiaException; -import fr.ifremer.isisfish.IsisFishEntityEnum; import jaxx.runtime.JAXXContextEntryDef; import jaxx.runtime.swing.navigation.NavigationTreeModel.NavigationTreeNode; import jaxx.runtime.swing.navigation.NavigationTreeModelBuilder;

1 0

r1804 - isis-fish/trunk
by tchemit＠users.labs.libre-entreprise.org Feb. 11, 2009

Feb. 11, 2009

Author: tchemit Date: 2009-02-11 20:12:09 +0000 (Wed, 11 Feb 2009) New Revision: 1804 Modified: isis-fish/trunk/pom.xml Log: ajout d'un profile pour hudson en attendant de comprendre pourquoi ca ne compile pas sur hudson... Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2009-02-11 14:09:20 UTC (rev 1803) +++ isis-fish/trunk/pom.xml 2009-02-11 20:12:09 UTC (rev 1804) @@ -729,6 +729,24 @@ </plugins> </build> </profile> + +  + <profile> + <id>hudson</id> + <build> + <pluginManagement> + <plugins> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <fork>true</fork> + </configuration> + </plugin> + </plugins> + </pluginManagement> + </build> + </profile> + </profiles> </project>

1 0

r1803 - isis-fish/trunk
by chatellier＠users.labs.libre-entreprise.org Feb. 11, 2009

Feb. 11, 2009

Author: chatellier Date: 2009-02-11 14:09:20 +0000 (Wed, 11 Feb 2009) New Revision: 1803 Modified: isis-fish/trunk/pom.xml Log: Test de changement de phase Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2009-02-11 11:01:43 UTC (rev 1802) +++ isis-fish/trunk/pom.xml 2009-02-11 14:09:20 UTC (rev 1803) @@ -379,7 +379,7 @@ <executions> <execution> <id>Generator</id> - <phase>process-sources</phase> + <phase>generate-sources</phase> <configuration> <srcDirZuml>${project.basedir}/src/main/xmi</srcDirZuml> <srcXmiDest>${maven.gen.dir}/xmi/</srcXmiDest>

1 0

r1802 - isis-fish/trunk
by tchemit＠users.labs.libre-entreprise.org Feb. 11, 2009

Feb. 11, 2009

Author: tchemit Date: 2009-02-11 11:01:43 +0000 (Wed, 11 Feb 2009) New Revision: 1802 Modified: isis-fish/trunk/pom.xml Log: ajout repository codelutin dans les poms des projets + fix generator plugin parameter Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2009-02-10 13:08:25 UTC (rev 1801) +++ isis-fish/trunk/pom.xml 2009-02-11 11:01:43 UTC (rev 1802) @@ -366,7 +366,7 @@ <jnlpCodebase>${project.url}</jnlpCodebase>  -  + <jnlpCodebase>file://${jnlp.build.directory}</jnlpCodebase> </properties> <build> @@ -381,7 +381,7 @@ <id>Generator</id> <phase>process-sources</phase> <configuration> - <srcDirZUml>${project.basedir}/src/main/xmi</srcDirZUml> + <srcDirZuml>${project.basedir}/src/main/xmi</srcDirZuml> <srcXmiDest>${maven.gen.dir}/xmi/</srcXmiDest> <fullPackagePath>fr.ifremer.isisfish</fullPackagePath> <extractedPackages>fr.ifremer.isisfish</extractedPackages> @@ -530,6 +530,23 @@ <url>${maven.scm.url}</url> </scm> +  + <repositories> + <repository> + <id>codelutin-repository</id> + <name>CodeLutinRepository</name> + <url>http://lutinbuilder.labs.libre-entreprise.org/maven2</url> + <snapshots> + <enabled>true</enabled> + <checksumPolicy>warn</checksumPolicy> + </snapshots> + <releases> + <enabled>true</enabled> + <checksumPolicy>warn</checksumPolicy> + </releases> + </repository> + </repositories> + <profiles> <profile> <id>release-profile</id>

1 0

r1801 - isis-fish/trunk
by chatellier＠users.labs.libre-entreprise.org Feb. 10, 2009

Feb. 10, 2009

Author: chatellier Date: 2009-02-10 13:08:25 +0000 (Tue, 10 Feb 2009) New Revision: 1801 Modified: isis-fish/trunk/pom.xml Log: Update config Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2009-02-08 14:26:28 UTC (rev 1800) +++ isis-fish/trunk/pom.xml 2009-02-10 13:08:25 UTC (rev 1801) @@ -381,7 +381,7 @@ <id>Generator</id> <phase>process-sources</phase> <configuration> - <srcDirUml>${project.basedir}/src/main/xmi</srcDirUml> + <srcDirZUml>${project.basedir}/src/main/xmi</srcDirZUml> <srcXmiDest>${maven.gen.dir}/xmi/</srcXmiDest> <fullPackagePath>fr.ifremer.isisfish</fullPackagePath> <extractedPackages>fr.ifremer.isisfish</extractedPackages>

1 0

r1800 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish
by tchemit＠users.labs.libre-entreprise.org Feb. 8, 2009

Feb. 8, 2009

Author: tchemit Date: 2009-02-08 14:26:28 +0000 (Sun, 08 Feb 2009) New Revision: 1800 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java Log: utilisation d'un WidnowAdapter plutot que WindowListener (vu qu'on ne surcharge q'un seul evenement...) Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java 2009-02-08 14:06:23 UTC (rev 1799) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java 2009-02-08 14:26:28 UTC (rev 1800) @@ -77,7 +77,7 @@ import fr.ifremer.isisfish.vcs.VCSException; import fr.ifremer.isisfish.vcs.VCSFactory; import fr.ifremer.isisfish.vcs.VetoableActionListener; -import java.awt.event.WindowListener; +import java.awt.event.WindowAdapter; import javax.swing.UIManager; import javax.swing.UnsupportedLookAndFeelException; @@ -426,36 +426,12 @@ WelcomeUI welcome = new WelcomeUI(); // Set to exit on close welcome.setDefaultCloseOperation(WelcomeUI.DO_NOTHING_ON_CLOSE); - welcome.addWindowListener(new WindowListener() { + welcome.addWindowListener(new WindowAdapter() { @Override - public void windowOpened(WindowEvent e) { - } - - @Override public void windowClosing(WindowEvent e) { ((WelcomeUI)e.getSource()).close(); } - - @Override - public void windowClosed(WindowEvent e) { - } - - @Override - public void windowIconified(WindowEvent e) { - } - - @Override - public void windowDeiconified(WindowEvent e) { - } - - @Override - public void windowActivated(WindowEvent e) { - } - - @Override - public void windowDeactivated(WindowEvent e) { - } }); // add context welcome.setVisible(true);

1 0

r1799 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher
by tchemit＠users.labs.libre-entreprise.org Feb. 8, 2009

Feb. 8, 2009

Author: tchemit Date: 2009-02-08 14:06:23 +0000 (Sun, 08 Feb 2009) New Revision: 1799 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SubProcessSimulationLauncher.java Log: faire fonctionner les simulations en jnlp (il reste un cas qui ne fonctionne pas : en sub process + aspect) Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java 2009-02-08 14:05:20 UTC (rev 1798) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java 2009-02-08 14:06:23 UTC (rev 1799) @@ -212,7 +212,8 @@ IsisFish.config.getCompileDirectory().toURI().toURL() }; //URL [] classpath = new URL[]{directory.toURL()}; - AspectClassLoader loader = new AspectClassLoader(classpath, ClassLoader.getSystemClassLoader()); //new URLClassLoader(classpath); + AspectClassLoader loader = new AspectClassLoader(classpath, IsisFish.class.getClassLoader()); //new URLClassLoader(classpath); + //AspectClassLoader loader = new AspectClassLoader(classpath, ClassLoader.getSystemClassLoader()); //new URLClassLoader(classpath); thread.setContextClassLoader(loader); log.info("Classloader used for simulation: " + loader + " " + Arrays.toString(loader.getURLs())); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SubProcessSimulationLauncher.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SubProcessSimulationLauncher.java 2009-02-08 14:05:20 UTC (rev 1798) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SubProcessSimulationLauncher.java 2009-02-08 14:06:23 UTC (rev 1799) @@ -27,6 +27,8 @@ import java.io.InputStream; import java.io.InputStreamReader; import java.rmi.RemoteException; +import java.net.URLClassLoader; +import java.net.URL; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -118,6 +120,25 @@ File.separator + "bin" + File.separator + "java"; String classpath = System.getProperty("java.class.path"); + if (classpath==null) { + // could not find the jvm property (jnlp context for example) + // rebuild the classpath as in {@link AspectClassLoader} + String pathSep = File.pathSeparator; + ClassLoader loader = IsisFish.class.getClassLoader(); + if (loader instanceof URLClassLoader) { + URLClassLoader urlLoader = (URLClassLoader) loader; + StringBuilder buffer = new StringBuilder(); + for (URL url : urlLoader.getURLs()) { + buffer.append(pathSep).append(url.getPath()); + } + classpath=buffer.substring(1); + } else { + //FIXME, should do as in {@link AspectClassLoader} + } + } + if (log.isDebugEnabled()) { + log.debug("classpath to use : " + classpath); + } // prepare le process ProcessBuilder processBuilder = new ProcessBuilder( java, "-classpath", classpath,

1 0

r1798 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/aspect
by tchemit＠users.labs.libre-entreprise.org Feb. 8, 2009

Feb. 8, 2009

Author: tchemit Date: 2009-02-08 14:05:20 +0000 (Sun, 08 Feb 2009) New Revision: 1798 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/aspect/AspectClassLoader.java Log: fix javadoc Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/aspect/AspectClassLoader.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/aspect/AspectClassLoader.java 2009-02-08 14:05:00 UTC (rev 1797) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/aspect/AspectClassLoader.java 2009-02-08 14:05:20 UTC (rev 1798) @@ -108,9 +108,9 @@ * Returns a set with the new expressions for the advice in the aspect to deploy. * * @param aspectClass s * @param newAspectDef + * @param newAspectDef * @param systemDef * @param deploymentScope - * @param deploymentHandle * @return a set with the new expressions */ private Set getNewExpressionsForAspect(final Class aspectClass,

1 0

r1797 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish
by tchemit＠users.labs.libre-entreprise.org Feb. 8, 2009

Feb. 8, 2009

Author: tchemit Date: 2009-02-08 14:05:00 +0000 (Sun, 08 Feb 2009) New Revision: 1797 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java Log: fix bug lors de la sauvegarde des tagValues Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2009-02-08 14:04:27 UTC (rev 1796) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2009-02-08 14:05:00 UTC (rev 1797) @@ -459,12 +459,12 @@ } public void setDefaultTagValues(Map<String, String> tagValues) { - StringBuilder sb = new StringBuilder(); + StringBuilder sb = new StringBuilder(" "); for (Map.Entry<String, String> entry : tagValues.entrySet()) { sb.append(SEP).append('"').append(entry.getKey()).append("\":\"").append(entry.getValue()).append('"'); } - String value = sb.toString().substring(1); - setOption(Option.DEFAULT_TAG_VALUE.key, value); + String value = sb.toString().trim(); + setOption(Option.DEFAULT_TAG_VALUE.key, value.isEmpty() ? "" : value.substring(1)); saveForUser(); }

1 0

r1796 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish
by tchemit＠users.labs.libre-entreprise.org Feb. 8, 2009

Feb. 8, 2009

Author: tchemit Date: 2009-02-08 14:04:27 +0000 (Sun, 08 Feb 2009) New Revision: 1796 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java Log: desactive le security manager pour faire fonctionner javassist en jnlp Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java 2009-02-05 18:55:54 UTC (rev 1795) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java 2009-02-08 14:04:27 UTC (rev 1796) @@ -115,7 +115,7 @@ static public void main(String... args) { try { // permet de faire fonctionner la compilation en webstart - //System.setSecurityManager(null); + System.setSecurityManager(null); // initialisation de l'application IsisFish.init(args);

1 0