Revision 416

View differences:

2.1/trunk/org.gvsig.view3d/pom.xml
60 60
		<dependencies>
61 61
			<dependency>
62 62
				<groupId>org.gvsig</groupId>
63
				<artifactId>org.gvsig.view3d.app.mainplugin</artifactId>
63
				<artifactId>org.gvsig.view3d.app.common</artifactId>
64 64
				<version>1.0.0-SNAPSHOT</version>
65 65
			</dependency>
66 66
			<dependency>
2.1/trunk/org.gvsig.view3d/org.gvsig.view3d.swing/org.gvsig.view3d.swing.api/src/main/java/org/gvsig/view3d/swing/api/AbstractView3DPanel.java
91 91
                .createConfigurationComponent(AVKey.MODEL_CLASS_NAME);
92 92
        this.wwd.setModel(m);
93 93

  
94
        // Setup a select listener for the worldmap click-and-go feature
95
        this.wwd.addSelectListener(new ClickAndGoSelectListener(wwd,
96
            WorldMapLayer.class));
94
//        // Setup a select listener for the worldmap click-and-go feature
95
//        this.wwd.addSelectListener(new ClickAndGoSelectListener(wwd,
96
//            WorldMapLayer.class));
97 97

  
98 98
        // Add view control layer
99 99
        addNavigation();
2.1/trunk/org.gvsig.view3d/org.gvsig.view3d.app/org.gvsig.view3d.app.lin.x86_64/pom.xml
1
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2
	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3
	<modelVersion>4.0.0</modelVersion>
4
	<parent>
5
		<groupId>org.gvsig</groupId>
6
		<artifactId>org.gvsig.view3d.app</artifactId>
7
		<version>1.0.0-SNAPSHOT</version>
8
	</parent>
9
	<artifactId>org.gvsig.view3d.app.lin.x86_64</artifactId>
10
	<name>org.gvsig.view3d.app.lin.x86_64</name>
11

  
12
	<dependencyManagement>
13
		<dependencies>
14
			<dependency>
15
				<groupId>org.jogamp.jogl</groupId>
16
				<artifactId>jogl-all</artifactId>
17
				<version>2.2.1</version>
18
				<classifier>natives-linux-amd64</classifier>
19
				<scope>runtime</scope>
20
			</dependency>
21
			<dependency>
22
				<groupId>org.jogamp.gluegen</groupId>
23
				<artifactId>gluegen-rt</artifactId>
24
				<version>2.2.1</version>
25
				<classifier>natives-linux-amd64</classifier>
26
				<scope>runtime</scope>
27
			</dependency>
28
		</dependencies>
29
	</dependencyManagement>
30

  
31
	<dependencies>
32
		<dependency>
33
			<groupId>org.gvsig</groupId>
34
			<artifactId>org.gvsig.view3d.app.common</artifactId>
35
		</dependency>
36
		<dependency>
37
			<groupId>org.jogamp.jogl</groupId>
38
			<artifactId>jogl-all</artifactId>
39
			<classifier>natives-linux-amd64</classifier>
40
		</dependency>
41
		<dependency>
42
			<groupId>org.jogamp.gluegen</groupId>
43
			<artifactId>gluegen-rt</artifactId>
44
			<classifier>natives-linux-amd64</classifier>
45
		</dependency>
46
	</dependencies>
47

  
48
	<build>
49
		<plugins>
50
			<plugin>
51
				<groupId>org.apache.maven.plugins</groupId>
52
				<artifactId>maven-dependency-plugin</artifactId>
53
				<executions>
54
					<execution>
55
						<id>unpack</id>
56
						<phase>process-sources</phase>
57
						<goals>
58
							<goal>unpack</goal>
59
						</goals>
60
						<configuration>
61
							<artifactItems>
62
								<artifactItem>
63
									<groupId>org.gvsig</groupId>
64
									<artifactId>org.gvsig.view3d.app.common</artifactId>
65
									<type>zip</type>
66
									<overWrite>true</overWrite>
67
									<outputDirectory>target</outputDirectory>
68
								</artifactItem>
69
							</artifactItems>
70
						</configuration>
71
					</execution>
72
				</executions>
73
			</plugin>
74
		</plugins>
75
	</build>
76

  
77
	<!-- The profiles only configure the automatic deploy of gvSIG plugin in 
78
		the gvSIG configured in HOME/.gvsig-devel.properties -->
79
	<profiles>
