Index: tags/v2_0_0_Build_2047/extensions/org.gvsig.annotation.app/buildNumber.properties
===================================================================
--- tags/v2_0_0_Build_2047/extensions/org.gvsig.annotation.app/buildNumber.properties	(revision 0)
+++ tags/v2_0_0_Build_2047/extensions/org.gvsig.annotation.app/buildNumber.properties	(revision 38296)
@@ -0,0 +1,3 @@
+#maven.buildNumber.plugin properties file
+#Tue May 29 16:42:03 CEST 2012
+buildNumber=2055
Index: tags/v2_0_0_Build_2047/extensions/org.gvsig.annotation.app/org.gvsig.annotation.app.extension/src/test/resources/README.txt
===================================================================
--- tags/v2_0_0_Build_2047/extensions/org.gvsig.annotation.app/org.gvsig.annotation.app.extension/src/test/resources/README.txt	(revision 0)
+++ tags/v2_0_0_Build_2047/extensions/org.gvsig.annotation.app/org.gvsig.annotation.app.extension/src/test/resources/README.txt	(revision 38296)
@@ -0,0 +1,8 @@
+Put into this folder the resources needed by your test classes.
+
+This folder is added to the Tests classpath, so you can load any resources 
+through the ClassLoader.
+
+By default, in this folder you can find an example of log4j configuration,
+prepared to log messages through the console, so logging works when you
+run your tests classes.
\ No newline at end of file

Property changes on: tags/v2_0_0_Build_2047/extensions/org.gvsig.annotation.app/org.gvsig.annotation.app.extension/src/test/resources/README.txt
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Index: tags/v2_0_0_Build_2047/extensions/org.gvsig.annotation.app/org.gvsig.annotation.app.extension/src/test/resources/log4j.xml
===================================================================
--- tags/v2_0_0_Build_2047/extensions/org.gvsig.annotation.app/org.gvsig.annotation.app.extension/src/test/resources/log4j.xml	(revision 0)
+++ tags/v2_0_0_Build_2047/extensions/org.gvsig.annotation.app/org.gvsig.annotation.app.extension/src/test/resources/log4j.xml	(revision 38296)
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<!-- 
+Log4J configuration file for unit tests execution.
+ -->
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
+
+	<!-- Appender configuration to show logging messages through the console -->
+	<appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
+		<layout class="org.apache.log4j.PatternLayout">
+			<param name="ConversionPattern" value="%d{HH:mm:ss,SSS} %-5p [%c{2}.%M()]\n  %m%n" />
+		</layout>
+	</appender>
+
+	<!-- 
+	Activate logging messages of DEBUG level of higher only for the
+	org.gvsig.tools packages.
+	You can put full classes names or packages instead, to configure
+	logging for all the classes and subpackages of the package.
+	-->
+	<category name="org.gvsig.tools">
+		<priority value="DEBUG" />
+	</category>
+	<category name="org.gvsig.annotation">
+		<priority value="DEBUG" />
+	</category>
+
+	<!-- 
+	By default, show only logging messages of INFO level or higher, 
+	through the previously configured CONSOLE appender. 
+	-->
+	<root>
+		<priority value="INFO" />
+		<appender-ref ref="CONSOLE" />
+	</root>
+</log4j:configuration>
\ No newline at end of file

Property changes on: tags/v2_0_0_Build_2047/extensions/org.gvsig.annotation.app/org.gvsig.annotation.app.extension/src/test/resources/log4j.xml
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Index: tags/v2_0_0_Build_2047/extensions/org.gvsig.annotation.app/org.gvsig.annotation.app.extension/src/main/resources/config.xml
===================================================================
--- tags/v2_0_0_Build_2047/extensions/org.gvsig.annotation.app/org.gvsig.annotation.app.extension/src/main/resources/config.xml	(revision 0)
+++ tags/v2_0_0_Build_2047/extensions/org.gvsig.annotation.app/org.gvsig.annotation.app.extension/src/main/resources/config.xml	(revision 38296)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<plugin-config>
+	<depends plugin-name="org.gvsig.app" />
+	<depends plugin-name="org.gvsig.editing" />
+    <depends plugin-name="org.gvsig.app.document.table.app.mainplugin" />
+	<resourceBundle name="text"/>
+	<libraries library-dir="lib"/>
+	<extensions>
+		<extension class-name="org.gvsig.annotation.app.extension.AnnotationExtension"
+			description=""
+			active="true"
+			priority="1">
+			<menu text="Capa/export_to_annotation"
+				position="35020"
+				action-command="Annotation"/>
+		</extension>	
+		<extension class-name="org.gvsig.annotation.app.extension.AnnotationAboutExtension"
+			description=""
+			active="true"
+			priority="1">			
+		</extension>		
+	</extensions>
+</plugin-config>

Property changes on: tags/v2_0_0_Build_2047/extensions/org.gvsig.annotation.app/org.gvsig.annotation.app.extension/src/main/resources/config.xml
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Index: tags/v2_0_0_Build_2047/extensions/org.gvsig.annotation.app/org.gvsig.annotation.app.extension/src/main/resources/images/AnnotationProperties.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: tags/v2_0_0_Build_2047/extensions/org.gvsig.annotation.app/org.gvsig.annotation.app.extension/src/main/resources/images/AnnotationProperties.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: tags/v2_0_0_Build_2047/extensions/org.gvsig.annotation.app/org.gvsig.annotation.app.extension/src/main/resources/org/gvsig/annotation/app/extension/i18n/text.properties
===================================================================
--- tags/v2_0_0_Build_2047/extensions/org.gvsig.annotation.app/org.gvsig.annotation.app.extension/src/main/resources/org/gvsig/annotation/app/extension/i18n/text.properties	(revision 0)
+++ tags/v2_0_0_Build_2047/extensions/org.gvsig.annotation.app/org.gvsig.annotation.app.extension/src/main/resources/org/gvsig/annotation/app/extension/i18n/text.properties	(revision 38296)
@@ -0,0 +1,2 @@
+# Resource bundle texts for the Spanish language locale (es)
+export_to_annotation=Exportar a anotaciones

Property changes on: tags/v2_0_0_Build_2047/extensions/org.gvsig.annotation.app/org.gvsig.annotation.app.extension/src/main/resources/org/gvsig/annotation/app/extension/i18n/text.properties
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Index: tags/v2_0_0_Build_2047/extensions/org.gvsig.annotation.app/org.gvsig.annotation.app.extension/src/main/resources/org/gvsig/annotation/app/extension/i18n/text_en.properties
===================================================================
--- tags/v2_0_0_Build_2047/extensions/org.gvsig.annotation.app/org.gvsig.annotation.app.extension/src/main/resources/org/gvsig/annotation/app/extension/i18n/text_en.properties	(revision 0)
+++ tags/v2_0_0_Build_2047/extensions/org.gvsig.annotation.app/org.gvsig.annotation.app.extension/src/main/resources/org/gvsig/annotation/app/extension/i18n/text_en.properties	(revision 38296)
@@ -0,0 +1,3 @@
+# Resource bundle texts for the English language locale (en)
+export_to_annotation=Export to anotation
+

