Revision 472

View differences:

org.gvsig.proj/trunk/org.gvsig.proj/prepare-workspace.xml
1
<!--
2

  
3
    gvSIG. Desktop Geographic Information System.
4

  
5
    Copyright (C) 2007-2012 gvSIG Association.
6

  
7
    This program is free software; you can redistribute it and/or
8
    modify it under the terms of the GNU General Public License
9
    as published by the Free Software Foundation; either version 2
10
    of the License, or (at your option) any later version.
11

  
12
    This program is distributed in the hope that it will be useful,
13
    but WITHOUT ANY WARRANTY; without even the implied warranty of
14
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
15
    GNU General Public License for more details.
16

  
17
    You should have received a copy of the GNU General Public License
18
    along with this program; if not, write to the Free Software
19
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
20
    MA  02110-1301, USA.
21

  
22
    For any additional information, do not hesitate to contact us
23
    at info AT gvsig.com, or visit our website www.gvsig.com.
24

  
25
-->
26
<project name="org.gvsig.initial.build" default="prepare-workspace">
27

  
28
	<dirname property="org.gvsig.initial.build.basedir" file="${ant.file.org.gvsig.initial.build}" />
29

  
30
	<property name="workspace.basedir" value="${org.gvsig.initial.build.basedir}/.." />
31
	<property name="build.basedir" value="${workspace.basedir}/org.gvsig.maven.base.build" description="Eclipse workspace location" />
32
	<property name="build.jar.version" value="1.0.8-SNAPSHOT" />
33
	<property name="build.jar.file" value="org.gvsig.maven.base.build-${build.jar.version}.jar" />
34

  
35
	<property name="ant.libs.dir" location="${build.basedir}" description="Additional ant tasks libs folder" />
36

  
37
	<target name="check-maven-base-build-available">
38
		<available file="${user.home}/.m2/repository/org/gvsig/org.gvsig.maven.base.build/${build.jar.version}/${build.jar.file}" property="maven-base-build-available" />
39
	</target>
40

  
41
	<target name="get-maven-base-build-local" depends="check-maven-base-build-available" if="maven-base-build-available">
42
		<!-- Unzip de build jar file from the maven repository into the workspace root folder -->
43
		<copy todir="${workspace.basedir}" preservelastmodified="false" filtering="false">
44
			<zipfileset src="${user.home}/.m2/repository/org/gvsig/org.gvsig.maven.base.build/${build.jar.version}/${build.jar.file}">
45
				<patternset>
46
					<exclude name="META-INF/**" />
47
				</patternset>
48
			</zipfileset>
49
		</copy>
50
	</target>
51

  
52
	<target name="get-maven-base-build-remote" depends="check-maven-base-build-available" unless="maven-base-build-available">
53
		<mkdir dir="target" />
54

  
55
		<!-- Download the build jar file -->
56
		<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" />
57

  
58
		<!-- Unzip de build jar file into the workspace root folder -->
59
		<copy todir="${workspace.basedir}" preservelastmodified="false" filtering="false">
60
			<zipfileset src="target/${build.jar.file}">
61
				<patternset>
62
					<exclude name="META-INF/**" />
63
				</patternset>
64
			</zipfileset>
65
		</copy>
66

  
67
	</target>
68
	
69
	<target name="find.depends.natives.file">
70
	    <condition property="depends.natives.file.exists">
71
            <available file="${org.gvsig.initial.build.basedir}/DEPENDS_ON_NATIVE_LIBRARIES"/>
72
	    </condition>	
73
	</target>
74
	
75
	<target name="find.gvsig.platform.properties.file" 
76
			depends="find.depends.natives.file"
77
			if="depends.natives.file.exists">
78
	    <condition property="gvsig.platform.exists">
79
            <available file="${user.home}/.gvsig.platform.properties"/>
80
	    </condition>	
81
	</target>
82
	
83
	<target name="check.gvsig.platform.properties" 
