Skip to content

Removed embedded Jackson sources. #23

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
emxsys merged 1 commit into from
Apr 13, 2019
Merged

Removed embedded Jackson sources. #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions .idea/libraries/jackson.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 5 additions & 10 deletions build.macros.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,9 @@
<!-- Macros for bundling library JAR files.

The WorldWind core JAR file includes all class files, property files, configuration files, and image files
under the package gov.nasa.worldwind, all class files under the package com.zebraimaging, and optionally all
class files under the package org.codehaus.jackson (depending on the worldwind.exclude.jackson property).
The zebraimaging package includes an alternative input handler for the Zebra Imaging display controller. The
jackson package includes the Jackson JSON parsing library which is used by gov.nasa.worldwind.formats.geojson.
Requires jogl-all.jar, gluegen-rt.jar, gdal.jar on the class path.
under the package gov.nasa.worldwind and all class files under the package com.zebraimaging.
The zebraimaging package includes an alternative input handler for the Zebra Imaging display controller.
Requires jackson-core-asl.jar, jogl-all.jar, gluegen-rt.jar, gdal.jar on the class path.

The WorldWind extensions JAR file includes all class files, configuration files, image files, and data
resource files under the package gov.nasa.worldwindx. Requires the WorldWind core JAR file on the class path.
Expand All @@ -66,20 +64,17 @@
<jar jarfile="@{destdir}/worldwind.jar">
<manifest>
<attribute name="Permissions" value="all-permissions"/>
<attribute name="Class-Path" value="jogl-all.jar gluegen-rt.jar gdal.jar"/>
<attribute name="Class-Path" value="jackson-core-asl.jar jogl-all.jar gluegen-rt.jar gdal.jar"/>
</manifest>
<fileset dir="@{classdir}">
<include name="gov/nasa/worldwind/**/*.class"/>
<include name="com/zebraimaging/**/*.class"/>
<include name="org/codehaus/jackson/**/*.class" unless="${worldwind.exclude.jackson}"/>
<type type="file"/>
</fileset>
<fileset dir="@{srcdir}">
<include name="gov/nasa/worldwind/**/*.java" if="@{debug}"/>
<include name="gov/nasa/worldwind/util/**/*.properties"/>
<include name="com/zebraimaging/**/*.java" if="@{debug}"/>
<include name="org/codehaus/jackson/**/*.java" if="@{debug}"
unless="${worldwind.exclude.jackson}"/>
<include name="config/**"/>
<include name="images/**"/>
<type type="file"/>
Expand Down Expand Up @@ -111,4 +106,4 @@
</sequential>
</macrodef>

</project>
</project>
1 change: 0 additions & 1 deletion build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ worldwind.doc.dir=${worldwind.build.dir}/doc
worldwind.jar.dir=${worldwind.build.dir}/jar
worldwind.test.results.dir=${worldwind.build.dir}/test-results
worldwind.jdk=1.8
#worldwind.exclude.jackson=true