Property changes on: tags/v2_0_0_Build_2047/extensions/org.gvsig.annotation.app/org.gvsig.annotation.app.extension/src/main/resources/org/gvsig/annotation/app/extension/i18n/text_en.properties
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Index: tags/v2_0_0_Build_2047/extensions/org.gvsig.annotation.app/org.gvsig.annotation.app.extension/src/main/java/org/gvsig/annotation/app/extension/package.html
===================================================================
--- tags/v2_0_0_Build_2047/extensions/org.gvsig.annotation.app/org.gvsig.annotation.app.extension/src/main/java/org/gvsig/annotation/app/extension/package.html	(revision 0)
+++ tags/v2_0_0_Build_2047/extensions/org.gvsig.annotation.app/org.gvsig.annotation.app.extension/src/main/java/org/gvsig/annotation/app/extension/package.html	(revision 38296)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<title>org.gvsig.annotation package documentation</title>
+</head>
+<body>
+
+	<p>Annotation gvSIG extension</p>
+	
+	<p>
+	Shows Annotation into gvSIG.
+	</p>
+
+</body>
+</html>
\ No newline at end of file

Property changes on: tags/v2_0_0_Build_2047/extensions/org.gvsig.annotation.app/org.gvsig.annotation.app.extension/src/main/java/org/gvsig/annotation/app/extension/package.html
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Index: tags/v2_0_0_Build_2047/extensions/org.gvsig.annotation.app/org.gvsig.annotation.app.extension/src/main/java/org/gvsig/annotation/app/extension/AnnotationAboutExtension.java
===================================================================
--- tags/v2_0_0_Build_2047/extensions/org.gvsig.annotation.app/org.gvsig.annotation.app.extension/src/main/java/org/gvsig/annotation/app/extension/AnnotationAboutExtension.java	(revision 0)
+++ tags/v2_0_0_Build_2047/extensions/org.gvsig.annotation.app/org.gvsig.annotation.app.extension/src/main/java/org/gvsig/annotation/app/extension/AnnotationAboutExtension.java	(revision 38296)
@@ -0,0 +1,56 @@
+/* gvSIG. Geographic Information System of the Valencian Government
+*
+* Copyright (C) 2007-2008 Infrastructures and Transports Department
+* of the Valencian Government (CIT)
+* 
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License
+* as published by the Free Software Foundation; either version 2
+* 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 Public License for more details.
+* 
+* You should have received a copy of the GNU General Public License
+* along with this program; if not, write to the Free Software
+* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
+* MA  02110-1301, USA.
+* 
+*/
+
+/*
+* AUTHORS (In addition to CIT):
+* 2010 {Prodevelop}   {Task}
+*/
+ 
+package org.gvsig.annotation.app.extension;
+
+import org.gvsig.andami.plugins.Extension;
+
+/**
+ * @author <a href="mailto:jpiera@gvsig.org">Jorge Piera Llodr&aacute;</a>
+ */
+public class AnnotationAboutExtension extends Extension {
+
+	public void execute(String actionCommand) {
+        // Nothing to do
+	}
+
+	public void initialize() {
+        // Nothing to do
+	}
+
+	public boolean isEnabled() {
+		return false;
+	}
+
+	public boolean isVisible() {
+		return false;
+	}
+
+	public void postInitialize() {
+		super.postInitialize();
+	}
+}

Property changes on: tags/v2_0_0_Build_2047/extensions/org.gvsig.annotation.app/org.gvsig.annotation.app.extension/src/main/java/org/gvsig/annotation/app/extension/AnnotationAboutExtension.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Index: tags/v2_0_0_Build_2047/extensions/org.gvsig.annotation.app/org.gvsig.annotation.app.extension/src/main/java/org/gvsig/annotation/app/extension/AnnotationWindow.java
===================================================================
--- tags/v2_0_0_Build_2047/extensions/org.gvsig.annotation.app/org.gvsig.annotation.app.extension/src/main/java/org/gvsig/annotation/app/extension/AnnotationWindow.java	(revision 0)
+++ tags/v2_0_0_Build_2047/extensions/org.gvsig.annotation.app/org.gvsig.annotation.app.extension/src/main/java/org/gvsig/annotation/app/extension/AnnotationWindow.java	(revision 38296)
@@ -0,0 +1,95 @@
+/* gvSIG. Geographic Information System of the Valencian Government
+ *
+ * Copyright (C) 2007-2008 Infrastructures and Transports Department
+ * of the Valencian Government (CIT)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * 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 Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ */
+package org.gvsig.annotation.app.extension;
+
+import java.awt.BorderLayout;
+import java.awt.Dimension;
+
+import javax.swing.JPanel;
+
+import org.gvsig.andami.ui.mdiManager.IWindow;
+import org.gvsig.andami.ui.mdiManager.WindowInfo;
+import org.gvsig.annotation.swing.AnnotationWindowManager;
+
+/**
+ * {@link IWindow} to show a Annotation.
+ * 
+ * @author gvSIG Team
+ * @version $Id$
+ */
+public class AnnotationWindow extends JPanel implements IWindow {
+
+    private static final long serialVersionUID = -4401123724140025094L;
+
+    private WindowInfo info;
+
+    private Object profile = WindowInfo.EDITOR_PROFILE;
+
+    /**
+     * Constructor.
+     * 
+     * @param panel
+     *            the panel to show
+     * @param title
+     *            the window title
+     * @param mode
+     *            the window mode
+     * @see {@link AnnotationWindowManager#MODE_DIALOG}
+     * @see {@link AnnotationWindowManager#MODE_TOOL}
+     * @see {@link AnnotationWindowManager#MODE_WINDOW}
+     */
+    public AnnotationWindow(JPanel panel, String title, int mode) {
+        this.setLayout(new BorderLayout());
+    	add(panel, BorderLayout.CENTER);
+    
+        Dimension dimension = new Dimension(700, 400);
+        setSize(dimension);
+        int code =
+            WindowInfo.ICONIFIABLE | WindowInfo.MAXIMIZABLE
+                | WindowInfo.RESIZABLE;
+        switch (mode) {
+        case AnnotationWindowManager.MODE_DIALOG:
+            code |= WindowInfo.MODALDIALOG;
+            profile = WindowInfo.DIALOG_PROFILE;
+            break;
+        case AnnotationWindowManager.MODE_TOOL:
+            code |= WindowInfo.PALETTE;
+            profile = WindowInfo.TOOL_PROFILE;
+            break;
+        case AnnotationWindowManager.MODE_WINDOW:
+        default:
+            code |= WindowInfo.MODELESSDIALOG;
+            profile = WindowInfo.EDITOR_PROFILE;
+        }
+        info = new WindowInfo(code);
+        info.setTitle(title);
+        info.setMinimumSize(dimension);
+    }
+
+    public WindowInfo getWindowInfo() {
+        return info;
+    }
+
+    public Object getWindowProfile() {
+        return profile;
+    }
+}