84
			depends="find.gvsig.platform.properties.file">
85
		<fail if="depends.natives.file.exists" unless="gvsig.platform.exists">
86
ERROR!!
87
	
88
You have to define your gvSIG platform properties, 
89
by creating the file: ${user.home}/.gvsig.platform.properties
90
with the following content:
91

  
92
native_platform=linux
93
native_distribution=all
94
native_compiler=gcc4
95
native_arch=i386
96
native_libraryType=dynamic
97
export native_classifier=${native_platform}-${native_distribution}-${native_compiler}-${native_arch}-${native_libraryType}
98

  
99
Replace the fifth initial variables values with the ones appropiate 
100
to your platform.
101
	
102
If you use maven in the command line, you can use the previous file also
103
to define the MAVEN_OPTS environment variable, by adding to your 
104
.bash_rc file something like this:
105

  
106
if [ -f "${HOME}/.gvsig.platform.properties" ]
107
then
108
    . ${HOME}/.gvsig.platform.properties
109
    export MAVEN_OPTS="-Xmx256M -XX:MaxPermSize=64m -Dnative-classifier=${native_classifier}"
110
else
111
    export MAVEN_OPTS="-Xmx256M -XX:MaxPermSize=64m"
112
fi
113

  
114
It will work if you use the bash shell. In any other case or platform, you'll
115
have to define your MAVEN_OPTS environment variable and set the 
116
"native-classifier" parameter directly.
117
		</fail>			
118
	
119
	</target>
120

  
121
	<target name="prepare-workspace" depends="get-maven-base-build-local,get-maven-base-build-remote,check.gvsig.platform.properties">
122

  
123
		<mkdir dir="target" />
124

  
125
		<chmod dir="${build.basedir}/maven/bin" perm="u+x" includes="m2,mvn,mvnDebug" />
126

  
127
		<!-- Copy the maven launchers to the workspace metadata folder -->
128
		<copy todir="${workspace.basedir}/.metadata">
129
			<fileset dir="${build.basedir}/eclipse-launchers">
130
				<exclude name="**/org.eclipse.jdt.core.prefs" />
131
				<exclude name="**/org.eclipse.core.variables.prefs" />
132
			</fileset>
133
		</copy>
134

  
135
		<concat destfile="${workspace.basedir}/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.core.prefs" append="true">
136
			<filelist dir="${build.basedir}/eclipse-launchers/.plugins/org.eclipse.core.runtime/.settings" files="org.eclipse.jdt.core.prefs" />
137
		</concat>
138
		<concat destfile="${workspace.basedir}/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.core.variables.prefs" append="true">
139
			<filelist dir="${build.basedir}/eclipse-launchers/.plugins/org.eclipse.core.runtime/.settings" files="org.eclipse.core.variables.prefs" />
140
		</concat>
141

  
142
		<!-- Configure the eclipse workspace -->
143
		<ant antfile="${build.basedir}/maven-goals.xml" target="mvn-configure-eclipse-workspace" />
144

  
145
		<!-- Configure the gvSIG profile -->
146
		<ant antfile="${build.basedir}/check-gvsig-profile.xml" />
147

  
148
		<property name="user-settings-file-location" value="${user.home}/.m2/settings.xml" />
149

  
150
		<taskdef name="xmltask" classname="com.oopsconsultancy.xmltask.ant.XmlTask">
151
			<classpath>
152
				<pathelement location="${ant.libs.dir}/com.oopsconsultancy.xmltask-1.16.1.jar" />
153
			</classpath>
154
		</taskdef>
155

  
156
		<xmltask source="${user-settings-file-location}" dest="${user-settings-file-location}">
157
			<copy path="//:settings/:profiles/:profile[:id/text() = 'gvsig-install']/:properties/:gvsig.install.dir/text()" property="current-gvsig-location" />
158
		</xmltask>
