0
@@ -3,4 +3,5 @@ target
0
 **/*.log
0
 examples/*/tmp
0
 examples/merb/merb.war
0
-examples/rails/rails.war
0
\ No newline at end of file
0
+examples/rails/rails.war
0
+nbproject/private/*
0
\ No newline at end of file

0
@@ -313,7 +313,7 @@ is divided into following sections:
0
                 ===================
0
             -->
0
     <target depends="init" name="deps-jar" unless="no.deps">
0
-        <ant antfile="${project.JRuby}/build.xml" inheritall="false" target="jar"/>
0
+        <ant antfile="${project.JRuby_trunk}/build.xml" inheritall="false" target="jar"/>
0
     </target>
0
     <target depends="init,deps-jar" name="-pre-pre-compile">
0
         <mkdir dir="${build.classes.dir}"/>
0
@@ -625,8 +625,7 @@ is divided into following sections:
0
                 ===============
0
             -->
0
     <target depends="init" name="deps-clean" unless="no.deps">
0
-        <ant antfile="${project.JRuby}/build.xml" inheritall="false" target="clean"/>
0
-        <ant antfile="${project.JRuby}/build.xml" inheritall="false" target="clean"/>
0
+        <ant antfile="${project.JRuby_trunk}/build.xml" inheritall="false" target="clean"/>
0
     </target>
0
     <target depends="init" name="-do-clean">
0
         <delete dir="${build.dir}"/>

0
@@ -1,8 +1,8 @@
0
-build.xml.data.CRC32=63b0d262
0
+build.xml.data.CRC32=e98221f4
0
 build.xml.script.CRC32=cafd15dc
0
 build.xml.stylesheet.CRC32=be360661
0
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
0
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
0
-nbproject/build-impl.xml.data.CRC32=63b0d262
0
-nbproject/build-impl.xml.script.CRC32=7d4bac5a
0
+nbproject/build-impl.xml.data.CRC32=e98221f4
0
+nbproject/build-impl.xml.script.CRC32=5fedd2f2
0
 nbproject/build-impl.xml.stylesheet.CRC32=487672f9

0
@@ -18,18 +18,19 @@ dist.dir=target
0
 dist.jar=${dist.dir}/rack.jar
0
 dist.javadoc.dir=${dist.dir}/javadoc
0
 excludes=
0
+jnlp.codebase.type=local
0
+jnlp.codebase.url=file:/Users/nicksieger/Projects/ruby/jruby-rack/target/
0
+jnlp.enabled=false
0
+jnlp.offline-allowed=false
0
+jnlp.signed=false
0
 maven.repos=${user.home}/.m2/repository
0
 file.reference.main-java=src/main/java
0
-file.reference.rack-lib=lib
0
-file.reference.rack-spec=spec
0
 file.reference.servlet-api-2.3.jar=${maven.repos}/javax/servlet/servlet-api/2.3/servlet-api-2.3.jar
0
 includes=**
0
 jar.compress=false
0
 javac.classpath=\
0
-    ${reference.JRuby.jar2}:\
0
-    ${reference.JRuby.jar}:\
0
-    ${reference.JRuby.jar.1}:\
0
-    ${file.reference.servlet-api-2.3.jar}
0
+    ${file.reference.servlet-api-2.3.jar}:\
0
+    ${reference.JRuby_trunk.jar2}
0
 # Space-separated list of extra javac options
0
 javac.compilerargs=
0
 javac.deprecation=false
0
@@ -37,9 +38,7 @@ javac.source=1.5
0
 javac.target=1.5
0
 javac.test.classpath=\
0
     ${javac.classpath}:\
0
-    ${build.classes.dir}:\
0
-    ${libs.junit.classpath}:\
0
-    ${libs.junit_4.classpath}
0
+    ${build.classes.dir}
0
 javadoc.additionalparam=
0
 javadoc.author=false
0
 javadoc.encoding=${source.encoding}
0
@@ -56,10 +55,8 @@ manifest.file=manifest.mf
0
 meta.inf.dir=${src.dir}/META-INF
0
 no.dependencies=true
0
 platform.active=default_platform
0
-project.JRuby=../../trunk/jruby
0
-reference.JRuby.jar=${project.JRuby}/build/classes/jruby
0
-reference.JRuby.jar.1=${project.JRuby}/build/classes/test
0
-reference.JRuby.jar2=${project.JRuby}/lib/jruby.jar
0
+project.JRuby_trunk=../../jruby/trunk/jruby
0
+reference.JRuby_trunk.jar2=${project.JRuby_trunk}/lib/jruby.jar
0
 run.classpath=\
0
     ${javac.classpath}:\
0
     ${build.classes.dir}

0
@@ -15,17 +15,9 @@
0
         </data>
0
         <references xmlns="http://www.netbeans.org/ns/ant-project-references/2">
0
             <reference>
0
-                <foreign-project>JRuby</foreign-project>
0
-                <artifact-type>folder</artifact-type>
0
-                <script>${project.JRuby}/build.xml</script>
0
-                <target>jar</target>
0
-                <clean-target>clean</clean-target>
0
-                <id>jar</id>
0
-            </reference>
0
-            <reference>
0
-                <foreign-project>JRuby</foreign-project>
0
+                <foreign-project>JRuby_trunk</foreign-project>
0
                 <artifact-type>jar</artifact-type>
0
-                <script>${project.JRuby}/build.xml</script>
0
+                <script>${project.JRuby_trunk}/build.xml</script>
0
                 <target>jar</target>
0
                 <clean-target>clean</clean-target>
0
                 <id>jar2</id>