From: yuki <yuki@bdf3b611-c98c-6041-8292-703d9c9adbe7>
Date: Fri, 13 Nov 2009 03:18:46 +0000 (+0000)
Subject: Log4Jのバージョン誤りを修正
X-Git-Tag: rel20091113_ver0.1.1~2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=135e7bb43ea596184b321bf3841c6e47dff4598b;p=coroid%2FNicoBrowser.git

Log4Jのバージョン誤りを修正

git-svn-id: http://192.168.11.7/svn/repository/NicoBrowser/branches/20091112_add_author@215 bdf3b611-c98c-6041-8292-703d9c9adbe7
---

diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml
index 9b241b6..91026bc 100644
--- a/nbproject/build-impl.xml
+++ b/nbproject/build-impl.xml
@@ -20,8 +20,8 @@ is divided into following sections:
 
         -->
 <project xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1" xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3" xmlns:jaxrpc="http://www.netbeans.org/ns/j2se-project/jax-rpc" basedir=".." default="default" name="NicoBrowser-impl">
-    <import file="groovy-build.xml"/>
     <import file="jnlp-impl.xml"/>
+    <import file="groovy-build.xml"/>
     <fail message="Please build using Ant 1.7.1 or higher.">
         <condition>
             <not>
diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties
index abffea9..a5bfdec 100644
--- a/nbproject/genfiles.properties
+++ b/nbproject/genfiles.properties
@@ -4,7 +4,7 @@ build.xml.stylesheet.CRC32=958a1d3e@1.26.2.45
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
 nbproject/build-impl.xml.data.CRC32=d1b53a37
-nbproject/build-impl.xml.script.CRC32=64e0e087
+nbproject/build-impl.xml.script.CRC32=1f81b2d9
 nbproject/build-impl.xml.stylesheet.CRC32=5c621a33@1.26.2.45
 nbproject/groovy-build.xml.data.CRC32=d1b53a37
 nbproject/groovy-build.xml.script.CRC32=6721cc58
diff --git a/nbproject/project.properties b/nbproject/project.properties
index 4141fac..e5493b7 100644
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -29,7 +29,6 @@ javac.classpath=\
     ${libs.Rome.classpath}:\
     ${libs.H2_DB.classpath}:\
     ${libs.toplink.classpath}:\
-    ${libs.Log4J1.2.14.classpath}:\
     ${libs.Log4J.classpath}:\
     ${libs.HttpClient4.0.classpath}:\
     ${libs.NekoHtml.classpath}:\