Property changes on: tags/v2_0_0_Build_2047/extensions/org.gvsig.annotation.app/org.gvsig.annotation.app.extension/src/main/java/org/gvsig/annotation/app/extension/AnnotationWindow.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Index: tags/v2_0_0_Build_2047/extensions/org.gvsig.annotation.app/org.gvsig.annotation.app.extension/src/main/java/org/gvsig/annotation/app/extension/AddLayerFinishAction.java
===================================================================
--- tags/v2_0_0_Build_2047/extensions/org.gvsig.annotation.app/org.gvsig.annotation.app.extension/src/main/java/org/gvsig/annotation/app/extension/AddLayerFinishAction.java	(revision 0)
+++ tags/v2_0_0_Build_2047/extensions/org.gvsig.annotation.app/org.gvsig.annotation.app.extension/src/main/java/org/gvsig/annotation/app/extension/AddLayerFinishAction.java	(revision 38296)
@@ -0,0 +1,79 @@
+/* gvSIG. Geographic Information System of the Valencian Government
+ *
+ * Copyright (C) 2007-2008 Infrastructures and Transports Department
+ * of the Valencian Government (CIT)
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * 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 Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
+ * MA  02110-1301, USA.
+ * 
+ */
+
+/*
+ * AUTHORS (In addition to CIT):
+ * 2010 {Prodevelop}   {Task}
+ */
+
+package org.gvsig.annotation.app.extension;
+
+import javax.swing.JComponent;
+import javax.swing.JOptionPane;
+
+import org.gvsig.andami.PluginServices;
+import org.gvsig.andami.messages.NotificationManager;
+import org.gvsig.annotation.AnnotationCreationFinishAction;
+import org.gvsig.app.project.documents.view.gui.DefaultViewPanel;
+import org.gvsig.fmap.dal.feature.FeatureStore;
+import org.gvsig.fmap.mapcontext.MapContext;
+import org.gvsig.fmap.mapcontext.MapContextLocator;
+import org.gvsig.fmap.mapcontext.exceptions.LoadLayerException;
+import org.gvsig.fmap.mapcontext.layers.FLayer;
+import org.gvsig.tools.locator.LocatorException;
+
+/**
+ * @author <a href="mailto:jpiera@gvsig.org">Jorge Piera Llodr&aacute;</a>
+ */
+public class AddLayerFinishAction implements AnnotationCreationFinishAction {
+	private MapContext mapContext;
+	
+	public AddLayerFinishAction(MapContext mapContext) {
+		this.mapContext = mapContext;
+	}
+
+	public void finished(FeatureStore featureStore) {
+		int res = JOptionPane.showConfirmDialog((JComponent) PluginServices.getMDIManager()
+				.getActiveWindow(),
+				PluginServices.getText(this,
+				"insertar_en_la_vista_la_capa_creada"),
+				PluginServices.getText(this, "insertar_capa"),
+				JOptionPane.YES_NO_OPTION);
+
+		if (res == JOptionPane.YES_OPTION) {
+			try {
+				addShape(featureStore);
+			} catch (LoadLayerException e) {
+				NotificationManager.addError(e);
+			} catch (LocatorException e) {
+				NotificationManager.addError(e);
+			}
+		}
+	}
+
+	private void addShape(FeatureStore featureStore) throws LoadLayerException, LocatorException {
+		FLayer layer = MapContextLocator.getMapContextManager().createLayer("Annotations", featureStore);
+		mapContext.getLayers().addLayer(layer);		
+	}
+
+}
+

