Skip to content

Commit 8728eb3

Browse files
emxsysemxsys
authored
Merge pull request #23 from WorldWindEarth/remove-jackson-sources
Removed embedded Jackson sources.
2 parents 9039b48 + 6d3998f commit 8728eb3

83 files changed

Lines changed: 38 additions & 20186 deletions

File tree

Some content is hidden

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

‎.idea/libraries/jackson.xml‎

Lines changed: 9 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎build.macros.xml‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,9 @@
4343
<!-- Macros for bundling library JAR files.
4444
4545
The WorldWind core JAR file includes all class files, property files, configuration files, and image files
46-
under the package gov.nasa.worldwind, all class files under the package com.zebraimaging, and optionally all
47-
class files under the package org.codehaus.jackson (depending on the worldwind.exclude.jackson property).
48-
The zebraimaging package includes an alternative input handler for the Zebra Imaging display controller. The
49-
jackson package includes the Jackson JSON parsing library which is used by gov.nasa.worldwind.formats.geojson.
50-
Requires jogl-all.jar, gluegen-rt.jar, gdal.jar on the class path.
46+
under the package gov.nasa.worldwind and all class files under the package com.zebraimaging.
47+
The zebraimaging package includes an alternative input handler for the Zebra Imaging display controller.
48+
Requires jackson-core-asl.jar, jogl-all.jar, gluegen-rt.jar, gdal.jar on the class path.
5149
5250
The WorldWind extensions JAR file includes all class files, configuration files, image files, and data
5351
resource files under the package gov.nasa.worldwindx. Requires the WorldWind core JAR file on the class path.
@@ -66,20 +64,17 @@
6664
<jar jarfile="@{destdir}/worldwind.jar">
6765
<manifest>
6866
<attribute name="Permissions" value="all-permissions"/>
69-
<attribute name="Class-Path" value="jogl-all.jar gluegen-rt.jar gdal.jar"/>
67+
<attribute name="Class-Path" value="jackson-core-asl.jar jogl-all.jar gluegen-rt.jar gdal.jar"/>
7068
</manifest>
7169
<fileset dir="@{classdir}">
7270
<include name="gov/nasa/worldwind/**/*.class"/>
7371
<include name="com/zebraimaging/**/*.class"/>
74-
<include name="org/codehaus/jackson/**/*.class" unless="${worldwind.exclude.jackson}"/>
7572
<type type="file"/>
7673
</fileset>
7774
<fileset dir="@{srcdir}">
7875
<include name="gov/nasa/worldwind/**/*.java" if="@{debug}"/>
7976
<include name="gov/nasa/worldwind/util/**/*.properties"/>
8077
<include name="com/zebraimaging/**/*.java" if="@{debug}"/>
81-
<include name="org/codehaus/jackson/**/*.java" if="@{debug}"
82-
unless="${worldwind.exclude.jackson}"/>
8378
<include name="config/**"/>
8479
<include name="images/**"/>
8580
<type type="file"/>
@@ -111,4 +106,4 @@
111106
</sequential>
112107
</macrodef>
113108

114-
</project>
109+
</project>

‎build.properties‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ worldwind.doc.dir=${worldwind.build.dir}/doc
1717
worldwind.jar.dir=${worldwind.build.dir}/jar
1818
worldwind.test.results.dir=${worldwind.build.dir}/test-results
1919
worldwind.jdk=1.8
20-
#worldwind.exclude.jackson=true
2120

2221
# MIL-STD-2525 package build properties
2322
milstd2525.src.dir=${basedir}/milstd2525

