Re: [udig-devel] merging trunk fixes into 1.2.0 tag for post-QA re-relea

[Jody Garnett <jody.garnett@xxxxxxxxx>]

So switching my check out to the 1.2.0 tag resulted in the following:

svn switch http://svn.refractions.net/udig/udig/tags/1.2.0 .

U    plugins/net.refractions.udig.libs/build.properties

U    plugins/net.refractions.udig.libs/refresh.xml

U    plugins/net.refractions.udig.libs/META-INF/MANIFEST.MF

U    plugins/net.refractions.udig.libs/.classpath

U    plugins/net.refractions.udig.ui.tests/src/net/refractions/udig/ui/DrawingTest.java

U    plugins/net.refractions.udig/about.mappings

U    plugins/net.refractions.udig.project.ui/src/net/refractions/udig/project/ui/internal/render/displayAdapter/impl/ViewportPainter.java

U    plugins/net.refractions.udig.project.ui/src/net/refractions/udig/project/ui/internal/render/displayAdapter/impl/ViewportPaneTiledSWT.java

U    plugins/net.refractions.udig.ui/src/net/refractions/udig/ui/graphics/NonAdvancedSWTGraphics.java

U    plugins/net.refractions.udig.ui/src/net/refractions/udig/ui/graphics/ViewportGraphics.java

U    plugins/net.refractions.udig.ui/src/net/refractions/udig/ui/graphics/AWTGraphics.java

U    plugins/net.refractions.udig.ui/src/net/refractions/udig/ui/graphics/SWTGraphics.java

Hopefully that agrees with your expectations.

I also updated the copy.properties file to point to the correct geotools repository so that 2.6.5 can be downloaded :-)

To help out in the future I updated the docs here:

- http://udig.refractions.net/confluence/display/ADMIN/08+Libs+Refresh.xml+Ant+Script#08LibsRefresh.xmlAntScript-ChangingRepositorytoDownloadFrom

The copy.properties file also indicates what geotools repository to use.

# Uncomment this line when working on a tagged release such as 1.2.0
geotoolsRepository=http://download.osgeo.org/webdav/geotools
# Uncomment this line when working on trunk such as 1.2-SNAPSHOT
# geotoolsRepository=http://repo.opengeo.org

Sorry for not changing the copy.properties on the tag before now; I see it caused lots of confusion.

Jody

On 15/08/2010, at 2:57 AM, andrea antonello wrote:

Hi Jody, as decided i have merged the fixes we did since the 1.2.0 tag
from trunk.

The revision is: 31953

The tag revision was:  31934 -> tag 1.2.0

following here the revisions since the tag and whether I merged them in:
31936
no 31937
31938
31939
31940
31941
31942
31943
no 31944
31945
31946
31947
31948
31949
31950
no 31951
31952

There were two bigger issues:
- imageio-ext giving problemas, but I setteled that manually on
1.0.6-1, which is what we had.
- I still can't get a geotools 2.6.5 build, so to test the merge
result I had to put the 1.2.0 tag on geotools 2.6-SNAPSHOT. Since you
are the only man living having a 2.6.5 geotools (is it really true or
are you faking us? :) ), you will have to do the switch and commit it
on the tag.

Anyways, after the merge I tested walkthrough 1 and everything went well.

two comments:
- page 18, the host is www .refraction.net    -> there is a space
after the www, which is breaking heavy metal copy-paster as me :)
- page 25, point 10 talks about the symple style page, but the image
below is from the themed page. There is no image from the simple style
page


Ciao
Andrea
_______________________________________________
User-friendly Desktop Internet GIS (uDig)
http://udig.refractions.net
http://lists.refractions.net/mailman/listinfo/udig-devel