Property changes on: tags/v2_0_0_Build_2047/extensions/org.gvsig.annotation.app/org.gvsig.annotation.app.extension/src/main/java/org/gvsig/annotation/app/extension/AddLayerFinishAction.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Index: tags/v2_0_0_Build_2047/extensions/org.gvsig.annotation.app/org.gvsig.annotation.app.extension/src/main/java/org/gvsig/annotation/app/extension/AnnotationExtension.java
===================================================================
--- tags/v2_0_0_Build_2047/extensions/org.gvsig.annotation.app/org.gvsig.annotation.app.extension/src/main/java/org/gvsig/annotation/app/extension/AnnotationExtension.java	(revision 0)
+++ tags/v2_0_0_Build_2047/extensions/org.gvsig.annotation.app/org.gvsig.annotation.app.extension/src/main/java/org/gvsig/annotation/app/extension/AnnotationExtension.java	(revision 38296)
@@ -0,0 +1,165 @@
+/* gvSIG. Geographic Information System of the Valencian Government
+ *
+ * Copyright (C) 2007-2008 Infrastructures and Transports Department
+ * of the Valencian Government (CIT)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * 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 Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ */
+package org.gvsig.annotation.app.extension;
+
+import java.util.Locale;
+
+import org.gvsig.andami.PluginServices;
+import org.gvsig.andami.messages.NotificationManager;
+import org.gvsig.andami.plugins.Extension;
+import org.gvsig.annotation.AnnotationCreationService;
+import org.gvsig.annotation.AnnotationLocator;
+import org.gvsig.annotation.AnnotationManager;
+import org.gvsig.annotation.swing.AnnotationSwingLocator;
+import org.gvsig.annotation.swing.AnnotationSwingManager;
+import org.gvsig.annotation.swing.AnnotationWindowManager;
+import org.gvsig.annotation.swing.JAnnotationCreationServicePanel;
+import org.gvsig.app.ApplicationLocator;
+import org.gvsig.app.ApplicationManager;
+import org.gvsig.app.project.documents.view.ViewDocument;
+import org.gvsig.app.project.documents.view.ViewManager;
+import org.gvsig.fmap.dal.feature.FeatureStore;
+import org.gvsig.fmap.mapcontext.MapContext;
+import org.gvsig.fmap.mapcontext.layers.FLayer;
+import org.gvsig.fmap.mapcontext.layers.vectorial.FLyrVect;
+import org.gvsig.i18n.Messages;
+import org.gvsig.tools.ToolsLocator;
+import org.gvsig.tools.extensionpoint.ExtensionPoint;
+import org.gvsig.tools.extensionpoint.ExtensionPointManager;
+import org.gvsig.tools.service.ServiceException;
+
+/**
+ * Andami extension to show Annotation in the application.
+ * 
+ * @author gvSIG Team
+ * @version $Id$
+ */
+public class AnnotationExtension extends Extension {
+	private AnnotationManager manager;
+	private AnnotationSwingManager swingManager;
+
+	public void initialize() {
+		ExtensionPointManager extensionPoints = ToolsLocator.getExtensionPointManager();
+		ExtensionPoint ep = extensionPoints.add("AplicationPreferences", "");
+		
+		ep.append("AnnotationPreferencesPage", "", new AnnotationPreferencesPage());
+		
+		PluginServices.getIconTheme().registerDefault(
+				"annotation-properties",
+				AnnotationPreferencesPage.class.getClassLoader().getResource("images/AnnotationProperties.png")
+		);
+		
+		if (!Messages.hasLocales()) {
+		    Messages.addLocale(Locale.getDefault());
+		}
+		Messages.addResourceFamily("org.gvsig.annotation.app.extension.i18n.text",
+		    AnnotationExtension.class.getClassLoader(),
+		    AnnotationExtension.class.getClass().getName());
+	}
+
+	@Override
+	public void postInitialize() {
+		super.postInitialize();
+		manager = AnnotationLocator.getManager();
+		// Asignamos el locator e iniciamos la instancia
+		swingManager = AnnotationSwingLocator.getSwingManager();
+
+		swingManager.registerWindowManager(new GvSIGAnnotationWindowManager());		
+	
+	}
+
+	private FLyrVect getCurrentLayer() {
+		return this.getCurrentLayer(null); 
+	}
+	
+	private FLyrVect getCurrentLayer(MapContext mapContext) {
+		FLyrVect layer = null; 
+		
+		if( mapContext == null ) {
+			ApplicationManager application = ApplicationLocator.getManager();
+
+			ViewDocument view = (ViewDocument) application.getActiveDocument(ViewManager.TYPENAME);
+			if( view == null ) {
+				return null;
+			}
+			mapContext = view.getMapContext();
+		}
+		FLayer[] actives = mapContext.getLayers().getActives();
+
+		for (int i=0 ; i<actives.length ; i++){
+			if (actives[i] instanceof FLyrVect){
+				layer = (FLyrVect)actives[i];
+				break;
+			}
+		}
+		return layer;
+	}
+	
+	public void execute(String actionCommand) {
+		ApplicationManager application = ApplicationLocator.getManager();
+
+		ViewDocument view = (ViewDocument) application.getActiveDocument(ViewManager.TYPENAME);
+		if( view == null ) {
+			return;
+		}
+		MapContext mapContext = view.getMapContext();
+		FLyrVect layer = getCurrentLayer(mapContext);
+		if (layer == null){
+			return;
+		}		
+		showAnnotation(manager, layer.getFeatureStore(), mapContext);
+	}
+
+	public void showAnnotation(AnnotationManager manager, FeatureStore featureStore, MapContext mapContext) {
+		try {
+			AnnotationCreationService service =
+				(AnnotationCreationService) manager.getAnnotationCreationService(featureStore);
+			service.setAnnotationCreationFinishAction(new AddLayerFinishAction(mapContext));
+
+			JAnnotationCreationServicePanel panel =
+				swingManager.createAnnotation(service);
+			swingManager.getWindowManager().showWindow(panel, "Annotation",
+					AnnotationWindowManager.MODE_WINDOW);
+
+		} catch (ServiceException e) {
+			NotificationManager.addError(e);
+		}
+	}
+
+	public boolean isEnabled() {
+		FLayer layer = getCurrentLayer();
+		if( layer == null ) {
+			return false;
+		}
+		return true;
+	}
+
+	public boolean isVisible() {
+		ApplicationManager application = ApplicationLocator.getManager();
+
+		ViewDocument view = (ViewDocument) application.getActiveDocument(ViewManager.TYPENAME);
+		if( view == null ) {
+			return false;
+		}
+		return true;
+	}
+}

Property changes on: tags/v2_0_0_Build_2047/extensions/org.gvsig.annotation.app/org.gvsig.annotation.app.extension/src/main/java/org/gvsig/annotation/app/extension/AnnotationExtension.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Index: tags/v2_0_0_Build_2047/extensions/org.gvsig.annotation.app/org.gvsig.annotation.app.extension/src/main/java/org/gvsig/annotation/app/extension/AnnotationPreferencesPage.java
===================================================================
--- tags/v2_0_0_Build_2047/extensions/org.gvsig.annotation.app/org.gvsig.annotation.app.extension/src/main/java/org/gvsig/annotation/app/extension/AnnotationPreferencesPage.java	(revision 0)
+++ tags/v2_0_0_Build_2047/extensions/org.gvsig.annotation.app/org.gvsig.annotation.app.extension/src/main/java/org/gvsig/annotation/app/extension/AnnotationPreferencesPage.java	(revision 38296)
@@ -0,0 +1,147 @@
+/* gvSIG. Sistema de Informaci�n Geogr�fica de la Generalitat Valenciana
+ *
+ * Copyright (C) 2005 IVER T.I. and Generalitat Valenciana.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * 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 Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,USA.
+ *
+ * For more information, contact:
+ *
+ *  Generalitat Valenciana
+ *   Conselleria d'Infraestructures i Transport
+ *   Av. Blasco Ib��ez, 50
+ *   46010 VALENCIA
+ *   SPAIN
+ *
+ *      +34 963862235
+ *   gvsig@gva.es
+ *      www.gvsig.gva.es
+ *
+ *    or
+ *
+ *   IVER T.I. S.A
+ *   Salamanca 50
+ *   46005 Valencia
+ *   Spain
+ *
+ *   +34 963163400
+ *   dac@iver.es
+ */
+
+package org.gvsig.annotation.app.extension;
+
+import java.awt.GridBagConstraints;
+import java.awt.Insets;
+
+import javax.swing.ImageIcon;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JTextField;
+
+import org.gvsig.andami.PluginServices;
+import org.gvsig.andami.preferences.AbstractPreferencePage;
+import org.gvsig.andami.preferences.StoreException;
+import org.gvsig.annotation.AnnotationLocator;
+import org.gvsig.annotation.AnnotationManager;
+import org.gvsig.annotation.swing.AnnotationSwingLocator;
+import org.gvsig.annotation.swing.JAnnotationPreferencesPanel;
+import org.gvsig.app.gui.panels.ColorChooserPanel;
+import org.gvsig.utils.swing.JComboBox;
+/**
+ *  Default configuration page.
+ *  <b><b>
+ *  Here the user can establish what settings wants to use by default annotations.
+ *
+ *
+ * @author Vicente Caballero Navarro
+ */
+public class AnnotationPreferencesPage extends AbstractPreferencePage {
+	protected String id;
+	private ImageIcon icon;
+	private JTextField txtDefaultText;
+	private JComboBox cmbDefaultTypeFont;
+	private JComboBox cmbDefaultStyleFont;
+	private JTextField txtDefaultRotate;
+	private JTextField txtDefaultHeight;
+	private ColorChooserPanel jccDefaultColor;
+	private JAnnotationPreferencesPanel panel = null;
+	
+	private AnnotationManager annotationManager = null;
+	
+
+	/**
+	 * Creates a new panel containing View preferences settings.
+	 *
+	 */
+	public AnnotationPreferencesPage() {
+		super();
+		id = this.getClass().getName();
+		this.annotationManager = AnnotationLocator.getManager();
+	}
+
+	public void initializeValues() {
+		getPanel(); // init UI		
+	}
+
+	public String getID() {
+		return id;
+	}
+
+	public String getTitle() {
+		return PluginServices.getText(this, "annotation_preferences");
+	}
+
+	public JPanel getPanel() {
+			if (panel==null) {
+				addComponent(new JLabel(PluginServices.getText(this,"text")),
+						txtDefaultText = new JTextField(), GridBagConstraints.BOTH, new Insets(4,0,4,8));
+				panel = AnnotationSwingLocator.getSwingManager().createAnnotationPreferences();
+				addComponent(panel);
+			}
+			return this;
+	}
+
+	public void storeValues() throws StoreException {
+		annotationManager.setDefaultFontColor(panel.getDefaultFontColor());
+		annotationManager.setDefaultTextValue(txtDefaultText.getText());
+		annotationManager.setDefaultFontType(panel.getDefaultFontType());
+		annotationManager.setDefaultFontStyle(panel.getDefaultFontStyle());
+		annotationManager.setDefaultFontHeight(panel.getDefaultFontHeight());
+		annotationManager.setDefaultFontRotation(panel.getDefaultFontRotation());
+	}
+
+
+	public void initializeDefaults() {
+		txtDefaultText.setText(annotationManager.getDefaultTextValue());
+		panel.setDefaultFontType(annotationManager.getDefaultFontType());
+		panel.setDefaultFontStyle(annotationManager.getDefaultFontStyle());
+		panel.setDefaultFontHeight(annotationManager.getDefaultFontHeight());	
+		panel.setDefaultFontColor(annotationManager.getDefaultFontColor());
+		panel.setDefaultFontRotation(annotationManager.getDefaultFontRotation());		
+	}
+
+	public ImageIcon getIcon() {
+		if (icon==null)
+			icon = PluginServices.getIconTheme().get("annotation-properties");
+		return icon;
+	}
+
+	public boolean isValueChanged() {
+		return super.hasChanged();
+	}
+
+	public void setChangesApplied() {
+		setChanged(false);
+	}
+}