‎build.xml‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
<compileJava srcdir="${worldwind.src.dir}" classdir="${worldwind.classes.dir}/debug" debug="true"
4545
jdk="${worldwind.jdk}">
4646
<pathelements>
47+
<pathelement location="${basedir}/jackson-core-asl.jar"/>
4748
<pathelement location="${basedir}/jogl-all.jar"/>
4849
<pathelement location="${basedir}/gluegen-rt.jar"/>
4950
<pathelement location="${basedir}/gdal.jar"/>
@@ -56,6 +57,7 @@
5657
<compileJava srcdir="${worldwind.src.dir}" classdir="${worldwind.classes.dir}/release" debug="false"
5758
jdk="${worldwind.jdk}">
5859
<pathelements>
60+
<pathelement location="${basedir}/jackson-core-asl.jar"/>
5961
<pathelement location="${basedir}/jogl-all.jar"/>
6062
<pathelement location="${basedir}/gluegen-rt.jar"/>
6163
<pathelement location="${basedir}/gdal.jar"/>
@@ -96,6 +98,7 @@
9698
<exclude name="gov/nasa/worldwind/formats/**"/>
9799
</packageset>
98100
<classpath>
101+
<pathelement location="jackson-core-asl.jar"/>
99102
<pathelement location="jogl-all.jar"/>
100103
<pathelement location="gluegen-rt.jar"/>
101104
<pathelement location="gdal.jar"/>
@@ -137,6 +140,8 @@
137140
<!-- WorldWind library JAR files. -->
138141
<copy file="${worldwind.jar.dir}/release/worldwind.jar" tofile="${webstart.unsigned.dir}/worldwind.jar"/>
139142
<copy file="${worldwind.jar.dir}/release/worldwindx.jar" tofile="${webstart.unsigned.dir}/worldwindx.jar"/>
143+
<!-- Jackson JAR file. -->
144+
<copy file="${basedir}/jackson-core-asl.jar" todir="${webstart.unsigned.dir}"/>
140145
<!-- JOGL and GlueGen library JAR files. -->
141146
<copy todir="${webstart.unsigned.dir}">
142147
<fileset dir="${basedir}">
@@ -318,6 +323,7 @@
318323
jdk="${worldwind.jdk}">
319324
<pathelements>
320325
<pathelement location="${worldwind.classes.dir}/debug"/>
326+
<pathelement location="${basedir}/jackson-core-asl.jar"/>
321327
<pathelement location="${basedir}/jogl-all.jar"/>
322328
<pathelement location="${basedir}/gluegen-rt.jar"/>
323329
<pathelement location="${basedir}/gdal.jar"/>
@@ -338,6 +344,7 @@
338344
<pathelement location="${worldwind.src.dir}"/>
339345
<pathelement location="${worldwind.classes.dir}/test"/>
340346
<pathelement location="${worldwind.classes.dir}/debug"/>
347+
<pathelement location="${basedir}/jackson-core-asl.jar"/>
341348
<pathelement location="${basedir}/jogl-all.jar"/>
342349
<pathelement location="${basedir}/gluegen-rt.jar"/>
343350
<pathelement location="${basedir}/gdal.jar"/>
@@ -550,7 +557,7 @@
550557
<target name="runLayerManager" depends="build" description="Runs the LayerManager example app.">
551558
<java fork="true"
552559
classname="gov.nasa.worldwindx.examples.layermanager.LayerManagerApp"
553-
classpath="gdal.jar;gluegen-rt-natives-linux-amd64.jar;gluegen-rt-natives-linux-i586.jar;gluegen-rt-natives-macosx-universal.jar;gluegen-rt-natives-windows-amd64.jar;gluegen-rt-natives-windows-i586.jar;gluegen-rt.jar;jogl-all-natives-linux-amd64.jar;jogl-all-natives-linux-i586.jar;jogl-all-natives-macosx-universal.jar;jogl-all-natives-windows-amd64.jar;jogl-all-natives-windows-i586.jar;jogl-all.jar;junit-4.5.jar;vpf-symbols.jar;worldwind.jar;worldwindx.jar"
560+
classpath="gdal.jar;gluegen-rt-natives-linux-amd64.jar;gluegen-rt-natives-linux-i586.jar;gluegen-rt-natives-macosx-universal.jar;gluegen-rt-natives-windows-amd64.jar;gluegen-rt-natives-windows-i586.jar;gluegen-rt.jar;jackson-core-asl.jar;jogl-all-natives-linux-amd64.jar;jogl-all-natives-linux-i586.jar;jogl-all-natives-macosx-universal.jar;jogl-all-natives-windows-amd64.jar;jogl-all-natives-windows-i586.jar;jogl-all.jar;junit-4.5.jar;vpf-symbols.jar;worldwind.jar;worldwindx.jar"
554561
/>
555562
</target>
556563

‎jackson-core-asl.jar‎

227 KB
Binary file not shown.

‎jackson.LICENSE.txt‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
This copy of Jackson JSON processor is licensed under the
2+
Apache (Software) License, version 2.0 ("the License").
3+
See the License for details about distribution rights, and the
4+
specific rights regarding derivate works.
5+
6+
You may obtain a copy of the License at:
7+
8+
http://www.apache.org/licenses/
9+
10+
A copy is also included with both the the downloadable source code package
11+
and jar that contains class bytecodes, as file "ASL 2.0". In both cases,
12+
that file should be located next to this file: in source distribution
13+
the location should be "release-notes/asl"; and in jar "META-INF/"

