Jaxx-commits
Threads by month
- ----- 2026 -----
- June
- May
- April
- March
- February
- January
- ----- 2025 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2006 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2005 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2004 -----
- December
- November
- October
- September
- August
- 3898 discussions
r2324 - in trunk: jaxx-demo/src/main/java/jaxx/demo jaxx-demo/src/main/resources jaxx-demo/src/main/resources/i18n jaxx-widgets jaxx-widgets/src/main/java/jaxx/runtime/swing jaxx-widgets/src/main/java/jaxx/runtime/swing/log
by sletellier@users.nuiton.org 01 Jun '12
by sletellier@users.nuiton.org 01 Jun '12
01 Jun '12
Author: sletellier
Date: 2012-06-01 18:15:02 +0200 (Fri, 01 Jun 2012)
New Revision: 2324
Url: http://nuiton.org/repositories/revision/jaxx/2324
Log:
fixes #2124 : Add ui to display log from log4j appender
Added:
trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/log/
trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/log/JAXXLog4jAppender.java
trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/log/JAXXLog4jHandler.java
trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/log/JAXXLog4jUI.jaxx
Modified:
trunk/jaxx-demo/src/main/java/jaxx/demo/DemoUI.css
trunk/jaxx-demo/src/main/java/jaxx/demo/DemoUI.jaxx
trunk/jaxx-demo/src/main/java/jaxx/demo/DemoUIHandler.java
trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo_en_GB.properties
trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo_es_ES.properties
trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo_fr_FR.properties
trunk/jaxx-demo/src/main/resources/log4j.properties
trunk/jaxx-widgets/pom.xml
Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/DemoUI.css
===================================================================
--- trunk/jaxx-demo/src/main/java/jaxx/demo/DemoUI.css 2012-05-30 17:46:08 UTC (rev 2323)
+++ trunk/jaxx-demo/src/main/java/jaxx/demo/DemoUI.css 2012-06-01 16:15:02 UTC (rev 2324)
@@ -112,6 +112,11 @@
_help:{"ui.main.menu.file.exit"};
}
+#menuLogs {
+ text:"jaxxdemo.menu.showLogs";
+ _help:{"ui.main.menu.showLogs"};
+}
+
#menuHelp {
text:"jaxxdemo.menu.help";
mnemonic:e;
Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/DemoUI.jaxx
===================================================================
--- trunk/jaxx-demo/src/main/java/jaxx/demo/DemoUI.jaxx 2012-05-30 17:46:08 UTC (rev 2323)
+++ trunk/jaxx-demo/src/main/java/jaxx/demo/DemoUI.jaxx 2012-06-01 16:15:02 UTC (rev 2324)
@@ -85,6 +85,8 @@
</JMenu>
<JMenu id='menuHelp'>
+ <JMenuItem id='menuLogs'
+ onActionPerformed="getHandler().showLogs(this)"/>
<JMenuItem id='menuHelpHelp'
onActionPerformed="getHandler().showHelp(this, null)"/>
<JMenuItem id='menuHelpSite'
Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/DemoUIHandler.java
===================================================================
--- trunk/jaxx-demo/src/main/java/jaxx/demo/DemoUIHandler.java 2012-05-30 17:46:08 UTC (rev 2323)
+++ trunk/jaxx-demo/src/main/java/jaxx/demo/DemoUIHandler.java 2012-06-01 16:15:02 UTC (rev 2324)
@@ -52,6 +52,7 @@
import jaxx.runtime.context.DefaultApplicationContext;
import jaxx.runtime.context.JAXXContextEntryDef;
import jaxx.runtime.context.JAXXInitialContext;
+import jaxx.runtime.swing.log.JAXXLog4jUI;
import org.nuiton.util.decorator.DecoratorProvider;
import jaxx.runtime.swing.AboutPanel;
import jaxx.runtime.swing.ErrorDialogUI;
@@ -445,6 +446,14 @@
// mainUI.getHelp().setCurrentID(helpId);
}
+ public void showLogs(DemoUI ui) {
+
+ JAXXLog4jUI log4jUI = new JAXXLog4jUI("jaxxDemoAppender");
+ String title = _("jaxxdemo.title.showLog");
+ log4jUI.setTitle(title);
+ log4jUI.showInDialog(ui, false);
+ }
+
public void gotoSite(JAXXContext context) {
DemoUI ui = getUI(context);
Modified: trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo_en_GB.properties
===================================================================
--- trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo_en_GB.properties 2012-05-30 17:46:08 UTC (rev 2323)
+++ trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo_en_GB.properties 2012-06-01 16:15:02 UTC (rev 2324)
@@ -204,6 +204,7 @@
jaxxdemo.menu.file=File
jaxxdemo.menu.file.locale=Languages
jaxxdemo.menu.help=
+jaxxdemo.menu.showLogs=Show logs
jaxxdemo.message.config.loaded=Configuration of JAXXDemo v. %1$s loaded.
jaxxdemo.message.goto.site=Go to JAXXDemo Web site
jaxxdemo.navigation.actor.title=Actor
@@ -227,6 +228,7 @@
jaxxdemo.timeeditor.model=Result
jaxxdemo.timeeditor.value=Selected time \: %1$tH\:%1$tM
jaxxdemo.title.about=About JAXXDemo...
+jaxxdemo.title.showLog=JAXXDemo logs
jaxxdemo.tree.tabtitle=Tree
jaxxdemo.treeTable.tabtitle=TreeTable
jaxxdemo.warning.nimbus.landf=Could not init nymbus look and feel, you need at leasr version 1.6u10 of java.
Modified: trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo_es_ES.properties
===================================================================
--- trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo_es_ES.properties 2012-05-30 17:46:08 UTC (rev 2323)
+++ trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo_es_ES.properties 2012-06-01 16:15:02 UTC (rev 2324)
@@ -204,6 +204,7 @@
jaxxdemo.menu.file=Fichier
jaxxdemo.menu.file.locale=Langues
jaxxdemo.menu.help=Aide
+jaxxdemo.menu.showLogs=Afficher les logs
jaxxdemo.message.config.loaded=Configuration de JAXX Demo v. %1$s chargée.
jaxxdemo.message.goto.site=Accéder au site de JAXX Demo (%1$s)
jaxxdemo.navigation.actor.title=Acteur
@@ -227,6 +228,7 @@
jaxxdemo.timeeditor.model=Résultat
jaxxdemo.timeeditor.value=Heure sélectionnée \: %1$tH\:%1$tM
jaxxdemo.title.about=A propos de JAXX Demo...
+jaxxdemo.title.showLog=Logs de JAXX Demo
jaxxdemo.tree.tabtitle=Arbre
jaxxdemo.treeTable.tabtitle=Arbre tableau
jaxxdemo.warning.nimbus.landf=Le look and Feel Nimbus n'a pas été trouvé, il faut au moins la version 1.6u10 de java.
Modified: trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo_fr_FR.properties
===================================================================
--- trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo_fr_FR.properties 2012-05-30 17:46:08 UTC (rev 2323)
+++ trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo_fr_FR.properties 2012-06-01 16:15:02 UTC (rev 2324)
@@ -204,6 +204,7 @@
jaxxdemo.menu.file=Fichier
jaxxdemo.menu.file.locale=Langues
jaxxdemo.menu.help=Aide
+jaxxdemo.menu.showLogs=Afficher les logs
jaxxdemo.message.config.loaded=Configuration de JAXX Demo v. %1$s chargée.
jaxxdemo.message.goto.site=Accéder au site de JAXX Demo (%1$s)
jaxxdemo.navigation.actor.title=Acteur
@@ -227,6 +228,7 @@
jaxxdemo.timeeditor.model=Résultat
jaxxdemo.timeeditor.value=Heure sélectionnée \: %1$tH\:%1$tM
jaxxdemo.title.about=A propos de JAXX Demo...
+jaxxdemo.title.showLog=Logs de JAXX Demo
jaxxdemo.tree.tabtitle=Arbre
jaxxdemo.treeTable.tabtitle=Arbre tableau
jaxxdemo.warning.nimbus.landf=Le look and Feel Nimbus n'a pas été trouvé, il faut au moins la version 1.6u10 de java.
Modified: trunk/jaxx-demo/src/main/resources/log4j.properties
===================================================================
--- trunk/jaxx-demo/src/main/resources/log4j.properties 2012-05-30 17:46:08 UTC (rev 2323)
+++ trunk/jaxx-demo/src/main/resources/log4j.properties 2012-06-01 16:15:02 UTC (rev 2324)
@@ -23,12 +23,17 @@
# #L%
###
# Global logging configuration
-log4j.rootLogger=ERROR, stdout
+log4j.rootLogger=ERROR, stdout, jaxxDemoAppender
# Console output...
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) %M - %m%n
+# JAXX output
+log4j.appender.jaxxDemoAppender=jaxx.runtime.swing.log.JAXXLog4jAppender
+log4j.appender.jaxxDemoAppender.layout=org.apache.log4j.PatternLayout
+log4j.appender.jaxxDemoAppender.layout.ConversionPattern=%5p [%t] (%F:%L) %M - %m%n
+
log4j.logger.jaxx=INFO
#log4j.logger.jaxx.demo=INFO
log4j.logger.jaxx.demo.tree=DEBUG
Modified: trunk/jaxx-widgets/pom.xml
===================================================================
--- trunk/jaxx-widgets/pom.xml 2012-05-30 17:46:08 UTC (rev 2323)
+++ trunk/jaxx-widgets/pom.xml 2012-06-01 16:15:02 UTC (rev 2324)
@@ -94,7 +94,6 @@
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <scope>test</scope>
</dependency>
<dependency>
@@ -172,4 +171,4 @@
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
Added: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/log/JAXXLog4jAppender.java
===================================================================
--- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/log/JAXXLog4jAppender.java (rev 0)
+++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/log/JAXXLog4jAppender.java 2012-06-01 16:15:02 UTC (rev 2324)
@@ -0,0 +1,141 @@
+/*
+ * #%L
+ * JAXX :: Widgets
+ *
+ * $Id$
+ * $HeadURL$
+ * %%
+ * Copyright (C) 2008 - 2012 CodeLutin
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Lesser Public License for more details.
+ *
+ * You should have received a copy of the GNU General Lesser Public
+ * License along with this program. If not, see
+ * <http://www.gnu.org/licenses/lgpl-3.0.html>.
+ * #L%
+ */
+package jaxx.runtime.swing.log;
+
+import java.beans.PropertyChangeListener;
+import java.beans.PropertyChangeSupport;
+import java.util.LinkedList;
+import java.util.List;
+import org.apache.log4j.Level;
+import org.apache.log4j.WriterAppender;
+import org.apache.log4j.spi.LoggingEvent;
+
+/**
+ * @author sletellier <letellier(a)codelutin.com>
+ */
+public class JAXXLog4jAppender extends WriterAppender {
+
+ public static final String PROPERTY_LOGS = "logs";
+ public static final String PROPERTY_LEVEL = "level";
+
+ protected List<LoggingEvent> events;
+ protected StringBuilder logs;
+ protected Level level;
+
+ protected final PropertyChangeSupport pcs = new PropertyChangeSupport(this);
+
+ public JAXXLog4jAppender() {
+ events = new LinkedList<LoggingEvent>();
+ logs = new StringBuilder();
+ }
+
+ public String getLogs() {
+ return logs.toString();
+ }
+
+ public void setLogs(String logs) {
+ String oldValue = getLogs();
+ this.logs = new StringBuilder(logs);
+ firePropertyChange(PROPERTY_LOGS, oldValue, logs);
+ }
+
+ public Level getLevel() {
+ if (level == null) {
+ level = Level.ALL;
+ }
+ return level;
+ }
+
+ public void setLevel(Level level) {
+ Level oldValue = getLevel();
+ this.level = level;
+ firePropertyChange(PROPERTY_LEVEL, oldValue, level);
+ updateLogs();
+ }
+
+ @Override
+ public void append(LoggingEvent event) {
+ super.append(event);
+ if (event != null) {
+ events.add(event);
+ updateLog(event);
+ }
+ }
+
+ protected void updateLogs() {
+ String oldValue = getLogs();
+ logs = new StringBuilder();
+ for (LoggingEvent event : events) {
+ updateLog(event);
+ }
+ firePropertyChange(PROPERTY_LOGS, oldValue, getLogs());
+ }
+
+ protected void updateLog(LoggingEvent event) {
+ Level level = event.getLevel();
+ if (getLevel() != null && level.isGreaterOrEqual(getLevel())) {
+ String log = this.layout.format(event);
+ appendLog(log);
+ if(layout.ignoresThrowable()) {
+ String[] errorLogs = event.getThrowableStrRep();
+ if (errorLogs != null) {
+ for (String errorLog : errorLogs) {
+ appendLog(errorLog + "\n");
+ }
+ }
+ }
+ }
+ }
+
+ protected void appendLog(String log) {
+ String oldValue = getLogs();
+ logs.append(log);
+ firePropertyChange(PROPERTY_LOGS, oldValue, getLogs());
+ }
+
+ public void addPropertyChangeListener(PropertyChangeListener listener) {
+ pcs.addPropertyChangeListener(listener);
+ }
+
+ public void addPropertyChangeListener(String propertyName, PropertyChangeListener listener) {
+ pcs.addPropertyChangeListener(propertyName, listener);
+ }
+
+ public void removePropertyChangeListener(PropertyChangeListener listener) {
+ pcs.removePropertyChangeListener(listener);
+ }
+
+ public void removePropertyChangeListener(String propertyName, PropertyChangeListener listener) {
+ pcs.removePropertyChangeListener(propertyName, listener);
+ }
+
+ protected void firePropertyChange(String propertyName, Object oldValue, Object newValue) {
+ pcs.firePropertyChange(propertyName, oldValue, newValue);
+ }
+
+ protected void firePropertyChange(String propertyName, Object newValue) {
+ firePropertyChange(propertyName, null, newValue);
+ }
+}
Added: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/log/JAXXLog4jHandler.java
===================================================================
--- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/log/JAXXLog4jHandler.java (rev 0)
+++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/log/JAXXLog4jHandler.java 2012-06-01 16:15:02 UTC (rev 2324)
@@ -0,0 +1,106 @@
+/*
+ * #%L
+ * JAXX :: Widgets
+ *
+ * $Id$
+ * $HeadURL$
+ * %%
+ * Copyright (C) 2008 - 2012 CodeLutin
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Lesser Public License for more details.
+ *
+ * You should have received a copy of the GNU General Lesser Public
+ * License along with this program. If not, see
+ * <http://www.gnu.org/licenses/lgpl-3.0.html>.
+ * #L%
+ */
+package jaxx.runtime.swing.log;
+
+import java.awt.Component;
+import java.awt.Frame;
+import java.awt.event.ActionEvent;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
+import javax.swing.AbstractAction;
+import javax.swing.Action;
+import javax.swing.JComponent;
+import javax.swing.JDialog;
+import javax.swing.JRootPane;
+import javax.swing.KeyStroke;
+import jaxx.runtime.JAXXUtil;
+import jaxx.runtime.SwingUtil;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.log4j.Logger;
+
+/**
+ * @author sletellier <letellier(a)codelutin.com>
+ */
+public class JAXXLog4jHandler {
+
+ private static final Log log = LogFactory.getLog(JAXXLog4jHandler.class);
+
+ protected JAXXLog4jUI ui;
+
+ public JAXXLog4jHandler(JAXXLog4jUI ui) {
+ this.ui = ui;
+ }
+
+ final protected Action closeAction = new AbstractAction("close") {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ JDialog container = ui.getParentContainer(JDialog.class);
+ if (container != null) {
+ container.dispose();
+ } else {
+ ui.setVisible(false);
+ }
+ }
+ };
+
+ public JAXXLog4jAppender getAppender(String appenderName) {
+
+ Logger logger = Logger.getRootLogger();
+ try {
+ JAXXLog4jAppender appender = (JAXXLog4jAppender) logger.getAppender(appenderName);
+ return appender;
+ } catch (ClassCastException eee) {
+ log.error("Appender '" + appenderName + "' must be an jaxx.runtime.swing.log.JAXXLog4jAppender", eee);
+ throw eee;
+ }
+ }
+
+ public void showInDialog(Frame ui, boolean undecorated) {
+ JDialog f = new JDialog(ui, this.ui.getTitle(), false);
+ f.add(this.ui);
+ f.setResizable(true);
+ f.setSize(550, 450);
+ f.setUndecorated(undecorated);
+ JRootPane rootPane = f.getRootPane();
+ rootPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke("ESCAPE"), "close");
+ rootPane.getActionMap().put("close", closeAction);
+ f.addWindowListener(new WindowAdapter() {
+ @Override
+ public void windowClosed(WindowEvent e) {
+ Component ui = (Component) e.getSource();
+ if (log.isInfoEnabled()) {
+ log.info("destroy ui " + ui);
+ }
+ JAXXUtil.destroy(ui);
+ JAXXUtil.destroy(JAXXLog4jHandler.this.ui);
+ }
+ });
+ SwingUtil.center(ui, f);
+ f.setVisible(true);
+ }
+}
Added: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/log/JAXXLog4jUI.jaxx
===================================================================
--- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/log/JAXXLog4jUI.jaxx (rev 0)
+++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/log/JAXXLog4jUI.jaxx 2012-06-01 16:15:02 UTC (rev 2324)
@@ -0,0 +1,109 @@
+<!--
+ #%L
+ JAXX :: Widgets
+
+ $Id$
+ $HeadURL$
+ %%
+ Copyright (C) 2008 - 2012 CodeLutin
+ %%
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Lesser General Public License as
+ published by the Free Software Foundation, either version 3 of the
+ License, or (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Lesser Public License for more details.
+
+ You should have received a copy of the GNU General Lesser Public
+ License along with this program. If not, see
+ <http://www.gnu.org/licenses/lgpl-3.0.html>.
+ #L%
+ -->
+<JPanel id='log4jUI' layout='{new BorderLayout()}'>
+
+ <import>
+ java.awt.Frame
+ org.apache.log4j.Level
+ </import>
+
+ <script><![CDATA[
+ protected String appenderName;
+
+ public JAXXLog4jUI(String appenderName) {
+ this.appenderName = appenderName;
+ }
+
+ public void showInDialog(Frame ui, boolean undecorated) {
+ handler.showInDialog(ui, undecorated);
+ }
+ ]]></script>
+
+ <String id='title' javaBean='null'/>
+
+ <JAXXLog4jHandler id='handler' constructorParams='this'/>
+
+ <JAXXLog4jAppender id='model' initializer='getHandler().getAppender(appenderName)'/>
+
+ <JScrollPane constraints='BorderLayout.CENTER'>
+ <JTextArea id='logArea'
+ text='{model.getLogs()}'/>
+ </JScrollPane>
+
+ <Table constraints='BorderLayout.SOUTH'>
+ <row>
+ <cell>
+ <JRadioButton id='fatalRadio'
+ buttonGroup="levelRadioGroup"
+ text='{Level.FATAL.toString()}'
+ value='{Level.FATAL}'
+ onActionPerformed='model.setLevel(Level.FATAL)'/>
+ </cell>
+ <cell>
+ <JRadioButton id='errorRadio'
+ buttonGroup="levelRadioGroup"
+ text='{Level.ERROR.toString()}'
+ value='{Level.ERROR}'
+ onActionPerformed='model.setLevel(Level.ERROR)'/>
+ </cell>
+ <cell>
+ <JRadioButton id='warnRadio'
+ buttonGroup="levelRadioGroup"
+ text='{Level.WARN.toString()}'
+ value='{Level.WARN}'
+ onActionPerformed='model.setLevel(Level.WARN)'/>
+ </cell>
+ <cell>
+ <JRadioButton id='infoRadio'
+ buttonGroup="levelRadioGroup"
+ text='{Level.INFO.toString()}'
+ value='{Level.INFO}'
+ onActionPerformed='model.setLevel(Level.INFO)'/>
+ </cell>
+ <cell>
+ <JRadioButton id='debugRadio'
+ buttonGroup="levelRadioGroup"
+ text='{Level.DEBUG.toString()}'
+ value='{Level.DEBUG}'
+ onActionPerformed='model.setLevel(Level.DEBUG)'/>
+ </cell>
+ <cell>
+ <JRadioButton id='traceRadio'
+ buttonGroup="levelRadioGroup"
+ text='{Level.TRACE.toString()}'
+ value='{Level.TRACE}'
+ onActionPerformed='model.setLevel(Level.TRACE)'/>
+ </cell>
+ <cell>
+ <JRadioButton id='allRadio'
+ buttonGroup="levelRadioGroup"
+ text='{Level.ALL.toString()}'
+ value='{Level.ALL}'
+ selected='true'
+ onActionPerformed='model.setLevel(Level.ALL)'/>
+ </cell>
+ </row>
+ </Table>
+</JPanel>
\ No newline at end of file
1
0
30 May '12
Author: ymartel
Date: 2012-05-30 19:46:08 +0200 (Wed, 30 May 2012)
New Revision: 2323
Url: http://nuiton.org/repositories/revision/jaxx/2323
Log:
update to mavenpom 3.3.2
Modified:
trunk/jaxx-compiler/src/site/site_fr.xml
trunk/jaxx-demo/src/site/site_fr.xml
trunk/jaxx-maven-plugin/src/site/site_fr.xml
trunk/jaxx-runtime/src/site/site_fr.xml
trunk/jaxx-swing-action/src/site/site_fr.xml
trunk/jaxx-tutorial-config/src/site/site_fr.xml
trunk/jaxx-tutorial-css/src/site/site_fr.xml
trunk/jaxx-tutorial-databinding/src/site/site_fr.xml
trunk/jaxx-tutorial-helloworld/src/site/site_fr.xml
trunk/jaxx-tutorial-helloworld2/src/site/site_fr.xml
trunk/jaxx-tutorial-validation/src/site/site_fr.xml
trunk/jaxx-tutorial/src/site/site_fr.xml
trunk/jaxx-validator/src/site/site_fr.xml
trunk/pom.xml
trunk/src/site/site_fr.xml
Modified: trunk/jaxx-compiler/src/site/site_fr.xml
===================================================================
--- trunk/jaxx-compiler/src/site/site_fr.xml 2012-03-21 12:03:25 UTC (rev 2322)
+++ trunk/jaxx-compiler/src/site/site_fr.xml 2012-05-30 17:46:08 UTC (rev 2323)
@@ -32,7 +32,46 @@
<href>index.html</href>
</bannerLeft>
+ <bannerRight>
+ <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src>
+ <href>http://www.codelutin.com</href>
+ </bannerRight>
+
+ <skin>
+ <groupId>org.apache.maven.skins</groupId>
+ <artifactId>maven-fluido-skin</artifactId>
+ <version>1.2.1</version>
+ </skin>
+
+ <custom>
+ <fluidoSkin>
+ <topBarEnabled>true</topBarEnabled>
+ <googleSearch/>
+ <sideBarEnabled>false</sideBarEnabled>
+ <searchEnabled>true</searchEnabled>
+ <sourceLineNumbersEnabled>true</sourceLineNumbersEnabled>
+ </fluidoSkin>
+ </custom>
+
+ <publishDate position="right" format="dd/MM/yyyy"/>
+ <version position="right"/>
+
+ <poweredBy>
+ <logo href="http://maven.apache.org" name="Maven"
+ img="${project.url}/images/logos/maven-feather.png"/>
+ <logo href="http://maven-site.nuiton.org/jrst" name="JRst"
+ img="http://maven-site.nuiton.org/public/images/jrst-logo.png"/>
+ <logo href="http://docutils.sourceforge.net/rst.html"
+ name="ReStructuredText"
+ img="http://maven-site.nuiton.org/public/images/restructuredtext-logo.png"/>
+ </poweredBy>
+
<body>
+ <links>
+ <item name="nuiton.org" href="http://www.nuiton.org"/>
+ <item name="CodeLutin" href="http://codelutin.com"/>
+ <item name="Libre-Entreprise" href="http://www.libre-entreprise.org/"/>
+ </links>
<breadcrumbs>
<item name="${project.name}" href="index.html" />
@@ -44,5 +83,24 @@
<menu ref="reports"/>
+ <footer>
+
+ <script type="text/javascript"
+ src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js">
+ </script>
+
+ <div id='projectMetas'
+ projectversion='${project.version}'
+ platform='${project.platform}'
+ projectid='${project.projectId}'
+ scm='${project.scm.connection}'
+ scmwebeditorenabled='${project.scmwebeditorEnabled}'
+ scmwebeditorurl='${project.scmwebeditorUrl}'
+ siteSourcesType='${project.siteSourcesType}'
+ piwikEnabled='${project.piwikEnabled}'
+ piwikId='${project.piwikId}'>
+ </div>
+ </footer>
+
</body>
</project>
Modified: trunk/jaxx-demo/src/site/site_fr.xml
===================================================================
--- trunk/jaxx-demo/src/site/site_fr.xml 2012-03-21 12:03:25 UTC (rev 2322)
+++ trunk/jaxx-demo/src/site/site_fr.xml 2012-05-30 17:46:08 UTC (rev 2323)
@@ -32,11 +32,40 @@
<href>index.html</href>
</bannerLeft>
+ <bannerRight>
+ <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src>
+ <href>http://www.codelutin.com</href>
+ </bannerRight>
+
+ <skin>
+ <groupId>org.apache.maven.skins</groupId>
+ <artifactId>maven-fluido-skin</artifactId>
+ <version>1.2.1</version>
+ </skin>
+
+ <custom>
+ <fluidoSkin>
+ <topBarEnabled>true</topBarEnabled>
+ <googleSearch/>
+ <sideBarEnabled>false</sideBarEnabled>
+ <searchEnabled>true</searchEnabled>
+ <sourceLineNumbersEnabled>true</sourceLineNumbersEnabled>
+ </fluidoSkin>
+ </custom>
+
+ <publishDate position="right" format="dd/MM/yyyy"/>
+ <version position="right"/>
+
<poweredBy>
<logo href="http://maven-site.nuiton.org/jaxx/" name="Jaxx" img="${project.url}/images/jaxx-logo.png"/>
</poweredBy>
<body>
+ <links>
+ <item name="nuiton.org" href="http://www.nuiton.org"/>
+ <item name="CodeLutin" href="http://codelutin.com"/>
+ <item name="Libre-Entreprise" href="http://www.libre-entreprise.org/"/>
+ </links>
<breadcrumbs>
<item name="${project.name}" href="index.html" />
@@ -53,5 +82,24 @@
<menu ref="modules"/>
+ <footer>
+
+ <script type="text/javascript"
+ src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js">
+ </script>
+
+ <div id='projectMetas'
+ projectversion='${project.version}'
+ platform='${project.platform}'
+ projectid='${project.projectId}'
+ scm='${project.scm.connection}'
+ scmwebeditorenabled='${project.scmwebeditorEnabled}'
+ scmwebeditorurl='${project.scmwebeditorUrl}'
+ siteSourcesType='${project.siteSourcesType}'
+ piwikEnabled='${project.piwikEnabled}'
+ piwikId='${project.piwikId}'>
+ </div>
+ </footer>
+
</body>
</project>
Modified: trunk/jaxx-maven-plugin/src/site/site_fr.xml
===================================================================
--- trunk/jaxx-maven-plugin/src/site/site_fr.xml 2012-03-21 12:03:25 UTC (rev 2322)
+++ trunk/jaxx-maven-plugin/src/site/site_fr.xml 2012-05-30 17:46:08 UTC (rev 2323)
@@ -32,7 +32,46 @@
<href>index.html</href>
</bannerLeft>
+ <bannerRight>
+ <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src>
+ <href>http://www.codelutin.com</href>
+ </bannerRight>
+
+ <skin>
+ <groupId>org.apache.maven.skins</groupId>
+ <artifactId>maven-fluido-skin</artifactId>
+ <version>1.2.1</version>
+ </skin>
+
+ <custom>
+ <fluidoSkin>
+ <topBarEnabled>true</topBarEnabled>
+ <googleSearch/>
+ <sideBarEnabled>false</sideBarEnabled>
+ <searchEnabled>true</searchEnabled>
+ <sourceLineNumbersEnabled>true</sourceLineNumbersEnabled>
+ </fluidoSkin>
+ </custom>
+
+ <publishDate position="right" format="dd/MM/yyyy"/>
+ <version position="right"/>
+
+ <poweredBy>
+ <logo href="http://maven.apache.org" name="Maven"
+ img="${project.url}/images/logos/maven-feather.png"/>
+ <logo href="http://maven-site.nuiton.org/jrst" name="JRst"
+ img="http://maven-site.nuiton.org/public/images/jrst-logo.png"/>
+ <logo href="http://docutils.sourceforge.net/rst.html"
+ name="ReStructuredText"
+ img="http://maven-site.nuiton.org/public/images/restructuredtext-logo.png"/>
+ </poweredBy>
+
<body>
+ <links>
+ <item name="nuiton.org" href="http://www.nuiton.org"/>
+ <item name="CodeLutin" href="http://codelutin.com"/>
+ <item name="Libre-Entreprise" href="http://www.libre-entreprise.org/"/>
+ </links>
<breadcrumbs>
<item name="${project.name}" href="index.html" />
@@ -57,5 +96,24 @@
<menu ref="reports"/>
<menu ref="modules"/>
+
+ <footer>
+
+ <script type="text/javascript"
+ src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js">
+ </script>
+
+ <div id='projectMetas'
+ projectversion='${project.version}'
+ platform='${project.platform}'
+ projectid='${project.projectId}'
+ scm='${project.scm.connection}'
+ scmwebeditorenabled='${project.scmwebeditorEnabled}'
+ scmwebeditorurl='${project.scmwebeditorUrl}'
+ siteSourcesType='${project.siteSourcesType}'
+ piwikEnabled='${project.piwikEnabled}'
+ piwikId='${project.piwikId}'>
+ </div>
+ </footer>
</body>
</project>
Modified: trunk/jaxx-runtime/src/site/site_fr.xml
===================================================================
--- trunk/jaxx-runtime/src/site/site_fr.xml 2012-03-21 12:03:25 UTC (rev 2322)
+++ trunk/jaxx-runtime/src/site/site_fr.xml 2012-05-30 17:46:08 UTC (rev 2323)
@@ -32,7 +32,46 @@
<href>index.html</href>
</bannerLeft>
+ <bannerRight>
+ <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src>
+ <href>http://www.codelutin.com</href>
+ </bannerRight>
+
+ <skin>
+ <groupId>org.apache.maven.skins</groupId>
+ <artifactId>maven-fluido-skin</artifactId>
+ <version>1.2.1</version>
+ </skin>
+
+ <custom>
+ <fluidoSkin>
+ <topBarEnabled>true</topBarEnabled>
+ <googleSearch/>
+ <sideBarEnabled>false</sideBarEnabled>
+ <searchEnabled>true</searchEnabled>
+ <sourceLineNumbersEnabled>true</sourceLineNumbersEnabled>
+ </fluidoSkin>
+ </custom>
+
+ <publishDate position="right" format="dd/MM/yyyy"/>
+ <version position="right"/>
+
+ <poweredBy>
+ <logo href="http://maven.apache.org" name="Maven"
+ img="${project.url}/images/logos/maven-feather.png"/>
+ <logo href="http://maven-site.nuiton.org/jrst" name="JRst"
+ img="http://maven-site.nuiton.org/public/images/jrst-logo.png"/>
+ <logo href="http://docutils.sourceforge.net/rst.html"
+ name="ReStructuredText"
+ img="http://maven-site.nuiton.org/public/images/restructuredtext-logo.png"/>
+ </poweredBy>
+
<body>
+ <links>
+ <item name="nuiton.org" href="http://www.nuiton.org"/>
+ <item name="CodeLutin" href="http://codelutin.com"/>
+ <item name="Libre-Entreprise" href="http://www.libre-entreprise.org/"/>
+ </links>
<breadcrumbs>
<item name="${project.name}" href="index.html" />
@@ -48,5 +87,24 @@
<menu ref="modules"/>
+ <footer>
+
+ <script type="text/javascript"
+ src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js">
+ </script>
+
+ <div id='projectMetas'
+ projectversion='${project.version}'
+ platform='${project.platform}'
+ projectid='${project.projectId}'
+ scm='${project.scm.connection}'
+ scmwebeditorenabled='${project.scmwebeditorEnabled}'
+ scmwebeditorurl='${project.scmwebeditorUrl}'
+ siteSourcesType='${project.siteSourcesType}'
+ piwikEnabled='${project.piwikEnabled}'
+ piwikId='${project.piwikId}'>
+ </div>
+ </footer>
+
</body>
</project>
Modified: trunk/jaxx-swing-action/src/site/site_fr.xml
===================================================================
--- trunk/jaxx-swing-action/src/site/site_fr.xml 2012-03-21 12:03:25 UTC (rev 2322)
+++ trunk/jaxx-swing-action/src/site/site_fr.xml 2012-05-30 17:46:08 UTC (rev 2323)
@@ -32,7 +32,36 @@
<href>index.html</href>
</bannerLeft>
+ <bannerRight>
+ <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src>
+ <href>http://www.codelutin.com</href>
+ </bannerRight>
+
+ <skin>
+ <groupId>org.apache.maven.skins</groupId>
+ <artifactId>maven-fluido-skin</artifactId>
+ <version>1.2.1</version>
+ </skin>
+
+ <custom>
+ <fluidoSkin>
+ <topBarEnabled>true</topBarEnabled>
+ <googleSearch/>
+ <sideBarEnabled>false</sideBarEnabled>
+ <searchEnabled>true</searchEnabled>
+ <sourceLineNumbersEnabled>true</sourceLineNumbersEnabled>
+ </fluidoSkin>
+ </custom>
+
+ <publishDate position="right" format="dd/MM/yyyy"/>
+ <version position="right"/>
+
<body>
+ <links>
+ <item name="nuiton.org" href="http://www.nuiton.org"/>
+ <item name="CodeLutin" href="http://codelutin.com"/>
+ <item name="Libre-Entreprise" href="http://www.libre-entreprise.org/"/>
+ </links>
<breadcrumbs>
<item name="${project.name}" href="index.html" />
@@ -46,5 +75,24 @@
<menu ref="modules"/>
+ <footer>
+
+ <script type="text/javascript"
+ src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js">
+ </script>
+
+ <div id='projectMetas'
+ projectversion='${project.version}'
+ platform='${project.platform}'
+ projectid='${project.projectId}'
+ scm='${project.scm.connection}'
+ scmwebeditorenabled='${project.scmwebeditorEnabled}'
+ scmwebeditorurl='${project.scmwebeditorUrl}'
+ siteSourcesType='${project.siteSourcesType}'
+ piwikEnabled='${project.piwikEnabled}'
+ piwikId='${project.piwikId}'>
+ </div>
+ </footer>
+
</body>
</project>
Modified: trunk/jaxx-tutorial/src/site/site_fr.xml
===================================================================
--- trunk/jaxx-tutorial/src/site/site_fr.xml 2012-03-21 12:03:25 UTC (rev 2322)
+++ trunk/jaxx-tutorial/src/site/site_fr.xml 2012-05-30 17:46:08 UTC (rev 2323)
@@ -34,7 +34,36 @@
<href>index.html</href>
</bannerLeft>
+ <bannerRight>
+ <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src>
+ <href>http://www.codelutin.com</href>
+ </bannerRight>
+
+ <skin>
+ <groupId>org.apache.maven.skins</groupId>
+ <artifactId>maven-fluido-skin</artifactId>
+ <version>1.2.1</version>
+ </skin>
+
+ <custom>
+ <fluidoSkin>
+ <topBarEnabled>true</topBarEnabled>
+ <googleSearch/>
+ <sideBarEnabled>false</sideBarEnabled>
+ <searchEnabled>true</searchEnabled>
+ <sourceLineNumbersEnabled>true</sourceLineNumbersEnabled>
+ </fluidoSkin>
+ </custom>
+
+ <publishDate position="right" format="dd/MM/yyyy"/>
+ <version position="right"/>
+
<body>
+ <links>
+ <item name="nuiton.org" href="http://www.nuiton.org"/>
+ <item name="CodeLutin" href="http://codelutin.com"/>
+ <item name="Libre-Entreprise" href="http://www.libre-entreprise.org/"/>
+ </links>
<breadcrumbs>
<item name="${project.name}" href="index.html" />
@@ -48,5 +77,24 @@
<menu ref="modules"/>
+ <footer>
+
+ <script type="text/javascript"
+ src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js">
+ </script>
+
+ <div id='projectMetas'
+ projectversion='${project.version}'
+ platform='${project.platform}'
+ projectid='${project.projectId}'
+ scm='${project.scm.connection}'
+ scmwebeditorenabled='${project.scmwebeditorEnabled}'
+ scmwebeditorurl='${project.scmwebeditorUrl}'
+ siteSourcesType='${project.siteSourcesType}'
+ piwikEnabled='${project.piwikEnabled}'
+ piwikId='${project.piwikId}'>
+ </div>
+ </footer>
+
</body>
</project>
Modified: trunk/jaxx-tutorial-config/src/site/site_fr.xml
===================================================================
--- trunk/jaxx-tutorial-config/src/site/site_fr.xml 2012-03-21 12:03:25 UTC (rev 2322)
+++ trunk/jaxx-tutorial-config/src/site/site_fr.xml 2012-05-30 17:46:08 UTC (rev 2323)
@@ -32,7 +32,36 @@
<href>index.html</href>
</bannerLeft>
+ <bannerRight>
+ <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src>
+ <href>http://www.codelutin.com</href>
+ </bannerRight>
+
+ <skin>
+ <groupId>org.apache.maven.skins</groupId>
+ <artifactId>maven-fluido-skin</artifactId>
+ <version>1.2.1</version>
+ </skin>
+
+ <custom>
+ <fluidoSkin>
+ <topBarEnabled>true</topBarEnabled>
+ <googleSearch/>
+ <sideBarEnabled>false</sideBarEnabled>
+ <searchEnabled>true</searchEnabled>
+ <sourceLineNumbersEnabled>true</sourceLineNumbersEnabled>
+ </fluidoSkin>
+ </custom>
+
+ <publishDate position="right" format="dd/MM/yyyy"/>
+ <version position="right"/>
+
<body>
+ <links>
+ <item name="nuiton.org" href="http://www.nuiton.org"/>
+ <item name="CodeLutin" href="http://codelutin.com"/>
+ <item name="Libre-Entreprise" href="http://www.libre-entreprise.org/"/>
+ </links>
<breadcrumbs>
<item name="${project.name}" href="index.html"/>
@@ -45,5 +74,24 @@
<item name="Lancer la démo" href="jnlp/launch.jnlp"/>
</menu>
+ <footer>
+
+ <script type="text/javascript"
+ src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js">
+ </script>
+
+ <div id='projectMetas'
+ projectversion='${project.version}'
+ platform='${project.platform}'
+ projectid='${project.projectId}'
+ scm='${project.scm.connection}'
+ scmwebeditorenabled='${project.scmwebeditorEnabled}'
+ scmwebeditorurl='${project.scmwebeditorUrl}'
+ siteSourcesType='${project.siteSourcesType}'
+ piwikEnabled='${project.piwikEnabled}'
+ piwikId='${project.piwikId}'>
+ </div>
+ </footer>
+
</body>
</project>
Modified: trunk/jaxx-tutorial-css/src/site/site_fr.xml
===================================================================
--- trunk/jaxx-tutorial-css/src/site/site_fr.xml 2012-03-21 12:03:25 UTC (rev 2322)
+++ trunk/jaxx-tutorial-css/src/site/site_fr.xml 2012-05-30 17:46:08 UTC (rev 2323)
@@ -32,7 +32,36 @@
<href>index.html</href>
</bannerLeft>
+ <bannerRight>
+ <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src>
+ <href>http://www.codelutin.com</href>
+ </bannerRight>
+
+ <skin>
+ <groupId>org.apache.maven.skins</groupId>
+ <artifactId>maven-fluido-skin</artifactId>
+ <version>1.2.1</version>
+ </skin>
+
+ <custom>
+ <fluidoSkin>
+ <topBarEnabled>true</topBarEnabled>
+ <googleSearch/>
+ <sideBarEnabled>false</sideBarEnabled>
+ <searchEnabled>true</searchEnabled>
+ <sourceLineNumbersEnabled>true</sourceLineNumbersEnabled>
+ </fluidoSkin>
+ </custom>
+
+ <publishDate position="right" format="dd/MM/yyyy"/>
+ <version position="right"/>
+
<body>
+ <links>
+ <item name="nuiton.org" href="http://www.nuiton.org"/>
+ <item name="CodeLutin" href="http://codelutin.com"/>
+ <item name="Libre-Entreprise" href="http://www.libre-entreprise.org/"/>
+ </links>
<breadcrumbs>
<item name="${project.name}" href="index.html"/>
@@ -45,5 +74,24 @@
<item name="Lancer la démo" href="jnlp/launch.jnlp"/>
</menu>
+ <footer>
+
+ <script type="text/javascript"
+ src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js">
+ </script>
+
+ <div id='projectMetas'
+ projectversion='${project.version}'
+ platform='${project.platform}'
+ projectid='${project.projectId}'
+ scm='${project.scm.connection}'
+ scmwebeditorenabled='${project.scmwebeditorEnabled}'
+ scmwebeditorurl='${project.scmwebeditorUrl}'
+ siteSourcesType='${project.siteSourcesType}'
+ piwikEnabled='${project.piwikEnabled}'
+ piwikId='${project.piwikId}'>
+ </div>
+ </footer>
+
</body>
</project>
Modified: trunk/jaxx-tutorial-databinding/src/site/site_fr.xml
===================================================================
--- trunk/jaxx-tutorial-databinding/src/site/site_fr.xml 2012-03-21 12:03:25 UTC (rev 2322)
+++ trunk/jaxx-tutorial-databinding/src/site/site_fr.xml 2012-05-30 17:46:08 UTC (rev 2323)
@@ -32,7 +32,36 @@
<href>index.html</href>
</bannerLeft>
+ <bannerRight>
+ <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src>
+ <href>http://www.codelutin.com</href>
+ </bannerRight>
+
+ <skin>
+ <groupId>org.apache.maven.skins</groupId>
+ <artifactId>maven-fluido-skin</artifactId>
+ <version>1.2.1</version>
+ </skin>
+
+ <custom>
+ <fluidoSkin>
+ <topBarEnabled>true</topBarEnabled>
+ <googleSearch/>
+ <sideBarEnabled>false</sideBarEnabled>
+ <searchEnabled>true</searchEnabled>
+ <sourceLineNumbersEnabled>true</sourceLineNumbersEnabled>
+ </fluidoSkin>
+ </custom>
+
+ <publishDate position="right" format="dd/MM/yyyy"/>
+ <version position="right"/>
+
<body>
+ <links>
+ <item name="nuiton.org" href="http://www.nuiton.org"/>
+ <item name="CodeLutin" href="http://codelutin.com"/>
+ <item name="Libre-Entreprise" href="http://www.libre-entreprise.org/"/>
+ </links>
<breadcrumbs>
<item name="${project.name}" href="index.html"/>
@@ -45,5 +74,24 @@
<item name="Lancer la démo" href="jnlp/launch.jnlp"/>
</menu>
+ <footer>
+
+ <script type="text/javascript"
+ src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js">
+ </script>
+
+ <div id='projectMetas'
+ projectversion='${project.version}'
+ platform='${project.platform}'
+ projectid='${project.projectId}'
+ scm='${project.scm.connection}'
+ scmwebeditorenabled='${project.scmwebeditorEnabled}'
+ scmwebeditorurl='${project.scmwebeditorUrl}'
+ siteSourcesType='${project.siteSourcesType}'
+ piwikEnabled='${project.piwikEnabled}'
+ piwikId='${project.piwikId}'>
+ </div>
+ </footer>
+
</body>
</project>
Modified: trunk/jaxx-tutorial-helloworld/src/site/site_fr.xml
===================================================================
--- trunk/jaxx-tutorial-helloworld/src/site/site_fr.xml 2012-03-21 12:03:25 UTC (rev 2322)
+++ trunk/jaxx-tutorial-helloworld/src/site/site_fr.xml 2012-05-30 17:46:08 UTC (rev 2323)
@@ -32,7 +32,36 @@
<href>index.html</href>
</bannerLeft>
+ <bannerRight>
+ <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src>
+ <href>http://www.codelutin.com</href>
+ </bannerRight>
+
+ <skin>
+ <groupId>org.apache.maven.skins</groupId>
+ <artifactId>maven-fluido-skin</artifactId>
+ <version>1.2.1</version>
+ </skin>
+
+ <custom>
+ <fluidoSkin>
+ <topBarEnabled>true</topBarEnabled>
+ <googleSearch/>
+ <sideBarEnabled>false</sideBarEnabled>
+ <searchEnabled>true</searchEnabled>
+ <sourceLineNumbersEnabled>true</sourceLineNumbersEnabled>
+ </fluidoSkin>
+ </custom>
+
+ <publishDate position="right" format="dd/MM/yyyy"/>
+ <version position="right"/>
+
<body>
+ <links>
+ <item name="nuiton.org" href="http://www.nuiton.org"/>
+ <item name="CodeLutin" href="http://codelutin.com"/>
+ <item name="Libre-Entreprise" href="http://www.libre-entreprise.org/"/>
+ </links>
<breadcrumbs>
<item name="${project.name}" href="index.html"/>
@@ -45,5 +74,24 @@
<item name="Lancer la démo" href="jnlp/launch.jnlp"/>
</menu>
+ <footer>
+
+ <script type="text/javascript"
+ src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js">
+ </script>
+
+ <div id='projectMetas'
+ projectversion='${project.version}'
+ platform='${project.platform}'
+ projectid='${project.projectId}'
+ scm='${project.scm.connection}'
+ scmwebeditorenabled='${project.scmwebeditorEnabled}'
+ scmwebeditorurl='${project.scmwebeditorUrl}'
+ siteSourcesType='${project.siteSourcesType}'
+ piwikEnabled='${project.piwikEnabled}'
+ piwikId='${project.piwikId}'>
+ </div>
+ </footer>
+
</body>
</project>
Modified: trunk/jaxx-tutorial-helloworld2/src/site/site_fr.xml
===================================================================
--- trunk/jaxx-tutorial-helloworld2/src/site/site_fr.xml 2012-03-21 12:03:25 UTC (rev 2322)
+++ trunk/jaxx-tutorial-helloworld2/src/site/site_fr.xml 2012-05-30 17:46:08 UTC (rev 2323)
@@ -32,7 +32,36 @@
<href>index.html</href>
</bannerLeft>
+ <bannerRight>
+ <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src>
+ <href>http://www.codelutin.com</href>
+ </bannerRight>
+
+ <skin>
+ <groupId>org.apache.maven.skins</groupId>
+ <artifactId>maven-fluido-skin</artifactId>
+ <version>1.2.1</version>
+ </skin>
+
+ <custom>
+ <fluidoSkin>
+ <topBarEnabled>true</topBarEnabled>
+ <googleSearch/>
+ <sideBarEnabled>false</sideBarEnabled>
+ <searchEnabled>true</searchEnabled>
+ <sourceLineNumbersEnabled>true</sourceLineNumbersEnabled>
+ </fluidoSkin>
+ </custom>
+
+ <publishDate position="right" format="dd/MM/yyyy"/>
+ <version position="right"/>
+
<body>
+ <links>
+ <item name="nuiton.org" href="http://www.nuiton.org"/>
+ <item name="CodeLutin" href="http://codelutin.com"/>
+ <item name="Libre-Entreprise" href="http://www.libre-entreprise.org/"/>
+ </links>
<breadcrumbs>
<item name="${project.name}" href="index.html"/>
@@ -45,5 +74,24 @@
<item name="Lancer la démo" href="jnlp/launch.jnlp"/>
</menu>
+ <footer>
+
+ <script type="text/javascript"
+ src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js">
+ </script>
+
+ <div id='projectMetas'
+ projectversion='${project.version}'
+ platform='${project.platform}'
+ projectid='${project.projectId}'
+ scm='${project.scm.connection}'
+ scmwebeditorenabled='${project.scmwebeditorEnabled}'
+ scmwebeditorurl='${project.scmwebeditorUrl}'
+ siteSourcesType='${project.siteSourcesType}'
+ piwikEnabled='${project.piwikEnabled}'
+ piwikId='${project.piwikId}'>
+ </div>
+ </footer>
+
</body>
</project>
Modified: trunk/jaxx-tutorial-validation/src/site/site_fr.xml
===================================================================
--- trunk/jaxx-tutorial-validation/src/site/site_fr.xml 2012-03-21 12:03:25 UTC (rev 2322)
+++ trunk/jaxx-tutorial-validation/src/site/site_fr.xml 2012-05-30 17:46:08 UTC (rev 2323)
@@ -32,7 +32,36 @@
<href>index.html</href>
</bannerLeft>
+ <bannerRight>
+ <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src>
+ <href>http://www.codelutin.com</href>
+ </bannerRight>
+
+ <skin>
+ <groupId>org.apache.maven.skins</groupId>
+ <artifactId>maven-fluido-skin</artifactId>
+ <version>1.2.1</version>
+ </skin>
+
+ <custom>
+ <fluidoSkin>
+ <topBarEnabled>true</topBarEnabled>
+ <googleSearch/>
+ <sideBarEnabled>false</sideBarEnabled>
+ <searchEnabled>true</searchEnabled>
+ <sourceLineNumbersEnabled>true</sourceLineNumbersEnabled>
+ </fluidoSkin>
+ </custom>
+
+ <publishDate position="right" format="dd/MM/yyyy"/>
+ <version position="right"/>
+
<body>
+ <links>
+ <item name="nuiton.org" href="http://www.nuiton.org"/>
+ <item name="CodeLutin" href="http://codelutin.com"/>
+ <item name="Libre-Entreprise" href="http://www.libre-entreprise.org/"/>
+ </links>
<breadcrumbs>
<item name="${project.name}" href="index.html"/>
@@ -45,5 +74,24 @@
<item name="Lancer la démo" href="jnlp/launch.jnlp"/>
</menu>
+ <footer>
+
+ <script type="text/javascript"
+ src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js">
+ </script>
+
+ <div id='projectMetas'
+ projectversion='${project.version}'
+ platform='${project.platform}'
+ projectid='${project.projectId}'
+ scm='${project.scm.connection}'
+ scmwebeditorenabled='${project.scmwebeditorEnabled}'
+ scmwebeditorurl='${project.scmwebeditorUrl}'
+ siteSourcesType='${project.siteSourcesType}'
+ piwikEnabled='${project.piwikEnabled}'
+ piwikId='${project.piwikId}'>
+ </div>
+ </footer>
+
</body>
</project>
Modified: trunk/jaxx-validator/src/site/site_fr.xml
===================================================================
--- trunk/jaxx-validator/src/site/site_fr.xml 2012-03-21 12:03:25 UTC (rev 2322)
+++ trunk/jaxx-validator/src/site/site_fr.xml 2012-05-30 17:46:08 UTC (rev 2323)
@@ -32,7 +32,46 @@
<href>index.html</href>
</bannerLeft>
+ <bannerRight>
+ <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src>
+ <href>http://www.codelutin.com</href>
+ </bannerRight>
+
+ <skin>
+ <groupId>org.apache.maven.skins</groupId>
+ <artifactId>maven-fluido-skin</artifactId>
+ <version>1.2.1</version>
+ </skin>
+
+ <custom>
+ <fluidoSkin>
+ <topBarEnabled>true</topBarEnabled>
+ <googleSearch/>
+ <sideBarEnabled>false</sideBarEnabled>
+ <searchEnabled>true</searchEnabled>
+ <sourceLineNumbersEnabled>true</sourceLineNumbersEnabled>
+ </fluidoSkin>
+ </custom>
+
+ <publishDate position="right" format="dd/MM/yyyy"/>
+ <version position="right"/>
+
+ <poweredBy>
+ <logo href="http://maven.apache.org" name="Maven"
+ img="${project.url}/images/logos/maven-feather.png"/>
+ <logo href="http://maven-site.nuiton.org/jrst" name="JRst"
+ img="http://maven-site.nuiton.org/public/images/jrst-logo.png"/>
+ <logo href="http://docutils.sourceforge.net/rst.html"
+ name="ReStructuredText"
+ img="http://maven-site.nuiton.org/public/images/restructuredtext-logo.png"/>
+ </poweredBy>
+
<body>
+ <links>
+ <item name="nuiton.org" href="http://www.nuiton.org"/>
+ <item name="CodeLutin" href="http://codelutin.com"/>
+ <item name="Libre-Entreprise" href="http://www.libre-entreprise.org/"/>
+ </links>
<breadcrumbs>
<item name="${project.name}" href="index.html" />
@@ -46,5 +85,24 @@
<menu ref="modules"/>
+ <footer>
+
+ <script type="text/javascript"
+ src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js">
+ </script>
+
+ <div id='projectMetas'
+ projectversion='${project.version}'
+ platform='${project.platform}'
+ projectid='${project.projectId}'
+ scm='${project.scm.connection}'
+ scmwebeditorenabled='${project.scmwebeditorEnabled}'
+ scmwebeditorurl='${project.scmwebeditorUrl}'
+ siteSourcesType='${project.siteSourcesType}'
+ piwikEnabled='${project.piwikEnabled}'
+ piwikId='${project.piwikId}'>
+ </div>
+ </footer>
+
</body>
</project>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2012-03-21 12:03:25 UTC (rev 2322)
+++ trunk/pom.xml 2012-05-30 17:46:08 UTC (rev 2323)
@@ -36,7 +36,7 @@
<parent>
<groupId>org.nuiton</groupId>
<artifactId>mavenpom4redmineAndCentral</artifactId>
- <version>3.2</version>
+ <version>3.3.2</version>
</parent>
<artifactId>jaxx</artifactId>
@@ -55,7 +55,7 @@
<developer>
<name>Tony Chemit</name>
<id>tchemit</id>
- <email>chemit(a)codelutin.com</email>
+ <email>chemit at codelutin dot com</email>
<organization>CodeLutin</organization>
<timezone>+2</timezone>
<roles>
@@ -66,7 +66,7 @@
<developer>
<name>Sylvain Letellier</name>
<id>sletellier</id>
- <email>letellier(a)codelutin.com</email>
+ <email>letellier at codelutin dot com</email>
<organization>CodeLutin</organization>
<timezone>+2</timezone>
<roles>
@@ -77,13 +77,24 @@
<developer>
<name>Jean Couteau</name>
<id>jcouteau</id>
- <email>couteau(a)codelutin.com</email>
+ <email>couteau at codelutin dot com</email>
<organization>CodeLutin</organization>
<timezone>+2</timezone>
<roles>
<role>Technical Writer</role>
</roles>
</developer>
+
+ <developer>
+ <name>Yannick Martel</name>
+ <id>ymartel</id>
+ <email>martel at codelutin dot com</email>
+ <organization>CodeLutin</organization>
+ <timezone>+2</timezone>
+ <roles>
+ <role>Developer</role>
+ </roles>
+ </developer>
</developers>
@@ -580,6 +591,56 @@
</profile>
+ <!-- reporting at release time -->
+ <profile>
+ <id>reporting</id>
+ <activation>
+ <property>
+ <name>performRelease</name>
+ <value>true</value>
+ </property>
+ </activation>
+
+ <reporting>
+ <plugins>
+
+ <plugin>
+ <artifactId>maven-plugin-plugin</artifactId>
+ <version>${pluginPluginVersion}</version>
+ </plugin>
+
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>cobertura-maven-plugin</artifactId>
+ <version>${coberturaPluginVersion}</version>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>${projectInfoReportsPluginVersion}</version>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>project-team</report>
+ <report>mailing-list</report>
+ <report>cim</report>
+ <report>issue-tracking</report>
+ <report>license</report>
+ <report>scm</report>
+ <report>dependencies</report>
+ <report>dependency-convergence</report>
+ <report>plugin-management</report>
+ <report>plugins</report>
+ <report>dependency-management</report>
+ <report>summary</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+ </plugins>
+ </reporting>
+ </profile>
+
</profiles>
</project>
Modified: trunk/src/site/site_fr.xml
===================================================================
--- trunk/src/site/site_fr.xml 2012-03-21 12:03:25 UTC (rev 2322)
+++ trunk/src/site/site_fr.xml 2012-05-30 17:46:08 UTC (rev 2323)
@@ -32,6 +32,30 @@
<href>index.html</href>
</bannerLeft>
+ <bannerRight>
+ <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src>
+ <href>http://www.codelutin.com</href>
+ </bannerRight>
+
+ <skin>
+ <groupId>org.apache.maven.skins</groupId>
+ <artifactId>maven-fluido-skin</artifactId>
+ <version>1.2.1</version>
+ </skin>
+
+ <custom>
+ <fluidoSkin>
+ <topBarEnabled>true</topBarEnabled>
+ <googleSearch/>
+ <sideBarEnabled>false</sideBarEnabled>
+ <searchEnabled>true</searchEnabled>
+ <sourceLineNumbersEnabled>true</sourceLineNumbersEnabled>
+ </fluidoSkin>
+ </custom>
+
+ <publishDate position="right" format="dd/MM/yyyy"/>
+ <version position="right"/>
+
<poweredBy>
<logo href="http://maven.apache.org" name="Maven"
img="${project.url}/images/logos/maven-feather.png"/>
@@ -44,6 +68,9 @@
<body>
<links>
+ <item name="nuiton.org" href="http://www.nuiton.org"/>
+ <item name="CodeLutin" href="http://codelutin.com"/>
+ <item name="Libre-Entreprise" href="http://www.libre-entreprise.org/"/>
<item name="original JAXX"
href="http://buix.labs.libre-entreprise.org/original-jaxx"/>
</links>
@@ -95,5 +122,24 @@
<menu ref="reports"/>
+
+ <footer>
+
+ <script type="text/javascript"
+ src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js">
+ </script>
+
+ <div id='projectMetas'
+ projectversion='${project.version}'
+ platform='${project.platform}'
+ projectid='${project.projectId}'
+ scm='${project.scm.connection}'
+ scmwebeditorenabled='${project.scmwebeditorEnabled}'
+ scmwebeditorurl='${project.scmwebeditorUrl}'
+ siteSourcesType='${project.siteSourcesType}'
+ piwikEnabled='${project.piwikEnabled}'
+ piwikId='${project.piwikId}'>
+ </div>
+ </footer>
</body>
</project>
1
0
Author: maven-release
Date: 2012-03-20 09:21:32 +0100 (Tue, 20 Mar 2012)
New Revision: 2321
Url: http://nuiton.org/repositories/revision/jaxx/2321
Log:
Revert commit r2320
Modified:
trunk/src/site/rst/index.rst
Modified: trunk/src/site/rst/index.rst
===================================================================
--- trunk/src/site/rst/index.rst 2012-03-20 05:00:21 UTC (rev 2320)
+++ trunk/src/site/rst/index.rst 2012-03-20 08:21:32 UTC (rev 2321)
@@ -1 +1,345 @@
-X4wF8m <a href="http://qowxzzueegjk.com/">qowxzzueegjk</a>, [url=http://obfgmgmjsmir.com/]obfgmgmjsmir[/url] [link=http://qzznhhndnmrk.com/]qzznhhndnmrk[/link] http://wnoszsorrfit.com/
\ No newline at end of file
+.. -
+.. * #%L
+.. * JAXX
+.. *
+.. * $Id$
+.. * $HeadURL$
+.. * %%
+.. * Copyright (C) 2008 - 2010 CodeLutin
+.. * %%
+.. * This program is free software: you can redistribute it and/or modify
+.. * it under the terms of the GNU Lesser General Public License as
+.. * published by the Free Software Foundation, either version 3 of the
+.. * License, or (at your option) any later version.
+.. *
+.. * This program is distributed in the hope that it will be useful,
+.. * but WITHOUT ANY WARRANTY; without even the implied warranty of
+.. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+.. * GNU General Lesser Public License for more details.
+.. *
+.. * You should have received a copy of the GNU General Lesser Public
+.. * License along with this program. If not, see
+.. * <http://www.gnu.org/licenses/lgpl-3.0.html>.
+.. * #L%
+.. -
+JAXX
+====
+
+.. contents::
+
+Presentation
+------------
+
+JAXX is a framework that allows you to build Swing User Interface in XML.
+
+JAXX documentation is in French, we are planning to update it and make an
+english translation at the same time. To help you wait, you can have a look to
+the demo_.
+
+Nouveautés de la version 2.5
+----------------------------
+
+Changement de l'artifactId du plugin
+____________________________________
+
+Avant la version 2.4, l'artifactId du plugin était **maven-jaxx-plugin**, mais
+Maven depuis la version 3 demande que nous utilisions plutôt
+**jaxx-maven-plugin** car à terme la première forme d'artifactId ne sera plus
+acceptée que pour les projets de maven.
+
+Pour plus d'information sur comment utiliser le plugin, veuillez visiter la
+`page des goals`_
+
+Nouveautés de la version 2.4
+----------------------------
+
+Amélioration des imports
+________________________
+
+La version 2.4 fait le ménage dans le code généré par JAXX en se rapprochant du
+projet eugene_.
+
+Toute la génération n'est pas encore basée sur Eugene mais cela viendra avant la
+version 3.
+
+JAXX n'utilise plus des imports de paquetaques (import avec *), il est donc
+désormais (enfin...) possible d'utiliser dans les scripts directement un import
+sur *java.util.List*.
+
+Le fait de ne plus importer des paquetages a des impacts et pourrait rendre
+votre code non compilable.
+
+Pour reproduire la génération comme en version *2.3*, il suffit de renseigner
+dans la configuration du plugin la propriété *extraImportList* avec les valeurs
+suivantes :
+
+::
+
+ <extraImportList>
+ java.awt.*
+ javax.swing.*
+ javax.swing.event.*
+ java.util.*
+ </extraImportList>
+
+Il est cependant déconseillé de laisser une telle configuration car le fait
+d'utiliser des paquetages au lieu de noms de classes précises alourdit les
+temps du compilateur JAXX et génère du code de moins bonne qualité...
+
+D'ici la version *3.0* on écrira une documentation précise de fonctionnement du
+compilateur et on va faire une différence entre les namespaces utilisés pour
+trouver les objets correspondants au tags d'un fichier jaxx et les imports d'une
+classe java à générer. Actuellement les deux concepts sont mélangés.
+
+Utilisation de JXLayer 3.0.4
+____________________________
+
+L'utilisation de cette mise à jour (à partir de la 3.0.3) a des impacts car
+l'api a été modifiée et n'est plus compatible... Il s'agit en fait de
+modification des generics sur JXLayer, vous devrez peut-être modifier votre code
+pour qu'il compile.
+
+Nouveautés de la version 2.3
+----------------------------
+
+Validation
+__________
+
+JAXX se base désormais sur la librarie nuiton-validator_ (qui a été extraite de
+jaxx).
+
+Cela a entrainé un certain nombre de modification dans l'api de jaxx. Notamment :
+
+- Les validateurs ont changé de packages et sont dans l'autre librairie : il
+ faut donc modifier dans son validators.xml les fqn des validateurs en question.
+ Un exemple est donné dans le module **jaxx-demo** ou
+ **jaxx-tutorial-validation**.
+
+- Réécriture de l'api de validation (on travaille désormais par annotation pour
+ spécifier les validateurs d'un GUI ainsi que les champs à valider).
+
+- L'api SwingValidator a été modifiée sans conserver les anciennes signatures
+ car les propriétés en question (contextName devient context) sont des
+ propriétés de type JavaBean et la maintenance de l'ancienne et la nouvelle
+ api aurait été trop compliquée et confuse.
+
+Dans la version 2.3.x ou 2.4 une documentation complête va être écrite
+concernant l'utilisation de la validation avec JAXX, en attendant un nouveau
+tutorial jaxx-tutorial-validation a été écrit pour aider un peu (seul
+l'application est écrite, sans documentation pour le moment...) et la page
+suivante : BeanValidator_
+
+Amélioration du générateur
+__________________________
+
+Le compilateur JAXX est désormais capable plus facilement de générer des
+annotations sur les champs et les méthodes.
+
+Montées de version
+__________________
+
+Un certain nombre de librairies ont été montées de version, notamment
+**nuiton-i18n** en version 2.2. Veuillez bien utiliser au moins cette version
+car cela peut casser l'éxécution au runtime sinon.
+
+
+Nouveautés de la version 2.2.4
+------------------------------
+
+Nouveau module de validation
+____________________________
+
+Un nouveau module a été crée **jaxx-validator** qui regroupe tout ce qui
+concerne le framework de validation proposé par JAXX (anciennement quand **jaxx-runtime**).
+
+Toute l'api de neutre non lié à JAXX a été dépréciée et sera supprimer en version
+*2.3* pour utiliser celle de nuiton-validator (qui récupère le code).
+
+A noter que le module **jaxx-runtime** n'est plus exposé en classifier **tests**
+mais **jaxx-validator** l'est (pour pouvoir utiliser les tests abstraits sur
+les validateurs).
+
+Utilisation de i18n 2.0
+_______________________
+
+En utilisant **i18n 2.0**, on a des bundles de traductions compatible
+**ResourceBundle**, ceci étant dit il faut que vous utilisiez aussi cette
+version de i18n sinon il ne pourra pas utiliser les traductions offertes par
+jaxx.
+
+Nouveautés de la version 2.1
+----------------------------
+
+Introduction d'un nouveau tag **import**
+________________________________________
+
+Ce tag simplifie la gestion des imports.
+
+Chaque ligne correspond à un import à effectuer.
+
+Exemple :
+
+::
+ <import>
+ java.io.File
+ static java.io.File.separatorChar
+ </import>
+
+Voir http://nuiton.org/issues/show/685
+
+Meilleure gestion de l'héritage
+_______________________________
+
+La gestion de l'héritage a été amélioré.
+
+On peut désormais surcharger un tag dans un fichier jaxx fils, le getter surchargé
+sera bien généré.
+
+Si aucun initializer n'est renseigné (constructorParams, javabean, initializer)
+alors rien de plus ne sera généré.
+
+De plus pour les bindings, on doit utiliser la propriété surchargée et non pas
+l'accesseur sur la propriété.
+
+Lors de la génération, l'accesseur sera utilisé à la place de la propriété.
+
+WARNING::
+ Cette évolution admet une restriction : si on veut surcharger un
+ component swing, on DOIT alors toujours lui préciser un initializer, sinon le
+ component surchargé ne sera pas généré et à l'exécution on risque d'avoir un
+ *ClassCastException* si le type n'est pas le même.
+
+Une documentation plus détaillée sur le mécanisme d'héritage sera écrite pour la
+version 2.2.
+
+
+Voir
+
+ * http://nuiton.org/issues/show/625
+ * http://nuiton.org/issues/show/626
+
+Nouvelle api d'arbre
+____________________
+
+Le package *jaxx.runtime.swing.tree** contient une api simplifié pour créer des
+arbres qui savent se charger tout seul.
+
+Cette api remplace celle du package **jaxx.runtime.swing.navigation**.
+
+Voir http://nuiton.org/issues/show/666
+
+Nouvelle api d'assistant
+________________________
+
+Le package *jaxx.runtime.swing.wizard.ext** contient une nouvelle api simplifié
+pour créer des assitants avec des modèles attachés aux étapes.
+
+Cette api remplace celle du **jaxx.runtime.swing.wizard.WizardOperationXXX**.
+
+Voir http://nuiton.org/issues/show/665
+
+Ajout de tutoriaux
+__________________
+
+JAXX intègre désormais des tutoriaux.
+
+Voir
+
+ * http://nuiton.org/issues/show/640
+ * http://nuiton.org/issues/show/641
+ * http://nuiton.org/issues/show/642
+
+Présentation
+------------
+
+JAXX est un framework qui vous permet de créer des interfaces utilisateur Swing
+à partir de fichiers de description en XML. La documentation n'est plus à jour.
+En attendant la mise à jour de la documentation (en cours), vous pouvez vous
+reporter à la demo_ .
+
+.. TODO A faire car plus a jour...
+
+Le projet JAXX ...
+
+
+Depuis la version 1.0, et en prévision de nouveaux générateurs s'appuyant sur Jaxx,on a revu l'architecture du projet.
+
+Désormais, une séparation a été effectuée entre le code de compilation et le code d'exécution.
+
+Tout le code de compilation est en dépendance du plugin maven et vous ne devriez pas à avoir à vous en servir.
+
+Ce dont vous avez besoin dans vos dépendances sont uniquement les modules jaxx-runtime-xxx.
+
+.. TODO A finir la présentation de la nouvelle architecture (dans la version 1.2).
+
+**Veuillez consulter la JavaDoc pour de plus ample détails sur les différentes
+librairies.**
+
+Migration vers JAXX 2.0
+-----------------------
+
+La version 2.0 de JAXX n'est pas compatible avec les versions antérieures.
+
+Pour plus de détail consulter la page `Migration`_.
+
+Nouvelles fonctionnalités 2.0
+-----------------------------
+
+ * Core_
+
+ * I18n_
+
+ * JAXXContext_
+
+ * BeanValidator_
+
+ * NavigationModel_
+
+Qui utilise JAXX ?
+------------------
+
+Voici une liste de projets utilisant JAXX :
+
+ * Isis-fish_ - Logiciel de simulation de pêcheries complexes - GPL
+
+ * simExplorer-si_
+
+ * ObServe_ - Logiciel de saisie de données concernant la pèche thonière - GPL
+
+ * Lima_ - Logiciel de comptabilité française adaptée aux PME - GPL
+
+ * Vradi_ - Logiciel de traitement de flux XML - GPL
+
+ * Nuiton-i18n-editor
+
+.. TODO Finish this list and add icons
+
+.. _Isis-fish: http://www.isis-fish.org/
+
+.. _simExplorer-si: http://www.simexplorer.org
+
+.. _ObServe: http://maven-site.forge.codelutin.com/observe/
+
+.. _Lima: http://maven-site.chorem.org/lima/
+
+.. _Vradi: http://maven-site.forge.codelutin.com/vradi
+
+.. _Migration: ./migration.html
+
+.. _Core: ./Core.html
+
+.. _demo: ./jaxx-demo/index.html
+
+.. _I18n: ./I18n.html
+
+.. _JAXXContext: ./JAXXContext.html
+
+.. _BeanValidator: ./BeanValidator.html
+
+.. _NavigationModel: ./NavigationModel.html
+
+.. _nuiton-validator: http://maven-site.nuiton.org/nuiton-utils/nuiton-validator
+
+.. _eugene: http://maven-site.nuiton.org/eugene
+
+.. _page des goals: ./jaxx-maven-plugin/plugin-info.html
\ No newline at end of file
1
0
Author: bpoussin
Date: 2012-03-20 06:00:21 +0100 (Tue, 20 Mar 2012)
New Revision: 2320
Url: http://nuiton.org/repositories/revision/jaxx/2320
Log:
>From scmwebeditor -- X4wF8m <a href="http://qowxzzueegjk.com/">qowxzzueegjk</a>, [url=http://obfgmgmjsmir.com/]obfgmgmjsmir[/url] [link=http://qzznhhndnmrk.com/]qzznhhndnmrk[/link] http://wnoszsorrfit.com/
Modified:
trunk/src/site/rst/index.rst
Modified: trunk/src/site/rst/index.rst
===================================================================
--- trunk/src/site/rst/index.rst 2012-02-29 11:09:48 UTC (rev 2319)
+++ trunk/src/site/rst/index.rst 2012-03-20 05:00:21 UTC (rev 2320)
@@ -1,345 +1 @@
-.. -
-.. * #%L
-.. * JAXX
-.. *
-.. * $Id$
-.. * $HeadURL$
-.. * %%
-.. * Copyright (C) 2008 - 2010 CodeLutin
-.. * %%
-.. * This program is free software: you can redistribute it and/or modify
-.. * it under the terms of the GNU Lesser General Public License as
-.. * published by the Free Software Foundation, either version 3 of the
-.. * License, or (at your option) any later version.
-.. *
-.. * This program is distributed in the hope that it will be useful,
-.. * but WITHOUT ANY WARRANTY; without even the implied warranty of
-.. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-.. * GNU General Lesser Public License for more details.
-.. *
-.. * You should have received a copy of the GNU General Lesser Public
-.. * License along with this program. If not, see
-.. * <http://www.gnu.org/licenses/lgpl-3.0.html>.
-.. * #L%
-.. -
-JAXX
-====
-
-.. contents::
-
-Presentation
-------------
-
-JAXX is a framework that allows you to build Swing User Interface in XML.
-
-JAXX documentation is in French, we are planning to update it and make an
-english translation at the same time. To help you wait, you can have a look to
-the demo_.
-
-Nouveautés de la version 2.5
-----------------------------
-
-Changement de l'artifactId du plugin
-____________________________________
-
-Avant la version 2.4, l'artifactId du plugin était **maven-jaxx-plugin**, mais
-Maven depuis la version 3 demande que nous utilisions plutôt
-**jaxx-maven-plugin** car à terme la première forme d'artifactId ne sera plus
-acceptée que pour les projets de maven.
-
-Pour plus d'information sur comment utiliser le plugin, veuillez visiter la
-`page des goals`_
-
-Nouveautés de la version 2.4
-----------------------------
-
-Amélioration des imports
-________________________
-
-La version 2.4 fait le ménage dans le code généré par JAXX en se rapprochant du
-projet eugene_.
-
-Toute la génération n'est pas encore basée sur Eugene mais cela viendra avant la
-version 3.
-
-JAXX n'utilise plus des imports de paquetaques (import avec *), il est donc
-désormais (enfin...) possible d'utiliser dans les scripts directement un import
-sur *java.util.List*.
-
-Le fait de ne plus importer des paquetages a des impacts et pourrait rendre
-votre code non compilable.
-
-Pour reproduire la génération comme en version *2.3*, il suffit de renseigner
-dans la configuration du plugin la propriété *extraImportList* avec les valeurs
-suivantes :
-
-::
-
- <extraImportList>
- java.awt.*
- javax.swing.*
- javax.swing.event.*
- java.util.*
- </extraImportList>
-
-Il est cependant déconseillé de laisser une telle configuration car le fait
-d'utiliser des paquetages au lieu de noms de classes précises alourdit les
-temps du compilateur JAXX et génère du code de moins bonne qualité...
-
-D'ici la version *3.0* on écrira une documentation précise de fonctionnement du
-compilateur et on va faire une différence entre les namespaces utilisés pour
-trouver les objets correspondants au tags d'un fichier jaxx et les imports d'une
-classe java à générer. Actuellement les deux concepts sont mélangés.
-
-Utilisation de JXLayer 3.0.4
-____________________________
-
-L'utilisation de cette mise à jour (à partir de la 3.0.3) a des impacts car
-l'api a été modifiée et n'est plus compatible... Il s'agit en fait de
-modification des generics sur JXLayer, vous devrez peut-être modifier votre code
-pour qu'il compile.
-
-Nouveautés de la version 2.3
-----------------------------
-
-Validation
-__________
-
-JAXX se base désormais sur la librarie nuiton-validator_ (qui a été extraite de
-jaxx).
-
-Cela a entrainé un certain nombre de modification dans l'api de jaxx. Notamment :
-
-- Les validateurs ont changé de packages et sont dans l'autre librairie : il
- faut donc modifier dans son validators.xml les fqn des validateurs en question.
- Un exemple est donné dans le module **jaxx-demo** ou
- **jaxx-tutorial-validation**.
-
-- Réécriture de l'api de validation (on travaille désormais par annotation pour
- spécifier les validateurs d'un GUI ainsi que les champs à valider).
-
-- L'api SwingValidator a été modifiée sans conserver les anciennes signatures
- car les propriétés en question (contextName devient context) sont des
- propriétés de type JavaBean et la maintenance de l'ancienne et la nouvelle
- api aurait été trop compliquée et confuse.
-
-Dans la version 2.3.x ou 2.4 une documentation complête va être écrite
-concernant l'utilisation de la validation avec JAXX, en attendant un nouveau
-tutorial jaxx-tutorial-validation a été écrit pour aider un peu (seul
-l'application est écrite, sans documentation pour le moment...) et la page
-suivante : BeanValidator_
-
-Amélioration du générateur
-__________________________
-
-Le compilateur JAXX est désormais capable plus facilement de générer des
-annotations sur les champs et les méthodes.
-
-Montées de version
-__________________
-
-Un certain nombre de librairies ont été montées de version, notamment
-**nuiton-i18n** en version 2.2. Veuillez bien utiliser au moins cette version
-car cela peut casser l'éxécution au runtime sinon.
-
-
-Nouveautés de la version 2.2.4
-------------------------------
-
-Nouveau module de validation
-____________________________
-
-Un nouveau module a été crée **jaxx-validator** qui regroupe tout ce qui
-concerne le framework de validation proposé par JAXX (anciennement quand **jaxx-runtime**).
-
-Toute l'api de neutre non lié à JAXX a été dépréciée et sera supprimer en version
-*2.3* pour utiliser celle de nuiton-validator (qui récupère le code).
-
-A noter que le module **jaxx-runtime** n'est plus exposé en classifier **tests**
-mais **jaxx-validator** l'est (pour pouvoir utiliser les tests abstraits sur
-les validateurs).
-
-Utilisation de i18n 2.0
-_______________________
-
-En utilisant **i18n 2.0**, on a des bundles de traductions compatible
-**ResourceBundle**, ceci étant dit il faut que vous utilisiez aussi cette
-version de i18n sinon il ne pourra pas utiliser les traductions offertes par
-jaxx.
-
-Nouveautés de la version 2.1
-----------------------------
-
-Introduction d'un nouveau tag **import**
-________________________________________
-
-Ce tag simplifie la gestion des imports.
-
-Chaque ligne correspond à un import à effectuer.
-
-Exemple :
-
-::
- <import>
- java.io.File
- static java.io.File.separatorChar
- </import>
-
-Voir http://nuiton.org/issues/show/685
-
-Meilleure gestion de l'héritage
-_______________________________
-
-La gestion de l'héritage a été amélioré.
-
-On peut désormais surcharger un tag dans un fichier jaxx fils, le getter surchargé
-sera bien généré.
-
-Si aucun initializer n'est renseigné (constructorParams, javabean, initializer)
-alors rien de plus ne sera généré.
-
-De plus pour les bindings, on doit utiliser la propriété surchargée et non pas
-l'accesseur sur la propriété.
-
-Lors de la génération, l'accesseur sera utilisé à la place de la propriété.
-
-WARNING::
- Cette évolution admet une restriction : si on veut surcharger un
- component swing, on DOIT alors toujours lui préciser un initializer, sinon le
- component surchargé ne sera pas généré et à l'exécution on risque d'avoir un
- *ClassCastException* si le type n'est pas le même.
-
-Une documentation plus détaillée sur le mécanisme d'héritage sera écrite pour la
-version 2.2.
-
-
-Voir
-
- * http://nuiton.org/issues/show/625
- * http://nuiton.org/issues/show/626
-
-Nouvelle api d'arbre
-____________________
-
-Le package *jaxx.runtime.swing.tree** contient une api simplifié pour créer des
-arbres qui savent se charger tout seul.
-
-Cette api remplace celle du package **jaxx.runtime.swing.navigation**.
-
-Voir http://nuiton.org/issues/show/666
-
-Nouvelle api d'assistant
-________________________
-
-Le package *jaxx.runtime.swing.wizard.ext** contient une nouvelle api simplifié
-pour créer des assitants avec des modèles attachés aux étapes.
-
-Cette api remplace celle du **jaxx.runtime.swing.wizard.WizardOperationXXX**.
-
-Voir http://nuiton.org/issues/show/665
-
-Ajout de tutoriaux
-__________________
-
-JAXX intègre désormais des tutoriaux.
-
-Voir
-
- * http://nuiton.org/issues/show/640
- * http://nuiton.org/issues/show/641
- * http://nuiton.org/issues/show/642
-
-Présentation
-------------
-
-JAXX est un framework qui vous permet de créer des interfaces utilisateur Swing
-à partir de fichiers de description en XML. La documentation n'est plus à jour.
-En attendant la mise à jour de la documentation (en cours), vous pouvez vous
-reporter à la demo_ .
-
-.. TODO A faire car plus a jour...
-
-Le projet JAXX ...
-
-
-Depuis la version 1.0, et en prévision de nouveaux générateurs s'appuyant sur Jaxx,on a revu l'architecture du projet.
-
-Désormais, une séparation a été effectuée entre le code de compilation et le code d'exécution.
-
-Tout le code de compilation est en dépendance du plugin maven et vous ne devriez pas à avoir à vous en servir.
-
-Ce dont vous avez besoin dans vos dépendances sont uniquement les modules jaxx-runtime-xxx.
-
-.. TODO A finir la présentation de la nouvelle architecture (dans la version 1.2).
-
-**Veuillez consulter la JavaDoc pour de plus ample détails sur les différentes
-librairies.**
-
-Migration vers JAXX 2.0
------------------------
-
-La version 2.0 de JAXX n'est pas compatible avec les versions antérieures.
-
-Pour plus de détail consulter la page `Migration`_.
-
-Nouvelles fonctionnalités 2.0
------------------------------
-
- * Core_
-
- * I18n_
-
- * JAXXContext_
-
- * BeanValidator_
-
- * NavigationModel_
-
-Qui utilise JAXX ?
-------------------
-
-Voici une liste de projets utilisant JAXX :
-
- * Isis-fish_ - Logiciel de simulation de pêcheries complexes - GPL
-
- * simExplorer-si_
-
- * ObServe_ - Logiciel de saisie de données concernant la pèche thonière - GPL
-
- * Lima_ - Logiciel de comptabilité française adaptée aux PME - GPL
-
- * Vradi_ - Logiciel de traitement de flux XML - GPL
-
- * Nuiton-i18n-editor
-
-.. TODO Finish this list and add icons
-
-.. _Isis-fish: http://www.isis-fish.org/
-
-.. _simExplorer-si: http://www.simexplorer.org
-
-.. _ObServe: http://maven-site.forge.codelutin.com/observe/
-
-.. _Lima: http://maven-site.chorem.org/lima/
-
-.. _Vradi: http://maven-site.forge.codelutin.com/vradi
-
-.. _Migration: ./migration.html
-
-.. _Core: ./Core.html
-
-.. _demo: ./jaxx-demo/index.html
-
-.. _I18n: ./I18n.html
-
-.. _JAXXContext: ./JAXXContext.html
-
-.. _BeanValidator: ./BeanValidator.html
-
-.. _NavigationModel: ./NavigationModel.html
-
-.. _nuiton-validator: http://maven-site.nuiton.org/nuiton-utils/nuiton-validator
-
-.. _eugene: http://maven-site.nuiton.org/eugene
-
-.. _page des goals: ./jaxx-maven-plugin/plugin-info.html
\ No newline at end of file
+X4wF8m <a href="http://qowxzzueegjk.com/">qowxzzueegjk</a>, [url=http://obfgmgmjsmir.com/]obfgmgmjsmir[/url] [link=http://qzznhhndnmrk.com/]qzznhhndnmrk[/link] http://wnoszsorrfit.com/
\ No newline at end of file
1
0
Author: tchemit
Date: 2012-02-29 12:09:48 +0100 (Wed, 29 Feb 2012)
New Revision: 2319
Url: http://nuiton.org/repositories/revision/jaxx/2319
Log:
T?\195?\162che #897: Updates to mavenpom 3.1.1
Modified:
trunk/pom.xml
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2012-02-15 13:49:02 UTC (rev 2318)
+++ trunk/pom.xml 2012-02-29 11:09:48 UTC (rev 2319)
@@ -36,7 +36,7 @@
<parent>
<groupId>org.nuiton</groupId>
<artifactId>mavenpom4redmineAndCentral</artifactId>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.1.1</version>
</parent>
<artifactId>jaxx</artifactId>
1
0
Author: tchemit
Date: 2012-02-15 14:49:02 +0100 (Wed, 15 Feb 2012)
New Revision: 2318
Url: http://nuiton.org/repositories/revision/jaxx/2318
Log:
revert site deploy function
Modified:
trunk/pom.xml
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2012-02-09 23:08:03 UTC (rev 2317)
+++ trunk/pom.xml 2012-02-15 13:49:02 UTC (rev 2318)
@@ -90,7 +90,7 @@
<name>JAXX</name>
<description>JAXX Project</description>
<inceptionYear>2008</inceptionYear>
- <url>http://maven-site.nuiton.org/jaxx${projectUrlSuffix}</url>
+ <url>http://maven-site.nuiton.org/jaxx</url>
<packaging>pom</packaging>
@@ -123,7 +123,7 @@
<distributionManagement>
<site>
<id>${platform}</id>
- <url>${our.site.repository}/${projectId}${projectUrlSuffix}</url>
+ <url>${our.site.repository}/${pojectId}</url>
</site>
</distributionManagement>
1
0
Author: tchemit
Date: 2012-02-10 00:08:03 +0100 (Fri, 10 Feb 2012)
New Revision: 2317
Url: http://nuiton.org/repositories/revision/jaxx/2317
Log:
optimize dependencies
Modified:
trunk/jaxx-runtime/pom.xml
Modified: trunk/jaxx-runtime/pom.xml
===================================================================
--- trunk/jaxx-runtime/pom.xml 2012-02-09 23:02:02 UTC (rev 2316)
+++ trunk/jaxx-runtime/pom.xml 2012-02-09 23:08:03 UTC (rev 2317)
@@ -79,11 +79,6 @@
</dependency>
<dependency>
- <groupId>commons-jxpath</groupId>
- <artifactId>commons-jxpath</artifactId>
- </dependency>
-
- <dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<scope>test</scope>
1
0
r2316 - in trunk: . jaxx-demo jaxx-runtime/src/main/java/jaxx/runtime jaxx-runtime/src/test/java/jaxx/runtime jaxx-tutorial jaxx-tutorial-validation jaxx-tutorial-validation/src/license
by tchemit@users.nuiton.org 09 Feb '12
by tchemit@users.nuiton.org 09 Feb '12
09 Feb '12
Author: tchemit
Date: 2012-02-10 00:02:02 +0100 (Fri, 10 Feb 2012)
New Revision: 2316
Url: http://nuiton.org/repositories/revision/jaxx/2316
Log:
T?\195?\162che #1962: Updates to mavenpom 3.1.1
Evolution #1647: Remove deprecated decorator api
Evolution #1645: Updates to nuiton-utils 2.4.4
Removed:
trunk/jaxx-runtime/src/main/java/jaxx/runtime/decorator/
trunk/jaxx-runtime/src/test/java/jaxx/runtime/decorator/
Modified:
trunk/jaxx-demo/pom.xml
trunk/jaxx-tutorial-validation/pom.xml
trunk/jaxx-tutorial-validation/src/license/THIRD-PARTY.properties
trunk/jaxx-tutorial/pom.xml
trunk/pom.xml
Modified: trunk/jaxx-demo/pom.xml
===================================================================
--- trunk/jaxx-demo/pom.xml 2012-02-06 10:49:06 UTC (rev 2315)
+++ trunk/jaxx-demo/pom.xml 2012-02-09 23:02:02 UTC (rev 2316)
@@ -298,7 +298,7 @@
<id>jnlpwar-profile</id>
<dependencies>
<dependency>
- <groupId>org.codehaus.mojo.webstart</groupId>
+ <groupId>org.codehaus.mojo</groupId>
<artifactId>webstart-jnlp-servlet</artifactId>
<version>${webstartPluginVersion}</version>
</dependency>
Modified: trunk/jaxx-tutorial/pom.xml
===================================================================
--- trunk/jaxx-tutorial/pom.xml 2012-02-06 10:49:06 UTC (rev 2315)
+++ trunk/jaxx-tutorial/pom.xml 2012-02-09 23:02:02 UTC (rev 2316)
@@ -197,7 +197,7 @@
<!-- make webstart -->
<plugin>
- <groupId>org.codehaus.mojo.webstart</groupId>
+ <groupId>org.codehaus.mojo</groupId>
<artifactId>webstart-maven-plugin</artifactId>
<executions>
<execution>
@@ -226,7 +226,7 @@
<reporting>
<plugins>
<plugin>
- <groupId>org.codehaus.mojo.webstart</groupId>
+ <groupId>org.codehaus.mojo</groupId>
<artifactId>webstart-maven-plugin</artifactId>
<version>${webstartPluginVersion}</version>
</plugin>
Modified: trunk/jaxx-tutorial-validation/pom.xml
===================================================================
--- trunk/jaxx-tutorial-validation/pom.xml 2012-02-06 10:49:06 UTC (rev 2315)
+++ trunk/jaxx-tutorial-validation/pom.xml 2012-02-09 23:02:02 UTC (rev 2316)
@@ -262,7 +262,7 @@
<!-- key store secrets availables -->
<plugin>
<groupId>org.nuiton</groupId>
- <artifactId>maven-helper-plugin</artifactId>
+ <artifactId>helper-maven-plugin</artifactId>
<executions>
<execution>
<id>get-keystore</id>
@@ -283,7 +283,7 @@
<!-- make webstart -->
<plugin>
- <groupId>org.codehaus.mojo.webstart</groupId>
+ <groupId>org.codehaus.mojo</groupId>
<artifactId>webstart-maven-plugin</artifactId>
<executions>
<execution>
@@ -312,7 +312,7 @@
<reporting>
<plugins>
<plugin>
- <groupId>org.codehaus.mojo.webstart</groupId>
+ <groupId>org.codehaus.mojo</groupId>
<artifactId>webstart-maven-plugin</artifactId>
<version>${webstartPluginVersion}</version>
</plugin>
Modified: trunk/jaxx-tutorial-validation/src/license/THIRD-PARTY.properties
===================================================================
--- trunk/jaxx-tutorial-validation/src/license/THIRD-PARTY.properties 2012-02-06 10:49:06 UTC (rev 2315)
+++ trunk/jaxx-tutorial-validation/src/license/THIRD-PARTY.properties 2012-02-09 23:02:02 UTC (rev 2316)
@@ -1,20 +1,20 @@
# Generated by org.codehaus.mojo.license.AddThirdPartyMojo
#-------------------------------------------------------------------------------
# Already used licenses in project :
-# - BSD License
+# - BSD
# - GNU General Public License - Version 2 with the class path exception
# - Lesser General Public License (LGPL)
# - Lesser General Public License (LGPL) v 3.0
-# - Lesser General Public License (LPGL) v 2.1
# - Lesser General Public License v2.1,Mozilla Public License 1.1 (MPL)
# - The Apache Software License, Version 2.0
+# - http://asm.ow2.org/license.html
#-------------------------------------------------------------------------------
# Please fill the missing licenses for dependencies :
#
#
-#Sun Jul 31 15:21:14 CEST 2011
-asm--asm--3.1--jar=http\://asm.ow2.org/license.html
-asm--asm-commons--3.1--jar=http\://asm.ow2.org/license.html
-asm--asm-tree--3.1--jar=http\://asm.ow2.org/license.html
-commons-primitives--commons-primitives--1.0--jar=The Apache Software License, Version 2.0
-javassist--javassist--3.8.0.GA--jar=Lesser General Public License v2.1,Mozilla Public License 1.1 (MPL)
+#Thu Feb 09 23:56:26 CET 2012
+asm--asm--3.1=http\://asm.ow2.org/license.html
+asm--asm-commons--3.1=http\://asm.ow2.org/license.html
+asm--asm-tree--3.1=http\://asm.ow2.org/license.html
+commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0
+javassist--javassist--3.8.0.GA=Lesser General Public License v2.1,Mozilla Public License 1.1 (MPL)
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2012-02-06 10:49:06 UTC (rev 2315)
+++ trunk/pom.xml 2012-02-09 23:02:02 UTC (rev 2316)
@@ -36,7 +36,7 @@
<parent>
<groupId>org.nuiton</groupId>
<artifactId>mavenpom4redmineAndCentral</artifactId>
- <version>3.1</version>
+ <version>3.1.1-SNAPSHOT</version>
</parent>
<artifactId>jaxx</artifactId>
@@ -90,7 +90,7 @@
<name>JAXX</name>
<description>JAXX Project</description>
<inceptionYear>2008</inceptionYear>
- <url>http://maven-site.nuiton.org/jaxx</url>
+ <url>http://maven-site.nuiton.org/jaxx${projectUrlSuffix}</url>
<packaging>pom</packaging>
@@ -98,7 +98,7 @@
<!-- pour un muli module on doit fixer le projectId -->
<projectId>jaxx</projectId>
- <nuitonUtilsVersion>2.3</nuitonUtilsVersion>
+ <nuitonUtilsVersion>2.4.4</nuitonUtilsVersion>
<nuitonI18nVersion>2.4.1</nuitonI18nVersion>
<eugeneVersion>2.3.2</eugeneVersion>
<xworkVersion>2.3.1.2</xworkVersion>
@@ -106,12 +106,6 @@
<javaHelpVersion>2.0.05</javaHelpVersion>
<swingXVersion>1.6.2-2</swingXVersion>
- <!--<nuitonSkinVersion>1.1.2-SNAPSHOT</nuitonSkinVersion>-->
-
- <webstartPluginVersion>1.0-beta-3-SNAPSHOT</webstartPluginVersion>
-
- <site.home.url>${project.url}</site.home.url>
-
<!-- i18n configuration -->
<i18n.bundles>fr_FR,en_GB,es_ES</i18n.bundles>
</properties>
@@ -129,7 +123,7 @@
<distributionManagement>
<site>
<id>${platform}</id>
- <url>${our.site.repository}/${projectId}</url>
+ <url>${our.site.repository}/${projectId}${projectUrlSuffix}</url>
</site>
</distributionManagement>
1
0
Author: tchemit
Date: 2012-02-06 11:49:06 +0100 (Mon, 06 Feb 2012)
New Revision: 2315
Url: http://nuiton.org/repositories/revision/jaxx/2315
Log:
Evolution #1939: Change maven-jaxx-plugin to jaxx-maven-plugin
Removed:
trunk/maven-jaxx-plugin/
1
0
Author: tchemit
Date: 2012-02-06 11:48:25 +0100 (Mon, 06 Feb 2012)
New Revision: 2314
Url: http://nuiton.org/repositories/revision/jaxx/2314
Log:
Evolution #1939: Change maven-jaxx-plugin to jaxx-maven-plugin
Anomalie #1948: inherited attribute no more supported by item of site.xml
Anomalie #1947: Can not use any more menu item with no href with m-site-p 3.0
Added:
trunk/jaxx-maven-plugin/
trunk/jaxx-maven-plugin/pom.xml
Removed:
trunk/jaxx-maven-plugin/pom.xml
trunk/maven-jaxx-plugin/LICENSE.txt
trunk/maven-jaxx-plugin/README.txt
trunk/maven-jaxx-plugin/changelog.txt
trunk/maven-jaxx-plugin/pom.xml
trunk/maven-jaxx-plugin/src/
Modified:
trunk/jaxx-compiler/src/site/site_fr.xml
trunk/jaxx-demo/pom.xml
trunk/jaxx-demo/src/site/site_fr.xml
trunk/jaxx-maven-plugin/src/site/site_fr.xml
trunk/jaxx-maven-plugin/src/test/java/org/nuiton/jaxx/plugin/JaxxBaseTest.java
trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/bug1404Test/Bug_1404.xml
trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/bug1722Test/Bug_1722.xml
trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/bug1750Test/Bug_1750.xml
trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/bug1751Test/Bug_1751.xml
trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/bug184Test/Bug_184.xml
trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/CSSTests.xml
trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/ClassReferences.xml
trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/ClientProperty.xml
trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/ErrorJaxxContextImplementorClass.xml
trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/Errors.xml
trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/ErrorsCss.xml
trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/Force.xml
trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/Icon.xml
trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/ImportTag.xml
trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/Initializers.xml
trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/InnerClasses.xml
trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/NoLog.xml
trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/OverridingDataBindings.xml
trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/Script.xml
trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/SpecialSubclassing.xml
trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/WithLog.xml
trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerValidatorTest/ValidatorErrors.xml
trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerValidatorTest/ValidatorOk.xml
trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/dataBindingTest/simpleBinding.xml
trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/decoratorTest/Decorator.xml
trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/evolution74Test/error.xml
trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/evolution74Test/ok.xml
trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/i18nTest/I18nText.xml
trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/i18nTest/I18nTitle.xml
trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/i18nTest/I18nToolTipText.xml
trunk/jaxx-runtime/src/site/site_fr.xml
trunk/jaxx-swing-action/src/site/site_fr.xml
trunk/jaxx-tutorial-config/src/site/site_fr.xml
trunk/jaxx-tutorial-css/pom.xml
trunk/jaxx-tutorial-css/src/site/site_fr.xml
trunk/jaxx-tutorial-databinding/pom.xml
trunk/jaxx-tutorial-databinding/src/site/site_fr.xml
trunk/jaxx-tutorial-helloworld/pom.xml
trunk/jaxx-tutorial-helloworld/src/site/site_fr.xml
trunk/jaxx-tutorial-helloworld2/pom.xml
trunk/jaxx-tutorial-helloworld2/src/site/site_fr.xml
trunk/jaxx-tutorial-validation/pom.xml
trunk/jaxx-tutorial-validation/src/site/site_fr.xml
trunk/jaxx-tutorial/pom.xml
trunk/jaxx-tutorial/src/site/site_fr.xml
trunk/jaxx-validator/src/site/site_fr.xml
trunk/jaxx-widgets/pom.xml
trunk/jaxx-widgets/src/site/site_fr.xml
trunk/pom.xml
trunk/src/site/rst/index.rst
trunk/src/site/rst/tutos/helloworld.rst
trunk/src/site/rst/tutos/helloworld2.rst
trunk/src/site/site_fr.xml
Modified: trunk/jaxx-compiler/src/site/site_fr.xml
===================================================================
--- trunk/jaxx-compiler/src/site/site_fr.xml 2012-02-03 00:09:33 UTC (rev 2313)
+++ trunk/jaxx-compiler/src/site/site_fr.xml 2012-02-06 10:48:25 UTC (rev 2314)
@@ -28,7 +28,7 @@
<bannerLeft>
<name>${project.name}</name>
- <src>${site.home.url}/jaxx.png</src>
+ <src>../jaxx.png</src>
<href>index.html</href>
</bannerLeft>
@@ -40,7 +40,7 @@
<menu ref="parent"/>
- <menu name="Utilisateur" inherited="top"/>
+ <menu name="Utilisateur"/>
<menu ref="reports"/>
Modified: trunk/jaxx-demo/pom.xml
===================================================================
--- trunk/jaxx-demo/pom.xml 2012-02-03 00:09:33 UTC (rev 2313)
+++ trunk/jaxx-demo/pom.xml 2012-02-06 10:48:25 UTC (rev 2314)
@@ -24,7 +24,9 @@
#L%
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -56,7 +58,7 @@
<artifactId>jaxx-validator</artifactId>
<version>${project.version}</version>
</dependency>
-
+
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>jaxx-widgets</artifactId>
@@ -77,7 +79,7 @@
<groupId>org.nuiton</groupId>
<artifactId>nuiton-validator</artifactId>
</dependency>
-
+
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
@@ -216,7 +218,7 @@
<plugin>
<groupId>org.nuiton.jaxx</groupId>
- <artifactId>maven-jaxx-plugin</artifactId>
+ <artifactId>jaxx-maven-plugin</artifactId>
<version>${project.version}</version>
<executions>
<execution>
@@ -291,6 +293,83 @@
<!-- ************************************************************* -->
<profiles>
+
+ <profile>
+ <id>jnlpwar-profile</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.codehaus.mojo.webstart</groupId>
+ <artifactId>webstart-jnlp-servlet</artifactId>
+ <version>${webstartPluginVersion}</version>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <!-- key store secrets availables -->
+ <plugin>
+ <groupId>org.nuiton</groupId>
+ <artifactId>helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>get-keystore</id>
+ <goals>
+ <goal>share-server-secret</goal>
+ </goals>
+ <phase>package</phase>
+ <configuration>
+ <serverId>codelutin-keystore</serverId>
+ <privateKeyOut>keystorepath</privateKeyOut>
+ <passwordOut>keystorepass</passwordOut>
+ <usernameOut>keyalias</usernameOut>
+ <passphraseOut>keypass</passphraseOut>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <!-- make webstart -->
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>webstart-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>generate-jnlp</id>
+ <phase>package</phase>
+ <goals>
+ <goal>jnlp-download-servlet</goal>
+ </goals>
+ <configuration>
+ <outputDirectoryName>jnlp</outputDirectoryName>
+ <excludeTransitive>false</excludeTransitive>
+ <libPath>apps</libPath>
+ <outputJarVersions>true</outputJarVersions>
+ <!--dependencies>
+ <includes>
+ <include>be.irisnet.nova:nova-common</include>
+ </includes>
+ </dependencies-->
+ <jnlpFiles>
+ <jnlpFile>
+ <!--templateFilename>template_com.jnlp</templateFilename>
+ <outputFilename>client_com.jnlp</outputFilename-->
+ <jarResources>
+ <jarResource>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>jaxx-demo</artifactId>
+ <version>${project.version}</version>
+ <mainClass>${maven.jar.main.class}</mainClass>
+ </jarResource>
+ </jarResources>
+ </jnlpFile>
+ </jnlpFiles>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
<!-- by default jnlp is only perform on a release stage when using the maven-release-plugin -->
<profile>
<id>release-jnlp-profile</id>
@@ -305,7 +384,7 @@
<!-- key store secrets availables -->
<plugin>
<groupId>org.nuiton</groupId>
- <artifactId>maven-helper-plugin</artifactId>
+ <artifactId>helper-maven-plugin</artifactId>
<executions>
<execution>
<id>get-keystore</id>
@@ -326,7 +405,7 @@
<!-- make webstart -->
<plugin>
- <groupId>org.codehaus.mojo.webstart</groupId>
+ <groupId>org.codehaus.mojo</groupId>
<artifactId>webstart-maven-plugin</artifactId>
<executions>
<execution>
@@ -355,7 +434,7 @@
<reporting>
<plugins>
<plugin>
- <groupId>org.codehaus.mojo.webstart</groupId>
+ <groupId>org.codehaus.mojo</groupId>
<artifactId>webstart-maven-plugin</artifactId>
<version>${webstartPluginVersion}</version>
</plugin>
Modified: trunk/jaxx-demo/src/site/site_fr.xml
===================================================================
--- trunk/jaxx-demo/src/site/site_fr.xml 2012-02-03 00:09:33 UTC (rev 2313)
+++ trunk/jaxx-demo/src/site/site_fr.xml 2012-02-06 10:48:25 UTC (rev 2314)
@@ -28,7 +28,7 @@
<bannerLeft>
<name>${project.name}</name>
- <src>${site.home.url}/jaxx.png</src>
+ <src>../jaxx.png</src>
<href>index.html</href>
</bannerLeft>
@@ -44,7 +44,7 @@
<menu ref="parent"/>
- <menu name="Utilisateur" inherited="top">
+ <menu name="Utilisateur">
<item name="Accueil" href="index.html"/>
<item name="Lancer la démo" href="jnlp/launch.jnlp"/>
</menu>
Deleted: trunk/jaxx-maven-plugin/pom.xml
===================================================================
--- trunk/maven-jaxx-plugin/pom.xml 2012-01-04 17:18:38 UTC (rev 2311)
+++ trunk/jaxx-maven-plugin/pom.xml 2012-02-06 10:48:25 UTC (rev 2314)
@@ -1,227 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- #%L
- JAXX :: Maven plugin
-
- $Id$
- $HeadURL$
- %%
- Copyright (C) 2008 - 2010 CodeLutin
- %%
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Lesser General Public License as
- published by the Free Software Foundation, either version 3 of the
- License, or (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Lesser Public License for more details.
-
- You should have received a copy of the GNU General Lesser Public
- License along with this program. If not, see
- <http://www.gnu.org/licenses/lgpl-3.0.html>.
- #L%
- -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <!-- ************************************************************* -->
- <!-- *** POM Relationships *************************************** -->
- <!-- ************************************************************* -->
-
- <parent>
- <groupId>org.nuiton</groupId>
- <artifactId>jaxx</artifactId>
- <version>2.5-SNAPSHOT</version>
- </parent>
-
- <groupId>org.nuiton.jaxx</groupId>
- <artifactId>maven-jaxx-plugin</artifactId>
-
- <dependencies>
-
- <!-- sibling dependencies -->
-
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>jaxx-runtime</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>jaxx-validator</artifactId>
- <version>${project.version}</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>jaxx-compiler</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <!-- maven plugin project dependencies -->
-
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-plugin-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-project</artifactId>
- </dependency>
-
- <!-- other dependencies -->
-
- <dependency>
- <groupId>org.nuiton</groupId>
- <artifactId>maven-helper-plugin</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.nuiton</groupId>
- <artifactId>nuiton-utils</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.nuiton.i18n</groupId>
- <artifactId>nuiton-i18n</artifactId>
- </dependency>
-
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
-
- <dependency>
- <groupId>javax.help</groupId>
- <artifactId>javahelp</artifactId>
- </dependency>
-
- <!-- pour acceder aux BeansInfos swing via Introspector -->
- <dependency>
- <groupId>com.sun</groupId>
- <artifactId>dt</artifactId>
- <scope>system</scope>
- <systemPath>/${java.home}/../lib/dt.jar</systemPath>
- </dependency>
-
- <!-- tests dependencies -->
-
- <dependency>
- <groupId>org.apache.maven.shared</groupId>
- <artifactId>maven-verifier</artifactId>
- </dependency>
-
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.maven.plugin-testing</groupId>
- <artifactId>maven-plugin-testing-harness</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.nuiton</groupId>
- <artifactId>maven-helper-plugin</artifactId>
- <classifier>tests</classifier>
- </dependency>
-
- <!-- FIXME si on ne le rajoute pas, on se retrouve avec la version 1.1 qui ne convient pas -->
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-utils</artifactId>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <scope>runtime</scope>
- </dependency>
-
-
- </dependencies>
-
- <!-- ************************************************************* -->
- <!-- *** Project Information ************************************* -->
- <!-- ************************************************************* -->
-
- <name>JAXX :: Maven plugin</name>
- <description>
- Maven 2 plugin to generate java sources from JAXX files.
- </description>
-
- <!-- ************************************************************* -->
- <!-- *** Build Settings ****************************************** -->
- <!-- ************************************************************* -->
-
- <packaging>maven-plugin</packaging>
-
- <profiles>
- <!-- by default jnlp is only perform on a release stage when using the maven-release-plugin -->
- <profile>
- <id>release-profile</id>
- <activation>
- <property>
- <name>performRelease</name>
- <value>true</value>
- </property>
- </activation>
- <build>
- <plugins>
-
- <plugin>
- <artifactId>maven-plugin-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>helpmojo</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- </plugins>
-
- </build>
- </profile>
-
- <!-- by default jnlp is only perform on a release stage when using the maven-release-plugin -->
- <profile>
- <id>reporting</id>
- <activation>
- <property>
- <name>performRelease</name>
- <value>true</value>
- </property>
- </activation>
-
- <reporting>
- <plugins>
-
- <plugin>
- <artifactId>maven-plugin-plugin</artifactId>
- <version>${pluginPluginVersion}</version>
- </plugin>
-
- </plugins>
- </reporting>
-
- </profile>
-
- </profiles>
-
-</project>
Copied: trunk/jaxx-maven-plugin/pom.xml (from rev 2312, trunk/maven-jaxx-plugin/pom.xml)
===================================================================
--- trunk/jaxx-maven-plugin/pom.xml (rev 0)
+++ trunk/jaxx-maven-plugin/pom.xml 2012-02-06 10:48:25 UTC (rev 2314)
@@ -0,0 +1,227 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ #%L
+ JAXX :: Maven plugin
+
+ $Id$
+ $HeadURL$
+ %%
+ Copyright (C) 2008 - 2010 CodeLutin
+ %%
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Lesser General Public License as
+ published by the Free Software Foundation, either version 3 of the
+ License, or (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Lesser Public License for more details.
+
+ You should have received a copy of the GNU General Lesser Public
+ License along with this program. If not, see
+ <http://www.gnu.org/licenses/lgpl-3.0.html>.
+ #L%
+ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <!-- ************************************************************* -->
+ <!-- *** POM Relationships *************************************** -->
+ <!-- ************************************************************* -->
+
+ <parent>
+ <groupId>org.nuiton</groupId>
+ <artifactId>jaxx</artifactId>
+ <version>2.5-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.nuiton.jaxx</groupId>
+ <artifactId>jaxx-maven-plugin</artifactId>
+
+ <dependencies>
+
+ <!-- sibling dependencies -->
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>jaxx-runtime</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>jaxx-validator</artifactId>
+ <version>${project.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>jaxx-compiler</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <!-- maven plugin project dependencies -->
+
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-plugin-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-project</artifactId>
+ </dependency>
+
+ <!-- other dependencies -->
+
+ <dependency>
+ <groupId>org.nuiton</groupId>
+ <artifactId>helper-maven-plugin</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.nuiton</groupId>
+ <artifactId>nuiton-utils</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.nuiton.i18n</groupId>
+ <artifactId>nuiton-i18n</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.help</groupId>
+ <artifactId>javahelp</artifactId>
+ </dependency>
+
+ <!-- pour acceder aux BeansInfos swing via Introspector -->
+ <dependency>
+ <groupId>com.sun</groupId>
+ <artifactId>dt</artifactId>
+ <scope>system</scope>
+ <systemPath>/${java.home}/../lib/dt.jar</systemPath>
+ </dependency>
+
+ <!-- tests dependencies -->
+
+ <dependency>
+ <groupId>org.apache.maven.shared</groupId>
+ <artifactId>maven-verifier</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.maven.plugin-testing</groupId>
+ <artifactId>maven-plugin-testing-harness</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.nuiton</groupId>
+ <artifactId>helper-maven-plugin</artifactId>
+ <classifier>tests</classifier>
+ </dependency>
+
+ <!-- FIXME si on ne le rajoute pas, on se retrouve avec la version 1.1 qui ne convient pas -->
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+
+
+ </dependencies>
+
+ <!-- ************************************************************* -->
+ <!-- *** Project Information ************************************* -->
+ <!-- ************************************************************* -->
+
+ <name>JAXX :: Maven plugin</name>
+ <description>
+ Maven 2 plugin to generate java sources from JAXX files.
+ </description>
+
+ <!-- ************************************************************* -->
+ <!-- *** Build Settings ****************************************** -->
+ <!-- ************************************************************* -->
+
+ <packaging>maven-plugin</packaging>
+
+ <profiles>
+ <!-- by default jnlp is only perform on a release stage when using the maven-release-plugin -->
+ <profile>
+ <id>release-profile</id>
+ <activation>
+ <property>
+ <name>performRelease</name>
+ <value>true</value>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+
+ <plugin>
+ <artifactId>maven-plugin-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>helpmojo</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ </plugins>
+
+ </build>
+ </profile>
+
+ <!-- by default jnlp is only perform on a release stage when using the maven-release-plugin -->
+ <profile>
+ <id>reporting</id>
+ <activation>
+ <property>
+ <name>performRelease</name>
+ <value>true</value>
+ </property>
+ </activation>
+
+ <reporting>
+ <plugins>
+
+ <plugin>
+ <artifactId>maven-plugin-plugin</artifactId>
+ <version>${pluginPluginVersion}</version>
+ </plugin>
+
+ </plugins>
+ </reporting>
+
+ </profile>
+
+ </profiles>
+
+</project>
Modified: trunk/jaxx-maven-plugin/src/site/site_fr.xml
===================================================================
--- trunk/maven-jaxx-plugin/src/site/site_fr.xml 2012-01-04 17:18:38 UTC (rev 2311)
+++ trunk/jaxx-maven-plugin/src/site/site_fr.xml 2012-02-06 10:48:25 UTC (rev 2314)
@@ -28,7 +28,7 @@
<bannerLeft>
<name>${project.name}</name>
- <src>${site.home.url}/jaxx.png</src>
+ <src>../jaxx.png</src>
<href>index.html</href>
</bannerLeft>
@@ -40,7 +40,7 @@
<menu ref="parent"/>
- <menu name="Utilisateur" inherited="top">
+ <menu name="Utilisateur">
<item name="Accueil" href="index.html"/>
<item name="Détail goals" href="plugin-info.html">
<item name="generate" href="generate-mojo.html"/>
Modified: trunk/jaxx-maven-plugin/src/test/java/org/nuiton/jaxx/plugin/JaxxBaseTest.java
===================================================================
--- trunk/maven-jaxx-plugin/src/test/java/org/nuiton/jaxx/plugin/JaxxBaseTest.java 2012-01-04 17:18:38 UTC (rev 2311)
+++ trunk/jaxx-maven-plugin/src/test/java/org/nuiton/jaxx/plugin/JaxxBaseTest.java 2012-02-06 10:48:25 UTC (rev 2314)
@@ -44,7 +44,7 @@
/**
* Base test case for a jaxx:generate goal.
* <p/>
- * Use {@link AbstractMojoTest} from {@code maven-helper-plugin}.
+ * Use {@link AbstractMojoTest} from {@code helper-maven-plugin}.
*
* @author tchemit <chemit(a)codelutin.com>
* @see AbstractMojoTest
Modified: trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/bug1404Test/Bug_1404.xml
===================================================================
--- trunk/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/bug1404Test/Bug_1404.xml 2012-01-04 17:18:38 UTC (rev 2311)
+++ trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/bug1404Test/Bug_1404.xml 2012-02-06 10:48:25 UTC (rev 2314)
@@ -34,7 +34,7 @@
<plugins>
<plugin>
<groupId>org.nuiton</groupId>
- <artifactId>maven-jaxx-plugin</artifactId>
+ <artifactId>jaxx-maven-plugin</artifactId>
<configuration>
<src>${basedir}/target/test-classes</src>
<outJava>${basedir}/target/generated-sources/test-java</outJava>
Modified: trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/bug1722Test/Bug_1722.xml
===================================================================
--- trunk/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/bug1722Test/Bug_1722.xml 2012-01-04 17:18:38 UTC (rev 2311)
+++ trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/bug1722Test/Bug_1722.xml 2012-02-06 10:48:25 UTC (rev 2314)
@@ -35,7 +35,7 @@
<plugins>
<plugin>
<groupId>org.nuiton</groupId>
- <artifactId>maven-jaxx-plugin</artifactId>
+ <artifactId>jaxx-maven-plugin</artifactId>
<configuration>
<src>${basedir}/target/test-classes</src>
<outJava>${basedir}/target/generated-sources/test-java</outJava>
Modified: trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/bug1750Test/Bug_1750.xml
===================================================================
--- trunk/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/bug1750Test/Bug_1750.xml 2012-01-04 17:18:38 UTC (rev 2311)
+++ trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/bug1750Test/Bug_1750.xml 2012-02-06 10:48:25 UTC (rev 2314)
@@ -35,7 +35,7 @@
<plugins>
<plugin>
<groupId>org.nuiton</groupId>
- <artifactId>maven-jaxx-plugin</artifactId>
+ <artifactId>jaxx-maven-plugin</artifactId>
<configuration>
<src>${basedir}/target/test-classes</src>
<outJava>${basedir}/target/generated-sources/test-java</outJava>
Modified: trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/bug1751Test/Bug_1751.xml
===================================================================
--- trunk/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/bug1751Test/Bug_1751.xml 2012-01-04 17:18:38 UTC (rev 2311)
+++ trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/bug1751Test/Bug_1751.xml 2012-02-06 10:48:25 UTC (rev 2314)
@@ -35,7 +35,7 @@
<plugins>
<plugin>
<groupId>org.nuiton</groupId>
- <artifactId>maven-jaxx-plugin</artifactId>
+ <artifactId>jaxx-maven-plugin</artifactId>
<configuration>
<src>${basedir}/target/test-classes</src>
<outJava>${basedir}/target/generated-sources/test-java</outJava>
Modified: trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/bug184Test/Bug_184.xml
===================================================================
--- trunk/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/bug184Test/Bug_184.xml 2012-01-04 17:18:38 UTC (rev 2311)
+++ trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/bug184Test/Bug_184.xml 2012-02-06 10:48:25 UTC (rev 2314)
@@ -35,7 +35,7 @@
<plugins>
<plugin>
<groupId>org.nuiton</groupId>
- <artifactId>maven-jaxx-plugin</artifactId>
+ <artifactId>jaxx-maven-plugin</artifactId>
<configuration>
<src>${basedir}/target/test-classes</src>
<outJava>${basedir}/target/generated-sources/test-java</outJava>
Modified: trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/CSSTests.xml
===================================================================
--- trunk/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/CSSTests.xml 2012-01-04 17:18:38 UTC (rev 2311)
+++ trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/CSSTests.xml 2012-02-06 10:48:25 UTC (rev 2314)
@@ -35,7 +35,7 @@
<plugins>
<plugin>
<groupId>org.nuiton</groupId>
- <artifactId>maven-jaxx-plugin</artifactId>
+ <artifactId>jaxx-maven-plugin</artifactId>
<configuration>
<src>${basedir}/target/test-classes</src>
<outJava>${basedir}/target/generated-sources/test-java</outJava>
Modified: trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/ClassReferences.xml
===================================================================
--- trunk/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/ClassReferences.xml 2012-01-04 17:18:38 UTC (rev 2311)
+++ trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/ClassReferences.xml 2012-02-06 10:48:25 UTC (rev 2314)
@@ -35,7 +35,7 @@
<plugins>
<plugin>
<groupId>org.nuiton</groupId>
- <artifactId>maven-jaxx-plugin</artifactId>
+ <artifactId>jaxx-maven-plugin</artifactId>
<configuration>
<src>${basedir}/target/test-classes</src>
<outJava>${basedir}/target/generated-sources/test-java</outJava>
Modified: trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/ClientProperty.xml
===================================================================
--- trunk/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/ClientProperty.xml 2012-01-04 17:18:38 UTC (rev 2311)
+++ trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/ClientProperty.xml 2012-02-06 10:48:25 UTC (rev 2314)
@@ -35,7 +35,7 @@
<plugins>
<plugin>
<groupId>org.nuiton</groupId>
- <artifactId>maven-jaxx-plugin</artifactId>
+ <artifactId>jaxx-maven-plugin</artifactId>
<configuration>
<src>${basedir}/target/test-classes</src>
<outJava>${basedir}/target/generated-sources/test-java</outJava>
Modified: trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/ErrorJaxxContextImplementorClass.xml
===================================================================
--- trunk/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/ErrorJaxxContextImplementorClass.xml 2012-01-04 17:18:38 UTC (rev 2311)
+++ trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/ErrorJaxxContextImplementorClass.xml 2012-02-06 10:48:25 UTC (rev 2314)
@@ -35,7 +35,7 @@
<plugins>
<plugin>
<groupId>org.nuiton</groupId>
- <artifactId>maven-jaxx-plugin</artifactId>
+ <artifactId>jaxx-maven-plugin</artifactId>
<configuration>
<src>${basedir}/target/test-classes</src>
<outJava>${basedir}/target/generated-sources/test-java</outJava>
Modified: trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/Errors.xml
===================================================================
--- trunk/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/Errors.xml 2012-01-04 17:18:38 UTC (rev 2311)
+++ trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/Errors.xml 2012-02-06 10:48:25 UTC (rev 2314)
@@ -35,7 +35,7 @@
<plugins>
<plugin>
<groupId>org.nuiton</groupId>
- <artifactId>maven-jaxx-plugin</artifactId>
+ <artifactId>jaxx-maven-plugin</artifactId>
<configuration>
<src>${basedir}/target/test-classes</src>
<outJava>${basedir}/target/generated-sources/test-java</outJava>
Modified: trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/ErrorsCss.xml
===================================================================
--- trunk/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/ErrorsCss.xml 2012-01-04 17:18:38 UTC (rev 2311)
+++ trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/ErrorsCss.xml 2012-02-06 10:48:25 UTC (rev 2314)
@@ -35,7 +35,7 @@
<plugins>
<plugin>
<groupId>org.nuiton</groupId>
- <artifactId>maven-jaxx-plugin</artifactId>
+ <artifactId>jaxx-maven-plugin</artifactId>
<configuration>
<src>${basedir}/target/test-classes</src>
<outJava>${basedir}/target/generated-sources/test-java</outJava>
Modified: trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/Force.xml
===================================================================
--- trunk/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/Force.xml 2012-01-04 17:18:38 UTC (rev 2311)
+++ trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/Force.xml 2012-02-06 10:48:25 UTC (rev 2314)
@@ -35,7 +35,7 @@
<plugins>
<plugin>
<groupId>org.nuiton</groupId>
- <artifactId>maven-jaxx-plugin</artifactId>
+ <artifactId>jaxx-maven-plugin</artifactId>
<configuration>
<src>${basedir}/target/test-classes</src>
<outJava>${basedir}/target/generated-sources/test-java</outJava>
Modified: trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/Icon.xml
===================================================================
--- trunk/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/Icon.xml 2012-01-04 17:18:38 UTC (rev 2311)
+++ trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/Icon.xml 2012-02-06 10:48:25 UTC (rev 2314)
@@ -35,7 +35,7 @@
<plugins>
<plugin>
<groupId>org.nuiton</groupId>
- <artifactId>maven-jaxx-plugin</artifactId>
+ <artifactId>jaxx-maven-plugin</artifactId>
<configuration>
<src>${basedir}/target/test-classes</src>
<outJava>${basedir}/target/generated-sources/test-java</outJava>
Modified: trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/ImportTag.xml
===================================================================
--- trunk/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/ImportTag.xml 2012-01-04 17:18:38 UTC (rev 2311)
+++ trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/ImportTag.xml 2012-02-06 10:48:25 UTC (rev 2314)
@@ -35,7 +35,7 @@
<plugins>
<plugin>
<groupId>org.nuiton</groupId>
- <artifactId>maven-jaxx-plugin</artifactId>
+ <artifactId>jaxx-maven-plugin</artifactId>
<configuration>
<src>${basedir}/target/test-classes</src>
<outJava>${basedir}/target/generated-sources/test-java</outJava>
Modified: trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/Initializers.xml
===================================================================
--- trunk/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/Initializers.xml 2012-01-04 17:18:38 UTC (rev 2311)
+++ trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/Initializers.xml 2012-02-06 10:48:25 UTC (rev 2314)
@@ -35,7 +35,7 @@
<plugins>
<plugin>
<groupId>org.nuiton</groupId>
- <artifactId>maven-jaxx-plugin</artifactId>
+ <artifactId>jaxx-maven-plugin</artifactId>
<configuration>
<src>${basedir}/target/test-classes</src>
<outJava>${basedir}/target/generated-sources/test-java</outJava>
Modified: trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/InnerClasses.xml
===================================================================
--- trunk/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/InnerClasses.xml 2012-01-04 17:18:38 UTC (rev 2311)
+++ trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/InnerClasses.xml 2012-02-06 10:48:25 UTC (rev 2314)
@@ -35,7 +35,7 @@
<plugins>
<plugin>
<groupId>org.nuiton</groupId>
- <artifactId>maven-jaxx-plugin</artifactId>
+ <artifactId>jaxx-maven-plugin</artifactId>
<configuration>
<src>${basedir}/target/test-classes</src>
<outJava>${basedir}/target/generated-sources/test-java</outJava>
Modified: trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/NoLog.xml
===================================================================
--- trunk/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/NoLog.xml 2012-01-04 17:18:38 UTC (rev 2311)
+++ trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/NoLog.xml 2012-02-06 10:48:25 UTC (rev 2314)
@@ -35,7 +35,7 @@
<plugins>
<plugin>
<groupId>org.nuiton</groupId>
- <artifactId>maven-jaxx-plugin</artifactId>
+ <artifactId>jaxx-maven-plugin</artifactId>
<configuration>
<src>${basedir}/target/test-classes</src>
<outJava>${basedir}/target/generated-sources/test-java</outJava>
Modified: trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/OverridingDataBindings.xml
===================================================================
--- trunk/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/OverridingDataBindings.xml 2012-01-04 17:18:38 UTC (rev 2311)
+++ trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/OverridingDataBindings.xml 2012-02-06 10:48:25 UTC (rev 2314)
@@ -35,7 +35,7 @@
<plugins>
<plugin>
<groupId>org.nuiton</groupId>
- <artifactId>maven-jaxx-plugin</artifactId>
+ <artifactId>jaxx-maven-plugin</artifactId>
<configuration>
<src>${basedir}/target/test-classes</src>
<outJava>${basedir}/target/generated-sources/test-java</outJava>
Modified: trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/Script.xml
===================================================================
--- trunk/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/Script.xml 2012-01-04 17:18:38 UTC (rev 2311)
+++ trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/Script.xml 2012-02-06 10:48:25 UTC (rev 2314)
@@ -35,7 +35,7 @@
<plugins>
<plugin>
<groupId>org.nuiton</groupId>
- <artifactId>maven-jaxx-plugin</artifactId>
+ <artifactId>jaxx-maven-plugin</artifactId>
<configuration>
<src>${basedir}/target/test-classes</src>
<outJava>${basedir}/target/generated-sources/test-java</outJava>
Modified: trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/SpecialSubclassing.xml
===================================================================
--- trunk/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/SpecialSubclassing.xml 2012-01-04 17:18:38 UTC (rev 2311)
+++ trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/SpecialSubclassing.xml 2012-02-06 10:48:25 UTC (rev 2314)
@@ -35,7 +35,7 @@
<plugins>
<plugin>
<groupId>org.nuiton</groupId>
- <artifactId>maven-jaxx-plugin</artifactId>
+ <artifactId>jaxx-maven-plugin</artifactId>
<configuration>
<src>${basedir}/target/test-classes</src>
<outJava>${basedir}/target/generated-sources/test-java</outJava>
Modified: trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/WithLog.xml
===================================================================
--- trunk/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/WithLog.xml 2012-01-04 17:18:38 UTC (rev 2311)
+++ trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/WithLog.xml 2012-02-06 10:48:25 UTC (rev 2314)
@@ -35,7 +35,7 @@
<plugins>
<plugin>
<groupId>org.nuiton</groupId>
- <artifactId>maven-jaxx-plugin</artifactId>
+ <artifactId>jaxx-maven-plugin</artifactId>
<configuration>
<src>${basedir}/target/test-classes</src>
<outJava>${basedir}/target/generated-sources/test-java</outJava>
Modified: trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerValidatorTest/ValidatorErrors.xml
===================================================================
--- trunk/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerValidatorTest/ValidatorErrors.xml 2012-01-04 17:18:38 UTC (rev 2311)
+++ trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerValidatorTest/ValidatorErrors.xml 2012-02-06 10:48:25 UTC (rev 2314)
@@ -36,7 +36,7 @@
<plugins>
<plugin>
<groupId>org.nuiton</groupId>
- <artifactId>maven-jaxx-plugin</artifactId>
+ <artifactId>jaxx-maven-plugin</artifactId>
<configuration>
<src>${basedir}/target/test-classes</src>
<outJava>${basedir}/target/generated-sources/test-java</outJava>
Modified: trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerValidatorTest/ValidatorOk.xml
===================================================================
--- trunk/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerValidatorTest/ValidatorOk.xml 2012-01-04 17:18:38 UTC (rev 2311)
+++ trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerValidatorTest/ValidatorOk.xml 2012-02-06 10:48:25 UTC (rev 2314)
@@ -35,7 +35,7 @@
<plugins>
<plugin>
<groupId>org.nuiton</groupId>
- <artifactId>maven-jaxx-plugin</artifactId>
+ <artifactId>jaxx-maven-plugin</artifactId>
<configuration>
<src>${basedir}/target/test-classes</src>
<outJava>${basedir}/target/generated-sources/test-java</outJava>
Modified: trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/dataBindingTest/simpleBinding.xml
===================================================================
--- trunk/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/dataBindingTest/simpleBinding.xml 2012-01-04 17:18:38 UTC (rev 2311)
+++ trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/dataBindingTest/simpleBinding.xml 2012-02-06 10:48:25 UTC (rev 2314)
@@ -35,7 +35,7 @@
<plugins>
<plugin>
<groupId>org.nuiton</groupId>
- <artifactId>maven-jaxx-plugin</artifactId>
+ <artifactId>jaxx-maven-plugin</artifactId>
<configuration>
<src>${basedir}/target/test-classes</src>
<outJava>${basedir}/target/generated-sources/test-java</outJava>
Modified: trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/decoratorTest/Decorator.xml
===================================================================
--- trunk/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/decoratorTest/Decorator.xml 2012-01-04 17:18:38 UTC (rev 2311)
+++ trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/decoratorTest/Decorator.xml 2012-02-06 10:48:25 UTC (rev 2314)
@@ -35,7 +35,7 @@
<plugins>
<plugin>
<groupId>org.nuiton</groupId>
- <artifactId>maven-jaxx-plugin</artifactId>
+ <artifactId>jaxx-maven-plugin</artifactId>
<configuration>
<src>${basedir}/target/test-classes</src>
<outJava>${basedir}/target/generated-sources/test-java</outJava>
Modified: trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/evolution74Test/error.xml
===================================================================
--- trunk/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/evolution74Test/error.xml 2012-01-04 17:18:38 UTC (rev 2311)
+++ trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/evolution74Test/error.xml 2012-02-06 10:48:25 UTC (rev 2314)
@@ -35,7 +35,7 @@
<plugins>
<plugin>
<groupId>org.nuiton</groupId>
- <artifactId>maven-jaxx-plugin</artifactId>
+ <artifactId>jaxx-maven-plugin</artifactId>
<configuration>
<src>${basedir}/target/test-classes</src>
<outJava>${basedir}/target/generated-sources/test-java</outJava>
Modified: trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/evolution74Test/ok.xml
===================================================================
--- trunk/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/evolution74Test/ok.xml 2012-01-04 17:18:38 UTC (rev 2311)
+++ trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/evolution74Test/ok.xml 2012-02-06 10:48:25 UTC (rev 2314)
@@ -35,7 +35,7 @@
<plugins>
<plugin>
<groupId>org.nuiton</groupId>
- <artifactId>maven-jaxx-plugin</artifactId>
+ <artifactId>jaxx-maven-plugin</artifactId>
<configuration>
<src>${basedir}/target/test-classes</src>
<outJava>${basedir}/target/generated-sources/test-java</outJava>
Modified: trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/i18nTest/I18nText.xml
===================================================================
--- trunk/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/i18nTest/I18nText.xml 2012-01-04 17:18:38 UTC (rev 2311)
+++ trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/i18nTest/I18nText.xml 2012-02-06 10:48:25 UTC (rev 2314)
@@ -35,7 +35,7 @@
<plugins>
<plugin>
<groupId>org.nuiton</groupId>
- <artifactId>maven-jaxx-plugin</artifactId>
+ <artifactId>jaxx-maven-plugin</artifactId>
<configuration>
<src>${basedir}/target/test-classes</src>
<outJava>${basedir}/target/generated-sources/test-java</outJava>
Modified: trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/i18nTest/I18nTitle.xml
===================================================================
--- trunk/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/i18nTest/I18nTitle.xml 2012-01-04 17:18:38 UTC (rev 2311)
+++ trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/i18nTest/I18nTitle.xml 2012-02-06 10:48:25 UTC (rev 2314)
@@ -35,7 +35,7 @@
<plugins>
<plugin>
<groupId>org.nuiton</groupId>
- <artifactId>maven-jaxx-plugin</artifactId>
+ <artifactId>jaxx-maven-plugin</artifactId>
<configuration>
<src>${basedir}/target/test-classes</src>
<outJava>${basedir}/target/generated-sources/test-java</outJava>
Modified: trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/i18nTest/I18nToolTipText.xml
===================================================================
--- trunk/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/i18nTest/I18nToolTipText.xml 2012-01-04 17:18:38 UTC (rev 2311)
+++ trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/i18nTest/I18nToolTipText.xml 2012-02-06 10:48:25 UTC (rev 2314)
@@ -35,7 +35,7 @@
<plugins>
<plugin>
<groupId>org.nuiton</groupId>
- <artifactId>maven-jaxx-plugin</artifactId>
+ <artifactId>jaxx-maven-plugin</artifactId>
<configuration>
<src>${basedir}/target/test-classes</src>
<outJava>${basedir}/target/generated-sources/test-java</outJava>
Modified: trunk/jaxx-runtime/src/site/site_fr.xml
===================================================================
--- trunk/jaxx-runtime/src/site/site_fr.xml 2012-02-03 00:09:33 UTC (rev 2313)
+++ trunk/jaxx-runtime/src/site/site_fr.xml 2012-02-06 10:48:25 UTC (rev 2314)
@@ -28,7 +28,7 @@
<bannerLeft>
<name>${project.name}</name>
- <src>${site.home.url}/jaxx.png</src>
+ <src>../jaxx.png</src>
<href>index.html</href>
</bannerLeft>
@@ -40,7 +40,7 @@
<menu ref="parent"/>
- <menu name="Utilisateur" inherited="top">
+ <menu name="Utilisateur">
<item name="Accueil" href="index.html"/>
</menu>
Modified: trunk/jaxx-swing-action/src/site/site_fr.xml
===================================================================
--- trunk/jaxx-swing-action/src/site/site_fr.xml 2012-02-03 00:09:33 UTC (rev 2313)
+++ trunk/jaxx-swing-action/src/site/site_fr.xml 2012-02-06 10:48:25 UTC (rev 2314)
@@ -28,7 +28,7 @@
<bannerLeft>
<name>${project.name}</name>
- <src>${site.home.url}/jaxx.png</src>
+ <src>../jaxx.png</src>
<href>index.html</href>
</bannerLeft>
@@ -40,7 +40,7 @@
<menu ref="parent"/>
- <menu name="Utilisateur" inherited="top"/>
+ <menu name="Utilisateur"/>
<menu ref="reports"/>
Modified: trunk/jaxx-tutorial/pom.xml
===================================================================
--- trunk/jaxx-tutorial/pom.xml 2012-02-03 00:09:33 UTC (rev 2313)
+++ trunk/jaxx-tutorial/pom.xml 2012-02-06 10:48:25 UTC (rev 2314)
@@ -95,7 +95,7 @@
<plugin>
<groupId>org.nuiton.jaxx</groupId>
- <artifactId>maven-jaxx-plugin</artifactId>
+ <artifactId>jaxx-maven-plugin</artifactId>
<version>${project.version}</version>
</plugin>
@@ -176,7 +176,7 @@
<!-- key store secrets availables -->
<plugin>
<groupId>org.nuiton</groupId>
- <artifactId>maven-helper-plugin</artifactId>
+ <artifactId>helper-maven-plugin</artifactId>
<executions>
<execution>
<id>get-keystore</id>
Modified: trunk/jaxx-tutorial/src/site/site_fr.xml
===================================================================
--- trunk/jaxx-tutorial/src/site/site_fr.xml 2012-02-03 00:09:33 UTC (rev 2313)
+++ trunk/jaxx-tutorial/src/site/site_fr.xml 2012-02-06 10:48:25 UTC (rev 2314)
@@ -30,7 +30,7 @@
<bannerLeft>
<name>${project.name}</name>
- <src>${site.home.url}/jaxx.png</src>
+ <src>../jaxx.png</src>
<href>index.html</href>
</bannerLeft>
@@ -42,7 +42,7 @@
<menu ref="parent"/>
- <menu name="Utilisateur" inherited="top">
+ <menu name="Utilisateur">
<item name="Accueil" href="index.html"/>
</menu>
Modified: trunk/jaxx-tutorial-config/src/site/site_fr.xml
===================================================================
--- trunk/jaxx-tutorial-config/src/site/site_fr.xml 2012-02-03 00:09:33 UTC (rev 2313)
+++ trunk/jaxx-tutorial-config/src/site/site_fr.xml 2012-02-06 10:48:25 UTC (rev 2314)
@@ -28,7 +28,7 @@
<bannerLeft>
<name>${project.name}</name>
- <src>${site.home.url}/jaxx.png</src>
+ <src>../jaxx.png</src>
<href>index.html</href>
</bannerLeft>
@@ -40,7 +40,7 @@
<menu ref="parent"/>
- <menu name="Utilisateur" inherited="top">
+ <menu name="Utilisateur">
<item name="Accueil" href="index.html"/>
<item name="Lancer la démo" href="jnlp/launch.jnlp"/>
</menu>
Modified: trunk/jaxx-tutorial-css/pom.xml
===================================================================
--- trunk/jaxx-tutorial-css/pom.xml 2012-02-03 00:09:33 UTC (rev 2313)
+++ trunk/jaxx-tutorial-css/pom.xml 2012-02-06 10:48:25 UTC (rev 2314)
@@ -77,7 +77,7 @@
<plugin>
<groupId>org.nuiton.jaxx</groupId>
- <artifactId>maven-jaxx-plugin</artifactId>
+ <artifactId>jaxx-maven-plugin</artifactId>
<executions>
<execution>
<goals>
Modified: trunk/jaxx-tutorial-css/src/site/site_fr.xml
===================================================================
--- trunk/jaxx-tutorial-css/src/site/site_fr.xml 2012-02-03 00:09:33 UTC (rev 2313)
+++ trunk/jaxx-tutorial-css/src/site/site_fr.xml 2012-02-06 10:48:25 UTC (rev 2314)
@@ -28,7 +28,7 @@
<bannerLeft>
<name>${project.name}</name>
- <src>${site.home.url}/jaxx.png</src>
+ <src>../jaxx.png</src>
<href>index.html</href>
</bannerLeft>
@@ -40,7 +40,7 @@
<menu ref="parent"/>
- <menu name="Utilisateur" inherited="top">
+ <menu name="Utilisateur">
<item name="Accueil" href="index.html"/>
<item name="Lancer la démo" href="jnlp/launch.jnlp"/>
</menu>
Modified: trunk/jaxx-tutorial-databinding/pom.xml
===================================================================
--- trunk/jaxx-tutorial-databinding/pom.xml 2012-02-03 00:09:33 UTC (rev 2313)
+++ trunk/jaxx-tutorial-databinding/pom.xml 2012-02-06 10:48:25 UTC (rev 2314)
@@ -82,7 +82,7 @@
<plugin>
<groupId>org.nuiton.jaxx</groupId>
- <artifactId>maven-jaxx-plugin</artifactId>
+ <artifactId>jaxx-maven-plugin</artifactId>
<executions>
<execution>
<goals>
Modified: trunk/jaxx-tutorial-databinding/src/site/site_fr.xml
===================================================================
--- trunk/jaxx-tutorial-databinding/src/site/site_fr.xml 2012-02-03 00:09:33 UTC (rev 2313)
+++ trunk/jaxx-tutorial-databinding/src/site/site_fr.xml 2012-02-06 10:48:25 UTC (rev 2314)
@@ -28,7 +28,7 @@
<bannerLeft>
<name>${project.name}</name>
- <src>${site.home.url}/jaxx.png</src>
+ <src>../jaxx.png</src>
<href>index.html</href>
</bannerLeft>
@@ -40,7 +40,7 @@
<menu ref="parent"/>
- <menu name="Utilisateur" inherited="top">
+ <menu name="Utilisateur">
<item name="Accueil" href="index.html"/>
<item name="Lancer la démo" href="jnlp/launch.jnlp"/>
</menu>
Modified: trunk/jaxx-tutorial-helloworld/pom.xml
===================================================================
--- trunk/jaxx-tutorial-helloworld/pom.xml 2012-02-03 00:09:33 UTC (rev 2313)
+++ trunk/jaxx-tutorial-helloworld/pom.xml 2012-02-06 10:48:25 UTC (rev 2314)
@@ -89,7 +89,7 @@
<plugin>
<groupId>org.nuiton.jaxx</groupId>
- <artifactId>maven-jaxx-plugin</artifactId>
+ <artifactId>jaxx-maven-plugin</artifactId>
<executions>
<execution>
<goals>
Modified: trunk/jaxx-tutorial-helloworld/src/site/site_fr.xml
===================================================================
--- trunk/jaxx-tutorial-helloworld/src/site/site_fr.xml 2012-02-03 00:09:33 UTC (rev 2313)
+++ trunk/jaxx-tutorial-helloworld/src/site/site_fr.xml 2012-02-06 10:48:25 UTC (rev 2314)
@@ -28,7 +28,7 @@
<bannerLeft>
<name>${project.name}</name>
- <src>${site.home.url}/jaxx.png</src>
+ <src>../jaxx.png</src>
<href>index.html</href>
</bannerLeft>
@@ -40,7 +40,7 @@
<menu ref="parent"/>
- <menu name="Utilisateur" inherited="top">
+ <menu name="Utilisateur">
<item name="Accueil" href="index.html"/>
<item name="Lancer la démo" href="jnlp/launch.jnlp"/>
</menu>
Modified: trunk/jaxx-tutorial-helloworld2/pom.xml
===================================================================
--- trunk/jaxx-tutorial-helloworld2/pom.xml 2012-02-03 00:09:33 UTC (rev 2313)
+++ trunk/jaxx-tutorial-helloworld2/pom.xml 2012-02-06 10:48:25 UTC (rev 2314)
@@ -88,7 +88,7 @@
<plugin>
<groupId>org.nuiton.jaxx</groupId>
- <artifactId>maven-jaxx-plugin</artifactId>
+ <artifactId>jaxx-maven-plugin</artifactId>
<executions>
<execution>
<goals>
Modified: trunk/jaxx-tutorial-helloworld2/src/site/site_fr.xml
===================================================================
--- trunk/jaxx-tutorial-helloworld2/src/site/site_fr.xml 2012-02-03 00:09:33 UTC (rev 2313)
+++ trunk/jaxx-tutorial-helloworld2/src/site/site_fr.xml 2012-02-06 10:48:25 UTC (rev 2314)
@@ -28,7 +28,7 @@
<bannerLeft>
<name>${project.name}</name>
- <src>${site.home.url}/jaxx.png</src>
+ <src>../jaxx.png</src>
<href>index.html</href>
</bannerLeft>
@@ -40,7 +40,7 @@
<menu ref="parent"/>
- <menu name="Utilisateur" inherited="top">
+ <menu name="Utilisateur">
<item name="Accueil" href="index.html"/>
<item name="Lancer la démo" href="jnlp/launch.jnlp"/>
</menu>
Modified: trunk/jaxx-tutorial-validation/pom.xml
===================================================================
--- trunk/jaxx-tutorial-validation/pom.xml 2012-02-03 00:09:33 UTC (rev 2313)
+++ trunk/jaxx-tutorial-validation/pom.xml 2012-02-06 10:48:25 UTC (rev 2314)
@@ -178,7 +178,7 @@
<plugin>
<groupId>org.nuiton.jaxx</groupId>
- <artifactId>maven-jaxx-plugin</artifactId>
+ <artifactId>jaxx-maven-plugin</artifactId>
<version>${project.version}</version>
<executions>
<execution>
Modified: trunk/jaxx-tutorial-validation/src/site/site_fr.xml
===================================================================
--- trunk/jaxx-tutorial-validation/src/site/site_fr.xml 2012-02-03 00:09:33 UTC (rev 2313)
+++ trunk/jaxx-tutorial-validation/src/site/site_fr.xml 2012-02-06 10:48:25 UTC (rev 2314)
@@ -28,7 +28,7 @@
<bannerLeft>
<name>${project.name}</name>
- <src>${site.home.url}/jaxx.png</src>
+ <src>../jaxx.png</src>
<href>index.html</href>
</bannerLeft>
@@ -40,7 +40,7 @@
<menu ref="parent"/>
- <menu name="Utilisateur" inherited="top">
+ <menu name="Utilisateur">
<item name="Accueil" href="index.html"/>
<item name="Lancer la démo" href="jnlp/launch.jnlp"/>
</menu>
Modified: trunk/jaxx-validator/src/site/site_fr.xml
===================================================================
--- trunk/jaxx-validator/src/site/site_fr.xml 2012-02-03 00:09:33 UTC (rev 2313)
+++ trunk/jaxx-validator/src/site/site_fr.xml 2012-02-06 10:48:25 UTC (rev 2314)
@@ -28,7 +28,7 @@
<bannerLeft>
<name>${project.name}</name>
- <src>${site.home.url}/jaxx.png</src>
+ <src>../jaxx.png</src>
<href>index.html</href>
</bannerLeft>
@@ -40,7 +40,7 @@
<menu ref="parent"/>
- <menu name="Utilisateur" inherited="top"/>
+ <menu name="Utilisateur"/>
<menu ref="reports"/>
Modified: trunk/jaxx-widgets/pom.xml
===================================================================
--- trunk/jaxx-widgets/pom.xml 2012-02-03 00:09:33 UTC (rev 2313)
+++ trunk/jaxx-widgets/pom.xml 2012-02-06 10:48:25 UTC (rev 2314)
@@ -138,7 +138,7 @@
<plugin>
<groupId>${project.groupId}</groupId>
- <artifactId>maven-jaxx-plugin</artifactId>
+ <artifactId>jaxx-maven-plugin</artifactId>
<version>${project.version}</version>
<executions>
<execution>
Modified: trunk/jaxx-widgets/src/site/site_fr.xml
===================================================================
--- trunk/jaxx-widgets/src/site/site_fr.xml 2012-02-03 00:09:33 UTC (rev 2313)
+++ trunk/jaxx-widgets/src/site/site_fr.xml 2012-02-06 10:48:25 UTC (rev 2314)
@@ -28,7 +28,7 @@
<bannerLeft>
<name>${project.name}</name>
- <src>${site.home.url}/jaxx.png</src>
+ <src>../jaxx.png</src>
<href>index.html</href>
</bannerLeft>
@@ -40,7 +40,7 @@
<menu ref="parent"/>
- <menu name="Utilisateur" inherited="top"/>
+ <menu name="Utilisateur"/>
<menu ref="reports"/>
Deleted: trunk/maven-jaxx-plugin/LICENSE.txt
===================================================================
--- trunk/maven-jaxx-plugin/LICENSE.txt 2012-02-03 00:09:33 UTC (rev 2313)
+++ trunk/maven-jaxx-plugin/LICENSE.txt 2012-02-06 10:48:25 UTC (rev 2314)
@@ -1,166 +0,0 @@
- GNU LESSER GENERAL PUBLIC LICENSE
- Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-
- This version of the GNU Lesser General Public License incorporates
-the terms and conditions of version 3 of the GNU General Public
-License, supplemented by the additional permissions listed below.
-
- 0. Additional Definitions.
-
- As used herein, "this License" refers to version 3 of the GNU Lesser
-General Public License, and the "GNU GPL" refers to version 3 of the GNU
-General Public License.
-
- "The Library" refers to a covered work governed by this License,
-other than an Application or a Combined Work as defined below.
-
- An "Application" is any work that makes use of an interface provided
-by the Library, but which is not otherwise based on the Library.
-Defining a subclass of a class defined by the Library is deemed a mode
-of using an interface provided by the Library.
-
- A "Combined Work" is a work produced by combining or linking an
-Application with the Library. The particular version of the Library
-with which the Combined Work was made is also called the "Linked
-Version".
-
- The "Minimal Corresponding Source" for a Combined Work means the
-Corresponding Source for the Combined Work, excluding any source code
-for portions of the Combined Work that, considered in isolation, are
-based on the Application, and not on the Linked Version.
-
- The "Corresponding Application Code" for a Combined Work means the
-object code and/or source code for the Application, including any data
-and utility programs needed for reproducing the Combined Work from the
-Application, but excluding the System Libraries of the Combined Work.
-
- 1. Exception to Section 3 of the GNU GPL.
-
- You may convey a covered work under sections 3 and 4 of this License
-without being bound by section 3 of the GNU GPL.
-
- 2. Conveying Modified Versions.
-
- If you modify a copy of the Library, and, in your modifications, a
-facility refers to a function or data to be supplied by an Application
-that uses the facility (other than as an argument passed when the
-facility is invoked), then you may convey a copy of the modified
-version:
-
- a) under this License, provided that you make a good faith effort to
- ensure that, in the event an Application does not supply the
- function or data, the facility still operates, and performs
- whatever part of its purpose remains meaningful, or
-
- b) under the GNU GPL, with none of the additional permissions of
- this License applicable to that copy.
-
- 3. Object Code Incorporating Material from Library Header Files.
-
- The object code form of an Application may incorporate material from
-a header file that is part of the Library. You may convey such object
-code under terms of your choice, provided that, if the incorporated
-material is not limited to numerical parameters, data structure
-layouts and accessors, or small macros, inline functions and templates
-(ten or fewer lines in length), you do both of the following:
-
- a) Give prominent notice with each copy of the object code that the
- Library is used in it and that the Library and its use are
- covered by this License.
-
- b) Accompany the object code with a copy of the GNU GPL and this license
- document.
-
- 4. Combined Works.
-
- You may convey a Combined Work under terms of your choice that,
-taken together, effectively do not restrict modification of the
-portions of the Library contained in the Combined Work and reverse
-engineering for debugging such modifications, if you also do each of
-the following:
-
- a) Give prominent notice with each copy of the Combined Work that
- the Library is used in it and that the Library and its use are
- covered by this License.
-
- b) Accompany the Combined Work with a copy of the GNU GPL and this license
- document.
-
- c) For a Combined Work that displays copyright notices during
- execution, include the copyright notice for the Library among
- these notices, as well as a reference directing the user to the
- copies of the GNU GPL and this license document.
-
- d) Do one of the following:
-
- 0) Convey the Minimal Corresponding Source under the terms of this
- License, and the Corresponding Application Code in a form
- suitable for, and under terms that permit, the user to
- recombine or relink the Application with a modified version of
- the Linked Version to produce a modified Combined Work, in the
- manner specified by section 6 of the GNU GPL for conveying
- Corresponding Source.
-
- 1) Use a suitable shared library mechanism for linking with the
- Library. A suitable mechanism is one that (a) uses at run time
- a copy of the Library already present on the user's computer
- system, and (b) will operate properly with a modified version
- of the Library that is interface-compatible with the Linked
- Version.
-
- e) Provide Installation Information, but only if you would otherwise
- be required to provide such information under section 6 of the
- GNU GPL, and only to the extent that such information is
- necessary to install and execute a modified version of the
- Combined Work produced by recombining or relinking the
- Application with a modified version of the Linked Version. (If
- you use option 4d0, the Installation Information must accompany
- the Minimal Corresponding Source and Corresponding Application
- Code. If you use option 4d1, you must provide the Installation
- Information in the manner specified by section 6 of the GNU GPL
- for conveying Corresponding Source.)
-
- 5. Combined Libraries.
-
- You may place library facilities that are a work based on the
-Library side by side in a single library together with other library
-facilities that are not Applications and are not covered by this
-License, and convey such a combined library under terms of your
-choice, if you do both of the following:
-
- a) Accompany the combined library with a copy of the same work based
- on the Library, uncombined with any other library facilities,
- conveyed under the terms of this License.
-
- b) Give prominent notice with the combined library that part of it
- is a work based on the Library, and explaining where to find the
- accompanying uncombined form of the same work.
-
- 6. Revised Versions of the GNU Lesser General Public License.
-
- The Free Software Foundation may publish revised and/or new versions
-of the GNU Lesser General Public License from time to time. Such new
-versions will be similar in spirit to the present version, but may
-differ in detail to address new problems or concerns.
-
- Each version is given a distinguishing version number. If the
-Library as you received it specifies that a certain numbered version
-of the GNU Lesser General Public License "or any later version"
-applies to it, you have the option of following the terms and
-conditions either of that published version or of any later version
-published by the Free Software Foundation. If the Library as you
-received it does not specify a version number of the GNU Lesser
-General Public License, you may choose any version of the GNU Lesser
-General Public License ever published by the Free Software Foundation.
-
- If the Library as you received it specifies that a proxy can decide
-whether future versions of the GNU Lesser General Public License shall
-apply, that proxy's public statement of acceptance of any version is
-permanent authorization for you to choose that version for the
-Library.
-
Deleted: trunk/maven-jaxx-plugin/README.txt
===================================================================
--- trunk/maven-jaxx-plugin/README.txt 2012-02-03 00:09:33 UTC (rev 2313)
+++ trunk/maven-jaxx-plugin/README.txt 2012-02-06 10:48:25 UTC (rev 2314)
@@ -1,2 +0,0 @@
-To deploy new version of pom: mvn deploy
-To install localy: mvn install
Deleted: trunk/maven-jaxx-plugin/changelog.txt
===================================================================
--- trunk/maven-jaxx-plugin/changelog.txt 2012-02-03 00:09:33 UTC (rev 2313)
+++ trunk/maven-jaxx-plugin/changelog.txt 2012-02-06 10:48:25 UTC (rev 2314)
@@ -1,37 +0,0 @@
-1.3 chemit 20090409
- * 20090327 [chemit] - add javax help mecanism
- * 20090301 [chemit] - add a profile mode (-Djaxx.profile)
-
-1.2 letelier 2009022?
-
-1.1 chemit 20090220
- * 20090203 [chemit] - mojo's property src is now by default in src/main/java
- * 20090202 [chemit] - introduce a property validatorClass to specify the validator implementation
- * 20090124 [chemit] - introduce a flag useUIManagerForIcon to retreave icons from UIManager
- - clean mojo getter and setter (not used here)
- * 20090123 [chemit] - add tests for icon improvment
- * 20090122 [chemit] - refactor poms (sibling dependencies, pluginsManagment,...)
- - rename i18n bundles according artifactId
- * 20090113 [chemit] - fix bug : when using addProjectClassPath property, sometimes does not retreave
- dependancies, force it to work whatever is the phase :)
-
-1.0 chemit 20090111
-
-0.8 chemit 200812??
- * 20081219 [chemit] - add addProjectClassPath property to add project compile class-path in plugin class-path
- * 20081214 [chemit] - add addSourcesToClassPath property to add sources directories in class-path
-
-0.7 chemit 20081210
- * 20081208 [chemit] - javabBean attribute use to initialize bean
- * 20081207 [chemit] use lutinproject 3.1
-
-0.6 chemit 200811??
- * 20081108 [chemit] can add extra imports in JaxxGeneratorMojo (will be added to all generated java files).
- * 20081104 [chemit] can add extra beanInfoSearchPath in JaxxGeneratorMojo
-
-0.5 chemit 20081002
- * 20081013 [chemit] can generate logger on jaxx files
- * 20081011 [chemit] improve site
- * 20081011 [chemit] refactor tests of the plugin using maven-plugin-testing-harness plugin
- * 20081002 [chemit] Using lutinpluginproject 3.0, changing groupId to org.codelutin
- * 20081002 [chemit] Make nearly all tests works again...
Deleted: trunk/maven-jaxx-plugin/pom.xml
===================================================================
--- trunk/maven-jaxx-plugin/pom.xml 2012-02-03 00:09:33 UTC (rev 2313)
+++ trunk/maven-jaxx-plugin/pom.xml 2012-02-06 10:48:25 UTC (rev 2314)
@@ -1,227 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- #%L
- JAXX :: Maven plugin
-
- $Id$
- $HeadURL$
- %%
- Copyright (C) 2008 - 2010 CodeLutin
- %%
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Lesser General Public License as
- published by the Free Software Foundation, either version 3 of the
- License, or (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Lesser Public License for more details.
-
- You should have received a copy of the GNU General Lesser Public
- License along with this program. If not, see
- <http://www.gnu.org/licenses/lgpl-3.0.html>.
- #L%
- -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <!-- ************************************************************* -->
- <!-- *** POM Relationships *************************************** -->
- <!-- ************************************************************* -->
-
- <parent>
- <groupId>org.nuiton</groupId>
- <artifactId>jaxx</artifactId>
- <version>2.5-SNAPSHOT</version>
- </parent>
-
- <groupId>org.nuiton.jaxx</groupId>
- <artifactId>maven-jaxx-plugin</artifactId>
-
- <dependencies>
-
- <!-- sibling dependencies -->
-
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>jaxx-runtime</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>jaxx-validator</artifactId>
- <version>${project.version}</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>jaxx-compiler</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <!-- maven plugin project dependencies -->
-
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-plugin-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-project</artifactId>
- </dependency>
-
- <!-- other dependencies -->
-
- <dependency>
- <groupId>org.nuiton</groupId>
- <artifactId>helper-maven-plugin</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.nuiton</groupId>
- <artifactId>nuiton-utils</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.nuiton.i18n</groupId>
- <artifactId>nuiton-i18n</artifactId>
- </dependency>
-
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
-
- <dependency>
- <groupId>javax.help</groupId>
- <artifactId>javahelp</artifactId>
- </dependency>
-
- <!-- pour acceder aux BeansInfos swing via Introspector -->
- <dependency>
- <groupId>com.sun</groupId>
- <artifactId>dt</artifactId>
- <scope>system</scope>
- <systemPath>/${java.home}/../lib/dt.jar</systemPath>
- </dependency>
-
- <!-- tests dependencies -->
-
- <dependency>
- <groupId>org.apache.maven.shared</groupId>
- <artifactId>maven-verifier</artifactId>
- </dependency>
-
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.maven.plugin-testing</groupId>
- <artifactId>maven-plugin-testing-harness</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.nuiton</groupId>
- <artifactId>helper-maven-plugin</artifactId>
- <classifier>tests</classifier>
- </dependency>
-
- <!-- FIXME si on ne le rajoute pas, on se retrouve avec la version 1.1 qui ne convient pas -->
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-utils</artifactId>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <scope>runtime</scope>
- </dependency>
-
-
- </dependencies>
-
- <!-- ************************************************************* -->
- <!-- *** Project Information ************************************* -->
- <!-- ************************************************************* -->
-
- <name>JAXX :: Maven plugin</name>
- <description>
- Maven 2 plugin to generate java sources from JAXX files.
- </description>
-
- <!-- ************************************************************* -->
- <!-- *** Build Settings ****************************************** -->
- <!-- ************************************************************* -->
-
- <packaging>maven-plugin</packaging>
-
- <profiles>
- <!-- by default jnlp is only perform on a release stage when using the maven-release-plugin -->
- <profile>
- <id>release-profile</id>
- <activation>
- <property>
- <name>performRelease</name>
- <value>true</value>
- </property>
- </activation>
- <build>
- <plugins>
-
- <plugin>
- <artifactId>maven-plugin-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>helpmojo</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- </plugins>
-
- </build>
- </profile>
-
- <!-- by default jnlp is only perform on a release stage when using the maven-release-plugin -->
- <profile>
- <id>reporting</id>
- <activation>
- <property>
- <name>performRelease</name>
- <value>true</value>
- </property>
- </activation>
-
- <reporting>
- <plugins>
-
- <plugin>
- <artifactId>maven-plugin-plugin</artifactId>
- <version>${pluginPluginVersion}</version>
- </plugin>
-
- </plugins>
- </reporting>
-
- </profile>
-
- </profiles>
-
-</project>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2012-02-03 00:09:33 UTC (rev 2313)
+++ trunk/pom.xml 2012-02-06 10:48:25 UTC (rev 2314)
@@ -46,7 +46,7 @@
<module>jaxx-runtime</module>
<module>jaxx-validator</module>
<module>jaxx-compiler</module>
- <module>maven-jaxx-plugin</module>
+ <module>jaxx-maven-plugin</module>
<module>jaxx-widgets</module>
</modules>
@@ -106,8 +106,12 @@
<javaHelpVersion>2.0.05</javaHelpVersion>
<swingXVersion>1.6.2-2</swingXVersion>
+ <!--<nuitonSkinVersion>1.1.2-SNAPSHOT</nuitonSkinVersion>-->
+
<webstartPluginVersion>1.0-beta-3-SNAPSHOT</webstartPluginVersion>
+ <site.home.url>${project.url}</site.home.url>
+
<!-- i18n configuration -->
<i18n.bundles>fr_FR,en_GB,es_ES</i18n.bundles>
</properties>
@@ -116,7 +120,8 @@
<!-- Source control management. -->
<scm>
<connection>scm:svn:http://svn.nuiton.org/svn/jaxx/trunk</connection>
- <developerConnection>scm:svn:http://svn.nuiton.org/svn/jaxx/trunk
+ <developerConnection>
+ scm:svn:http://svn.nuiton.org/svn/jaxx/trunk
</developerConnection>
<url>http://www.nuiton.org/repositories/browse/jaxx/trunk</url>
</scm>
Modified: trunk/src/site/rst/index.rst
===================================================================
--- trunk/src/site/rst/index.rst 2012-02-03 00:09:33 UTC (rev 2313)
+++ trunk/src/site/rst/index.rst 2012-02-06 10:48:25 UTC (rev 2314)
@@ -36,7 +36,20 @@
english translation at the same time. To help you wait, you can have a look to
the demo_.
+Nouveautés de la version 2.5
+----------------------------
+Changement de l'artifactId du plugin
+____________________________________
+
+Avant la version 2.4, l'artifactId du plugin était **maven-jaxx-plugin**, mais
+Maven depuis la version 3 demande que nous utilisions plutôt
+**jaxx-maven-plugin** car à terme la première forme d'artifactId ne sera plus
+acceptée que pour les projets de maven.
+
+Pour plus d'information sur comment utiliser le plugin, veuillez visiter la
+`page des goals`_
+
Nouveautés de la version 2.4
----------------------------
@@ -301,15 +314,15 @@
.. TODO Finish this list and add icons
-.. _Isis-fish: http://isis-fish.labs.libre-entreprise.org/
+.. _Isis-fish: http://www.isis-fish.org/
.. _simExplorer-si: http://www.simexplorer.org
-.. _ObServe: http://observe.labs.libre-entreprise.org/observe/
+.. _ObServe: http://maven-site.forge.codelutin.com/observe/
.. _Lima: http://maven-site.chorem.org/lima/
-.. _Vradi: http://vradi.labs.libre-entreprise.org/vradi/index.html
+.. _Vradi: http://maven-site.forge.codelutin.com/vradi
.. _Migration: ./migration.html
@@ -326,5 +339,7 @@
.. _NavigationModel: ./NavigationModel.html
.. _nuiton-validator: http://maven-site.nuiton.org/nuiton-utils/nuiton-validator
+
.. _eugene: http://maven-site.nuiton.org/eugene
+.. _page des goals: ./jaxx-maven-plugin/plugin-info.html
\ No newline at end of file
Modified: trunk/src/site/rst/tutos/helloworld.rst
===================================================================
--- trunk/src/site/rst/tutos/helloworld.rst 2012-02-03 00:09:33 UTC (rev 2313)
+++ trunk/src/site/rst/tutos/helloworld.rst 2012-02-06 10:48:25 UTC (rev 2314)
@@ -101,7 +101,7 @@
<plugin>
<groupId>org.nuiton.jaxx</groupId>
- <artifactId>maven-jaxx-plugin</artifactId>
+ <artifactId>jaxx-maven-plugin</artifactId>
<version>2.0.1</version>
<executions>
<execution>
Modified: trunk/src/site/rst/tutos/helloworld2.rst
===================================================================
--- trunk/src/site/rst/tutos/helloworld2.rst 2012-02-03 00:09:33 UTC (rev 2313)
+++ trunk/src/site/rst/tutos/helloworld2.rst 2012-02-06 10:48:25 UTC (rev 2314)
@@ -120,7 +120,7 @@
Les sources de ce tutoriel sont disponibles au `telechargement ici`_.
-.. _telechargement ici::http://nuiton.org/projects/list_files/jaxx
+.. _telechargement ici: http://nuiton.org/projects/list_files/jaxx
Lancer ce tutoriel
------------------
Modified: trunk/src/site/site_fr.xml
===================================================================
--- trunk/src/site/site_fr.xml 2012-02-03 00:09:33 UTC (rev 2313)
+++ trunk/src/site/site_fr.xml 2012-02-06 10:48:25 UTC (rev 2314)
@@ -28,7 +28,7 @@
<bannerLeft>
<name>${project.name}</name>
- <src>${site.home.url}/jaxx.png</src>
+ <src>./jaxx.png</src>
<href>index.html</href>
</bannerLeft>
@@ -55,38 +55,37 @@
<menu ref="modules"/>
- <menu name="Documentation">
+ <menu name="Présentation">
<item name="Accueil" href="index.html"/>
<item name="Présentation/Concept" href="presentation.html"/>
<item name="Qu'est-ce qu'un fichier JAXX ?" href="JAXXFile.html"/>
- <item name="Fonctionalités de base">
- <item name="Utiliser les objets Swing" href="useSwingObjects.html"/>
- <item name="Les scripts JAXX" href="scripting.html"/>
- <item name="Le data-binding" href="dataBinding.html"/>
- <item name="Utiliser des styles" href="useStylesheets.html"/>
- <!--item name="Le context/cache" href=""/-->
- <item name="Java beans" href="javaBeans.html"/>
- <!--item name="Actions/Tabs" href=""/-->
- </item>
- <item name="Fonctionnalités avancées">
- <item name="Internationalisation" href="I18n.html"/>
- <!--item name="Arbre de navigation" href=""/>
- <item name="Validateurs" href=""/-->
- <item name="Programmation par contrat" href="contractProgramming.html"/>
- <!--item name="Widgets" href=""/-->
- </item>
- <!--item name="Bonnes pratiques" href=""/-->
+ </menu>
+
+ <menu name="Fonctionalités de base">
+ <item name="Utiliser les objets Swing" href="useSwingObjects.html"/>
+ <item name="Les scripts JAXX" href="scripting.html"/>
+ <item name="Le data-binding" href="dataBinding.html"/>
+ <item name="Utiliser des styles" href="useStylesheets.html"/>
+ <!--item name="Le context/cache" href=""/-->
+ <item name="Java beans" href="javaBeans.html"/>
+ <!--item name="Actions/Tabs" href=""/-->
+ </menu>
+
+ <menu name="Fonctionnalités avancées">
+ <item name="Internationalisation" href="I18n.html"/>
+ <!--item name="Arbre de navigation" href=""/>
+ <item name="Validateurs" href=""/-->
+ <item name="Programmation par contrat" href="contractProgramming.html"/>
+ <!--item name="Widgets" href=""/-->
+ </menu>
+
+ <menu name="Démo et Tutoriels">
<item name="Démo" href="demo.html"/>
- <item name="Tutoriels">
- <item name="Hello World" href="tutos/helloworld.html"/>
- <item name="Hello World 2" href="tutos/helloworld2.html"/>
- <item name="Feuilles de style" href="tutos/css.html"/>
- <item name="Data-binding" href="tutos/data-binding.html"/>
- <item name="ConfigUI" href="tutos/config.html"/>
- </item>
- <!--item name="Développeur">
- <item name="Comment le compilateur JAXX fonctionne"/>
- </item-->
+ <item name="Hello World" href="tutos/helloworld.html"/>
+ <item name="Hello World 2" href="tutos/helloworld2.html"/>
+ <item name="Feuilles de style" href="tutos/css.html"/>
+ <item name="Data-binding" href="tutos/data-binding.html"/>
+ <item name="ConfigUI" href="tutos/config.html"/>
</menu>
<menu name="Ancienne documentation">
1
0