80

  
81
		<profile>
82
			<id>gvsig-plugin-install-view3d-linux-x86_64</id>
83
			<activation>
84
				<os>
85
					<family>unix</family>
86
					<name>linux</name>
87
					<arch>x86_64</arch>
88
				</os>
89
			</activation>
90
			<properties>
91
				<gvsig.install.plugin>true</gvsig.install.plugin>
92
			</properties>
93
		</profile>
94

  
95
		<profile>
96
			<id>gvsig-plugin-install-view3d-linux-amd64</id>
97
			<activation>
98
				<os>
99
					<family>unix</family>
100
					<name>linux</name>
101
					<arch>amd64</arch>
102
				</os>
103
			</activation>
104
			<properties>
105
				<gvsig.install.plugin>true</gvsig.install.plugin>
106
			</properties>
107
		</profile>
108

  
109
	</profiles>
110
</project>
2.1/trunk/org.gvsig.view3d/org.gvsig.view3d.app/org.gvsig.view3d.app.lin.x86_64/buildNumber.properties
1
buildNumber=0
2.1/trunk/org.gvsig.view3d/org.gvsig.view3d.app/org.gvsig.view3d.app.lin.x86_64/src/main/assembly/gvsig-plugin-package.xml
1
<!-- gvSIG. Desktop Geographic Information System. Copyright (C) 2007-2013 
2
	gvSIG Association. This program is free software; you can redistribute it 
3
	and/or modify it under the terms of the GNU General Public License as published 
4
	by the Free Software Foundation; either version 3 of the License, or (at 
5
	your option) any later version. This program is distributed in the hope that 
6
	it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty 
7
	of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General 
8
	Public License for more details. You should have received a copy of the GNU 
9
	General Public License along with this program; if not, write to the Free 
10
	Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, 
11
	USA. For any additional information, do not hesitate to contact us at info 
12
	AT gvsig.com, or visit our website www.gvsig.com. -->
13
<assembly>
14
	<id>gvsig-plugin-package</id>
15
	<formats>
16
		<format>zip</format>
17
	</formats>
18
	<baseDirectory>${project.parent.artifactId}</baseDirectory>
19
	<includeBaseDirectory>true</includeBaseDirectory>
20
	<files>
21
		<file>
22
			<source>target/${project.artifactId}-${project.version}.jar</source>
23
			<outputDirectory>lib</outputDirectory>
24
		</file>
25
		<file>
26
			<source>target/package.info</source>
27
		</file>
28
	</files>
29

  
30
	<fileSets>
31
		<fileSet>
32
			<directory>src/main/resources-plugin</directory>
33
			<outputDirectory>.</outputDirectory>
34
		</fileSet>
35
		<fileSet>
36
			<directory>target/org.gvsig.view3d.app.common</directory>
37
			<outputDirectory>.</outputDirectory>
38
			<excludes>
39
				<exclude>package.info</exclude>
40
			</excludes>
41
		</fileSet>
42
	</fileSets>
43

  
44

  
45

  
46

  
47
	<dependencySets>
48
		<dependencySet>
49
			<useProjectArtifact>false</useProjectArtifact>
50
			<useTransitiveDependencies>false</useTransitiveDependencies>
51
			<outputDirectory>lib</outputDirectory>
52
			<includes>
53
				<include>org.gvsig:org.gvsig.view3d.app.common</include>
54
				<include>org.jogamp.jogl:jogl-all</include>
55
				<include>org.jogamp.gluegen:gluegen-rt</include>
56
			</includes>
57
		</dependencySet>
58
	</dependencySets>
59

  
60
</assembly>
2.1/trunk/org.gvsig.view3d/org.gvsig.view3d.app/org.gvsig.view3d.app.win.x86/buildNumber.properties
1
buildNumber=0
2.1/trunk/org.gvsig.view3d/org.gvsig.view3d.app/org.gvsig.view3d.app.win.x86/src/main/assembly/gvsig-plugin-package.xml
1
<!-- gvSIG. Desktop Geographic Information System. Copyright (C) 2007-2013 
2
	gvSIG Association. This program is free software; you can redistribute it 
3
	and/or modify it under the terms of the GNU General Public License as published 
4
	by the Free Software Foundation; either version 3 of the License, or (at 
5
	your option) any later version. This program is distributed in the hope that 
6
	it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty 
7
	of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General 
8
	Public License for more details. You should have received a copy of the GNU 