‎nbproject/project.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,22 +114,22 @@ auxiliary.show.customizer.message=<message>
114114
<java-data xmlns="http://www.netbeans.org/ns/freeform-project-java/2">
115115
<compilation-unit>
116116
<package-root>src</package-root>
117-
<classpath mode="compile">gdal.jar;gluegen-rt-natives-linux-amd64.jar;gluegen-rt-natives-linux-i586.jar;gluegen-rt-natives-macosx-universal.jar;gluegen-rt-natives-windows-amd64.jar;gluegen-rt-natives-windows-i586.jar;gluegen-rt.jar;jogl-all-natives-linux-amd64.jar;jogl-all-natives-linux-i586.jar;jogl-all-natives-macosx-universal.jar;jogl-all-natives-windows-amd64.jar;jogl-all-natives-windows-i586.jar;jogl-all.jar;junit-4.5.jar;vpf-symbols.jar</classpath>
117+
<classpath mode="compile">gdal.jar:gluegen-rt-natives-linux-amd64.jar:gluegen-rt-natives-linux-i586.jar:gluegen-rt-natives-macosx-universal.jar:gluegen-rt-natives-windows-amd64.jar:gluegen-rt-natives-windows-i586.jar:gluegen-rt.jar:jackson-core-asl.jar:jogl-all-natives-linux-amd64.jar:jogl-all-natives-linux-i586.jar:jogl-all-natives-macosx-universal.jar:jogl-all-natives-windows-amd64.jar:jogl-all-natives-windows-i586.jar:jogl-all.jar:junit-4.5.jar:vpf-symbols.jar</classpath>
118118
<built-to>build/classes/debug</built-to>
119119
<source-level>1.5</source-level>
120120
</compilation-unit>
121121
<compilation-unit>
122122
<package-root>test</package-root>
123123
<unit-tests/>
124-
<classpath mode="compile">gdal.jar;gluegen-rt-natives-linux-amd64.jar;gluegen-rt-natives-linux-i586.jar;gluegen-rt-natives-macosx-universal.jar;gluegen-rt-natives-windows-amd64.jar;gluegen-rt-natives-windows-i586.jar;gluegen-rt.jar;jogl-all-natives-linux-amd64.jar;jogl-all-natives-linux-i586.jar;jogl-all-natives-macosx-universal.jar;jogl-all-natives-windows-amd64.jar;jogl-all-natives-windows-i586.jar;jogl-all.jar;junit-4.5.jar;vpf-symbols.jar;worldwind.jar;worldwindx.jar</classpath>
124+
<classpath mode="compile">gdal.jar:gluegen-rt-natives-linux-amd64.jar:gluegen-rt-natives-linux-i586.jar:gluegen-rt-natives-macosx-universal.jar:gluegen-rt-natives-windows-amd64.jar:gluegen-rt-natives-windows-i586.jar:gluegen-rt.jar:jackson-core-asl.jar:jogl-all-natives-linux-amd64.jar:jogl-all-natives-linux-i586.jar:jogl-all-natives-macosx-universal.jar:jogl-all-natives-windows-amd64.jar:jogl-all-natives-windows-i586.jar:jogl-all.jar:junit-4.5.jar:vpf-symbols.jar:worldwind.jar:worldwindx.jar</classpath>
125125
<built-to>build/classes/test</built-to>
126126
<javadoc-built-to>build/doc</javadoc-built-to>
127127
<source-level>1.5</source-level>
128128
</compilation-unit>
129129
<compilation-unit>
130130
<package-root>testFunctional</package-root>
131131
<unit-tests/>
132-
<classpath mode="compile">gdal.jar;gluegen-rt-natives-linux-amd64.jar;gluegen-rt-natives-linux-i586.jar;gluegen-rt-natives-macosx-universal.jar;gluegen-rt-natives-windows-amd64.jar;gluegen-rt-natives-windows-i586.jar;gluegen-rt.jar;jogl-all-natives-linux-amd64.jar;jogl-all-natives-linux-i586.jar;jogl-all-natives-macosx-universal.jar;jogl-all-natives-windows-amd64.jar;jogl-all-natives-windows-i586.jar;jogl-all.jar;junit-4.5.jar;vpf-symbols.jar;worldwind.jar;worldwindx.jar</classpath>
132+
<classpath mode="compile">gdal.jar:gluegen-rt-natives-linux-amd64.jar:gluegen-rt-natives-linux-i586.jar:gluegen-rt-natives-macosx-universal.jar:gluegen-rt-natives-windows-amd64.jar:gluegen-rt-natives-windows-i586.jar:gluegen-rt.jar:jackson-core-asl.jar:jogl-all-natives-linux-amd64.jar:jogl-all-natives-linux-i586.jar:jogl-all-natives-macosx-universal.jar:jogl-all-natives-windows-amd64.jar:jogl-all-natives-windows-i586.jar:jogl-all.jar:junit-4.5.jar:vpf-symbols.jar:worldwind.jar:worldwindx.jar</classpath>
133133
<built-to>build/classes/test</built-to>
134134
<source-level>1.5</source-level>
135135
</compilation-unit>

0 commit comments

Comments
 (0)