159

  
160
		<replace file="${workspace.basedir}/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.core.prefs" token="@GVSIG_HOME@" value="${current-gvsig-location}" />
161
		<replace file="${workspace.basedir}/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.core.variables.prefs" token="@GVSIG_HOME@" value="${current-gvsig-location}" />
162

  
163
		<!-- Compile, install and generate eclipse projects -->
164
		<ant antfile="${build.basedir}/maven-goals.xml" target="mvn-install-and-eclipse-eclipse" />
165

  
166
		<echo>INFORMATION!!!</echo>
167
		<echo>Restart eclipse and then proceed to import the subprojects contained into the main project</echo>
168

  
169
		<!-- TODO: copiar al proyecto de configuración general -->
170
	</target>
171

  
172
	<target name="clean">
173
		<delete dir="target" />
174
	</target>
175
	
176
</project>
org.gvsig.proj/trunk/org.gvsig.proj/README.txt
1
====
2
    gvSIG. Desktop Geographic Information System.
3

  
4
    Copyright (C) 2007-2012 gvSIG Association.
5

  
6
    This program is free software; you can redistribute it and/or
7
    modify it under the terms of the GNU General Public License
8
    as published by the Free Software Foundation; either version 2
9
    of the License, or (at your option) any later version.
10

  
11
    This program is distributed in the hope that it will be useful,
12
    but WITHOUT ANY WARRANTY; without even the implied warranty of
13
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
14
    GNU General Public License for more details.
15

  
16
    You should have received a copy of the GNU General Public License
17
    along with this program; if not, write to the Free Software
18
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
19
    MA  02110-1301, USA.
20

  
21
    For any additional information, do not hesitate to contact us
22
    at info AT gvsig.com, or visit our website www.gvsig.com.
23
====
24

  
25
The first time you checkout the current project to a new workspace, 
26
you have to prepare it to be able to work easily with maven from
27
eclipse itself.
28

  
29
Perform the following steps:
30

  
31
1.- Launch the *prepare-workspace.xml* ant build file. 
32
    You can do it by loading the file into the ant view, 
33
    and running the default task, or right-clicking the 
34
    file from the package explorer or the navigator and
35
    select the option: *Run as > Ant build*. 
36
    