9
	General Public License along with this program; if not, write to the Free 
10
	Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, 
11
	USA. For any additional information, do not hesitate to contact us at info 
12
	AT gvsig.com, or visit our website www.gvsig.com. -->
13
<assembly>
14
	<id>gvsig-plugin-package</id>
15
	<formats>
16
		<format>zip</format>
17
	</formats>
18
	<baseDirectory>${project.parent.artifactId}</baseDirectory>
19
	<includeBaseDirectory>true</includeBaseDirectory>
20
	<files>
21
		<file>
22
			<source>target/${project.artifactId}-${project.version}.jar</source>
23
			<outputDirectory>lib</outputDirectory>
24
		</file>
25
		<file>
26
			<source>target/package.info</source>
27
		</file>
28
	</files>
29

  
30
	<fileSets>
31
		<fileSet>
32
			<directory>src/main/resources-plugin</directory>
33
			<outputDirectory>.</outputDirectory>
34
		</fileSet>
35
		<fileSet>
36
			<directory>target/org.gvsig.view3d.app.common</directory>
37
			<outputDirectory>.</outputDirectory>
38
			<excludes>
39
				<exclude>package.info</exclude>
40
			</excludes>
41
		</fileSet>
42
	</fileSets>
43

  
44

  
45
	<dependencySets>
46
		<dependencySet>
47
			<useProjectArtifact>false</useProjectArtifact>
48
			<useTransitiveDependencies>false</useTransitiveDependencies>
49
			<outputDirectory>lib</outputDirectory>
50
			<includes>
51
				<include>org.gvsig:org.gvsig.view3d.app.common</include>
52
				<include>org.jogamp.jogl:jogl-all</include>
53
				<include>org.jogamp.gluegen:gluegen-rt</include>
54
			</includes>
55
		</dependencySet>
56
	</dependencySets>
57

  
58
</assembly>
2.1/trunk/org.gvsig.view3d/org.gvsig.view3d.app/org.gvsig.view3d.app.win.x86/pom.xml
1
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2
	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3
	<modelVersion>4.0.0</modelVersion>
4
	<parent>
5
		<groupId>org.gvsig</groupId>
6
		<artifactId>org.gvsig.view3d.app</artifactId>
7
		<version>1.0.0-SNAPSHOT</version>
8
	</parent>
9
	<artifactId>org.gvsig.view3d.app.win.x86</artifactId>
10
	<name>org.gvsig.view3d.app.win.x86</name>
11

  
12
	<dependencyManagement>
13
		<dependencies>
14
			<dependency>
15
				<groupId>org.jogamp.jogl</groupId>
16
				<artifactId>jogl-all</artifactId>
17
				<version>2.2.1</version>
18
				<classifier>natives-windows-i586</classifier>
19
				<scope>runtime</scope>
20
			</dependency>
21
			<dependency>
22
				<groupId>org.jogamp.gluegen</groupId>
23
				<artifactId>gluegen-rt</artifactId>
24
				<version>2.2.1</version>
25
				<classifier>natives-windows-i586</classifier>
26
				<scope>runtime</scope>
27
			</dependency>
28
		</dependencies>
29
	</dependencyManagement>
30

  
31
	<dependencies>
32
		<dependency>
33
			<groupId>org.gvsig</groupId>
34
			<artifactId>org.gvsig.view3d.app.common</artifactId>
35
		</dependency>
36
		<dependency>
37
			<groupId>org.gvsig</groupId>
38
			<artifactId>org.gvsig.view3d.app.common</artifactId>
39
		</dependency>
40
		<dependency>
41
			<groupId>org.jogamp.jogl</groupId>
42
			<artifactId>jogl-all</artifactId>
43
			<classifier>natives-windows-i586</classifier>
44
		</dependency>
45
		<dependency>
46
			<groupId>org.jogamp.gluegen</groupId>
47
			<artifactId>gluegen-rt</artifactId>
48
			<classifier>natives-windows-i586</classifier>
49
		</dependency>
50
		<dependency>
51
			<groupId>org.gvsig</groupId>
52
			<artifactId>org.gvsig.view3d.app.common</artifactId>
53
		</dependency>
54
	</dependencies>
55
	
56
	<build>
57
        <plugins>
58
            <plugin>
59
                <groupId>org.apache.maven.plugins</groupId>
60
                <artifactId>maven-dependency-plugin</artifactId>
61
                <executions>
62
                    <execution>
63
                        <id>unpack</id>
