Skip to content

Commit 55ac0a7

Browse files
stolstovstolstov
committed
changed the folder structure
1 parent 5c2e411 commit 55ac0a7

File tree

321 files changed

+32
-30
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

321 files changed

+32
-30
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ esri-geometry-api.jar
66
.classpath
77
description.jardesc
88
*.bak
9+
*.properties
910

1011
# Intellij project files
1112
*.iml

‎DepFiles/unittest/jersey-client-1.5.jar‎

-125 KB
Binary file not shown.

‎DepFiles/unittest/jersey-core-1.5.jar‎

-445 KB
Binary file not shown.

‎build.xml‎

Lines changed: 22 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,23 @@
22
<project default="all">
33

44
<property name="dir.src" value="src" />
5-
<property name="dir.unittest" value="unittest" />
5+
<property name="dir.src.main" value="src/main" />
6+
<property name="dir.src.main.java" value="src/main/java" />
7+
<property name="dir.src.main.resources" value="src/main/resources" />
8+
<property name="dir.src.test" value="src/test" />
9+
<property name="dir.src.test.java" value="src/test/java" />
10+
<property name="dir.src.test.resources" value="src/test/resources" />
611
<property name="dir.build" value="bin" />
12+
<property name="dir.depfiles" value="DepFiles" />
713
<property name="dir.javadoc" value="javadoc" />
814
<property name="dir.result" value="results" />
915
<property name="dir.root" value="." />
1016
<property name="file.jarname" value="esri-geometry-api.jar" />
1117

1218
<path id="project.classpath">
13-
<pathelement location="${dir.root}/DepFiles/public/jackson-core-asl-1.9.11.jar" />
14-
<pathelement location="${dir.root}/DepFiles/public/java-json.jar" />
15-
<pathelement location="${dir.root}/DepFiles/unittest/jersey-client-1.5.jar" />
16-
<pathelement location="${dir.root}/DepFiles/unittest/jersey-core-1.5.jar" />
17-
<pathelement location="${dir.root}/DepFiles/unittest/junit-4.8.2.jar" />
19+
<pathelement location="${dir.depfiles}/public/jackson-core-asl-1.9.11.jar" />
20+
<pathelement location="${dir.depfiles}/public/java-json.jar" />
21+
<pathelement location="${dir.depfiles}/unittest/junit-4.8.2.jar" />
1822
<pathelement location="${dir.build}" />
1923
</path>
2024

@@ -23,9 +27,9 @@
2327
<target name="build">
2428
<delete dir="${dir.build}" />
2529
<mkdir dir="${dir.build}" />
26-
<javac srcdir="." includes="src/**" classpathref="project.classpath" destdir="${dir.build}" debug="false" />
30+
<javac srcdir="." includes="${dir.src.main.java}/**" classpathref="project.classpath" destdir="${dir.build}" debug="false" />
2731
<copy todir="${dir.build}">
28-
<fileset dir="${dir.src}" includes = "**/*.txt" />
32+
<fileset dir="${dir.src.main.resources}" includes = "**/*.txt" />
2933
</copy>
3034
</target>
3135

@@ -37,9 +41,9 @@
3741
</target>
3842

3943
<target name="build.unittest" depends = "jar">
40-
<javac srcdir="." includes="unittest/**" classpathref="project.classpath" destdir="${dir.build}" debug="false" />
44+
<javac srcdir="." includes="${dir.src.test.java}/**" classpathref="project.classpath" destdir="${dir.build}" debug="false" />
4145
<copy todir="${dir.build}">
42-
<fileset dir="${dir.unittest}" includes="**/*.txt" />
46+
<fileset dir="${dir.src.test.resources}" includes="**/*.txt" />
4347
</copy>
4448
</target>
4549

@@ -78,11 +82,18 @@
7882
</target>
7983

8084
<target name="javadoc" depends="jar">
81-
<javadoc access="public" author="true" classpathref="project.classpath" destdir="${dir.javadoc}" doctitle="Esri-geometry-api" nodeprecated="false" nodeprecatedlist="false" noindex="false" nonavbar="false" notree="false" packagenames="com.esri.core.geometry.*" source="1.5" sourcepath="${dir.src}" splitindex="true" use="true" version="true">
85+
<javadoc access="public" author="true" classpathref="project.classpath" destdir="${dir.javadoc}" doctitle="Esri-geometry-api" nodeprecated="false" nodeprecatedlist="false" noindex="false" nonavbar="false" notree="false" packagenames="com.esri.core.geometry.*" source="1.5" sourcepath="${dir.src.main.java}" splitindex="true" use="true" version="true">
8286
<link href="http://help.arcgis.com/EN/sdk/10.0/Java_AO_ADF/api/arcobjects" />
8387
<link href="http://docs.oracle.com/javase/6/docs/api/" />
8488
</javadoc>
8589
</target>
8690

