diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index 43745a5..24f89f3 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -1,9 +1,82 @@ -=Piccolo2d 3.0-beta1 Release Notes= +=Piccolo2D 3.0 Release Notes= ------------------ -Initial beta release of svn branch https://piccolo2d.googlecode.com/svn/piccolo2d.java/branches/3.0-spike. +Major changes: -Further release notes will be available after beta releases are complete. +The minimum JDK version is now 1.6. + +JDK 1.6-only modules jdk16 and jdk16-examples have been merged to core and examples respectively. + +Piccolo2D.Java version 3.0 is _not_ binary compatible with version 1.3.x or version 2.x. + + +Fixed and verified issues: + + +=Piccolo2D 2.0 Release Notes= +------------------ + +Major changes: + +The root package name for Piccolo2D.Java is now org.piccolo2d to match the project domain name. + +The minimum JDK version is now 1.5. + +JDK 1.6-only code has been added to new modules jdk16 and jdk16-examples. + +Piccolo2D.Java version 2.0 is _not_ binary compatible with version 1.3.x. + + +Fixed and verified issues: + +33 PSwing components not visible in testing frameworks +37 change namespaces to piccolo2d, +86 inconsistencies of position method in PNode +135 Constants are not constant in the core. +136 PNotificationCenter is a singleton but isn't declared as final +152 Refactor PPath to use Path2D on JDK 1.6+ +153 PArea, a wrapper for java.awt.geom.Area to allow Constructive Area Geometry (CAG) operations +172 Add getRoot method to POffscreenCanvas +177 When deleting a selected node using the keyboard a selection change is not fired +180 Drawing tears when dragging or resizing path nodes +186 Create a new package org.piccolo2d.examples.bugs or .issues +236 Add zoom event handler that responds to mouse wheel events +251 Merge build-related changes from release-1.3 branch to trunk + + +=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 92b3c41..ceecc70 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -32,116 +32,17 @@ 4.0.0 - piccolo2d-parent + piccolo2d-complete org.piccolo2d 3.0-SNAPSHOT - ../parent/pom.xml piccolo2d-core bundle Piccolo2D Core + scm:svn:http://piccolo2d.googlecode.com/svn/piccolo2d.java/branches/3.0-spike/core scm:svn:https://piccolo2d.googlecode.com/svn/piccolo2d.java/branches/3.0-spike/core http://code.google.com/p/piccolo2d/source/browse/piccolo2d.java/branches/3.0-spike/core - - - - maven-checkstyle-plugin - 2.9.1 - - ${basedir}/src/build/conf/checkstyle.xml - false - - - - maven-javadoc-plugin - 2.9 - - true - false - package - - - - - javadoc - - - - - - maven-changelog-plugin - 2.2 - - - maven-jxr-plugin - 2.3 - - - maven-surefire-report-plugin - 2.14 - - - org.codehaus.mojo - taglist-maven-plugin - 2.4 - - - TODO - FIXME - @todo - @deprecated - - - - - maven-project-info-reports-plugin - 2.4 - - - maven-pmd-plugin - 3.0.1 - - ${jdk.version} - - - - org.codehaus.mojo - jdepend-maven-plugin - 2.0-beta-2 - - - org.codehaus.mojo - findbugs-maven-plugin - 2.5.2 - - false - - - - org.codehaus.mojo - cobertura-maven-plugin - 2.5.2 - - - - 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 b8df72d..d53ed55 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -32,26 +32,38 @@ 4.0.0 - piccolo2d-parent + piccolo2d-complete org.piccolo2d 3.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/branches/3.0-spike/examples scm:svn:https://piccolo2d.googlecode.com/svn/piccolo2d.java/branches/3.0-spike/examples http://code.google.com/p/piccolo2d/source/browse/piccolo2d.java/branches/3.0-spike/examples - + + + + + + org.piccolo2d + piccolo2d-extras + ${project.version} + + + + + + + org.piccolo2d + piccolo2d-extras + compile + + + @@ -59,7 +71,7 @@ - org.piccolo2d.examples.ExampleRunner + edu.umd.cs.piccolo.examples.ExampleRunner @@ -69,12 +81,4 @@ - - - - maven-project-info-reports-plugin - 2.4 - - - diff --git a/extras/pom.xml b/extras/pom.xml index 1535f0f..b581318 100644 --- a/extras/pom.xml +++ b/extras/pom.xml @@ -32,123 +32,35 @@ 4.0.0 - piccolo2d-parent + piccolo2d-complete org.piccolo2d 3.0-SNAPSHOT - ../parent/pom.xml piccolo2d-extras bundle Piccolo2D Extras - - - org.piccolo2d - piccolo2d-core - ${project.version} - - + scm:svn:http://piccolo2d.googlecode.com/svn/piccolo2d.java/branches/3.0-spike/extras scm:svn:https://piccolo2d.googlecode.com/svn/piccolo2d.java/branches/3.0-spike/extras http://code.google.com/p/piccolo2d/source/browse/piccolo2d.java/branches/3.0-spike/extras - - - - maven-checkstyle-plugin - 2.9.1 - - ${basedir}/src/build/conf/checkstyle.xml - false - - - - maven-javadoc-plugin - 2.9 - - true - false - package - - - - - javadoc - - - - - - maven-changelog-plugin - 2.2 - - - maven-jxr-plugin - 2.3 - - - maven-surefire-report-plugin - 2.14 - - - org.codehaus.mojo - taglist-maven-plugin - 2.4 - - - TODO - FIXME - @todo - @deprecated - - - - - maven-project-info-reports-plugin - 2.4 - - - maven-pmd-plugin - 3.0.1 - - ${jdk.version} - - - - org.codehaus.mojo - jdepend-maven-plugin - 2.0-beta-2 - - - org.codehaus.mojo - findbugs-maven-plugin - 2.5.2 - - false - - - - org.codehaus.mojo - cobertura-maven-plugin - 2.5.2 - - - - 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 - - - - - - + + + + + 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 304df62..0000000 --- a/parent/pom.xml +++ /dev/null @@ -1,344 +0,0 @@ - - - - 4.0.0 - - org.sonatype.oss - oss-parent - 7 - - org.piccolo2d - piccolo2d-parent - 3.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. - http://www.piccolo2d.org - - 1.6 - UTF-8 - UTF-8 - - - Google Code - http://code.google.com/p/piccolo2d/issues/list - - 1995 - - - 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/branches/3.0-spike/parent - scm:svn:https://piccolo2d.googlecode.com/svn/piccolo2d.java/branches/3.0-spike/parent - http://code.google.com/p/piccolo2d/source/browse/piccolo2d.java/branches/3.0-spike/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.4 - - - maven-clean-plugin - 2.5 - - - maven-compiler-plugin - 3.1 - - ${jdk.version} - ${jdk.version} - - - - maven-enforcer-plugin - 1.2 - - - maven-deploy-plugin - 2.7 - - - maven-install-plugin - 2.4 - - - maven-gpg-plugin - 1.4 - - - maven-jar-plugin - 2.4 - - - maven-javadoc-plugin - 2.9 - - true - false - package - - - - org.apache.maven.plugins - maven-release-plugin - 2.4.1 - - release - - - - maven-scm-plugin - 1.1 - - developerConnection - - - - maven-resources-plugin - 2.6 - - - maven-site-plugin - 3.2 - - - maven-source-plugin - 2.2.1 - - - maven-surefire-plugin - 2.14 - - - 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.5,) - - - [1.6,) - - - - - - - - - - - - junit - junit - 3.8.2 - - - - - - junit - junit - test - - - 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 cd3ec65..f30bc4d 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,29 +32,325 @@ 4.0.0 - piccolo2d-parent - org.piccolo2d - 3.0-SNAPSHOT - ./parent/pom.xml + org.sonatype.oss + oss-parent + 7 + + org.piccolo2d piccolo2d-complete + 3.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/branches/3.0-spike scm:svn:https://piccolo2d.googlecode.com/svn/piccolo2d.java/branches/3.0-spike http://code.google.com/p/piccolo2d/source/browse/piccolo2d.java/branches/3.0-spike + + + 1.6 + 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.4 + 2.7 + + + + index + summary + modules + scm + dependency-management + dependencies + dependency-convergence + distribution-management + + + + + + maven-surefire-report-plugin + 2.16 + - parent core extras swt diff --git a/swt-examples/pom.xml b/swt-examples/pom.xml index 46a4313..7a1d677 100644 --- a/swt-examples/pom.xml +++ b/swt-examples/pom.xml @@ -32,34 +32,47 @@ 4.0.0 - piccolo2d-parent + piccolo2d-complete org.piccolo2d 3.0-SNAPSHOT - ../parent/pom.xml piccolo2d-swt-examples bundle Piccolo2D SWT Examples + scm:svn:http://piccolo2d.googlecode.com/svn/piccolo2d.java/branches/3.0-spike/swt-examples scm:svn:https://piccolo2d.googlecode.com/svn/piccolo2d.java/branches/3.0-spike/swt-examples http://code.google.com/p/piccolo2d/source/browse/piccolo2d.java/branches/3.0-spike/swt-examples + + + + + org.piccolo2d + piccolo2d-swt + ${project.version} + + + + org.piccolo2d piccolo2d-swt - ${project.version} + compile + + org.apache.maven.plugins maven-assembly-plugin - org.piccolo2d.extras.swt.examples.SWTBasicExample + edu.umd.cs.piccolox.swt.examples.SWTBasicExample @@ -69,12 +82,4 @@ - - - - maven-project-info-reports-plugin - 2.4 - - - diff --git a/swt/pom.xml b/swt/pom.xml index 90435cb..ac7dd8b 100644 --- a/swt/pom.xml +++ b/swt/pom.xml @@ -32,32 +32,48 @@ 4.0.0 - piccolo2d-parent + piccolo2d-complete org.piccolo2d 3.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/branches/3.0-spike/swt scm:svn:https://piccolo2d.googlecode.com/svn/piccolo2d.java/branches/3.0-spike/swt http://code.google.com/p/piccolo2d/source/browse/piccolo2d.java/branches/3.0-spike/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 + + + @@ -68,105 +84,7 @@ - - - - maven-checkstyle-plugin - 2.9.1 - - ${basedir}/src/build/conf/checkstyle.xml - false - - - - maven-javadoc-plugin - 2.9 - - true - false - package - - - - - javadoc - - - - - - maven-changelog-plugin - 2.2 - - - maven-jxr-plugin - 2.3 - - - maven-surefire-report-plugin - 2.14 - - - org.codehaus.mojo - taglist-maven-plugin - 2.4 - - - TODO - FIXME - @todo - @deprecated - - - - - maven-project-info-reports-plugin - 2.4 - - - maven-pmd-plugin - 3.0.1 - - ${jdk.version} - - - - org.codehaus.mojo - jdepend-maven-plugin - 2.0-beta-2 - - - org.codehaus.mojo - findbugs-maven-plugin - 2.5.2 - - false - - - - org.codehaus.mojo - cobertura-maven-plugin - 2.5.2 - - - - 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 - - - - - - + gtk_linux_x86_64 @@ -263,6 +181,7 @@ disable this profile to build on mac osx, jdk 1.6, x86_64 + macosx_carbon @@ -280,7 +199,6 @@ enable this profile to build on mac osx, jdk 1.6, x86_64 set MAVEN_OPTS="-Dd64", or unit tests will fail - --> macosx_cocoa_intel