37
2.- Restart eclipse.
38

  
39
3.- Import the subprojects of the project you have just checked out.
40

  
41
Those steps are only needed once per workspace.     
42

  
org.gvsig.proj/trunk/org.gvsig.proj/org.gvsig.proj.lib/org.gvsig.proj.lib.proj4j/src/test/java/org/gvsig/proj/proj4j/DefaultCoordinateReferenceSystemIT.java
23 23
package org.gvsig.proj.proj4j;
24 24

  
25 25
import org.gvsig.proj.CoordinateReferenceSystemIT;
26
import org.gvsig.proj.proj4j.DefaultCoordinateReferenceSystem;
27 26

  
28 27
/**
29 28
 * API acceptance tests for the {@link DefaultCoordinateReferenceSystem} implementation.
org.gvsig.proj/trunk/org.gvsig.proj/org.gvsig.proj.lib/org.gvsig.proj.lib.proj4j/pom.xml
37 37
            <groupId>org.osgeo</groupId>
38 38
            <artifactId>proj4j</artifactId>
39 39
        </dependency>
40
        <dependency>
41
            <groupId>junit</groupId>
42
            <artifactId>junit</artifactId>
43
            <scope>test</scope>
44
        </dependency>          
40 45
    </dependencies>
41 46
</project>
org.gvsig.proj/trunk/org.gvsig.proj/org.gvsig.proj.lib/org.gvsig.proj.lib.api/pom.xml
1 1
<?xml version="1.0" encoding="ISO-8859-1"?>
2 2
<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">
3
	<modelVersion>4.0.0</modelVersion>
4
	<artifactId>org.gvsig.proj.lib.api</artifactId>
5
	<packaging>jar</packaging>
6
	<name>${project.artifactId}</name>
7
	<parent>
8
		<groupId>org.gvsig</groupId>
9
		<artifactId>org.gvsig.proj.lib</artifactId>
10
		<version>1.0.2-SNAPSHOT</version>
11
	</parent>
3
    <modelVersion>4.0.0</modelVersion>
4
    <artifactId>org.gvsig.proj.lib.api</artifactId>
5
    <packaging>jar</packaging>
6
    <name>${project.artifactId}</name>
7
    <parent>
8
        <groupId>org.gvsig</groupId>
9
        <artifactId>org.gvsig.proj.lib</artifactId>
10
        <version>1.0.2-SNAPSHOT</version>
11
    </parent>
12 12
	
13
	<dependencies>
14
		<dependency>
15
			<groupId>org.gvsig</groupId>
16
			<artifactId>org.gvsig.tools.lib</artifactId>
17
			<scope>compile</scope>
18
		</dependency>
19
		<dependency>
20
			<groupId>org.gvsig</groupId>
21
			<artifactId>org.gvsig.tools.lib</artifactId>
22
			<type>test-jar</type>
23
			<scope>test</scope>
24
		</dependency>
13
    <dependencies>
25 14
        <dependency>
26 15
            <groupId>org.gvsig</groupId>
16
            <artifactId>org.gvsig.tools.lib</artifactId>
17
            <scope>compile</scope>
18
        </dependency>
19
        <dependency>
20
            <groupId>org.gvsig</groupId>
21
            <artifactId>org.gvsig.tools.lib</artifactId>
22
            <type>test-jar</type>
23
            <scope>test</scope>
24
        </dependency>
25
        <dependency>
26
            <groupId>org.gvsig</groupId>
27 27
            <artifactId>org.gvsig.projection.api</artifactId>
28 28
            <scope>compile</scope>
29 29
        </dependency>
30
	</dependencies>
30
        <dependency>
31
            <groupId>junit</groupId>
32
            <artifactId>junit</artifactId>
33
            <scope>test</scope>
34
        </dependency>     
35
    </dependencies>
31 36
	
32
	<build>
33
		<plugins>
34
		</plugins>
35
	</build>
37
    <build>
38
        <plugins>
39
        </plugins>
40
    </build>
36 41
	
37 42
</project>
org.gvsig.proj/trunk/org.gvsig.proj/org.gvsig.proj.lib/org.gvsig.proj.lib.api/src/main/java/org/gvsig/proj/cts/DefaultIProjection.java
38 38
import org.gvsig.proj.CoordinateTransformation;
39 39

  
40 40
/**
41
 * Java Map CoordinateReferenceSystem Library based implementation. It works
42
 * as a facade over a {@link CoordinateReferenceSystem} object.
43
 * 
41
 * Java Map CoordinateReferenceSystem Library based implementation. It works as
42
 * a facade over a {@link CoordinateReferenceSystem} object.
43
 *
44 44
 * @author gvSIG Team
45 45
 */