Property changes on: tags/v2_0_0_Build_2047/extensions/org.gvsig.annotation.app/org.gvsig.annotation.app.extension/src/main/java/org/gvsig/annotation/app/extension/AnnotationPreferencesPage.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Index: tags/v2_0_0_Build_2047/extensions/org.gvsig.annotation.app/org.gvsig.annotation.app.extension/src/main/java/org/gvsig/annotation/app/extension/GvSIGAnnotationWindowManager.java
===================================================================
--- tags/v2_0_0_Build_2047/extensions/org.gvsig.annotation.app/org.gvsig.annotation.app.extension/src/main/java/org/gvsig/annotation/app/extension/GvSIGAnnotationWindowManager.java	(revision 0)
+++ tags/v2_0_0_Build_2047/extensions/org.gvsig.annotation.app/org.gvsig.annotation.app.extension/src/main/java/org/gvsig/annotation/app/extension/GvSIGAnnotationWindowManager.java	(revision 38296)
@@ -0,0 +1,115 @@
+/* gvSIG. Geographic Information System of the Valencian Government
+ *
+ * Copyright (C) 2007-2008 Infrastructures and Transports Department
+ * of the Valencian Government (CIT)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * 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 Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ */
+package org.gvsig.annotation.app.extension;
+
+import java.awt.Component;
+import java.awt.event.ComponentEvent;
+import java.awt.event.ComponentListener;
+
+import javax.swing.JOptionPane;
+
+import org.gvsig.andami.PluginServices;
+import org.gvsig.annotation.swing.AnnotationWindowManager;
+import org.gvsig.annotation.swing.AnnotationWizardPanelActionListener;
+import org.gvsig.annotation.swing.JAnnotationCreationServicePanel;
+import org.gvsig.annotation.swing.JAnnotationPreferencesPanel;
+
+/**
+ * {@link AnnotationWindowManager} implementation to show Annotation
+ * windows as gvSIG windows
+ * 
+ * @author gvSIG Team
+ * @version $Id$
+ */
+public class GvSIGAnnotationWindowManager implements AnnotationWindowManager, ComponentListener {
+
+    public void showWindow(JAnnotationCreationServicePanel panel, String title, int mode) {
+        AnnotationWindow window =
+            new AnnotationWindow(panel, title, mode);
+
+        panel.setAnnotationServicePanelActionListener(new AnnotationWizardListener(window));        
+
+        window.addComponentListener(this);
+
+        PluginServices.getMDIManager().addCentredWindow(window);
+    }
+
+    public void componentHidden(ComponentEvent componentEvent) {
+        AnnotationWindow window =
+            (AnnotationWindow) componentEvent.getSource();
+        if (window.isVisible()){
+            PluginServices.getMDIManager().closeWindow(window);
+        }
+    }
+
+    public void componentMoved(ComponentEvent e) {
+        // Nothing to do
+    }
+
+    public void componentResized(ComponentEvent e) {
+        // Nothing to do
+    }
+
+    public void componentShown(ComponentEvent e) {
+        // Nothing to do
+    }
+
+    public class AnnotationWizardListener implements AnnotationWizardPanelActionListener{
+        private AnnotationWindow annotationWindow = null;
+
+        public AnnotationWizardListener(AnnotationWindow annotationWindow) {
+            super();
+            this.annotationWindow = annotationWindow;
+        }
+
+        public void cancel(
+            JAnnotationCreationServicePanel annotationCreationServicePanel) {
+            if (annotationWindow.isVisible()){
+                PluginServices.getMDIManager().closeWindow(annotationWindow); 
+            }
+        }
+
+        public void finish(
+            JAnnotationCreationServicePanel annotationCreationServicePanel) {
+            if (annotationWindow.isVisible()){
+                PluginServices.getMDIManager().closeWindow(annotationWindow);    
+            }
+        }
+    }
+
+
+    public boolean showFileExistsPopup(String title, String text) {
+        int resp = JOptionPane.showConfirmDialog(
+            (Component)PluginServices.getMainFrame(), text,
+            title, JOptionPane.YES_NO_OPTION);
+        if (resp == JOptionPane.YES_OPTION) {
+            return true;
+        }
+        return false;
+    }
+
+    public void showPreferencesWindow(JAnnotationPreferencesPanel panel,
+        String title, int mode) {
+        // TODO Auto-generated method stub
+
+    }
+}

