Changeset 78acf70


Ignore:
Timestamp:
Oct 26, 2016 5:45:34 PM (4 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
0439206
Parents:
08d1ea8
Message:

JRobin: 1.6.0-1, 2014-10-28, checked in as source
from https://github.com/OpenNMS/jrobin/releases
Replaces 1.5.9.1 from 2008-09-05
Needed for Java 9 to remove dependency on Sun private classes.
No modifications, but includes only core, data, and graph;
cmd, convertor, inspector, and tests are not included.
Using source instead of jar because:

Files:
119 added
1 deleted
3 edited

Legend:

Unmodified
Added
Removed
  • LICENSE.txt

    r08d1ea8 r78acf70  
    218218   See licenses/NOTICE-Commons-Logging.txt
    219219
    220    JRobin 1.5.9.1:
     220   JRobin 1.6.0-1:
     221   Copyright (c) 2001-2005 Sasa Markovic and Ciaran Treanor.
     222   Copyright (c) 2011 The OpenNMS Group, Inc.
    221223   See licenses/LICENSE-LGPLv2.1.txt
    222224
  • apps/routerconsole/java/build.xml

    r08d1ea8 r78acf70  
    3131                <pathelement location="../../desktopgui/build" />
    3232                <pathelement location="../../../installer/lib/wrapper/all/wrapper.jar" />
    33                 <pathelement location="../../jrobin/jrobin-1.5.9.1.jar" />
     33                <pathelement location="../../jrobin/java/build/jrobin.jar" />
    3434            </classpath>
    3535        </depend>
     
    7575                <pathelement location="../../desktopgui/dist/desktopgui.jar" />
    7676                <pathelement location="../../../installer/lib/wrapper/all/wrapper.jar" />
    77                 <pathelement location="../../jrobin/jrobin-1.5.9.1.jar" />
     77                <pathelement location="../../jrobin/java/build/jrobin.jar" />
    7878            </classpath>
    7979        </javac>
     
    122122        <jar destfile="./build/routerconsole.jar" basedir="./build/obj" includes="**/*.class">
    123123            <manifest>
    124                 <!-- top level installer will rename to jrobin.jar -->
    125124                <!-- DTG added in 0.8.4, not in the classpath for very old installs, before we changed wrapper.config to specify * -->
    126125                <!-- very old installs don't have i2psnark,jstl,standard in the classpath... not added in WebAppConfiguration any more -->
  • build.xml

    r08d1ea8 r78acf70  
    359359    </target>
    360360
    361     <target name="buildRouterConsole" depends="buildrouter, buildSystray, buildDesktopGui, buildJetty" >
     361    <target name="buildRouterConsole" depends="buildrouter, buildSystray, buildDesktopGui, buildJetty, buildJrobin" >
    362362        <ant dir="apps/routerconsole/java/" target="jar" />
    363363    </target>
     
    402402
    403403    <target name="buildJrobin" depends="buildProperties" >
    404         <!-- take only what we need from the jrobin jar -->
    405         <jar destfile="build/jrobin.jar" >
    406             <zipfileset src="apps/jrobin/jrobin-1.5.9.1.jar"
    407                         excludes="org/jrobin/cmd/ org/jrobin/convertor/ org/jrobin/inspector/" />
    408             <manifest>
    409                 <attribute name="Built-By" value="${build.built-by}" />
    410                 <attribute name="Build-Date" value="${build.timestamp}" />
    411                 <attribute name="Base-Revision" value="${workspace.version}" />
    412             </manifest>
    413         </jar>
     404        <ant dir="apps/jrobin/java/" target="jar" />
     405        <copy file="apps/jrobin/java/build/jrobin.jar" todir="build/" />
    414406    </target>
    415407
     
    542534      -->
    543535     <target name="jar" depends="jarSmall" />
    544      <target name="jarSmall" depends="builddepSmall, buildJrobin" />
     536     <target name="jarSmall" depends="builddepSmall" />
    545537
    546538    <!-- Custom target to collect the jars that I2P-Bote needs to compile, so it can compile from source. -->
     
    740732            <group title="Installer Utilities" packages="net.i2p.installer" />
    741733            <group title="Jetty Utilities" packages="net.i2p.jetty:net.i2p.servlet:net.i2p.servlet.*:org.mortbay.servlet:org.mortbay.util" />
     734            <group title="JRobin Library" packages="org.jrobin:org.jrobin.*" />
    742735            <group title="SAM Bridge" packages="net.i2p.sam" />
    743736            <group title="SAM Demos" packages="net.i2p.sam.client" />
     
    767760                <pathelement location="apps/imagegen/zxing/core/src/main/java" />
    768761                <pathelement location="apps/imagegen/zxing/javase/src/main/java" />
     762                <pathelement location="apps/jrobin/java/src" />
    769763                <pathelement location="installer/java/src" />
    770764            </sourcepath>
     
    990984        <ant dir="apps/jetty/" target="distclean" />
    991985        <ant dir="apps/imagegen/" target="distclean" />
     986        <ant dir="apps/jrobin/java" target="distclean" />
    992987        <delete dir="core/c/jbigi/bin" />
    993988        <delete dir="core/c/jbigi/lib" />
     
    12021197        <copy file="build/desktopgui.jar" todir="pkg-temp/lib/" />
    12031198        <copy file="build/routerconsole.jar" todir="pkg-temp/lib/" />
    1204         <!-- pulled out of routerconsole.jar in 0.7.12; name without version so we can overwrite if we upgrade  -->
     1199        <!-- Updated in 0.9.28; name without version so we can overwrite if we upgrade  -->
    12051200        <copy file="build/jrobin.jar" tofile="pkg-temp/lib/jrobin.jar" />
    12061201        <copy file="build/sam.jar" todir="pkg-temp/lib/" />
     
    15391534        <copy file="build/streaming.jar" todir="pkg-temp/lib/" />
    15401535        <copy file="build/routerconsole.jar" todir="pkg-temp/lib/" />
    1541         <!-- pulled out of routerconsole.jar in 0.7.12, someday we can take out of updater -->
     1536        <!-- Updated in 0.9.28 -->
    15421537        <!-- name without version so we can overwrite if we upgrade  -->
    15431538        <copy file="build/jrobin.jar" tofile="pkg-temp/lib/jrobin.jar" />
Note: See TracChangeset for help on using the changeset viewer.