64
                        <phase>process-sources</phase>
65
                        <goals>
66
                            <goal>unpack</goal>
67
                        </goals>
68
                        <configuration>
69
                            <artifactItems>
70
                                <artifactItem>
71
                                    <groupId>org.gvsig</groupId>
72
                                    <artifactId>org.gvsig.view3d.app.common</artifactId>
73
                                    <type>zip</type>
74
                                    <overWrite>true</overWrite>
75
                                    <outputDirectory>target</outputDirectory>
76
                                </artifactItem>
77
                            </artifactItems>
78
                        </configuration>
79
                    </execution>
80
                </executions>
81
            </plugin>
82
        </plugins>
83
    </build>
84

  
85
	<!-- The profiles only configure the automatic deploy of gvSIG plugin in 
86
		the gvSIG configured in HOME/.gvsig-devel.properties -->
87
	<profiles>
88

  
89
		<profile>
90
			<id>gvsig-plugin-install-view3d-windows-x86</id>
91
			<activation>
92
				<os>
93
					<family>windows</family>
94
					<arch>x86</arch>
95
				</os>
96
			</activation>
97
			<properties>
98
				<gvsig.install.plugin>true</gvsig.install.plugin>
99
			</properties>
100
		</profile>
101

  
102
		<profile>
103
			<id>gvsig-plugin-install-view3d-windows-i586</id>
104
			<activation>
105
				<os>
106
					<family>windows</family>
107
					<arch>i586</arch>
108
				</os>
109
			</activation>
110
			<properties>
111
				<gvsig.install.plugin>true</gvsig.install.plugin>
112
			</properties>
113
		</profile>
114

  
115
	</profiles>
116

  
117
</project>
2.1/trunk/org.gvsig.view3d/org.gvsig.view3d.app/org.gvsig.view3d.app.lin.x86/buildNumber.properties
1
buildNumber=0
2.1/trunk/org.gvsig.view3d/org.gvsig.view3d.app/org.gvsig.view3d.app.lin.x86/src/main/assembly/gvsig-plugin-package.xml
1
<!-- gvSIG. Desktop Geographic Information System. Copyright (C) 2007-2013 
2
	gvSIG Association. This program is free software; you can redistribute it 
3
	and/or modify it under the terms of the GNU General Public License as published 
4
	by the Free Software Foundation; either version 3 of the License, or (at 
5
	your option) any later version. This program is distributed in the hope that 
6
	it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty 
7
	of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General 
8
	Public License for more details. You should have received a copy of the GNU 
9
	General Public License along with this program; if not, write to the Free 
10
	Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, 
11
	USA. For any additional information, do not hesitate to contact us at info 
12
	AT gvsig.com, or visit our website www.gvsig.com. -->
13
<assembly>
14
	<id>gvsig-plugin-package</id>
15
	<formats>
16
		<format>zip</format>
17
	</formats>
18
	<baseDirectory>${project.parent.artifactId}</baseDirectory>
19
	<includeBaseDirectory>true</includeBaseDirectory>
20
	<files>
21
		<file>
22
			<source>target/${project.artifactId}-${project.version}.jar</source>
23
			<outputDirectory>lib</outputDirectory>
24
		</file>
25
		<file>
26
			<source>target/package.info</source>
27
		</file>
28
	</files>
29

  
30
	<fileSets>
31
		<fileSet>
32
			<directory>src/main/resources-plugin</directory>
33
			<outputDirectory>.</outputDirectory>
34
		</fileSet>
35
		<fileSet>
36
			<directory>target/org.gvsig.view3d.app.common</directory>
37
			<outputDirectory>.</outputDirectory>
38
			<excludes>
39
				<exclude>package.info</exclude>
40
			</excludes>
41
		</fileSet>
42
	</fileSets>
43

  
44

  
45
	<dependencySets>
46
		<dependencySet>
47
			<useProjectArtifact>false</useProjectArtifact>
48
			<useTransitiveDependencies>false</useTransitiveDependencies>
49
			<outputDirectory>lib</outputDirectory>
50
			<includes>
51
				<include>org.gvsig:org.gvsig.view3d.app.common</include>
52
				<include>org.jogamp.jogl:jogl-all</include>
53
				<include>org.jogamp.gluegen:gluegen-rt</include>
54
			</includes>
55
		</dependencySet>
56
	</dependencySets>
