Permalink
Browse files

fix

  • Loading branch information...
Ali Beyad
Ali Beyad committed Nov 21, 2008
1 parent ec5f645 commit 856da5385927de91ef6f1bbff3d085656c94078d
Showing with 12 additions and 4 deletions.
  1. +1 −1 .classpath
  2. +2 −2 apps/test/LuceneKitchenSink/tests.js
  3. +1 −0 apps/test/server.properties
  4. BIN lib/axiom-lucene.jar
  5. +1 −1 start.bat
  6. +7 −0 test.sh
View
@@ -37,6 +37,6 @@
<classpathentry kind="lib" path="utils/jsdoc-toolkit/jsrun.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="lib" path="lib/mime-util.jar"/>
- <classpathentry kind="lib" path="C:/Program Files/Java/jdk1.6.0/lib/tools.jar"/>
+ <classpathentry kind="lib" path="C:/Program Files/Java/jdk1.6.0_07/lib/tools.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
@@ -528,7 +528,7 @@ this._test = {
Assert.assertEquals("test_AxiomObject_getChildrenWithPrototype failed", 5, children.length);
}
},
- Performance_suite: {
+ /*Performance_suite: {
setup: function(){
app.log('Performance suite setup');
app.log('app_getObjects_suite setup');
@@ -563,6 +563,6 @@ this._test = {
// app.log("Inserted " + num + " objects at a rate of " + persec.toFixed() + " per second");
Assert.assertTrue("test_Performance_1000_objects_insert failed " + persec.toFixed() + " per second", persec > slowspeed);
}
- }
+ }*/
}
@@ -0,0 +1 @@
+enableRequestLog = true
View
Binary file not shown.
View
@@ -84,4 +84,4 @@ if not "%AXIOM_HOME%"=="" (
:: Invoking the Java virtual machine
::echo %OPTIONS%
- %JAVACMD% -Dfile.encoding=%ENCODING% -Dorg.apache.lucene.FSDirectory.class=%FSDIRECTORY% %JAVA_OPTIONS% -jar "%INSTALL_DIR%\launcher.jar" %OPTIONS%
+ %JAVACMD% -javaagent:c:\dev\JavaConTest\Lib\ConTest.jar -Dfile.encoding=%ENCODING% -Dorg.apache.lucene.FSDirectory.class=%FSDIRECTORY% %JAVA_OPTIONS% -jar "%INSTALL_DIR%\launcher.jar" %OPTIONS%
View
@@ -9,9 +9,16 @@ mkdir test/apps
cp -r ./lib test/
cp -r ./apps/test test/apps/
mv test/apps/test/app.properties.run test/apps/test/app.properties
+<<<<<<< TREE
+cp apps/test/server.properties test/
+cp start.bat test/
+cp launcher.jar test/
+cp KingProperties test/
+=======
cp ./apps/test/server.properties test/
cp ./start.sh test/
cp ./launcher.jar test/
+>>>>>>> MERGE-SOURCE
rm -rf test/db/*
cd test

0 comments on commit 856da53

Please sign in to comment.