46 46
public class DefaultIProjection implements IProjection {
......
49 49

  
50 50
    /**
51 51
     * Creates a {@link DefaultIProjection} with an authority name and CRS code.
52
     * 
53
     * @param authorityName
54
     *            name of the authority which defined the CRS.
55
     * @param code
56
     *            of the defined CRS represented by this object
57
     * @throws CoordinateReferenceSystemNotFoundException
58
     *             if a CRS with the
59
     *             given authority name and code could not be found in the
60
     *             system
52
     *
53
     * @param authorityName name of the authority which defined the CRS.
54
     * @param code of the defined CRS represented by this object
55
     * @throws CoordinateReferenceSystemNotFoundException if a CRS with the
56
     * given authority name and code could not be found in the system
61 57
     */
62 58
    public DefaultIProjection(String authorityName, String code)
63
        throws CoordinateReferenceSystemNotFoundException {
59
            throws CoordinateReferenceSystemNotFoundException {
64 60
        this(CoordinateReferenceSystemLocator.getManager()
65
            .getCoordinateReferenceSystem(authorityName, code));
61
                .getCoordinateReferenceSystem(authorityName, code));
66 62
    }
67 63

  
68 64
    /**
69
     * 
65
     *
70 66
     * @param crs
71 67
     */
72 68
    public DefaultIProjection(CoordinateReferenceSystem crs) {
......
78 74

  
79 75
            public double getEIFlattening() {
80 76
                return getCoordinateReferenceSystem().getDatum().getEllipsoid()
81
                    .getReciprocalFlattening();
77
                        .getReciprocalFlattening();
82 78
            }
83 79

  
84 80
            public double getESemiMajorAxis() {
85 81
                return getCoordinateReferenceSystem().getDatum().getEllipsoid()
86
                    .getSemiMajorAxis();
82
                        .getSemiMajorAxis();
87 83
            }
88 84

  
89 85
        };
......
120 116
    public Point2D toGeo(Point2D pt) {
121 117
        CoordinateReferenceSystem geographic = crs.createGeographic();
122 118

  
123
        CoordinateTransformation transfToGeo =
124
            crs.getTransformation(geographic);
119
        CoordinateTransformation transfToGeo
120
                = crs.getTransformation(geographic);
125 121

  
126
        double[] coords = new double[] { pt.getX(), pt.getY() };
122
        double[] coords = new double[]{pt.getX(), pt.getY()};
127 123
        transfToGeo.convert(coords);
128 124
        return new Point2D.Double(coords[0], coords[1]);
129 125
    }
......
131 127
    public Point2D fromGeo(Point2D gPt, Point2D mPt) {
132 128
        CoordinateReferenceSystem geographic = crs.createGeographic();
133 129

  
134
        CoordinateTransformation transfFromGeo =
135
            geographic.getTransformation(crs);
130
        CoordinateTransformation transfFromGeo
131
                = geographic.getTransformation(crs);
136 132

  
137
        double[] coords = new double[] { gPt.getX(), gPt.getY() };
133
        double[] coords = new double[]{gPt.getX(), gPt.getY()};
138 134
        transfFromGeo.convert(coords);
139 135
        mPt.setLocation(coords[0], coords[1]);
140 136
        return mPt;
......
142 138

  
143 139
    public double getScale(double minX, double maxX, double width, double dpi) {
144 140
        double scale = ((maxX - minX) * // metros
145
            (dpi / 2.54 * 100.0))
146
            / // px / metro
147
            width; // pixels
141
                (dpi / 2.54 * 100.0))
142
                / // px / metro
143
                width; // pixels
148 144
        return scale;
149 145
    }
150 146

  
151 147
    public Rectangle2D getExtent(Rectangle2D extent, double scale,
152
        double wImage, double hImage, double mapUnits, double distanceUnits,
153
        double dpi) {
148
            double wImage, double hImage, double mapUnits, double distanceUnits,
149
            double dpi) {
154 150

  
155 151
        // Code copied from the org.gvsig.crs.Crs class.
156 152
        // I think this calculation might be moved outside the projection
......
162 158

  
163 159
        double xExtent = extent.getCenterX() - wExtent / 2;
164 160
        double yExtent = extent.getCenterY() - hExtent / 2;
165
        Rectangle2D rec =
166
            new Rectangle2D.Double(xExtent, yExtent, wExtent, hExtent);
161
        Rectangle2D rec
162
                = new Rectangle2D.Double(xExtent, yExtent, wExtent, hExtent);
167 163
        return rec;
168 164
    }
169 165

  
......
173 169

  
174 170
    public Object clone() throws CloneNotSupportedException {
175 171
        DefaultIProjection cloned = (DefaultIProjection) super.clone();
176
        cloned.crs =
177
            (CoordinateReferenceSystem) this.getCoordinateReferenceSystem()
172
        cloned.crs
173
                = (CoordinateReferenceSystem) this.getCoordinateReferenceSystem()
178 174
                .clone();
179 175
        return cloned;
180 176
    }
......
186 182
    public String toString() {
187 183
        return crs.toString();
188 184
    }
185

  
186
    public String export(String format) {
187
        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
188
    }
189

  
190
    public boolean equals(Object obj) {
191
        if (this == obj) {
192
            return true;
193
        }
194
        if (!(obj instanceof DefaultIProjection)) {
195
            return false;
196
        }
197
        return this.getFullCode().equalsIgnoreCase(((DefaultIProjection) obj).getFullCode());
198
    }
199

  
200
    public int hashCode() {
201
        return this.getFullCode().hashCode();
202
    }
189 203
}
org.gvsig.proj/trunk/org.gvsig.proj/org.gvsig.proj.lib/org.gvsig.proj.lib.api/src/main/java/org/gvsig/proj/cts/DefaultICRSFactory.java
53 53
        }
