fix i2ptunnel bundles

This commit is contained in:
zzz
2009-12-15 01:51:56 +00:00
parent eb23306b12
commit cec75fa60e
5 changed files with 12 additions and 6 deletions

View File

@ -41,10 +41,8 @@
<attribute name="Class-Path" value="i2p.jar mstreaming.jar" />
</manifest>
</jar>
<ant target="war" />
<ant target="bundle" />
<!-- jar again to get the latest messages_*.class files -->
<jar destfile="./build/i2ptunnel.jar" basedir="./build/obj" includes="**/*.class" update="true" />
<ant target="war" />
</target>
<target name="bundle" depends="compile, precompilejsp">

View File

@ -76,7 +76,7 @@ do
echo "Generating ${CLASS}_$LG ResourceBundle..."
# convert to class files in build/obj
msgfmt --java -r $CLASS -l $LG -d build/obj $i
msgfmt --java --statistics -r $CLASS -l $LG -d ../jsp/WEB-INF/classes $i
if [ $? -ne 0 ]
then
echo 'Warning - msgfmt failed, not updating translations'

View File

@ -7,7 +7,7 @@ import net.i2p.util.Translate;
* Translate strings for this package.
*/
public class Messages {
private static final String BUNDLE_NAME = "net.i2p.i2ptunnel.messages";
private static final String BUNDLE_NAME = "net.i2p.i2ptunnel.web.messages";
private final I2PAppContext _context;
public Messages() {

View File

@ -1,3 +1,11 @@
2009-12-15 zzz
* HTTP Proxy: Make jump server list configurable
* i2psnark: Fix stop/start, cleanups
* i2ptunnel: Fix bundle location
* susidns: UTF-8 fixes
* TunnelManager: Fix a locking bug
* Update: Improve error message
2009-12-13 zzz
* Find ResourceBundles in wars
* Fix restart from config.jsp if no wrapper

View File

@ -18,7 +18,7 @@ public class RouterVersion {
/** deprecated */
public final static String ID = "Monotone";
public final static String VERSION = CoreVersion.VERSION;
public final static long BUILD = 6;
public final static long BUILD = 7;
/** for example "-test" */
public final static String EXTRA = "";
public final static String FULL_VERSION = VERSION + "-" + BUILD + EXTRA;