Property changes on: tags/v2_0_0_Build_2047/extensions/org.gvsig.annotation.app/org.gvsig.annotation.app.extension/src/main/java/org/gvsig/annotation/app/extension/GvSIGAnnotationWindowManager.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Index: tags/v2_0_0_Build_2047/extensions/org.gvsig.annotation.app/org.gvsig.annotation.app.extension/pom.xml
===================================================================
--- tags/v2_0_0_Build_2047/extensions/org.gvsig.annotation.app/org.gvsig.annotation.app.extension/pom.xml	(revision 0)
+++ tags/v2_0_0_Build_2047/extensions/org.gvsig.annotation.app/org.gvsig.annotation.app.extension/pom.xml	(revision 38296)
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<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/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<artifactId>org.gvsig.annotation.app.extension</artifactId>
+	<packaging>jar</packaging>
+	<name>Tools: Export to annotation</name>
+	<parent>
+		<groupId>org.gvsig</groupId>
+		<artifactId>org.gvsig.annotation.app</artifactId>
+		<version>1.0.0-SNAPSHOT</version>
+	</parent>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.gvsig</groupId>
+			<artifactId>org.gvsig.andami</artifactId>
+            <scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.gvsig</groupId>
+			<artifactId>org.gvsig.i18n</artifactId>
+            <scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.gvsig</groupId>
+			<artifactId>org.gvsig.tools.lib</artifactId>
+            <scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.gvsig</groupId>
+			<artifactId>org.gvsig.annotation.lib.api</artifactId>
+            <scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.gvsig</groupId>
+			<artifactId>org.gvsig.annotation.swing.api</artifactId>
+            <scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.gvsig</groupId>
+			<artifactId>org.gvsig.annotation.lib.impl</artifactId>
+            <scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.gvsig</groupId>
+			<artifactId>org.gvsig.annotation.swing.impl</artifactId>
+            <scope>compile</scope>
+		</dependency>
+        <dependency>
+            <groupId>org.gvsig</groupId>
+            <artifactId>org.gvsig.fmap.dal</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.gvsig</groupId>
+            <artifactId>org.gvsig.fmap.mapcontext</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.gvsig</groupId>
+            <artifactId>org.gvsig.utils</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.gvsig</groupId>
+            <artifactId>org.gvsig.app</artifactId>
+            <version>2.0-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.gvsig</groupId>
+            <artifactId>org.gvsig.app.document.table.app.mainplugin</artifactId>
+            <version>2.0.0-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.gvsig</groupId>
+            <artifactId>org.gvsig.ui</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.gvsig</groupId>
+            <artifactId>org.gvsig.metadata.lib.basic.api</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.gvsig</groupId>
+            <artifactId>org.gvsig.fmap.control</artifactId>
+            <scope>compile</scope>
+        </dependency>
+	</dependencies>
+	<profiles>
+		<profile>
+			<id>gvsig-install</id>
+			<activation>
+				<activeByDefault>true</activeByDefault>
+			</activation>
+			<properties>
+				<!--
+					Default gvSIG installation folder relative to the current workspace
+				-->
+				<gvsig.install.dir>${basedir}/../../build/product</gvsig.install.dir>
+			</properties>
+		</profile>
+	</profiles>
+    <properties>
+        <package.info.dependencies>required: org.gvsig.app.document.table.app.mainplugin -ge 2</package.info.dependencies>
+        <package.info.categories>View,Vector</package.info.categories>
+    </properties>
+</project>
\ No newline at end of file

Property changes on: tags/v2_0_0_Build_2047/extensions/org.gvsig.annotation.app/org.gvsig.annotation.app.extension/pom.xml
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Index: tags/v2_0_0_Build_2047/extensions/org.gvsig.annotation.app/org.gvsig.annotation.app.extension/distribution/distribution.xml
===================================================================
--- tags/v2_0_0_Build_2047/extensions/org.gvsig.annotation.app/org.gvsig.annotation.app.extension/distribution/distribution.xml	(revision 0)
+++ tags/v2_0_0_Build_2047/extensions/org.gvsig.annotation.app/org.gvsig.annotation.app.extension/distribution/distribution.xml	(revision 38296)
@@ -0,0 +1,34 @@
+<assembly>
+	<id>distribution</id>
+	<formats>
+		<format>dir</format>
+	</formats>
+	<fileSets>
+		<!-- Estructure for the extension -->
+		<fileSet>
+			<directory>src/main/resources</directory>
+			<outputDirectory>${extension.install.dir.name}
+			</outputDirectory>
+		</fileSet>
+	</fileSets>
+    <files>
+        <file>
+            <source>package.info</source>
+            <outputDirectory>${extension.install.dir.name}
+            </outputDirectory>
+        </file>
+    </files>
+	<dependencySets>
+		<dependencySet>
+			<outputDirectory>${extension.install.dir.name}/${library-dir}
+			</outputDirectory>
+			<includes>
+				<include>org.gvsig:org.gvsig.annotation.app.extension</include>
+				<include>org.gvsig:org.gvsig.annotation.lib.api</include>
+				<include>org.gvsig:org.gvsig.annotation.swing.api</include>
+				<include>org.gvsig:org.gvsig.annotation.lib.impl</include>
+				<include>org.gvsig:org.gvsig.annotation.swing.impl</include>
+			</includes>
+		</dependencySet>
+	</dependencySets>
+</assembly>

Property changes on: tags/v2_0_0_Build_2047/extensions/org.gvsig.annotation.app/org.gvsig.annotation.app.extension/distribution/distribution.xml
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Index: tags/v2_0_0_Build_2047/extensions/org.gvsig.annotation.app/org.gvsig.annotation.app.extension/buildNumber.properties
===================================================================
--- tags/v2_0_0_Build_2047/extensions/org.gvsig.annotation.app/org.gvsig.annotation.app.extension/buildNumber.properties	(revision 0)
+++ tags/v2_0_0_Build_2047/extensions/org.gvsig.annotation.app/org.gvsig.annotation.app.extension/buildNumber.properties	(revision 38296)
@@ -0,0 +1,3 @@
+#maven.buildNumber.plugin properties file
+#Tue May 29 16:42:04 CEST 2012
+buildNumber=2047

Property changes on: tags/v2_0_0_Build_2047/extensions/org.gvsig.annotation.app/org.gvsig.annotation.app.extension
___________________________________________________________________
Added: svn:ignore
   + target
bin
.settings
.classpath
.project
package.info


