diff --git a/Readme.txt b/Readme.txt index ececb3e..6a8ba9f 100644 --- a/Readme.txt +++ b/Readme.txt @@ -81,10 +81,10 @@ $ cd examples $ mvn assembly:assembly -$ java -jar target/piccolo2d-examples-1.3-jar-with-dependencies.jar +$ java -jar target/piccolo2d-examples-2.0-jar-with-dependencies.jar To build and run the Piccolo2D SWT examples runnable jar $ cd swt-examples $ mvn assembly:assembly -$ java -jar target/piccolo2d-swt-examples-1.3-jar-with-dependencies.jar \ No newline at end of file +$ java -jar target/piccolo2d-swt-examples-2.0-jar-with-dependencies.jar diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index 92f9034..947f835 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -1,3 +1,38 @@ +=Piccolo2D 1.3.2 Release Notes= +------------------ + +Fixed and verified issues: + +134 PTransformActivity can throw null pointer exception +207 Horizontal scrolling causes an exception +208 Merge maven reporting plugin versions to parent pom +211 Consider using Sonatype oss-parent-7.pom as the parent of parent/pom.xml +224 Update maven-site-plugin version to 3.0, remove maven-3 profile +229 Consider updating maven-checkstyle-plugin to version 2.8 +230 Add link to Autocad DXF File Viewer on applications page +231 Mistake in java doc comment +235 PSwingEventHandler doesn't dispatch events to nodes at extreme scales +242 Typo in API docs +250 Update junit dependency version to 4.11 + + +=Piccolo2D 1.3.1 Release Notes= +------------------ + +Fixed and verified issues: + +163 PSwing doesn't draw dynamic JComponent properly +173 Slow repaint of PSwing components when zooming (from 1.2 to 1.3) +185 Memory leak - PActivityScheduler keeps processed activities in reference +187 general shapes are not filled correctly under SWT +188 wrong line width when drawing general shapes under SWT +195 testPSwingDelegatesPaintingToItsComponent(edu.umd.cs.piccolox.pswing.PSwingTest) fails on release-1.3 branch +197 Maven site does not run reports from the command line with maven 3 +203 Missing maven profile for Windows x86_64 +206 SWTGraphics2D keeps invalid caches +212 Update maven-gpg-plugin dependency version to 1.2 + + =Piccolo2D 1.3 Release Notes= ------------------ diff --git a/core/pom.xml b/core/pom.xml index c601b61..736a7a4 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -32,131 +32,17 @@ 4.0.0 - piccolo2d-parent + piccolo2d-complete org.piccolo2d 2.0-SNAPSHOT - ../parent/pom.xml piccolo2d-core bundle - Piccolo2D Core + scm:svn:http://piccolo2d.googlecode.com/svn/piccolo2d.java/trunk/core scm:svn:https://piccolo2d.googlecode.com/svn/piccolo2d.java/trunk/core http://code.google.com/p/piccolo2d/source/browse/piccolo2d.java/trunk/core - - - - maven-checkstyle-plugin - 2.9 - - ${basedir}/src/build/conf/checkstyle.xml - false - - - - maven-javadoc-plugin - 2.9 - - ${jdk.version} - false - package - - - - - javadoc - - - - - - maven-surefire-report-plugin - 2.7.1 - - - maven-changelog-plugin - 2.2 - - - - maven-jxr-plugin - 2.2 - - - org.codehaus.mojo - taglist-maven-plugin - 2.4 - - - TODO - FIXME - @todo - @deprecated - - - - - maven-project-info-reports-plugin - 2.3.1 - - - maven-pmd-plugin - 2.5 - - ascii - ${jdk.version} - - - - org.codehaus.mojo - jdepend-maven-plugin - 2.0-beta-2 - - - org.codehaus.mojo - findbugs-maven-plugin - 2.3.1 - - - true - true - true - target/site - false - - - - org.codehaus.mojo - cobertura-maven-plugin - 2.4 - - - xml - html - - - - org.piccolo2d.examples.* - org.piccolo2d.examples.pswing.* - org.piccolo2d.examples.swt.* - org.piccolo2d.tutorial.* - - - org/piccolo2d/examples/** - org/piccolo2d/**/*Test.class - org/piccolo2d/extras/**/*Test.class - org/piccolo2d/**/Mock*.class - org/piccolo2d/extras/**/Mock*.class - - - - - - diff --git a/examples/pom.xml b/examples/pom.xml index 5e7eff2..52d6929 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -1,74 +1,84 @@ - - - - 4.0.0 - - piccolo2d-parent - org.piccolo2d - 2.0-SNAPSHOT - ../parent/pom.xml - - piccolo2d-examples - Piccolo2D Examples - bundle - - - - org.piccolo2d - piccolo2d-extras - ${project.version} - - - - scm:svn:http://piccolo2d.googlecode.com/svn/piccolo2d.java/trunk/examples - scm:svn:https://piccolo2d.googlecode.com/svn/piccolo2d.java/trunk/examples - http://code.google.com/p/piccolo2d/source/browse/piccolo2d.java/trunk/examples - - - - - org.apache.maven.plugins - maven-assembly-plugin - - - - org.piccolo2d.examples.ExampleRunner - - - - jar-with-dependencies - - - - - - + + + + 4.0.0 + + piccolo2d-complete + org.piccolo2d + 2.0-SNAPSHOT + + piccolo2d-examples + Piccolo2D Examples + bundle + + + scm:svn:http://piccolo2d.googlecode.com/svn/piccolo2d.java/trunk/examples + scm:svn:https://piccolo2d.googlecode.com/svn/piccolo2d.java/trunk/examples + http://code.google.com/p/piccolo2d/source/browse/piccolo2d.java/trunk/examples + + + + + + org.piccolo2d + piccolo2d-extras + ${project.version} + + + + + + + org.piccolo2d + piccolo2d-extras + compile + + + + + + + maven-assembly-plugin + + + + edu.umd.cs.piccolo.examples.ExampleRunner + + + + jar-with-dependencies + + + + + + diff --git a/extras/pom.xml b/extras/pom.xml index 72044e5..0124207 100644 --- a/extras/pom.xml +++ b/extras/pom.xml @@ -32,140 +32,35 @@ 4.0.0 - piccolo2d-parent + piccolo2d-complete org.piccolo2d 2.0-SNAPSHOT - ../parent/pom.xml piccolo2d-extras bundle - Piccolo2D Extras - - - org.piccolo2d - piccolo2d-core - ${project.version} - - - org.easytesting - fest-swing-junit - 1.2a4 - test - - + scm:svn:http://piccolo2d.googlecode.com/svn/piccolo2d.java/trunk/extras scm:svn:https://piccolo2d.googlecode.com/svn/piccolo2d.java/trunk/extras http://code.google.com/p/piccolo2d/source/browse/piccolo2d.java/trunk/extras - - - - maven-checkstyle-plugin - 2.9 - - ${basedir}/src/build/conf/checkstyle.xml - false - - - - maven-javadoc-plugin - 2.9 - - ${jdk.version} - false - package - - - - - javadoc - - - - - - maven-surefire-report-plugin - 2.7.1 - - - maven-changelog-plugin - 2.2 - - - - maven-jxr-plugin - 2.2 - - - org.codehaus.mojo - taglist-maven-plugin - 2.4 - - - TODO - FIXME - @todo - @deprecated - - - - - maven-project-info-reports-plugin - 2.3.1 - - - maven-pmd-plugin - 2.5 - - ascii - ${jdk.version} - - - - org.codehaus.mojo - jdepend-maven-plugin - 2.0-beta-2 - - - org.codehaus.mojo - findbugs-maven-plugin - 2.3.1 - - - true - true - true - target/site - false - - - - org.codehaus.mojo - cobertura-maven-plugin - 2.4 - - - xml - html - - - - org.piccolo2d.examples.* - org.piccolo2d.examples.pswing.* - org.piccolo2d.examples.swt.* - org.piccolo2d.tutorial.* - - - org/piccolo2d/examples/** - - - - - - + + + + + org.piccolo2d + piccolo2d-core + ${project.version} + + + + + + + org.piccolo2d + piccolo2d-core + compile + + diff --git a/extras/src/test/java/org/piccolo2d/extras/pswing/PSwingFESTTest.java b/extras/src/test/java/org/piccolo2d/extras/pswing/PSwingFESTTest.java deleted file mode 100644 index 85b05e2..0000000 --- a/extras/src/test/java/org/piccolo2d/extras/pswing/PSwingFESTTest.java +++ /dev/null @@ -1,114 +0,0 @@ -/* - * Copyright (c) 2008-2011, Piccolo2D project, http://piccolo2d.org - * Copyright (c) 1998-2008, University of Maryland - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without modification, are permitted provided - * that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, this list of conditions - * and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright notice, this list of conditions - * and the following disclaimer in the documentation and/or other materials provided with the - * distribution. - * - * None of the name of the University of Maryland, the name of the Piccolo2D project, or the names of its - * contributors may be used to endorse or promote products derived from this software without specific - * prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A - * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -package org.piccolo2d.extras.pswing; - -import java.awt.Component; -import java.awt.Dimension; -import java.awt.Point; - -import javax.swing.JFrame; -import javax.swing.JList; - -import junit.framework.TestCase; - -import org.fest.swing.core.MouseButton; -import org.fest.swing.core.MouseClickInfo; -import org.fest.swing.exception.ComponentLookupException; -import org.fest.swing.fixture.FrameFixture; -import org.fest.swing.fixture.JListFixture; -import org.piccolo2d.extras.pswing.PSwing; -import org.piccolo2d.extras.pswing.PSwingCanvas; - -/** - * The PSwingFESTTest is a TestCase designed to ensure Piccolo2D plays - * well with the FEST GUI Testing Framework. - */ -public class PSwingFESTTest extends TestCase { - private FrameFixture frameFixture; - - public void setUp() { - JFrame frame = new JFrame(); - PSwingCanvas swingCanvas = new PSwingCanvas(); - swingCanvas.setName("canvas"); - swingCanvas.setPreferredSize(new Dimension(300, 300)); - - JList testList = new JList(new String[] { "One", "Two", "Three" }); - testList.setName("testList"); - swingCanvas.getLayer().addChild(new PSwing(testList)); - - frame.getContentPane().add(swingCanvas); - frame.pack(); - - frameFixture = new FrameFixture(frame); - frameFixture.show(); - } - - public void tearDown() { - frameFixture.cleanUp(); - } - - public void testFESTThrowsExceptionWhenComponentNotFound() { - try { - frameFixture.list("invalidListName"); - } - catch (ComponentLookupException expected) { - // Expected - } - } - - public void testUnderlyingSwingComponentsAreAccessibleToFEST() { - JListFixture listFixture = frameFixture.list("testList"); - listFixture.selectItem("One"); - listFixture.requireVisible(); - - assertFirstElementOfListSelected(); - } - - //TODO: Make this work while running in headlesss mode under Xvnc - /* public void testClickingOnPSwingPassesThroughToComponent() { - Component canvas = frameFixture.robot.finder().findByName("canvas"); - assertNotNull(canvas); - - Point point = canvas.getLocationOnScreen(); - Point firstElementPoint = new Point(point.x + 5, point.y + 5); - frameFixture.robot.click(firstElementPoint, MouseButton.LEFT_BUTTON, 1); - - assertFirstElementOfListSelected(); - }*/ - - private void assertFirstElementOfListSelected() { - JListFixture listFixture = frameFixture.list("testList"); - - String[] selection = listFixture.selection(); - assertNotNull(selection); - assertFalse(0 == selection.length); - assertEquals("One", selection[0]); - } -} diff --git a/jdk16-examples/pom.xml b/jdk16-examples/pom.xml index 5f7bdc9..6470811 100644 --- a/jdk16-examples/pom.xml +++ b/jdk16-examples/pom.xml @@ -32,47 +32,68 @@ 4.0.0 - piccolo2d-parent + piccolo2d-complete org.piccolo2d 2.0-SNAPSHOT - ../parent/pom.xml - piccolo2d-examples + piccolo2d-jdk16-examples Piccolo2D JDK16 Examples bundle - - 1.6 - - - - org.piccolo2d - piccolo2d-extras - ${project.version} - - - org.piccolo2d - piccolo2d-jdk16 - ${project.version} - - + scm:svn:http://piccolo2d.googlecode.com/svn/piccolo2d.java/trunk/jdk16-examples scm:svn:https://piccolo2d.googlecode.com/svn/piccolo2d.java/trunk/jdk16-examples http://code.google.com/p/piccolo2d/source/browse/piccolo2d.java/trunk/jdk16-examples + + + 1.6 + + + + + + org.piccolo2d + piccolo2d-core + ${project.version} + + + org.piccolo2d + piccolo2d-extras + ${project.version} + + + org.piccolo2d + piccolo2d-jdk16 + ${project.version} + + + + + + + org.piccolo2d + piccolo2d-core + compile + + + org.piccolo2d + piccolo2d-extras + compile + + + org.piccolo2d + piccolo2d-jdk16 + compile + + + org.apache.maven.plugins maven-assembly-plugin - jar-with-dependencies diff --git a/jdk16/pom.xml b/jdk16/pom.xml index e8f9687..bc7aaad 100644 --- a/jdk16/pom.xml +++ b/jdk16/pom.xml @@ -32,136 +32,39 @@ 4.0.0 - piccolo2d-parent + piccolo2d-complete org.piccolo2d 2.0-SNAPSHOT - ../parent/pom.xml piccolo2d-jdk16 bundle Piccolo2D JDK16 - - 1.6 - - - - org.piccolo2d - piccolo2d-core - ${project.version} - - + scm:svn:http://piccolo2d.googlecode.com/svn/piccolo2d.java/trunk/jdk16 scm:svn:https://piccolo2d.googlecode.com/svn/piccolo2d.java/trunk/jdk16 http://code.google.com/p/piccolo2d/source/browse/piccolo2d.java/trunk/jdk16 - - - - maven-checkstyle-plugin - 2.9 - - ${basedir}/src/build/conf/checkstyle.xml - false - - - - maven-javadoc-plugin - 2.9 - - ${jdk.version} - false - package - - - - - javadoc - - - - - - maven-surefire-report-plugin - 2.7.1 - - - maven-changelog-plugin - 2.2 - - - - maven-jxr-plugin - 2.2 - - - org.codehaus.mojo - taglist-maven-plugin - 2.4 - - - TODO - FIXME - @todo - @deprecated - - - - - maven-project-info-reports-plugin - 2.3.1 - - - maven-pmd-plugin - 2.5 - - ascii - ${jdk.version} - - - - org.codehaus.mojo - jdepend-maven-plugin - 2.0-beta-2 - - - org.codehaus.mojo - findbugs-maven-plugin - 2.3.1 - - - true - true - true - target/site - false - - - - org.codehaus.mojo - cobertura-maven-plugin - 2.4 - - - xml - html - - - - org.piccolo2d.examples.* - org.piccolo2d.examples.pswing.* - org.piccolo2d.examples.swt.* - org.piccolo2d.tutorial.* - - - org/piccolo2d/examples/** - - - - - - + + + 1.6 + + + + + + org.piccolo2d + piccolo2d-core + ${project.version} + + + + + + + org.piccolo2d + piccolo2d-core + compile + + diff --git a/parent/.settings/org.eclipse.jdt.core.prefs b/parent/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index f879a5f..0000000 --- a/parent/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,5 +0,0 @@ -#Fri Jul 31 20:29:04 EDT 2009 -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.4 -org.eclipse.jdt.core.compiler.compliance=1.4 -org.eclipse.jdt.core.compiler.source=1.4 diff --git a/parent/.settings/org.maven.ide.eclipse.prefs b/parent/.settings/org.maven.ide.eclipse.prefs deleted file mode 100644 index e0f41b4..0000000 --- a/parent/.settings/org.maven.ide.eclipse.prefs +++ /dev/null @@ -1,9 +0,0 @@ -#Fri Jul 31 20:28:54 EDT 2009 -activeProfiles= -eclipse.preferences.version=1 -fullBuildGoals=process-test-resources -includeModules=false -resolveWorkspaceProjects=true -resourceFilterGoals=process-resources resources\:testResources -skipCompilerPlugin=true -version=1 diff --git a/parent/pom.xml b/parent/pom.xml deleted file mode 100644 index 8f17208..0000000 --- a/parent/pom.xml +++ /dev/null @@ -1,391 +0,0 @@ - - - - 4.0.0 - org.piccolo2d - piccolo2d-parent - 2.0-SNAPSHOT - pom - Piccolo2D Parent - A revolutionary way to create robust, full-featured graphical applications in Java and C#, with striking visual effects such as zooming, animation and multiple representations. - - 1.5 - UTF-8 - UTF-8 - http://www.piccolo2d.org/java - ${httpbase}/site - - - - - - - - - ${httpsitebase}/${project.artifactId}/${project.version} - - Google Code - http://code.google.com/p/piccolo2d/issues/list - - 1995 - - hudson - http://allain.homelinux.org:2121/ - - - - Piccolo2D Announce - http://groups.google.com/group/piccolo2d-announce/subscribe - piccolo2d-announce@googlegroups.com - http://groups.google.com/group/piccolo2d-announce - - - Piccolo2D Users - http://groups.google.com/group/piccolo2d-users/subscribe - piccolo2d-users@googlegroups.com - http://groups.google.com/group/piccolo2d-users - - - Piccolo2D Dev - http://groups.google.com/group/piccolo2d-dev/subscribe - piccolo2d-dev@googlegroups.com - http://groups.google.com/group/piccolo2d-dev - - - - - BSD PUBLIC LICENSE - http://opensource.org/licenses/bsd-license.php - manual - - - - scm:svn:http://piccolo2d.googlecode.com/svn/piccolo2d.java/trunk/parent - scm:svn:https://piccolo2d.googlecode.com/svn/piccolo2d.java/trunk/parent - http://code.google.com/p/piccolo2d/source/browse/piccolo2d.java/trunk/parent - - - Piccolo2D - http://code.google.com/p/piccolo2d/ - - - - allain.lalonde - Allain Lalonde - - developer - - allain@machete.ca - http://www.machete.ca - -5 - - - bederson - Ben Bederson - - founder, original architect - - -5 - University of Maryland / Human-Computer Interaction Lab - http://www.cs.umd.edu/~bederson - - - heuermh - Michael L Heuer - - developer - - -6 - - - jesse - jesse - - developer - - -5 - - - mr0738@mro.name - Marcus Rohrmoser - - developer - - +1 - http://blog.mro.name - - - reids - Sam Reid - - developer - - http://spot.colorado.edu/~reids - -7 - - - sjc@browsecode.org - Stephen Chin - - developer - - sjc@browsecode.org - http://steveonjava.com/ - -8 - - - aclamage - Aaron Clamage - - developer - - aclamage@gmail.com - -5 - - - lgood - Lance Good - - developer - - lance@goodle.org - -5 - - - Aaron Dixon - atdixon@gmail.com - - developer - - -6 - - - Chris Malley - cmalley@pixelzoom.com - http://www.pixelzoom.com - - developer - - -7 - - - - - Alexander Kurtakov - akurtakov@gmail.com - http://akurtakov.blogspot.com - Red Hat Inc. - http://redhat.com - - developer - - +2 - - - berthold.daum@bdaum.de - - developer - - - - - - - - maven-assembly-plugin - 2.2-beta-4 - - - maven-clean-plugin - 2.4.1 - - - maven-compiler-plugin - 2.3.2 - - true - true - ascii - false - false - ${jdk.version} - false - true - ${jdk.version} - ${jdk.version} - - - - maven-enforcer-plugin - 1.1.1 - - - maven-deploy-plugin - 2.5 - - - maven-gpg-plugin - 1.2 - - - maven-javadoc-plugin - 2.9 - - ${jdk.version} - false - package - - - - maven-jar-plugin - 2.3.1 - - - maven-scm-plugin - 1.1 - - developerConnection - - - - maven-site-plugin - 3.1 - - - maven-surefire-plugin - 2.8 - - - org.apache.felix - maven-bundle-plugin - 2.3.4 - true - - - - - - org.apache.felix - maven-bundle-plugin - true - - - maven-enforcer-plugin - - - enforce-java - - enforce - - - - - [3.0.4,) - - - - - - - - - - - - junit - junit - 3.8.2 - - - - - - junit - junit - test - - - - - - maven.site - ${piccolo2d.file.site.base} - - - sonatype-nexus-staging - Nexus Release Repository - http://oss.sonatype.org/service/local/staging/deploy/maven2/ - - - - - release-sign-artifacts - - - signArtifacts - true - - - - - - maven-gpg-plugin - - - sign-artifacts - verify - - sign - - - - - - - - - diff --git a/parent/src/site/apt/index.apt b/parent/src/site/apt/index.apt deleted file mode 100644 index 282dac9..0000000 --- a/parent/src/site/apt/index.apt +++ /dev/null @@ -1,11 +0,0 @@ - ------ - Piccolo2D - -Lorem ipsum - - dolor sit amet, consectetur adipisci elit. Nunc ac ante sed ante imperdiet auctor. Fusce dignissim, magna eu feugiat tincidunt, nibh metus tincidunt augue, quis ullamcorper lorem pede a ante. Proin congue nisl a arcu. Donec et elit. Etiam ac eros nec metus molestie aliquam. Nullam vestibulum molestie magna. In varius quam in nulla luctus tristique. Nam et eros. Sed vitae sem a velit mattis dapibus. Sed blandit, sapien auctor adipiscing viverra, purus urna fermentum wisi, id luctus tortor augue et ligula. In quis libero. Sed urna arcu, malesuada in, adipiscing vitae, vehicula vitae, magna. Phasellus sit amet nisl at erat aliquet eleifend. Quisque malesuada porta elit. Nulla nec orci ac leo posuere eleifend. Aliquam ultrices vulputate velit. Vestibulum vitae ipsum. Vestibulum pede erat, cursus nec, porttitor ac, accumsan ut, neque. - -* Aenean vel mi. - - Donec blandit mauris convallis lacus. Sed a urna. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Vivamus hendrerit. Curabitur libero leo, laoreet nec, lobortis in, auctor malesuada, metus. Vivamus ultrices eros eget pede. Morbi facilisis leo ut elit. Fusce viverra iaculis risus. Pellentesque posuere faucibus sem. Praesent et felis ac lorem laoreet venenatis. - diff --git a/parent/src/site/site.xml b/parent/src/site/site.xml deleted file mode 100644 index 921a88d..0000000 --- a/parent/src/site/site.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - Piccol2D - http://piccolo2d.googlecode.com/svn/site/images/Piccolo2D-Logo.png - ../piccolo2d-complete/index.html - - - - - - - - - - - - - - - - - - diff --git a/pom.xml b/pom.xml index 244ae9f..9227345 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ and the following disclaimer. Redistributions in binary form must reproduce the above copyright notice, this list of conditions - and the following disclaimer in the documentation and/or other materials provided with the +2 and the following disclaimer in the documentation and/or other materials provided with the distribution. None of the name of the University of Maryland, the name of the Piccolo2D project, or the names of its @@ -32,27 +32,331 @@ 4.0.0 - piccolo2d-parent - org.piccolo2d - 2.0-SNAPSHOT - ./parent/pom.xml + org.sonatype.oss + oss-parent + 7 + + org.piccolo2d piccolo2d-complete + 2.0-SNAPSHOT pom + Piccolo2D + A revolutionary way to create robust, full-featured graphical applications in Java and C#, with striking visual effects such as zooming, animation and multiple representations. + http://www.piccolo2d.org/java/site/${project.artifactId}/${project.version} + 1995 + + + Piccolo2D + http://code.google.com/p/piccolo2d/ + + + + + BSD PUBLIC LICENSE + http://opensource.org/licenses/bsd-license.php + manual + + + + + Google Code + http://code.google.com/p/piccolo2d/issues/list + + + + + Piccolo2D Announce + http://groups.google.com/group/piccolo2d-announce/subscribe + piccolo2d-announce@googlegroups.com + http://groups.google.com/group/piccolo2d-announce + + + Piccolo2D Users + http://groups.google.com/group/piccolo2d-users/subscribe + piccolo2d-users@googlegroups.com + http://groups.google.com/group/piccolo2d-users + + + Piccolo2D Dev + http://groups.google.com/group/piccolo2d-dev/subscribe + piccolo2d-dev@googlegroups.com + http://groups.google.com/group/piccolo2d-dev + + + + + + allain.lalonde + Allain Lalonde + + developer + + allain@machete.ca + http://www.machete.ca + -5 + + + bederson + Ben Bederson + + founder, original architect + + -5 + University of Maryland / Human-Computer Interaction Lab + http://www.cs.umd.edu/~bederson + + + heuermh + Michael L Heuer + + developer + + -6 + + + jesse + jesse + + developer + + -5 + + + mr0738@mro.name + Marcus Rohrmoser + + developer + + +1 + http://blog.mro.name + + + reids + Sam Reid + + developer + + http://spot.colorado.edu/~reids + -7 + + + sjc@browsecode.org + Stephen Chin + + developer + + sjc@browsecode.org + http://steveonjava.com/ + -8 + + + aclamage + Aaron Clamage + + developer + + aclamage@gmail.com + -5 + + + lgood + Lance Good + + developer + + lance@goodle.org + -5 + + + Aaron Dixon + atdixon@gmail.com + + developer + + -6 + + + Chris Malley + cmalley@pixelzoom.com + http://www.pixelzoom.com + + developer + + -7 + + + + + + Alexander Kurtakov + akurtakov@gmail.com + http://akurtakov.blogspot.com + Red Hat Inc. + http://redhat.com + + developer + + +2 + + + berthold.daum@bdaum.de + + developer + + + + scm:svn:http://piccolo2d.googlecode.com/svn/piccolo2d.java/trunk scm:svn:https://piccolo2d.googlecode.com/svn/piccolo2d.java/trunk http://code.google.com/p/piccolo2d/source/browse/piccolo2d.java/trunk - - + + + 1.5 + UTF-8 + UTF-8 + + + + + + + maven-assembly-plugin + 2.4 + + + maven-clean-plugin + 2.5 + + + maven-compiler-plugin + 3.1 + + ${maven.compile.source} + ${maven.compile.target} + + + + maven-deploy-plugin + 2.7 + + + maven-gpg-plugin + 1.4 + + + maven-install-plugin + 2.5.1 + + + maven-jar-plugin + 2.4 + + + maven-javadoc-plugin + 2.9.1 + + + maven-release-plugin + 2.4.1 + + + maven-resources-plugin + 2.6 + + + maven-site-plugin + 3.3 + + + maven-source-plugin + 2.2.1 + + + maven-surefire-plugin + 2.16 + + + org.apache.felix + maven-bundle-plugin + 2.4.0 + + + + + + org.apache.felix + maven-bundle-plugin + true + + + + + + + + junit + junit + 4.11 + + + + + + + junit + junit + test + + + + + + + maven-javadoc-plugin + 2.9.1 + + true + true + ${maven.compile.source} + true + + + + maven-project-info-reports-plugin + 2.7 + + + + index + summary + modules + scm + dependency-management + dependencies + dependency-convergence + distribution-management + + + + + + maven-surefire-report-plugin + 2.16 + + + + - parent core extras + jdk16 swt examples + jdk16-examples swt-examples diff --git a/swt-examples/pom.xml b/swt-examples/pom.xml index 01374c0..5b035ad 100644 --- a/swt-examples/pom.xml +++ b/swt-examples/pom.xml @@ -32,27 +32,38 @@ 4.0.0 - piccolo2d-parent + piccolo2d-complete org.piccolo2d 2.0-SNAPSHOT - ../parent/pom.xml piccolo2d-swt-examples bundle - Piccolo2D SWT Examples + scm:svn:http://piccolo2d.googlecode.com/svn/piccolo2d.java/trunk/swt-examples scm:svn:https://piccolo2d.googlecode.com/svn/piccolo2d.java/trunk/swt-examples http://code.google.com/p/piccolo2d/source/browse/piccolo2d.java/trunk/swt-examples + + + + + org.piccolo2d + piccolo2d-swt + ${project.version} + + + + org.piccolo2d piccolo2d-swt - ${project.version} + compile + @@ -61,7 +72,7 @@ - org.piccolo2d.extras.swt.examples.SWTBasicExample + edu.umd.cs.piccolox.swt.examples.SWTBasicExample diff --git a/swt/pom.xml b/swt/pom.xml index 2a76934..8586288 100644 --- a/swt/pom.xml +++ b/swt/pom.xml @@ -32,33 +32,48 @@ 4.0.0 - piccolo2d-parent + piccolo2d-complete org.piccolo2d 2.0-SNAPSHOT - ../parent/pom.xml piccolo2d-swt bundle - Piccolo2D SWT - - - org.piccolo2d - piccolo2d-extras - ${project.version} - - - ${swt.groupId} - ${swt.artifactId} - [3.3.0-v3346,) - compile - - + scm:svn:http://piccolo2d.googlecode.com/svn/piccolo2d.java/trunk/swt scm:svn:https://piccolo2d.googlecode.com/svn/piccolo2d.java/trunk/swt http://code.google.com/p/piccolo2d/source/browse/piccolo2d.java/trunk/swt + + + + + org.piccolo2d + piccolo2d-extras + ${project.version} + + + ${swt.groupId} + ${swt.artifactId} + [3.3.0-v3346,) + + + + + + + org.piccolo2d + piccolo2d-extras + compile + + + ${swt.groupId} + ${swt.artifactId} + compile + + + @@ -69,115 +84,7 @@ - - - - maven-checkstyle-plugin - 2.9 - - ${basedir}/src/build/conf/checkstyle.xml - false - - - - maven-javadoc-plugin - 2.9 - - ${jdk.version} - false - package - - - - - javadoc - - - - - - maven-surefire-report-plugin - 2.7.1 - - - maven-changelog-plugin - 2.2 - - - - maven-jxr-plugin - 2.2 - - - org.codehaus.mojo - taglist-maven-plugin - 2.4 - - - TODO - FIXME - @todo - @deprecated - - - - - maven-project-info-reports-plugin - 2.3.1 - - - maven-pmd-plugin - 2.5 - - ascii - ${jdk.version} - - - - org.codehaus.mojo - jdepend-maven-plugin - 2.0-beta-2 - - - org.codehaus.mojo - findbugs-maven-plugin - 2.3.1 - - - true - true - true - target/site - false - - - - org.codehaus.mojo - cobertura-maven-plugin - 2.4 - - - xml - html - - - - org.piccolo2d.examples.* - org.piccolo2d.examples.pswing.* - org.piccolo2d.examples.swt.* - org.piccolo2d.tutorial.* - - - org/piccolo2d/examples/** - - - - - - + gtk_linux_x86_64 @@ -274,7 +181,7 @@ disable this profile to build on mac osx, jdk 1.6, x86_64 ---> + macosx_carbon @@ -287,11 +194,12 @@ macosx +--> macosx_cocoa_intel @@ -306,6 +214,5 @@ -XstartOnFirstThread --->