Author: tchemit Date: 2010-06-19 02:50:37 +0200 (Sat, 19 Jun 2010) New Revision: 1973 Url: http://nuiton.org/repositories/revision/jaxx/1973 Log: use mavenpom 2.2 and central-safe profile + fix some mistakes in tutorial and demo Modified: trunk/jaxx-demo/pom.xml trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/BusyChangeListener.java trunk/jaxx-tutorial-config/pom.xml trunk/jaxx-tutorial-css/pom.xml trunk/jaxx-tutorial-databinding/pom.xml trunk/jaxx-tutorial-helloworld/pom.xml trunk/jaxx-tutorial-helloworld2/pom.xml trunk/jaxx-tutorial/pom.xml trunk/pom.xml Modified: trunk/jaxx-demo/pom.xml =================================================================== --- trunk/jaxx-demo/pom.xml 2010-06-14 16:33:04 UTC (rev 1972) +++ trunk/jaxx-demo/pom.xml 2010-06-19 00:50:37 UTC (rev 1973) @@ -151,6 +151,11 @@ </manifest> </archive> </configuration> + <executions> + <execution> + <goals><goal>jar</goal></goals> + </execution> + </executions> </plugin> </plugins> Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/BusyChangeListener.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/BusyChangeListener.java 2010-06-14 16:33:04 UTC (rev 1972) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/BusyChangeListener.java 2010-06-19 00:50:37 UTC (rev 1973) @@ -1,3 +1,27 @@ +/* + * #%L + * JAXX :: Runtime + * + * $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% + */ package jaxx.runtime.swing.wizard; import org.apache.commons.logging.Log; Modified: trunk/jaxx-tutorial/pom.xml =================================================================== --- trunk/jaxx-tutorial/pom.xml 2010-06-14 16:33:04 UTC (rev 1972) +++ trunk/jaxx-tutorial/pom.xml 2010-06-19 00:50:37 UTC (rev 1973) @@ -186,20 +186,6 @@ </profile> - <profile> - <id>staging-site-profile</id> - <activation> - <property> - <name>stagingSite</name> - <value>true</value> - </property> - </activation> - <properties> - <jnlp.codebase>http://maven-site.liosalfar/jaxx/jaxx-demo/jnlp - </jnlp.codebase> - </properties> - </profile> - </profiles> </project> Modified: trunk/jaxx-tutorial-config/pom.xml =================================================================== --- trunk/jaxx-tutorial-config/pom.xml 2010-06-14 16:33:04 UTC (rev 1972) +++ trunk/jaxx-tutorial-config/pom.xml 2010-06-19 00:50:37 UTC (rev 1973) @@ -90,7 +90,7 @@ <!-- main class to run --> - <main.class>jaxx.demo.config.RunDemo</main.class> + <maven.jar.main.class>jaxx.demo.config.RunDemo</maven.jar.main.class> <!-- compiler configuration --> @@ -123,7 +123,7 @@ <useUniqueVersions>false</useUniqueVersions> <addClasspath>true</addClasspath> <classpathPrefix>./lib/</classpathPrefix> - <mainClass>${main.class}</mainClass> + <mainClass>${maven.jar.main.class}</mainClass> </manifest> </archive> </configuration> @@ -131,7 +131,7 @@ <plugin> <artifactId>maven-compiler-plugin</artifactId> - <version>2.3</version> + <version>2.3.1</version> </plugin> <plugin> Modified: trunk/jaxx-tutorial-css/pom.xml =================================================================== --- trunk/jaxx-tutorial-css/pom.xml 2010-06-14 16:33:04 UTC (rev 1972) +++ trunk/jaxx-tutorial-css/pom.xml 2010-06-19 00:50:37 UTC (rev 1973) @@ -53,7 +53,7 @@ <!-- main class to run --> - <main.class>org.nuiton.jaxx.tutorials.css.css</main.class> + <maven.jar.main.class>org.nuiton.jaxx.tutorials.css.css</maven.jar.main.class> <!-- compiler configuration --> @@ -79,14 +79,14 @@ <plugin> <artifactId>maven-jar-plugin</artifactId> - <version>2.3</version> + <version>2.3.1</version> <configuration> <archive> <manifest> <useUniqueVersions>false</useUniqueVersions> <addClasspath>true</addClasspath> <classpathPrefix>./lib/</classpathPrefix> - <mainClass>${main.class}</mainClass> + <mainClass>${maven.jar.main.class}</mainClass> </manifest> </archive> </configuration> @@ -94,7 +94,7 @@ <plugin> <artifactId>maven-compiler-plugin</artifactId> - <version>2.3</version> + <version>2.3.1</version> </plugin> <plugin> Modified: trunk/jaxx-tutorial-databinding/pom.xml =================================================================== --- trunk/jaxx-tutorial-databinding/pom.xml 2010-06-14 16:33:04 UTC (rev 1972) +++ trunk/jaxx-tutorial-databinding/pom.xml 2010-06-19 00:50:37 UTC (rev 1973) @@ -53,7 +53,7 @@ <!-- main class to run --> - <main.class>org.nuiton.jaxx.tutorials.databinding.databinding</main.class> + <maven.jar.main.class>org.nuiton.jaxx.tutorials.databinding.databinding</maven.jar.main.class> <!-- compiler configuration --> @@ -86,7 +86,7 @@ <useUniqueVersions>false</useUniqueVersions> <addClasspath>true</addClasspath> <classpathPrefix>./lib/</classpathPrefix> - <mainClass>${main.class}</mainClass> + <mainClass>${maven.jar.main.class}</mainClass> </manifest> </archive> </configuration> Modified: trunk/jaxx-tutorial-helloworld/pom.xml =================================================================== --- trunk/jaxx-tutorial-helloworld/pom.xml 2010-06-14 16:33:04 UTC (rev 1972) +++ trunk/jaxx-tutorial-helloworld/pom.xml 2010-06-19 00:50:37 UTC (rev 1973) @@ -61,7 +61,7 @@ <!-- main class to run --> - <main.class>org.nuiton.jaxx.tutorials.helloworld.helloworld</main.class> + <maven.jar.main.class>org.nuiton.jaxx.tutorials.helloworld.helloworld</maven.jar.main.class> <!-- compiler configuration --> @@ -87,14 +87,14 @@ <plugin> <artifactId>maven-jar-plugin</artifactId> - <version>2.3</version> + <version>2.3.1</version> <configuration> <archive> <manifest> <useUniqueVersions>false</useUniqueVersions> <addClasspath>true</addClasspath> <classpathPrefix>./lib/</classpathPrefix> - <mainClass>${main.class}</mainClass> + <mainClass>${maven.jar.main.class}</mainClass> </manifest> </archive> </configuration> @@ -102,7 +102,7 @@ <plugin> <artifactId>maven-compiler-plugin</artifactId> - <version>2.3</version> + <version>2.3.1</version> </plugin> <plugin> Modified: trunk/jaxx-tutorial-helloworld2/pom.xml =================================================================== --- trunk/jaxx-tutorial-helloworld2/pom.xml 2010-06-14 16:33:04 UTC (rev 1972) +++ trunk/jaxx-tutorial-helloworld2/pom.xml 2010-06-19 00:50:37 UTC (rev 1973) @@ -60,7 +60,7 @@ <!-- main class to run --> - <main.class>org.nuiton.jaxx.tutorials.helloworld.helloworld</main.class> + <maven.jar.main.class>org.nuiton.jaxx.tutorials.helloworld.helloworld</maven.jar.main.class> <!-- compiler configuration --> @@ -86,14 +86,14 @@ <plugin> <artifactId>maven-jar-plugin</artifactId> - <version>2.3</version> + <version>2.3.1</version> <configuration> <archive> <manifest> <useUniqueVersions>false</useUniqueVersions> <addClasspath>true</addClasspath> <classpathPrefix>./lib/</classpathPrefix> - <mainClass>${main.class}</mainClass> + <mainClass>${maven.jar.main.class}</mainClass> </manifest> </archive> </configuration> @@ -101,7 +101,7 @@ <plugin> <artifactId>maven-compiler-plugin</artifactId> - <version>2.3</version> + <version>2.3.1</version> </plugin> <plugin> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-06-14 16:33:04 UTC (rev 1972) +++ trunk/pom.xml 2010-06-19 00:50:37 UTC (rev 1973) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.1.5</version> + <version>2.2-SNAPSHOT</version> </parent> <artifactId>jaxx</artifactId> @@ -433,7 +433,7 @@ <version>${jnlp.version}</version> <configuration> <jnlp> - <mainClass>${main.class}</mainClass> + <mainClass>${maven.jar.main.class}</mainClass> <allPermissions>true</allPermissions> <offlineAllowed>true</offlineAllowed> </jnlp> @@ -481,8 +481,7 @@ <!-- 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> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/jaxx/trunk</developerConnection> <url>http://www.nuiton.org/repositories/browse/jaxx/trunk</url> </scm> @@ -520,6 +519,48 @@ </profile> + <profile> + <id>central-safe</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + + <properties> + + <!-- deploy releases on nuiton-central-releases repository --> + <release.repository>${nuiton.central.release.repository}</release.repository> + + </properties> + + <build> + <plugins> + <plugin> + <groupId>org.nuiton</groupId> + <artifactId>maven-helper-plugin</artifactId> + <executions> + <execution> + <id>check-central-safe</id> + <inherited>true</inherited> + <goals> + <goal>check-central-safe</goal> + </goals> + <configuration> + <extraRepositories> + <nuiton-central-releases> + http://nexus.nuiton.org/nexus/content/repositories/nuiton-central-releases + </nuiton-central-releases> + </extraRepositories> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> </project>