Index: tags/v2_0_0_Build_2047/extensions/org.gvsig.annotation.app/prepare-workspace.xml
===================================================================
--- tags/v2_0_0_Build_2047/extensions/org.gvsig.annotation.app/prepare-workspace.xml	(revision 0)
+++ tags/v2_0_0_Build_2047/extensions/org.gvsig.annotation.app/prepare-workspace.xml	(revision 38296)
@@ -0,0 +1,151 @@
+<project name="org.gvsig.initial.build" default="prepare-workspace">
+
+	<dirname property="org.gvsig.initial.build.basedir" file="${ant.file.org.gvsig.initial.build}" />
+
+	<property name="workspace.basedir" value="${org.gvsig.initial.build.basedir}/.." />
+	<property name="build.basedir" value="${workspace.basedir}/org.gvsig.maven.base.build" description="Eclipse workspace location" />
+	<property name="build.jar.version" value="1.0.8-SNAPSHOT" />
+	<property name="build.jar.file" value="org.gvsig.maven.base.build-${build.jar.version}.jar" />
+
+	<property name="ant.libs.dir" location="${build.basedir}" description="Additional ant tasks libs folder" />
+
+	<target name="check-maven-base-build-available">
+		<available file="${user.home}/.m2/repository/org/gvsig/org.gvsig.maven.base.build/${build.jar.version}/${build.jar.file}" property="maven-base-build-available" />
+	</target>
+
+	<target name="get-maven-base-build-local" depends="check-maven-base-build-available" if="maven-base-build-available">
+		<!-- Unzip de build jar file from the maven repository into the workspace root folder -->
+		<copy todir="${workspace.basedir}" preservelastmodified="false" filtering="false">
+			<zipfileset src="${user.home}/.m2/repository/org/gvsig/org.gvsig.maven.base.build/${build.jar.version}/${build.jar.file}">
+				<patternset>
+					<exclude name="META-INF/**" />
+				</patternset>
+			</zipfileset>
+		</copy>
+	</target>
+
+	<target name="get-maven-base-build-remote" depends="check-maven-base-build-available" unless="maven-base-build-available">
+		<mkdir dir="target" />
+
+		<!-- Download the build jar file -->
+		<get src="http://devel.gvsig.org/m2repo/j2se/org/gvsig/org.gvsig.maven.base.build/${build.jar.version}/${build.jar.file}" dest="target/${build.jar.file}" verbose="true" />
+
+		<!-- Unzip de build jar file into the workspace root folder -->
+		<copy todir="${workspace.basedir}" preservelastmodified="false" filtering="false">
+			<zipfileset src="target/${build.jar.file}">
+				<patternset>
+					<exclude name="META-INF/**" />
+				</patternset>
+			</zipfileset>
+		</copy>
+
+	</target>
+	
+	<target name="find.depends.natives.file">
+	    <condition property="depends.natives.file.exists">
+            <available file="${org.gvsig.initial.build.basedir}/DEPENDS_ON_NATIVE_LIBRARIES"/>
+	    </condition>	
+	</target>
+	
+	<target name="find.gvsig.platform.properties.file" 
+			depends="find.depends.natives.file"
+			if="depends.natives.file.exists">
+	    <condition property="gvsig.platform.exists">
+            <available file="${user.home}/.gvsig.platform.properties"/>
+	    </condition>	
+	</target>
+	
+	<target name="check.gvsig.platform.properties" 
+			depends="find.gvsig.platform.properties.file">
+		<fail if="depends.natives.file.exists" unless="gvsig.platform.exists">
+ERROR!!
+	
+You have to define your gvSIG platform properties, 
+by creating the file: ${user.home}/.gvsig.platform.properties
+with the following content:
+
+native_platform=linux
+native_distribution=all
+native_compiler=gcc4
+native_arch=i386
+native_libraryType=dynamic
+export native_classifier=${native_platform}-${native_distribution}-${native_compiler}-${native_arch}-${native_libraryType}
+
+Replace the fifth initial variables values with the ones appropiate 
+to your platform.
+	
+If you use maven in the command line, you can use the previous file also
+to define the MAVEN_OPTS environment variable, by adding to your 
+.bash_rc file something like this:
+
+if [ -f "${HOME}/.gvsig.platform.properties" ]
+then
+    . ${HOME}/.gvsig.platform.properties
+    export MAVEN_OPTS="-Xmx256M -XX:MaxPermSize=64m -Dnative-classifier=${native_classifier}"
+else
+    export MAVEN_OPTS="-Xmx256M -XX:MaxPermSize=64m"
+fi
+
+It will work if you use the bash shell. In any other case or platform, you'll
+have to define your MAVEN_OPTS environment variable and set the 
+"native-classifier" parameter directly.
+		</fail>			
+	
+	</target>
+
+	<target name="prepare-workspace" depends="get-maven-base-build-local,get-maven-base-build-remote,check.gvsig.platform.properties">
+
+		<mkdir dir="target" />
+
+		<chmod dir="${build.basedir}/maven/bin" perm="u+x" includes="m2,mvn,mvnDebug" />
+
+		<!-- Copy the maven launchers to the workspace metadata folder -->
+		<copy todir="${workspace.basedir}/.metadata">
+			<fileset dir="${build.basedir}/eclipse-launchers">
+				<exclude name="**/org.eclipse.jdt.core.prefs" />
+				<exclude name="**/org.eclipse.core.variables.prefs" />
+			</fileset>
+		</copy>
+
+		<concat destfile="${workspace.basedir}/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.core.prefs" append="true">
+			<filelist dir="${build.basedir}/eclipse-launchers/.plugins/org.eclipse.core.runtime/.settings" files="org.eclipse.jdt.core.prefs" />
+		</concat>
+		<concat destfile="${workspace.basedir}/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.core.variables.prefs" append="true">
+			<filelist dir="${build.basedir}/eclipse-launchers/.plugins/org.eclipse.core.runtime/.settings" files="org.eclipse.core.variables.prefs" />
+		</concat>
+
+		<!-- Configure the eclipse workspace -->
+		<ant antfile="${build.basedir}/maven-goals.xml" target="mvn-configure-eclipse-workspace" />
+
+		<!-- Configure the gvSIG profile -->
+		<ant antfile="${build.basedir}/check-gvsig-profile.xml" />
+
+		<property name="user-settings-file-location" value="${user.home}/.m2/settings.xml" />
+
+		<taskdef name="xmltask" classname="com.oopsconsultancy.xmltask.ant.XmlTask">
+			<classpath>
+				<pathelement location="${ant.libs.dir}/com.oopsconsultancy.xmltask-1.16.1.jar" />
+			</classpath>
+		</taskdef>
+
+		<xmltask source="${user-settings-file-location}" dest="${user-settings-file-location}">
+			<copy path="//:settings/:profiles/:profile[:id/text() = 'gvsig-install']/:properties/:gvsig.install.dir/text()" property="current-gvsig-location" />
+		</xmltask>
+
+		<replace file="${workspace.basedir}/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.core.prefs" token="@GVSIG_HOME@" value="${current-gvsig-location}" />
+		<replace file="${workspace.basedir}/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.core.variables.prefs" token="@GVSIG_HOME@" value="${current-gvsig-location}" />
+
+		<!-- Compile, install and generate eclipse projects -->
+		<ant antfile="${build.basedir}/maven-goals.xml" target="mvn-install-and-eclipse-eclipse" />
+
+		<echo>INFORMATION!!!</echo>
+		<echo>Restart eclipse and then proceed to import the subprojects contained into the main project</echo>
+
+		<!-- TODO: copiar al proyecto de configuración general -->
+	</target>
+
+	<target name="clean">
+		<delete dir="target" />
+	</target>
+	
+</project>