54 54
    }
55 55

  
56
    public IProjection get(String format, String value) {
57
        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
58
    }
59

  
56 60
}
org.gvsig.proj/trunk/org.gvsig.proj/pom.xml
4 4
    <artifactId>org.gvsig.proj</artifactId>
5 5
    <packaging>pom</packaging>
6 6
    <version>1.0.2-SNAPSHOT</version>
7
    <name>Coordinate reference system management library</name>
7
    <name>${project.artifactId}</name>
8 8
    <description>Coordinate reference system management library</description>
9 9

  
10 10

  
......
137 137

  
138 138
    <dependencyManagement>
139 139
        <dependencies>
140

  
140
	    <dependency>
141
                <groupId>org.gvsig</groupId>
142
                <artifactId>org.gvsig.tools</artifactId>
143
                <version>${gvsig.tools.version}</version>
144
                <type>pom</type>
145
                <scope>import</scope>
146
	    </dependency>
147
        	
141 148
            <dependency>
142
                <groupId>org.slf4j</groupId>
143
                <artifactId>slf4j-api</artifactId>
144
                <version>1.5.5</version>
145
            </dependency>
146
            <dependency>
147
                <groupId>org.slf4j</groupId>
148
                <artifactId>slf4j-log4j12</artifactId>
149
                <version>1.5.5</version>
150
            </dependency>
151

  
152
            <dependency>
153
                <groupId>junit</groupId>
154
                <artifactId>junit</artifactId>
155
                <version>3.8.1</version>
156
            </dependency>
157
	
158
            <dependency>
159
                <groupId>org.osgeo</groupId>
160
                <artifactId>proj4j</artifactId>
161
                <version>0.1.0</version>
162
            </dependency>
163
	
164
            <dependency>
165 149
                <groupId>org.gvsig</groupId>
166 150
                <artifactId>org.gvsig.projection.api</artifactId>
167 151
                <version>${gvsig.projection.version}</version>
......
172 156
                <artifactId>org.gvsig.metadata.lib.basic.api</artifactId>
173 157
                <version>${gvsig.metadata.version}</version>
174 158
            </dependency>
175
	
159
	                
176 160
            <dependency>
177
                <groupId>org.gvsig</groupId>
178
                <artifactId>org.gvsig.tools.lib</artifactId>
179
                <version>${gvsig.tools.version}</version>
161
                <groupId>org.osgeo</groupId>
162
                <artifactId>proj4j</artifactId>
163
                <version>0.1.0</version>
180 164
            </dependency>
165
	
181 166
            <dependency>
182 167
                <groupId>org.gvsig</groupId>
183
                <artifactId>org.gvsig.tools.lib</artifactId>
184
                <version>${gvsig.tools.version}</version>
185
                <type>test-jar</type>
186
                <scope>test</scope>
187
            </dependency>
188
            <dependency>
189
                <groupId>org.gvsig</groupId>