# MIL-STD-2525 package build properties
milstd2525.src.dir=${basedir}/milstd2525
Expand Down
9 changes: 8 additions & 1 deletion build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
<compileJava srcdir="${worldwind.src.dir}" classdir="${worldwind.classes.dir}/debug" debug="true"
jdk="${worldwind.jdk}">
<pathelements>
<pathelement location="${basedir}/jackson-core-asl.jar"/>
<pathelement location="${basedir}/jogl-all.jar"/>
<pathelement location="${basedir}/gluegen-rt.jar"/>
<pathelement location="${basedir}/gdal.jar"/>
Expand All @@ -56,6 +57,7 @@
<compileJava srcdir="${worldwind.src.dir}" classdir="${worldwind.classes.dir}/release" debug="false"
jdk="${worldwind.jdk}">
<pathelements>
<pathelement location="${basedir}/jackson-core-asl.jar"/>
<pathelement location="${basedir}/jogl-all.jar"/>
<pathelement location="${basedir}/gluegen-rt.jar"/>
<pathelement location="${basedir}/gdal.jar"/>
Expand Down Expand Up @@ -96,6 +98,7 @@
<exclude name="gov/nasa/worldwind/formats/**"/>
</packageset>
<classpath>
<pathelement location="jackson-core-asl.jar"/>
<pathelement location="jogl-all.jar"/>
<pathelement location="gluegen-rt.jar"/>
<pathelement location="gdal.jar"/>
Expand Down Expand Up @@ -137,6 +140,8 @@
<!-- WorldWind library JAR files. -->
<copy file="${worldwind.jar.dir}/release/worldwind.jar" tofile="${webstart.unsigned.dir}/worldwind.jar"/>
<copy file="${worldwind.jar.dir}/release/worldwindx.jar" tofile="${webstart.unsigned.dir}/worldwindx.jar"/>
<!-- Jackson JAR file. -->
<copy file="${basedir}/jackson-core-asl.jar" todir="${webstart.unsigned.dir}"/>
<!-- JOGL and GlueGen library JAR files. -->
<copy todir="${webstart.unsigned.dir}">
<fileset dir="${basedir}">
Expand Down Expand Up @@ -318,6 +323,7 @@
jdk="${worldwind.jdk}">
<pathelements>
<pathelement location="${worldwind.classes.dir}/debug"/>
<pathelement location="${basedir}/jackson-core-asl.jar"/>
<pathelement location="${basedir}/jogl-all.jar"/>
<pathelement location="${basedir}/gluegen-rt.jar"/>
<pathelement location="${basedir}/gdal.jar"/>
Expand All @@ -338,6 +344,7 @@
<pathelement location="${worldwind.src.dir}"/>
<pathelement location="${worldwind.classes.dir}/test"/>
<pathelement location="${worldwind.classes.dir}/debug"/>
<pathelement location="${basedir}/jackson-core-asl.jar"/>
<pathelement location="${basedir}/jogl-all.jar"/>
<pathelement location="${basedir}/gluegen-rt.jar"/>
<pathelement location="${basedir}/gdal.jar"/>
Expand Down Expand Up @@ -550,7 +557,7 @@
<target name="runLayerManager" depends="build" description="Runs the LayerManager example app.">
<java fork="true"
classname="gov.nasa.worldwindx.examples.layermanager.LayerManagerApp"
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"
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"
/>
</target>

Expand Down
Binary file added jackson-core-asl.jar
View file
Open in desktop
Binary file not shown.
13 changes: 13 additions & 0 deletions jackson.LICENSE.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
This copy of Jackson JSON processor is licensed under the
Apache (Software) License, version 2.0 ("the License").
See the License for details about distribution rights, and the
specific rights regarding derivate works.

You may obtain a copy of the License at:

http://www.apache.org/licenses/

A copy is also included with both the the downloadable source code package
and jar that contains class bytecodes, as file "ASL 2.0". In both cases,
that file should be located next to this file: in source distribution
the location should be "release-notes/asl"; and in jar "META-INF/"
6 changes: 3 additions & 3 deletions nbproject/project.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,22 +114,22 @@ auxiliary.show.customizer.message=<message>
<java-data xmlns="http://www.netbeans.org/ns/freeform-project-java/2">
<compilation-unit>
<package-root>src</package-root>
<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>
<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>
<built-to>build/classes/debug</built-to>
<source-level>1.5</source-level>
</compilation-unit>
<compilation-unit>
<package-root>test</package-root>
<unit-tests/>
<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>
<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>
<built-to>build/classes/test</built-to>
<javadoc-built-to>build/doc</javadoc-built-to>
<source-level>1.5</source-level>
</compilation-unit>
<compilation-unit>
<package-root>testFunctional</package-root>
<unit-tests/>
<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>
<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>
<built-to>build/classes/test</built-to>
<source-level>1.5</source-level>
</compilation-unit>
Expand Down
Loading