57

  
58
</assembly>
2.1/trunk/org.gvsig.view3d/org.gvsig.view3d.app/org.gvsig.view3d.app.lin.x86/pom.xml
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">
2
  <modelVersion>4.0.0</modelVersion>
3
  <parent>
4
    <groupId>org.gvsig</groupId>
5
    <artifactId>org.gvsig.view3d.app</artifactId>
6
    <version>1.0.0-SNAPSHOT</version>
7
  </parent>
8
  <artifactId>org.gvsig.view3d.app.lin.x86</artifactId>
9
  <name>org.gvsig.view3d.app.lin.x86</name>
10
  
11
  <dependencyManagement>
12
    <dependencies>
13
        <dependency>
14
            <groupId>org.jogamp.jogl</groupId>
15
            <artifactId>jogl-all</artifactId>
16
            <version>2.2.1</version>
17
            <classifier>natives-linux-i586</classifier>
18
            <scope>runtime</scope>
19
        </dependency>
20
        <dependency>
21
            <groupId>org.jogamp.gluegen</groupId>
22
            <artifactId>gluegen-rt</artifactId>
23
            <version>2.2.1</version>
24
            <classifier>natives-linux-i586</classifier>
25
            <scope>runtime</scope>
26
        </dependency>
27
    </dependencies>
28
  </dependencyManagement>
29
  
30
  <dependencies>
31
    <dependency>
32
        <groupId>org.gvsig</groupId>
33
        <artifactId>org.gvsig.view3d.app.common</artifactId>
34
    </dependency>
35
    <dependency>
36
        <groupId>org.jogamp.jogl</groupId>
37
        <artifactId>jogl-all</artifactId>
38
        <classifier>natives-linux-i586</classifier>
39
    </dependency>
40
    <dependency>
41
        <groupId>org.jogamp.gluegen</groupId>
42
        <artifactId>gluegen-rt</artifactId>
43
        <classifier>natives-linux-i586</classifier>
44
    </dependency>
45
    <dependency>
46
        <groupId>org.gvsig</groupId>
47
        <artifactId>org.gvsig.view3d.app.common</artifactId>
48
    </dependency>
49
  </dependencies>
50
  
51
  <build>
52
        <plugins>
53
            <plugin>
54
                <groupId>org.apache.maven.plugins</groupId>
55
                <artifactId>maven-dependency-plugin</artifactId>
56
                <executions>
57
                    <execution>
58
                        <id>unpack</id>
59
                        <phase>process-sources</phase>
60
                        <goals>
61
                            <goal>unpack</goal>
62
                        </goals>
63
                        <configuration>
64
                            <artifactItems>
65
                                <artifactItem>
66
                                    <groupId>org.gvsig</groupId>
67
                                    <artifactId>org.gvsig.view3d.app.common</artifactId>
68
                                    <type>zip</type>
69
                                    <overWrite>true</overWrite>
70
                                    <outputDirectory>target</outputDirectory>
71
                                </artifactItem>
72
                            </artifactItems>
73
                        </configuration>
74
                    </execution>
75
                </executions>
76
            </plugin>
77
        </plugins>
78
    </build>
79
  
80
  <!-- 
81
  The profiles only configure the automatic deploy of gvSIG plugin in the gvSIG
82
  configured in HOME/.gvsig-devel.properties
83
  -->
84
  <profiles>
85
  
86
    <profile>
87
      <id>gvsig-plugin-install-view3d-linux-x86</id>
88
      <activation>
89
         <os>
90
             <family>unix</family>
91
             <name>linux</name>
92
             <arch>x86</arch>
93
         </os>
94
      </activation>
95
        <properties>
96
          <gvsig.install.plugin>true</gvsig.install.plugin>
97
        </properties>
98
    </profile>
99

  
100
    <profile>
101
      <id>gvsig-plugin-install-view3d-linux-i586</id>
102
      <activation>
103
         <os>
104
             <family>unix</family>
105
             <name>linux</name>
106
             <arch>i586</arch>
107
         </os>
108
      </activation>
109
      <properties>
110
         <gvsig.install.plugin>true</gvsig.install.plugin>
111
      </properties>
112
    </profile>
113

  
114
  </profiles>
115
</project>
2.1/trunk/org.gvsig.view3d/org.gvsig.view3d.app/pom.xml
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">
2
  <modelVersion>4.0.0</modelVersion>
3
  <parent>
4
    <groupId>org.gvsig</groupId>
5
    <artifactId>org.gvsig.view3d</artifactId>
