You are viewing a plain text version of this content. The canonical link for it is here.
Posted to xindice-dev@xml.apache.org by ks...@apache.org on 2002/07/12 04:46:11 UTC
cvs commit: xml-xindice/java/tests/stress/src AddManyDocuments.java ThrashCollection.java
kstaken 2002/07/11 19:46:11
Modified: . build.xml
config system.xml
java/src/org/apache/xindice/core/filer Paged.java
java/tests/stress build.xml
java/tests/stress/src AddManyDocuments.java
ThrashCollection.java
Removed: idl Xindice.idl
java/lib openorb-1.2.0.jar openorb.LICENSE
openorb_tools-1.2.0.jar openorb_tools.LICENSE
java/src/org/apache/xindice/client/corba
CollectionManagerServant.java
CollectionServant.java DatabaseManagerServant.java
DatabaseServant.java DocumentSetServant.java
EncodedBufferConverter.java SymbolDeserializer.java
SymbolSerializer.java package.html
java/src/org/apache/xindice/client/xmldb/corba
CollectionImpl.java DatabaseImpl.java
ManagedObject.java
java/src/org/apache/xindice/client/xmldb/corba/services
CollectionManagerImpl.java
DatabaseInstanceManagerImpl.java
XMLObjectServiceImpl.java
XPathQueryServiceImpl.java
XUpdateQueryServiceImpl.java package.html
Log:
Banishing CORBA to the nether worlds.
Revision Changes Path
1.15 +6 -30 xml-xindice/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-xindice/build.xml,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- build.xml 11 Jul 2002 04:37:02 -0000 1.14
+++ build.xml 12 Jul 2002 02:46:10 -0000 1.15
@@ -79,11 +79,6 @@
<property name="distrib.name" value="${name}-${version}"/>
<property name="jarname" value="xindice"/>
- <mkdir dir="${src.dir}/org/apache/xindice/client/corba/db"/>
- <uptodate property="idl-modified" targetfile="idl/Xindice.idl">
- <srcfiles dir="${src.dir}/org/apache/xindice/client/corba/db" includes="**"/>
- </uptodate>
-
<!-- these should really be links but I'm not sure how to get links using exec
that don't blow up on windows. Documentation on the os string would be nice-->
<copy file="bin/.cmdwrapper" tofile="bin/xindice"/>
@@ -97,30 +92,16 @@
<mkdir dir="${build.dir}"/>
</target>
- <target name="main" depends="idl,compile,bin-jar">
- </target>
-
-
- <!-- =================================================================== -->
- <!-- Compiles the idl seperately -->
- <!-- =================================================================== -->
- <target name="idl" depends="init" if="idl-modified">
- <echo message="Compiling IDL"/>
-
- <java classpathref="project.class.path" fork="yes" classname="org.openorb.compiler.IdlCompiler">
- <arg line="-d ${src.dir} idl/Xindice.idl"/>
- </java>
-
+ <target name="main" depends="compile,bin-jar">
</target>
-
<!-- =================================================================== -->
<!-- Compiles the database server sources -->
<!-- =================================================================== -->
<target name="compile" depends="prepare, clean-jar, src, bin-jar">
</target>
- <target name="src" depends="prepare, idl">
+ <target name="src" depends="prepare">
<echo message="Compiling Source"/>
<javac srcdir="${src.dir}"
destdir="${build.dir}"
@@ -134,10 +115,10 @@
</target>
- <target name="scratchpad" depends="prepare, clean-jar, idl, src, scratchpad-src, bin-jar">
+ <target name="scratchpad" depends="prepare, clean-jar, src, scratchpad-src, bin-jar">
</target>
- <target name="scratchpad-src" depends="prepare, idl, src">
+ <target name="scratchpad-src" depends="prepare, src">
<echo message="Compiling Scratchpad Source"/>
<copy todir="${build.dir}">
<fileset dir="${scratchpad.src.dir}">
@@ -188,7 +169,7 @@
<!-- =================================================================== -->
<!-- Cleans everything -->
<!-- =================================================================== -->
- <target name="clean" depends="init, clean-jar, clean-classes, clean-javadoc, clean-idl, clean-webapp">
+ <target name="clean" depends="init, clean-jar, clean-classes, clean-javadoc, clean-webapp">
</target>
<target name="clean-jar">
@@ -202,11 +183,6 @@
</target>
<target name="clean-webapp">
<delete dir="${webapp.dir}"/>
- </target>
- <target name="clean-idl">
- <delete includeEmptyDirs="true">
- <fileset dir="${src.dir}/org/apache/xindice/client/corba/db" includes="**"/>
- </delete>
</target>
<!-- =================================================================== -->
1.6 +0 -9 xml-xindice/config/system.xml
Index: system.xml
===================================================================
RCS file: /home/cvs/xml-xindice/config/system.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- system.xml 11 Jul 2002 23:25:28 -0000 1.5
+++ system.xml 12 Jul 2002 02:46:10 -0000 1.6
@@ -77,13 +77,6 @@
<response code="505" message="HTTP Version not supported" />
</responses>
</service>
- <!-- APIService must start after the HTTP service -->
- <!--service class="org.apache.xindice.server.services.APIService" name="APIService"-->
- <!-- If you want to use a CORBA naming service uncomment this and
- set the uri to point to the proper location. Most installations
- don't need to worry about this -->
- <!--naming property="InitRef.NameService" uri="http://localhost:4080/NamingService" /-->
- <!--/service-->
</services>
<logging class="org.apache.xindice.server.standard.StdLogManager" filename="./logs/Xindice.log" rotate="yes" />
@@ -101,8 +94,6 @@
<icon ext="png" path="/icons/image.gif" />
</icons>
</component>
- <!--component class="org.apache.xindice.server.rpc.RPCMessageHandler"
- name="RPCHandler"/-->
</components>
<scripts class="org.apache.xindice.server.standard.StdScriptManager" exceptions="yes" scriptdir="./scripts/" stablescripts="yes" />
</server>
1.5 +22 -19 xml-xindice/java/src/org/apache/xindice/core/filer/Paged.java
Index: Paged.java
===================================================================
RCS file: /home/cvs/xml-xindice/java/src/org/apache/xindice/core/filer/Paged.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Paged.java 9 Jun 2002 19:49:02 -0000 1.4
+++ Paged.java 12 Jul 2002 02:46:11 -0000 1.5
@@ -450,28 +450,31 @@
public void flush() throws DBException {
// TODO: Clean up this code
- Iterator i = dirty.values().iterator();
boolean error = false;
- while ( i.hasNext() ) {
- Page p = (Page)i.next();
- try {
- p.flush();
+ synchronized (this) {
+ Iterator i = dirty.values().iterator();
+
+ while ( i.hasNext() ) {
+ Page p = (Page)i.next();
+ try {
+ p.flush();
+ }
+ catch ( Exception e ) {
+ error = true;
+ }
}
- catch ( Exception e ) {
- error = true;
- }
- }
- dirty.clear();
+ dirty.clear();
- if ( fileHeader.dirty ) {
- try {
- fileHeader.write();
- }
- catch ( Exception e ) {
- error = true;
- }
+ if ( fileHeader.dirty ) {
+ try {
+ fileHeader.write();
+ }
+ catch ( Exception e ) {
+ error = true;
+ }
+ }
}
-
+
if ( error )
throw new FilerException(FaultCodes.GEN_CRITICAL_ERROR, "Error performing flush!");
}
1.2 +3 -3 xml-xindice/java/tests/stress/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-xindice/java/tests/stress/build.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build.xml 6 Dec 2001 19:34:01 -0000 1.1
+++ build.xml 12 Jul 2002 02:46:11 -0000 1.2
@@ -84,8 +84,8 @@
<target name="run">
<java classpathref="project.class.path" classname="Stress" fork="true">
- <arg value="100"/>
- <arg value="100"/>
+ <arg value="10"/>
+ <arg value="10"/>
</java>
</target>
1.2 +2 -2 xml-xindice/java/tests/stress/src/AddManyDocuments.java
Index: AddManyDocuments.java
===================================================================
RCS file: /home/cvs/xml-xindice/java/tests/stress/src/AddManyDocuments.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AddManyDocuments.java 6 Dec 2001 19:34:01 -0000 1.1
+++ AddManyDocuments.java 12 Jul 2002 02:46:11 -0000 1.2
@@ -82,7 +82,7 @@
Database database = (Database) c.newInstance();
DatabaseManager.registerDatabase(database);
col =
- DatabaseManager.getCollection("xmldb:dbxml:///db/addressbook");
+ DatabaseManager.getCollection("xmldb:xindice:///db/addressbook");
System.out.println("Adding " + count + " documents");
1.2 +3 -3 xml-xindice/java/tests/stress/src/ThrashCollection.java
Index: ThrashCollection.java
===================================================================
RCS file: /home/cvs/xml-xindice/java/tests/stress/src/ThrashCollection.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ThrashCollection.java 6 Dec 2001 19:34:01 -0000 1.1
+++ ThrashCollection.java 12 Jul 2002 02:46:11 -0000 1.2
@@ -76,13 +76,13 @@
public void run() {
Collection col = null;
try {
- String driver = "org.dbxml.client.xmldb.DatabaseImpl";
+ String driver = "org.apache.xindice.client.xmldb.DatabaseImpl";
Class c = Class.forName(driver);
Database database = (Database) c.newInstance();
DatabaseManager.registerDatabase(database);
col =
- DatabaseManager.getCollection("xmldb:dbxml:///db/addressbook");
+ DatabaseManager.getCollection("xmldb:xindice:///db/addressbook");
System.out.println("Adding " + count + " documents");