190
                <artifactId>org.gvsig.tools.swing</artifactId>
191
                <version>${gvsig.tools.version}</version>
192
            </dependency>
193
            <dependency>
194
                <groupId>org.gvsig</groupId>
195
                <artifactId>org.gvsig.tools.swing.api</artifactId>
196
                <version>${gvsig.tools.version}</version>
197
            </dependency>
198
            <dependency>
199
                <groupId>org.gvsig</groupId>
200
                <artifactId>org.gvsig.tools.swing.impl</artifactId>
201
                <version>${gvsig.tools.version}</version>
202
            </dependency>
203
            <dependency>
204
                <groupId>org.gvsig</groupId>
205
                <artifactId>org.gvsig.tools.swing.spi</artifactId>
206
                <version>${gvsig.tools.version}</version>
207
            </dependency>
208
            <dependency>
209
                <groupId>org.gvsig</groupId>
210
                <artifactId>org.gvsig.tools.swing.serv</artifactId>
211
                <version>${gvsig.tools.version}</version>
212
            </dependency>
213
            <dependency>
214
                <groupId>org.gvsig</groupId>
215
                <artifactId>org.gvsig.tools.swing.serv.field</artifactId>
216
                <version>${gvsig.tools.version}</version>
217
            </dependency>
218
            <dependency>
219
                <groupId>org.gvsig</groupId>
220
                <artifactId>org.gvsig.tools.swing.serv.jform</artifactId>
221
                <version>${gvsig.tools.version}</version>
222
            </dependency>
223
            <dependency>
224
                <groupId>org.gvsig</groupId>
225
                <artifactId>org.gvsig.tools.swing.serv.jlist</artifactId>
226
                <version>${gvsig.tools.version}</version>
227
            </dependency>
228
	                
229
	                
230
	                
231
            <dependency>
232
                <groupId>org.gvsig</groupId>
233 168
                <artifactId>org.gvsig.proj.lib</artifactId>
234 169
                <version>1.0.2-SNAPSHOT</version>
235 170
            </dependency>
......
280 215
	                
281 216
        </dependencies>
282 217
    </dependencyManagement>
283

  
218
<!--
284 219
    <dependencies>
285 220
        <dependency>
286 221
            <groupId>junit</groupId>
287 222
            <artifactId>junit</artifactId>
288 223
        </dependency>
289 224
    </dependencies>
290
	
225
	-->
291 226
    <build>
292 227
        <extensions>
293 228
            <extension>
......
312 247
                    <artifactId>maven-compiler-plugin</artifactId>
313 248
                    <version>2.3.2</version>
314 249
                    <configuration>
315
                        <source>1.5</source>
316
                        <target>1.5</target>
250
                        <source>1.7</source>
251
                        <target>1.7</target>
317 252
                        <encoding>ISO-8859-1</encoding>
318 253
                    </configuration>
319 254
                </plugin>
......
350 285
                            <property>
351 286
                                <name>api_1.6</name>
352 287
                                <value>http://download.oracle.com/javase/6/docs/api/</value>
288
                            </property>                            <property>
289
                                <name>api_1.7</name>
290
                                <value>http://download.oracle.com/javase/7/docs/api/</value>
353 291
                            </property>
354 292
                        </javaApiLinks>
355 293
                    </configuration>
......
511 449
        <site-repository>dav:https://devel.gvsig.org/sites/${project.artifactId}/${project.version}</site-repository>
512 450
		
513 451

  
514
        <gvsig.tools.version>3.0.7</gvsig.tools.version>
452
        <gvsig.tools.version>3.0.71</gvsig.tools.version>
515 453
        <gvsig.metadata.version>1.0.0</gvsig.metadata.version>
516
        <gvsig.projection.version>2.0.13</gvsig.projection.version>
454
        <gvsig.projection.version>2.0.21</gvsig.projection.version>
517 455
    </properties>
518 456

  
519 457
    <modules>

Also available in: Unified diff