6
    <version>1.0.0-SNAPSHOT</version>
7
  </parent>
8
  <artifactId>org.gvsig.view3d.app</artifactId>
9
  <packaging>pom</packaging>
10
  <name>org.gvsig.view3d.app</name>
11
  <modules>
12
  	<module>org.gvsig.view3d.app.common</module>
13
  </modules>
1
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2
	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3
	<modelVersion>4.0.0</modelVersion>
4
	<parent>
5
		<groupId>org.gvsig</groupId>
6
		<artifactId>org.gvsig.view3d</artifactId>
7
		<version>1.0.0-SNAPSHOT</version>
8
	</parent>
9
	<artifactId>org.gvsig.view3d.app</artifactId>
10
	<packaging>pom</packaging>
11
	<name>org.gvsig.view3d.app</name>
12

  
13
	<properties>
14
		<gvsig.install.plugin>false</gvsig.install.plugin>
15
	</properties>
16

  
17
	<modules>
18
		<module>org.gvsig.view3d.app.common</module>
19
		<module>org.gvsig.view3d.app.lin.x86</module>
20
		<module>org.gvsig.view3d.app.lin.x86_64</module>
21
		<module>org.gvsig.view3d.app.win.x86</module>
22
		<module>org.gvsig.view3d.app.win.x86_64</module>
23
	</modules>
14 24
</project>
2.1/trunk/org.gvsig.view3d/org.gvsig.view3d.app/org.gvsig.view3d.app.common/src/main/assembly/gvsig-plugin-package.xml
43 43
			<includes>
44 44
				<include>org.gvsig:org.gvsig.view3d.swing.api</include>
45 45
				<include>org.gvsig:org.gvsig.view3d.swing.impl</include>
46
				<include>gov.nasa:worldwind</include>
47
				<include>org.jogamp.gluegen:gluegen-rt</include>
48
				<include>org.jogamp.jogl:jogl-all</include>
46 49
			</includes>
47 50
		</dependencySet>
48 51
	</dependencySets>