91+
<target name="javadoc1">
92+
<javadoc access="public" author="true" classpathref="project.classpath" destdir="${dir.javadoc}" doctitle="Esri-geometry-api" nodeprecated="false" nodeprecatedlist="false" noindex="false" nonavbar="false" notree="false" packagenames="com.esri.core.geometry.*" source="1.5" sourcepath="${dir.src.main.java}" splitindex="true" use="true" version="true">
93+
<link href="http://help.arcgis.com/EN/sdk/10.0/Java_AO_ADF/api/arcobjects" />
94+
<link href="http://docs.oracle.com/javase/6/docs/api/" />
95+
</javadoc>
96+
</target>
97+
8798
</project>
8899

‎pom.xml‎

Lines changed: 9 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
<json.version>20090211</json.version>
3636
<jackson.version>1.9.12</jackson.version>
3737
<junit.version>4.11</junit.version>
38-
<jersey.version>1.5</jersey.version>
3938

4039
<!-- plugin versions -->
4140
<compiler.plugin.version>2.3.1</compiler.plugin.version>
@@ -67,33 +66,24 @@
6766
<version>${junit.version}</version>
6867
<scope>test</scope>
6968
</dependency>
70-
<dependency>
71-
<groupId>com.sun.jersey</groupId>
72-
<artifactId>jersey-client</artifactId>
73-
<version>${jersey.version}</version>
74-
<scope>test</scope>
75-
</dependency>
7669
</dependencies>
7770

7871
<build>
79-
<sourceDirectory>src</sourceDirectory>
80-
<testSourceDirectory>unittest</testSourceDirectory>
72+
<directory>${project.basedir}/target</directory>
73+
<outputDirectory>${project.build.directory}/classes</outputDirectory>
74+
<finalName>${project.artifactId}-${project.version}</finalName>
75+
<testOutputDirectory>${project.build.directory}/test-classes</testOutputDirectory>
76+
<sourceDirectory>${project.basedir}/src/main/java</sourceDirectory>
77+
<scriptSourceDirectory>src/main/scripts</scriptSourceDirectory>
78+
<testSourceDirectory>${project.basedir}/src/test/java</testSourceDirectory>
8179
<resources>
8280
<resource>
83-
<targetPath>com/esri/core/geometry</targetPath>
84-
<directory>src/com/esri/core/geometry</directory>
85-
<includes>
86-
<include>*.txt</include>
87-
</includes>
81+
<directory>${project.basedir}/src/main/resources</directory>
8882
</resource>
8983
</resources>
9084
<testResources>
9185
<testResource>
92-
<targetPath>com/esri/core/geometry</targetPath>
93-
<directory>unittest/com/esri/core/geometry</directory>
94-
<includes>
95-
<include>*.txt</include>
96-
</includes>
86+
<directory>${project.basedir}/src/test/resources</directory>
9787
</testResource>
9888
</testResources>
9989
<plugins>

src/com/esri/core/geometry/AttributeStreamBase.java renamed to src/main/java/com/esri/core/geometry/AttributeStreamBase.java

File renamed without changes.

src/com/esri/core/geometry/AttributeStreamOfDbl.java renamed to src/main/java/com/esri/core/geometry/AttributeStreamOfDbl.java

File renamed without changes.

src/com/esri/core/geometry/AttributeStreamOfFloat.java renamed to src/main/java/com/esri/core/geometry/AttributeStreamOfFloat.java

File renamed without changes.

src/com/esri/core/geometry/AttributeStreamOfInt16.java renamed to src/main/java/com/esri/core/geometry/AttributeStreamOfInt16.java

File renamed without changes.

src/com/esri/core/geometry/AttributeStreamOfInt32.java renamed to src/main/java/com/esri/core/geometry/AttributeStreamOfInt32.java

File renamed without changes.

0 commit comments

Comments
 (0)