Property changes on: tags/v2_0_0_Build_2047/extensions/org.gvsig.annotation.app/prepare-workspace.xml
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Index: tags/v2_0_0_Build_2047/extensions/org.gvsig.annotation.app/pom.xml
===================================================================
--- tags/v2_0_0_Build_2047/extensions/org.gvsig.annotation.app/pom.xml	(revision 0)
+++ tags/v2_0_0_Build_2047/extensions/org.gvsig.annotation.app/pom.xml	(revision 38296)
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<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>
+	<artifactId>org.gvsig.annotation.app</artifactId>
+	<packaging>pom</packaging>
+	<version>1.0.0-SNAPSHOT</version>
+	<name>org.gvsig.annotation.app</name>
+	<description>Anotation layer support:
+- Create anotation layer
+- Modify annotation layer (throught standard editing)
+- Editing single labelling (position and label settings)
+</description>
+    <parent>
+        <groupId>org.gvsig</groupId>
+        <artifactId>org.gvsig.maven.base.extension.pom</artifactId>
+        <version>1.0.8-SNAPSHOT</version>
+    </parent>
+
+    <scm>
+        <connection>scm:svn:https://devel.gvsig.org/svn/gvsig-desktop/branches/v2_0_0_prep/extensions/org.gvsig.annotation.app</connection>
+        <developerConnection>scm:svn:https://devel.gvsig.org/svn/gvsig-desktop/branches/v2_0_0_prep/extensions/org.gvsig.annotation.app</developerConnection>
+        <url>https://devel.gvsig.org/redmine/projects/gvsig-desktop/repository/show/branches/v2_0_0_prep/extensions/org.gvsig.annotation.app</url>
+    </scm>
+
+	<developers>
+		<developer>
+			<id>jjdelcerro</id>
+			<name>Joaqu�n Jos� del Cerro</name>
+			<email>jjdelcerro@gvsig.org</email>
+			<roles>
+				<role>Architect</role>
+				<role>Developer</role>
+			</roles>
+		</developer>
+		<developer>
+			<id>jbadia</id>
+			<name>Jos� Bad�a</name>
+			<email>badia_jos@gva.es</email>
+			<roles>
+				<role>Developer</role>
+			</roles>
+		</developer>
+		<developer>
+			<id>cordinyana</id>
+			<name>C�sar Ordi�ana</name>
+			<email>cordinyana@gvsig.com</email>
+			<roles>
+				<role>Architect</role>
+				<role>Developer</role>
+			</roles>
+		</developer>
+	</developers>
+	<repositories>
+		<repository>
+			<id>gvsig-public-http-repository</id>
+			<name>gvSIG maven public HTTP repository</name>
+			<url>http://devel.gvsig.org/m2repo/j2se</url>
+			<releases>
+				<enabled>true</enabled>
+				<updatePolicy>daily</updatePolicy>
+				<checksumPolicy>warn</checksumPolicy>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+				<updatePolicy>daily</updatePolicy>
+				<checksumPolicy>warn</checksumPolicy>
+			</snapshots>
+		</repository>
+	</repositories>
+    <dependencyManagement>
+        <dependencies>          
+            <dependency>
+                <groupId>org.gvsig</groupId>
+                <artifactId>org.gvsig.core.maven.dependencies</artifactId>
+                <version>2.0.1-SNAPSHOT</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+			<dependency>
+				<groupId>org.gvsig</groupId>
+				<artifactId>org.gvsig.annotation.lib.api</artifactId>
+				<version>1.0.0-SNAPSHOT</version>
+                <scope>compile</scope>
+			</dependency>
+			<dependency>
+				<groupId>org.gvsig</groupId>
+				<artifactId>org.gvsig.annotation.lib.impl</artifactId>
+				<version>1.0.0-SNAPSHOT</version>
+				<scope>runtime</scope>
+			</dependency>
+			<dependency>
+				<groupId>org.gvsig</groupId>
+				<artifactId>org.gvsig.annotation.swing.api</artifactId>
+				<version>1.0.0-SNAPSHOT</version>
+                <scope>compile</scope>
+			</dependency>
+			<dependency>
+				<groupId>org.gvsig</groupId>
+				<artifactId>org.gvsig.annotation.swing.impl</artifactId>
+				<version>1.0.0-SNAPSHOT</version>
+				<scope>runtime</scope>
+			</dependency>			
+		</dependencies>
+	</dependencyManagement>
+
+	<modules>
+		<module>org.gvsig.annotation.app.extension</module>
+	</modules>
+    <properties>
+    	<package.info.state>alpha5</package.info.state>
+    </properties>
+</project>
\ No newline at end of file

Property changes on: tags/v2_0_0_Build_2047/extensions/org.gvsig.annotation.app/pom.xml
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Index: tags/v2_0_0_Build_2047/extensions/org.gvsig.annotation.app/README.txt
===================================================================
--- tags/v2_0_0_Build_2047/extensions/org.gvsig.annotation.app/README.txt	(revision 0)
+++ tags/v2_0_0_Build_2047/extensions/org.gvsig.annotation.app/README.txt	(revision 38296)
@@ -0,0 +1,18 @@
+The first time you checkout the current project to a new workspace, 
+you have to prepare it to be able to work easily with maven from
+eclipse itself.
+
+Perform the following steps:
+
+1.- Launch the *prepare-workspace.xml* ant build file. 
+    You can do it by loading the file into the ant view, 
+    and running the default task, or right-clicking the 
+    file from the package explorer or the navigator and
+    select the option: *Run as > Ant build*. 
+    
+2.- Restart eclipse.
+
+3.- Import the subprojects of the project you have just checked out.
+
+Those steps are only needed once per workspace.     
+

Property changes on: tags/v2_0_0_Build_2047/extensions/org.gvsig.annotation.app/README.txt
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Index: tags/v2_0_0_Build_2047/extensions/org.gvsig.annotation.app/distribution/distribution.xml
===================================================================
--- tags/v2_0_0_Build_2047/extensions/org.gvsig.annotation.app/distribution/distribution.xml	(revision 0)
+++ tags/v2_0_0_Build_2047/extensions/org.gvsig.annotation.app/distribution/distribution.xml	(revision 38296)
@@ -0,0 +1,2 @@
+<assembly>
+</assembly>
\ No newline at end of file

Property changes on: tags/v2_0_0_Build_2047/extensions/org.gvsig.annotation.app/distribution/distribution.xml
___________________________________________________________________
Added: svn:mime-type
   + text/plain


Property changes on: tags/v2_0_0_Build_2047/extensions/org.gvsig.annotation.app
___________________________________________________________________
Added: svn:ignore
   + target
bin
.settings
.classpath
.project