2.1/trunk/org.gvsig.view3d/org.gvsig.view3d.app/org.gvsig.view3d.app.common/src/main/java/org/gvsig/view3d/app/mainplugin/View3DExtension.java
26 26

  
27 27
import org.gvsig.andami.plugins.Extension;
28 28
import org.gvsig.view3d.swing.api.View3DLocator;
29
import org.gvsig.view3d.swing.api.View3DManager;
30
import org.gvsig.view3d.swing.api.View3DPanel;
29 31

  
30 32

  
31 33
/**
......
38 40
    }
39 41

  
40 42
    public void execute(String actionCommand) {
41
        System.out.println(View3DLocator.getManager().toString());
43
        View3DManager manager = View3DLocator.getManager();
44
        View3DPanel createView3DPanel = manager.createView3DPanel(null, View3DPanel.SPHERE);
45
        createView3DPanel.show();
42 46
    }
43 47

  
44 48
    public boolean isEnabled() {
2.1/trunk/org.gvsig.view3d/org.gvsig.view3d.app/org.gvsig.view3d.app.common/pom.xml
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">
2
  <modelVersion>4.0.0</modelVersion>
3
  <parent>
4
    <groupId>org.gvsig</groupId>
5
    <artifactId>org.gvsig.view3d.app</artifactId>
6
    <version>1.0.0-SNAPSHOT</version>
7
  </parent>
8
  <artifactId>org.gvsig.view3d.app.common</artifactId>
9
  <name>org.gvsig.view3d.app.common</name>
10
  <dependencies>
11
  	<dependency>
12
  		<groupId>org.gvsig</groupId>
13
  		<artifactId>org.gvsig.view3d.swing.api</artifactId>
14
  	</dependency>
15
  	<dependency>
16
  		<groupId>org.gvsig</groupId>
17
  		<artifactId>org.gvsig.view3d.swing.impl</artifactId>
18
  		<scope>runtime</scope>
19
  	</dependency>
20
  	<dependency>
21
            <groupId>org.gvsig</groupId>
22
            <artifactId>org.gvsig.app.mainplugin</artifactId>
23
        </dependency>
24
  </dependencies>
1
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2
	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3
	<modelVersion>4.0.0</modelVersion>
4
	<parent>
5
		<groupId>org.gvsig</groupId>
6
		<artifactId>org.gvsig.view3d.app</artifactId>
7
		<version>1.0.0-SNAPSHOT</version>
8
	</parent>
9
	<artifactId>org.gvsig.view3d.app.common</artifactId>
10
	<name>org.gvsig.view3d.app.common</name>
11

  
12
	<properties>
13
		<!-- Control the deploy of the plugin in gvsig.product.folder.path/gvSIG/extensiones -->
14
		<gvsig.install.plugin>false</gvsig.install.plugin>
15
		<!-- Control the deploy of the plugin package in gvsig.product.folder.path/install -->
16
		<gvsig.install.plugin.package>false</gvsig.install.plugin.package>
17
	</properties>
18

  
19
	<dependencies>
20
		<dependency>
21
			<groupId>org.gvsig</groupId>
22
			<artifactId>org.gvsig.view3d.swing.api</artifactId>
23
		</dependency>
24
		<dependency>
25
			<groupId>org.gvsig</groupId>
26
			<artifactId>org.gvsig.view3d.swing.impl</artifactId>
27
			<scope>runtime</scope>
28
		</dependency>
29
		<dependency>
30
			<groupId>org.gvsig</groupId>
31
			<artifactId>org.gvsig.app.mainplugin</artifactId>
32
		</dependency>
33
		<dependency>
34
			<groupId>gov.nasa</groupId>
35
			<artifactId>worldwind</artifactId>
36
			<scope>runtime</scope>
37
		</dependency>
38
		<dependency>
39
			<groupId>org.jogamp.gluegen</groupId>
40
			<artifactId>gluegen-rt</artifactId>
41
			<scope>runtime</scope>
42
		</dependency>
43
		<dependency>
44
			<groupId>org.jogamp.jogl</groupId>
45
			<artifactId>jogl-all</artifactId>
46
			<scope>runtime</scope>
47
		</dependency>
48
	</dependencies>
25 49
</project>
2.1/trunk/org.gvsig.view3d/org.gvsig.view3d.app/org.gvsig.view3d.app.win.x86_64/src/main/assembly/gvsig-plugin-package.xml
1
<!-- gvSIG. Desktop Geographic Information System. Copyright (C) 2007-2013 
2
	gvSIG Association. This program is free software; you can redistribute it 
3
	and/or modify it under the terms of the GNU General Public License as published 
4
	by the Free Software Foundation; either version 3 of the License, or (at 
5
	your option) any later version. This program is distributed in the hope that 
6
	it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty 
7
	of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General 
8
	Public License for more details. You should have received a copy of the GNU 
9
	General Public License along with this program; if not, write to the Free 
10
	Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, 
11
	USA. For any additional information, do not hesitate to contact us at info 
12
	AT gvsig.com, or visit our website www.gvsig.com. -->
13
<assembly>
14
	<id>gvsig-plugin-package</id>
15
	<formats>
16
		<format>zip</format>
17
	</formats>
18
	<baseDirectory>${project.parent.artifactId}</baseDirectory>
19
	<includeBaseDirectory>true</includeBaseDirectory>
20
	<files>
21
		<file>
22
			<source>target/${project.artifactId}-${project.version}.jar</source>
23
			<outputDirectory>lib</outputDirectory>
24
		</file>
25
		<file>
26
			<source>target/package.info</source>
27
		</file>
28
	</files>
29

  
30
	<fileSets>
31
		<fileSet>
32
			<directory>src/main/resources-plugin</directory>
33
			<outputDirectory>.</outputDirectory>
34
		</fileSet>
35
		<fileSet>
36
			<directory>target/org.gvsig.view3d.app.common</directory>
37
			<outputDirectory>.</outputDirectory>
38
			<excludes>
39
				<exclude>package.info</exclude>
40
			</excludes>
41
		</fileSet>
42
	</fileSets>
43

  
44

  
45
	<dependencySets>
46
		<dependencySet>
47
			<useProjectArtifact>false</useProjectArtifact>
48
			<useTransitiveDependencies>false</useTransitiveDependencies>
49
			<outputDirectory>lib</outputDirectory>
50
			<includes>
51
				<include>org.gvsig:org.gvsig.view3d.app.common</include>
52
				<include>org.jogamp.jogl:jogl-all</include>
53
				<include>org.jogamp.gluegen:gluegen-rt</include>
54
			</includes>
55
		</dependencySet>
56
	</dependencySets>
57

  
58
</assembly>
2.1/trunk/org.gvsig.view3d/org.gvsig.view3d.app/org.gvsig.view3d.app.win.x86_64/pom.xml
1
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2
	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3
	<modelVersion>4.0.0</modelVersion>
4
	<parent>
5
		<groupId>org.gvsig</groupId>
6
		<artifactId>org.gvsig.view3d.app</artifactId>
7
		<version>1.0.0-SNAPSHOT</version>
8
	</parent>
9
	<artifactId>org.gvsig.view3d.app.win.x86_64</artifactId>
10
	<name>org.gvsig.view3d.app.win.x86_64</name>
11
	<dependencyManagement>
12
		<dependencies>
13
			<dependency>
14
				<groupId>org.jogamp.jogl</groupId>
15
				<artifactId>jogl-all</artifactId>
16
				<version>2.2.1</version>
17
				<classifier>natives-windows-amd64</classifier>
18
				<scope>runtime</scope>
19
			</dependency>
20
			<dependency>
21
				<groupId>org.jogamp.gluegen</groupId>
22
				<artifactId>gluegen-rt</artifactId>
23
				<version>2.2.1</version>
24
				<classifier>natives-windows-amd64</classifier>
25
				<scope>runtime</scope>
26
			</dependency>
27
		</dependencies>
28
	</dependencyManagement>
29

  
30
	<dependencies>
31
		<dependency>
32
			<groupId>org.gvsig</groupId>
33
			<artifactId>org.gvsig.view3d.app.common</artifactId>
34
		</dependency>
35
		<dependency>
36
			<groupId>org.gvsig</groupId>
37
			<artifactId>org.gvsig.view3d.app.common</artifactId>
38
		</dependency>
39
		<dependency>
40
			<groupId>org.jogamp.jogl</groupId>
41
			<artifactId>jogl-all</artifactId>
42
			<classifier>natives-windows-amd64</classifier>
43
		</dependency>
44
		<dependency>
45
			<groupId>org.jogamp.gluegen</groupId>
46
			<artifactId>gluegen-rt</artifactId>
47
			<classifier>natives-windows-amd64</classifier>
48
		</dependency>
49
		<dependency>
50
			<groupId>org.gvsig</groupId>
51
			<artifactId>org.gvsig.view3d.app.common</artifactId>
52
		</dependency>
53
	</dependencies>
54
	
55
	<build>
56
        <plugins>
57
            <plugin>
58
                <groupId>org.apache.maven.plugins</groupId>
59
                <artifactId>maven-dependency-plugin</artifactId>
60
                <executions>
61
                    <execution>
62
                        <id>unpack</id>
63
                        <phase>process-sources</phase>
64
                        <goals>
65
                            <goal>unpack</goal>
66
                        </goals>
67
                        <configuration>
68
                            <artifactItems>
69
                                <artifactItem>
70
                                    <groupId>org.gvsig</groupId>
71
                                    <artifactId>org.gvsig.view3d.app.common</artifactId>
72
                                    <type>zip</type>
73
                                    <overWrite>true</overWrite>
74
                                    <outputDirectory>target</outputDirectory>
75
                                </artifactItem>
76
                            </artifactItems>
77
                        </configuration>
78
                    </execution>
79
                </executions>
80
            </plugin>
81
        </plugins>
82
    </build>
83

  
84
	<!-- The profiles only configure the automatic deploy of gvSIG plugin in 
85
		the gvSIG configured in HOME/.gvsig-devel.properties -->
86
	<profiles>
87

  
88
		<profile>
89
			<id>gvsig-plugin-install-view3d-windows-x86_64</id>
90
			<activation>
91
				<os>
92
					<family>windows</family>
93
					<arch>x86_64</arch>
94
				</os>
95
			</activation>
96
			<properties>
97
				<gvsig.install.plugin>true</gvsig.install.plugin>
98
			</properties>
99
		</profile>
100

  
101
		<profile>
102
			<id>gvsig-plugin-install-view3d-windows-amd64</id>
103
			<activation>
104
				<os>
105
					<family>windows</family>
106
					<arch>amd64</arch>
107
				</os>
108
			</activation>
109
			<properties>
110
				<gvsig.install.plugin>true</gvsig.install.plugin>
111
			</properties>
112
		</profile>
113

  
114
	</profiles>
115
</project>
2.1/trunk/org.gvsig.view3d/org.gvsig.view3d.app/org.gvsig.view3d.app.win.x86_64/buildNumber.properties
1
buildNumber=0

Also available in: Unified diff