October 2009 - Jaxx-commits - mailman.cloud.codelutin.com

r1580 - branches/jaxx-2.X/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation
by tchemit＠users.nuiton.org 21 Oct '09

21 Oct '09

Author: tchemit Date: 2009-10-21 14:54:56 +0200 (Wed, 21 Oct 2009) New Revision: 1580 Modified: branches/jaxx-2.X/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/ItemNavigationCardPanel.java branches/jaxx-2.X/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/ItemNavigationPanel.java Log: fix generics on Class Modified: branches/jaxx-2.X/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/ItemNavigationCardPanel.java =================================================================== --- branches/jaxx-2.X/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/ItemNavigationCardPanel.java 2009-10-20 12:59:39 UTC (rev 1579) +++ branches/jaxx-2.X/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/ItemNavigationCardPanel.java 2009-10-21 12:54:56 UTC (rev 1580) @@ -30,8 +30,8 @@ if (i != null) { Object value = i.getValue(); if (value != null) { - if (value instanceof Class) { - layout.show(this, ((Class) value).getName()); + if (value instanceof Class<?>) { + layout.show(this, ((Class<?>) value).getName()); } else { layout.show(this, value.getClass().getName()); } Modified: branches/jaxx-2.X/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/ItemNavigationPanel.java =================================================================== --- branches/jaxx-2.X/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/ItemNavigationPanel.java 2009-10-20 12:59:39 UTC (rev 1579) +++ branches/jaxx-2.X/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/ItemNavigationPanel.java 2009-10-21 12:54:56 UTC (rev 1580) @@ -15,13 +15,13 @@ private static final long serialVersionUID = 1L; - protected Class associatedClass = null; + protected Class<?> associatedClass = null; - public ItemNavigationPanel(Class associatedClass) { + public ItemNavigationPanel(Class<?> associatedClass) { this.associatedClass = associatedClass; } - public Class getAssociatedClass() { + public Class<?> getAssociatedClass() { return associatedClass; }

1 0

r1579 - branches/jaxx-2.X/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation
by sletellier＠users.nuiton.org 20 Oct '09

20 Oct '09

Author: sletellier Date: 2009-10-20 14:59:39 +0200 (Tue, 20 Oct 2009) New Revision: 1579 Modified: branches/jaxx-2.X/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/NavigationTreeContextHelper.java Log: Adding helper to return typed selected node Modified: branches/jaxx-2.X/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/NavigationTreeContextHelper.java =================================================================== --- branches/jaxx-2.X/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/NavigationTreeContextHelper.java 2009-10-20 12:58:57 UTC (rev 1578) +++ branches/jaxx-2.X/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/NavigationTreeContextHelper.java 2009-10-20 12:59:39 UTC (rev 1579) @@ -88,6 +88,14 @@ return r; } + public <T> T getSelectedBean(JAXXContext context, Class<T> type) { + Object r = getSelectedBeanContextEntry().getContextValue(context); + if (type.equals(r.getClass())){ + return (T)getSelectedBeanContextEntry().getContextValue(context); + } + return null; + } + public void setTreeModel(JAXXContext context, NavigationTreeModel model) { getTreeModelContextEntry().setContextValue(context, model); }

2 1

r1578 - branches/jaxx-2.X/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation
by sletellier＠users.nuiton.org 20 Oct '09

20 Oct '09

Author: sletellier Date: 2009-10-20 14:58:57 +0200 (Tue, 20 Oct 2009) New Revision: 1578 Modified: branches/jaxx-2.X/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/ItemNavigationCardPanel.java branches/jaxx-2.X/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/ItemTreeNavigationAdapter.java Log: Bug categorie item in ItemTreeNavigation fixed Modified: branches/jaxx-2.X/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/ItemNavigationCardPanel.java =================================================================== --- branches/jaxx-2.X/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/ItemNavigationCardPanel.java 2009-10-16 14:05:07 UTC (rev 1577) +++ branches/jaxx-2.X/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/ItemNavigationCardPanel.java 2009-10-20 12:58:57 UTC (rev 1578) @@ -27,11 +27,14 @@ } public void showItem(Item i) { - if (i != null && i.getValue() != null) { - if (i.getValue() instanceof Class<?>) { - layout.show(this, i.getValue().getClass().getName()); - } else { - layout.show(this, i.getValue().getClass().getName()); + if (i != null) { + Object value = i.getValue(); + if (value != null) { + if (value instanceof Class) { + layout.show(this, ((Class) value).getName()); + } else { + layout.show(this, value.getClass().getName()); + } } } } Modified: branches/jaxx-2.X/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/ItemTreeNavigationAdapter.java =================================================================== --- branches/jaxx-2.X/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/ItemTreeNavigationAdapter.java 2009-10-16 14:05:07 UTC (rev 1577) +++ branches/jaxx-2.X/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/ItemTreeNavigationAdapter.java 2009-10-20 12:58:57 UTC (rev 1578) @@ -39,14 +39,19 @@ // Recuperation du path selectionne TreePath path = e.getNewLeadSelectionPath(); + if (path == null){ + path = e.getOldLeadSelectionPath(); + } TreeModel model = tree.getModel(); if (!(model instanceof JAXXTreeModel)){ log.error("Its not an JAXXTreeModel"); return; } + // Find item coresponding - Item itemSelected = ((JAXXTreeModel) model).findItem(path.getLastPathComponent()); + Object lastPathComponent = path.getLastPathComponent(); + Item itemSelected = ((JAXXTreeModel) model).findItem(lastPathComponent); // Show corresponding panel cardPanel.showItem(itemSelected);

1 0

r1577 - branches/jaxx-2.X/jaxx-widgets
by tchemit＠users.nuiton.org 16 Oct '09

16 Oct '09

Author: tchemit Date: 2009-10-16 16:05:07 +0200 (Fri, 16 Oct 2009) New Revision: 1577 Modified: branches/jaxx-2.X/jaxx-widgets/pom.xml Log: do not expose jaxx files Modified: branches/jaxx-2.X/jaxx-widgets/pom.xml =================================================================== --- branches/jaxx-2.X/jaxx-widgets/pom.xml 2009-10-16 12:47:28 UTC (rev 1576) +++ branches/jaxx-2.X/jaxx-widgets/pom.xml 2009-10-16 14:05:07 UTC (rev 1577) @@ -64,12 +64,13 @@ <build> <resources> - <resource> +  +  <resource> <directory>src/main/resources</directory> <includes>

1 0

r1576 - in branches/jaxx-2.X: . jaxx-demo
by tchemit＠users.nuiton.org 16 Oct '09

16 Oct '09

Author: tchemit Date: 2009-10-16 14:47:28 +0200 (Fri, 16 Oct 2009) New Revision: 1576 Modified: branches/jaxx-2.X/jaxx-demo/pom.xml branches/jaxx-2.X/pom.xml Log: use nuiton thirdparty rsyntaxtextarea... It seems somebody does not listen what I said :) Modified: branches/jaxx-2.X/jaxx-demo/pom.xml =================================================================== --- branches/jaxx-2.X/jaxx-demo/pom.xml 2009-10-14 10:04:28 UTC (rev 1575) +++ branches/jaxx-2.X/jaxx-demo/pom.xml 2009-10-16 12:47:28 UTC (rev 1576) @@ -47,7 +47,7 @@ </dependency> <dependency> - <groupId>org.fife</groupId> + <groupId>org.nuiton.thirdparty</groupId> <artifactId>rsyntaxtextarea</artifactId> </dependency> Modified: branches/jaxx-2.X/pom.xml =================================================================== --- branches/jaxx-2.X/pom.xml 2009-10-14 10:04:28 UTC (rev 1575) +++ branches/jaxx-2.X/pom.xml 2009-10-16 12:47:28 UTC (rev 1576) @@ -232,9 +232,9 @@  <dependency> - <groupId>org.fife</groupId> + <groupId>org.nuiton.thirdparty</groupId> <artifactId>rsyntaxtextarea</artifactId> - <version>1.3.4</version> + <version>1.3.3</version> </dependency>

1 0

r1575 - in branches/jaxx-2.X: . jaxx-demo jaxx-demo/src/main/java/jaxx/demo
by sletellier＠users.nuiton.org 14 Oct '09

14 Oct '09

Author: sletellier Date: 2009-10-14 12:04:28 +0200 (Wed, 14 Oct 2009) New Revision: 1575 Modified: branches/jaxx-2.X/jaxx-demo/pom.xml branches/jaxx-2.X/jaxx-demo/src/main/java/jaxx/demo/DemoPanel.jaxx branches/jaxx-2.X/pom.xml Log: Syntax highlighting in demo sources Modified: branches/jaxx-2.X/jaxx-demo/pom.xml =================================================================== --- branches/jaxx-2.X/jaxx-demo/pom.xml 2009-10-13 09:07:59 UTC (rev 1574) +++ branches/jaxx-2.X/jaxx-demo/pom.xml 2009-10-14 10:04:28 UTC (rev 1575) @@ -46,6 +46,11 @@ <artifactId>junit</artifactId> </dependency> + <dependency> + <groupId>org.fife</groupId> + <artifactId>rsyntaxtextarea</artifactId> + </dependency> + </dependencies>  Modified: branches/jaxx-2.X/jaxx-demo/src/main/java/jaxx/demo/DemoPanel.jaxx =================================================================== --- branches/jaxx-2.X/jaxx-demo/src/main/java/jaxx/demo/DemoPanel.jaxx 2009-10-13 09:07:59 UTC (rev 1574) +++ branches/jaxx-2.X/jaxx-demo/src/main/java/jaxx/demo/DemoPanel.jaxx 2009-10-14 10:04:28 UTC (rev 1575) @@ -23,6 +23,7 @@ <script><![CDATA[ import org.apache.commons.io.IOUtils; +import org.fife.ui.rsyntaxtextarea.RSyntaxTextArea; protected String[] getSources() { if (getClass() == DemoPanel.class) { @@ -77,7 +78,14 @@ pane.setBorder(null); //pane.setMinimumSize(jaxx.runtime.SwingUtil.newMinDimension()); // creation du contenu du fichier - JTextArea content = new JTextArea(); + RSyntaxTextArea content = new RSyntaxTextArea(); + if (extra.matches(".*\\.jaxx") || extra.matches(".*\\.xml")){ + content.setSyntaxEditingStyle(RSyntaxTextArea.SYNTAX_STYLE_XML); + } else if (extra.matches(".*\\.java")){ + content.setSyntaxEditingStyle(RSyntaxTextArea.SYNTAX_STYLE_JAVA); + } else if (extra.matches(".*\\.css")){ + content.setSyntaxEditingStyle(RSyntaxTextArea.SYNTAX_STYLE_CSS); + } content.setFont(content.getFont().deriveFont((float) 11)); content.setMinimumSize(jaxx.runtime.SwingUtil.newMinDimension()); content.setEditable(false); Modified: branches/jaxx-2.X/pom.xml =================================================================== --- branches/jaxx-2.X/pom.xml 2009-10-13 09:07:59 UTC (rev 1574) +++ branches/jaxx-2.X/pom.xml 2009-10-14 10:04:28 UTC (rev 1575) @@ -230,6 +230,13 @@ </exclusions> </dependency> +  + <dependency> + <groupId>org.fife</groupId> + <artifactId>rsyntaxtextarea</artifactId> + <version>1.3.4</version> + </dependency> +  <dependency>

1 0

r1574 - branches/jaxx-2.X/maven-jaxx-plugin/src/main/java/org/nuiton/jaxx/plugin
by tchemit＠users.nuiton.org 13 Oct '09

13 Oct '09

Author: tchemit Date: 2009-10-13 11:07:59 +0200 (Tue, 13 Oct 2009) New Revision: 1574 Modified: branches/jaxx-2.X/maven-jaxx-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateMojo.java Log: no using maven.src.dir in src default-value (this is not a maven property) Modified: branches/jaxx-2.X/maven-jaxx-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateMojo.java =================================================================== --- branches/jaxx-2.X/maven-jaxx-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateMojo.java 2009-10-11 13:10:37 UTC (rev 1573) +++ branches/jaxx-2.X/maven-jaxx-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateMojo.java 2009-10-13 09:07:59 UTC (rev 1574) @@ -62,7 +62,7 @@ /** * Repertoire sources des fichiers jaxx a generer. * - * @parameter expression="${jaxx.src}" default-value="${maven.src.dir}/main/java" + * @parameter expression="${jaxx.src}" default-value="${basedir}/src/main/java" */ protected File src; /**

1 0

r1573 - branches/jaxx-2.X/maven-jaxx-plugin/src/main/java/org/nuiton/jaxx/plugin
by tchemit＠users.nuiton.org 11 Oct '09

11 Oct '09

Author: tchemit Date: 2009-10-11 15:10:37 +0200 (Sun, 11 Oct 2009) New Revision: 1573 Removed: branches/jaxx-2.X/maven-jaxx-plugin/src/main/java/org/nuiton/jaxx/plugin/TemplateGenerator.java Modified: branches/jaxx-2.X/maven-jaxx-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpMojo.java Log: use VelocityTemplateGenerator from maven-helper-plugin Modified: branches/jaxx-2.X/maven-jaxx-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpMojo.java =================================================================== --- branches/jaxx-2.X/maven-jaxx-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpMojo.java 2009-10-10 16:48:11 UTC (rev 1572) +++ branches/jaxx-2.X/maven-jaxx-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpMojo.java 2009-10-11 13:10:37 UTC (rev 1573) @@ -39,6 +39,7 @@ import org.codehaus.plexus.util.FileUtils; import org.codehaus.plexus.util.StringUtils; import org.nuiton.i18n.I18n; +import org.nuiton.plugin.VelocityTemplateGenerator; import org.nuiton.util.FileUtil; import org.nuiton.util.SortedProperties; @@ -347,7 +348,7 @@ protected int generateContentFiles(File localizedTarget, Properties env, String localePath) throws Exception { int touchedFiles = 0; - TemplateGenerator gen = prepareGenerator(contentTemplate); + VelocityTemplateGenerator gen = prepareGenerator(contentTemplate); Enumeration<?> keys = helpIds.keys(); while (keys.hasMoreElements()) { String key = (String) keys.nextElement(); @@ -572,17 +573,17 @@ } protected void doGen(File template, File f, Properties env) throws Exception { - TemplateGenerator gen = prepareGenerator(template); + VelocityTemplateGenerator gen = prepareGenerator(template); gen.generate(env, f); } - protected TemplateGenerator prepareGenerator(File template) throws Exception { + protected VelocityTemplateGenerator prepareGenerator(File template) throws Exception { URL templateURL = getTemplate(template); if (verbose) { getLog().info("using template " + templateURL); } - TemplateGenerator gen = new TemplateGenerator(project, templateURL); + VelocityTemplateGenerator gen = new VelocityTemplateGenerator(project, templateURL); return gen; } } Deleted: branches/jaxx-2.X/maven-jaxx-plugin/src/main/java/org/nuiton/jaxx/plugin/TemplateGenerator.java =================================================================== --- branches/jaxx-2.X/maven-jaxx-plugin/src/main/java/org/nuiton/jaxx/plugin/TemplateGenerator.java 2009-10-10 16:48:11 UTC (rev 1572) +++ branches/jaxx-2.X/maven-jaxx-plugin/src/main/java/org/nuiton/jaxx/plugin/TemplateGenerator.java 2009-10-11 13:10:37 UTC (rev 1573) @@ -1,142 +0,0 @@ -/* - * Copyright 2001-2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License" ); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.nuiton.jaxx.plugin; - -import java.io.File; -import java.io.FileWriter; -import java.net.URISyntaxException; -import java.net.URL; -import java.util.Iterator; -import java.util.Properties; - -import org.apache.maven.project.MavenProject; -import org.apache.velocity.Template; -import org.apache.velocity.VelocityContext; -import org.apache.velocity.app.VelocityEngine; - -/** - * Generator of template base on velocity. - * - * @author chemit - * @since 1.3 - * - */ -public class TemplateGenerator { - - protected VelocityEngine engine; - protected final MavenProject mavenProject; - protected Template velocityTemplate; - - protected TemplateGenerator(MavenProject mavenProject, URL template) throws URISyntaxException { - - if (mavenProject == null) { - throw new IllegalArgumentException("mavenProject must not be null"); - } - - if (template == null) { - throw new IllegalArgumentException("template must not be null"); - } - - this.mavenProject = mavenProject; - - Properties props = new Properties(); - - String templateName; - - if (template.toURI().isOpaque()) { - - // template is in a jar - - props = new Properties(); - props.setProperty("resource.loader", "jar"); - props.setProperty("jar.resource.loader.description", "Jar resource loader for default webstart templates"); - props.setProperty("jar.resource.loader.class", "org.apache.velocity.runtime.resource.loader.JarResourceLoader"); - - // obtain the jar url - - String url = template.toString(); - int i = url.indexOf("!"); - templateName = url.substring(i + 2); - - props.setProperty("jar.resource.loader.path", url.substring(0, i + 2)); - - } else { - - - templateName = new File(template.getFile()).getName(); - - //props.setProperty(VelocityEngine.RUNTIME_LOG_LOGSYSTEM_CLASS, "org.apache.velocity.runtime.log.NullLogSystem"); - props.setProperty("file.resource.loader.path", template.getFile()); - - } - - try { - engine = new VelocityEngine(); - //engine.setProperty("runtime.log.logsystem", new NullLogSystem()); - engine.init(props); - } catch (Exception e) { - IllegalArgumentException iae = new IllegalArgumentException("Could not initialise Velocity"); - iae.initCause(e); - throw iae; - } - - try { - this.velocityTemplate = engine.getTemplate(templateName); - } catch (Exception e) { - IllegalArgumentException iae = - new IllegalArgumentException("Could not load the template file from '" + template + "'"); - iae.initCause(e); - throw iae; - } - } - - public void generate(Properties context, File outputFile) throws Exception { - - - VelocityContext vcontext = new VelocityContext(); - - // Note: properties that contain dots will not be properly parsed by Velocity. Should we replace dots with underscores ? - addPropertiesToContext(System.getProperties(), vcontext); - - addPropertiesToContext(mavenProject.getProperties(), vcontext); - addPropertiesToContext(context, vcontext); - - vcontext.put("project", mavenProject.getModel()); - - vcontext.put("outputFile", outputFile.getName()); - - FileWriter writer = new FileWriter(outputFile); - - try { - velocityTemplate.merge(vcontext, writer); - writer.flush(); - } catch (Exception e) { - throw new Exception("Could not generate the template " + velocityTemplate.getName() + ": " + e.getMessage(), e); - } finally { - writer.close(); - } - } - - protected void addPropertiesToContext(Properties properties, VelocityContext context) { - - for (Iterator<?> iter = properties.keySet().iterator(); iter.hasNext();) { - String key = (String) iter.next(); - Object value = properties.get(key); - context.put(key, value); - } - - } -}

1 0

r1572 - in branches/jaxx-2.X: . jaxx-demo
by tchemit＠users.nuiton.org 10 Oct '09

10 Oct '09

Author: tchemit Date: 2009-10-10 18:48:11 +0200 (Sat, 10 Oct 2009) New Revision: 1572 Modified: branches/jaxx-2.X/jaxx-demo/pom.xml branches/jaxx-2.X/pom.xml Log: utilisation de mavenpom 1.1.0, maven-license-plugin Modified: branches/jaxx-2.X/jaxx-demo/pom.xml =================================================================== --- branches/jaxx-2.X/jaxx-demo/pom.xml 2009-10-09 07:23:00 UTC (rev 1571) +++ branches/jaxx-2.X/jaxx-demo/pom.xml 2009-10-10 16:48:11 UTC (rev 1572) @@ -135,19 +135,10 @@ <plugin> <groupId>org.nuiton</groupId> - <artifactId>maven-helper-plugin</artifactId> + <artifactId>maven-license-plugin</artifactId> <configuration> <copyToMETA_INF>true</copyToMETA_INF> </configuration> - <executions> - <execution> - <id>attach-licenses</id> - <goals> - <goal>add-license</goal> - <goal>add-third-party</goal> - </goals> - </execution> - </executions> </plugin> </plugins> @@ -210,10 +201,14 @@ <plugin> <groupId>org.nuiton</groupId> - <artifactId>maven-helper-plugin</artifactId> + <artifactId>maven-license-plugin</artifactId> <executions> <execution> <id>attach-licenses</id> + <goals> + <goal>add-license</goal> + <goal>add-third-party</goal> + </goals> </execution> </executions> </plugin> Modified: branches/jaxx-2.X/pom.xml =================================================================== --- branches/jaxx-2.X/pom.xml 2009-10-09 07:23:00 UTC (rev 1571) +++ branches/jaxx-2.X/pom.xml 2009-10-10 16:48:11 UTC (rev 1572) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>1.0.3-SNAPSHOT</version> + <version>1.1.0-SNAPSHOT</version> </parent> <artifactId>jaxx</artifactId>

1 0

r1571 - in branches/jaxx-2.X: jaxx-compiler/src/main/java/jaxx/compiler maven-jaxx-plugin maven-jaxx-plugin/src/site maven-jaxx-plugin/src/site/rst
by tchemit＠users.nuiton.org 09 Oct '09

09 Oct '09

Author: tchemit Date: 2009-10-09 09:23:00 +0200 (Fri, 09 Oct 2009) New Revision: 1571 Modified: branches/jaxx-2.X/jaxx-compiler/src/main/java/jaxx/compiler/JAXXCompiler.java branches/jaxx-2.X/maven-jaxx-plugin/pom.xml branches/jaxx-2.X/maven-jaxx-plugin/src/site/rst/index.rst branches/jaxx-2.X/maven-jaxx-plugin/src/site/site.xml Log: fix javadoc + documentation Modified: branches/jaxx-2.X/jaxx-compiler/src/main/java/jaxx/compiler/JAXXCompiler.java =================================================================== --- branches/jaxx-2.X/jaxx-compiler/src/main/java/jaxx/compiler/JAXXCompiler.java 2009-10-08 21:10:15 UTC (rev 1570) +++ branches/jaxx-2.X/jaxx-compiler/src/main/java/jaxx/compiler/JAXXCompiler.java 2009-10-09 07:23:00 UTC (rev 1571) @@ -93,11 +93,11 @@ */ public static final int INLINE_THRESHOLD = 300; /** - * + * The unique object handler used in first pass */ protected final DefaultObjectHandler firstPassClassTagHandler; /** - * + * list of static imports */ protected List<String> staticImports = new ArrayList<String>(); @@ -133,7 +133,7 @@ */ protected List<DataBinding> dataBindings = new ArrayList<DataBinding>(); /** - * + * table of symbols for this compiler */ protected SymbolTable symbolTable = new SymbolTable(); /** @@ -250,7 +250,7 @@ */ protected JavaFile javaFile; /** - * + * configuration of the compiler */ protected CompilerConfiguration configuration; /** @@ -270,7 +270,7 @@ */ protected Map<CompiledObject, String> ids = new LinkedHashMap<CompiledObject, String>(); /** - * + * default decodator to use if none specified */ protected CompiledObjectDecorator defaultDecorator; Modified: branches/jaxx-2.X/maven-jaxx-plugin/pom.xml =================================================================== --- branches/jaxx-2.X/maven-jaxx-plugin/pom.xml 2009-10-08 21:10:15 UTC (rev 1570) +++ branches/jaxx-2.X/maven-jaxx-plugin/pom.xml 2009-10-09 07:23:00 UTC (rev 1571) @@ -77,12 +77,6 @@ <groupId>org.apache.maven.shared</groupId> <artifactId>maven-verifier</artifactId> </dependency> - -  <dependency> <groupId>commons-lang</groupId> Modified: branches/jaxx-2.X/maven-jaxx-plugin/src/site/rst/index.rst =================================================================== --- branches/jaxx-2.X/maven-jaxx-plugin/src/site/rst/index.rst 2009-10-08 21:10:15 UTC (rev 1570) +++ branches/jaxx-2.X/maven-jaxx-plugin/src/site/rst/index.rst 2009-10-09 07:23:00 UTC (rev 1571) @@ -4,10 +4,23 @@ .. contents:: -Présentation +Introduction ------------ -Le plugin maven pour lancer le compilateur jaxx dans un projet maven TODO +The plugin permits to generate java files from jaxx files via the `generate`_ goal. -**Veuillez consulter la JavaDoc pour de plus ample détails sur les différentes -librairies.** +You can also generate the java help system via the `generate-help`_ goal. + +Default layout +-------------- + +The plugin defines some directory layout convention, using them is a great +benefit. + + * the jaxx files should be under *src/main/java* + * the generated java files should be under *target/generated-sources/java* + * the java help files should be under *src/main/help* + +.. _generate: generate-mojo.html + +.. _generate-help: generate-help-mojo.html Modified: branches/jaxx-2.X/maven-jaxx-plugin/src/site/site.xml =================================================================== --- branches/jaxx-2.X/maven-jaxx-plugin/src/site/site.xml 2009-10-08 21:10:15 UTC (rev 1570) +++ branches/jaxx-2.X/maven-jaxx-plugin/src/site/site.xml 2009-10-09 07:23:00 UTC (rev 1571) @@ -19,17 +19,11 @@ <item name="Accueil" href="index.html"/> <item name="Détail goals" href="plugin-info.html"> <item name="generate" href="generate-mojo.html"/> + <item name="generate-help" href="generate-help-mojo.html"/> <item name="help" href="help-mojo.html"/> </item> </menu> - <menu name="Téléchargement" inherit="top"> - <item href="${labs.builder.url}/org/codelutin/jaxx/${project.artifactId}/${project.version}" - name="Télécharger la dernière version"/> - <item href="${labs.builder.url}/org/codelutin/jaxx/${project.artifactId}" - name="Voir toutes les versions"/> - </menu> - <menu name="Développeur" inherit="top"> <item name="A faire" href="Todo.html"/> </menu>

1 0