exist-commits — Receive notifications about CVS commits.

[Exist-commits] eXist-1.0/src/org/exist/storage/sync Sync.java,1.1,1.2

[Wolfgang M. M. <wol...@us...>]

Update of /cvsroot/exist/eXist-1.0/src/org/exist/storage/sync
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18472/src/org/exist/storage/sync

Modified Files:
	Sync.java 
Log Message:
Removed the cache sync events that had been triggered by every database file independantly. Instead, the global BrokerPool will now trigger all sync events 
(through the SyncDaemon background thread). It distinguishes between minor and major syncs. Major syncs write all caches to disk, minor syncs only write
the main document store (dom.dbx + collections.dbx). Minor syncs occur every 2 seconds, major syncs after a configurable period of time.

As BrokerPool controls all sync events, it is guaranteed that only one cache is written at the same time. This has a positive effect on indexing performance.

Index: Sync.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/storage/sync/Sync.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Sync.java	15 May 2003 12:38:01 -0000	1.1
--- Sync.java	16 Aug 2004 19:47:12 -0000	1.2
***************
*** 5,21 ****
  
  /**
!  * Sync open buffers to disk.
   */
  public class Sync implements Runnable {
  
  	private BrokerPool pool;
  	
! 	public Sync(BrokerPool pool) {
  		this.pool = pool;
  	}
  
  	public void run() {
! 		pool.triggerSync();
  	}
- 
  }
--- 5,32 ----
  
  /**
!  * This class is registered with the {@link org.exist.storage.sync.SyncDaemon}.
!  * It will periodically trigger a cache sync to write cached pages to disk. 
   */
  public class Sync implements Runnable {
  
+ 	public final static int MINOR_SYNC = 0;
+ 	public final static int MAJOR_SYNC = 1;
+ 	
+ 	private long majorSyncPeriod;
+ 	private long lastMajorSync = System.currentTimeMillis();
  	private BrokerPool pool;
  	
! 	public Sync(BrokerPool pool, long majorSyncPeriod) {
  		this.pool = pool;
+ 		this.majorSyncPeriod = majorSyncPeriod;
  	}
  
  	public void run() {
! 		if(System.currentTimeMillis() - lastMajorSync > majorSyncPeriod) {
! 			pool.triggerSync(MAJOR_SYNC);
! 			lastMajorSync = System.currentTimeMillis(); 
! 		} else {
! 			pool.triggerSync(MINOR_SYNC);
! 		}
  	}
  }

[Exist-commits] eXist-1.0/src/org/exist/storage DBBroker.java,1.42,1.43 BrokerPool.java,1.28,1.29 NativeBroker.java,1.99,1.100

[Wolfgang M. M. <wol...@us...>]

Update of /cvsroot/exist/eXist-1.0/src/org/exist/storage
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18472/src/org/exist/storage

Modified Files:
	DBBroker.java BrokerPool.java NativeBroker.java 
Log Message:
Removed the cache sync events that had been triggered by every database file independantly. Instead, the global BrokerPool will now trigger all sync events 
(through the SyncDaemon background thread). It distinguishes between minor and major syncs. Major syncs write all caches to disk, minor syncs only write
the main document store (dom.dbx + collections.dbx). Minor syncs occur every 2 seconds, major syncs after a configurable period of time.

As BrokerPool controls all sync events, it is guaranteed that only one cache is written at the same time. This has a positive effect on indexing performance.

Index: NativeBroker.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/storage/NativeBroker.java,v
retrieving revision 1.99
retrieving revision 1.100
diff -C2 -d -r1.99 -r1.100
*** NativeBroker.java	15 Aug 2004 20:29:09 -0000	1.99
--- NativeBroker.java	16 Aug 2004 19:47:11 -0000	1.100
***************
*** 75,78 ****
--- 75,79 ----
  import org.exist.storage.store.NodeIterator;
  import org.exist.storage.store.StorageAddress;
+ import org.exist.storage.sync.Sync;
  import org.exist.util.ByteArrayPool;
  import org.exist.util.ByteConversion;
***************
*** 2336,2340 ****
  		try {
  			flush();
! 			sync();
  			textEngine.close();
  			domDb.close();
--- 2337,2341 ----
  		try {
  			flush();
! 			sync(Sync.MAJOR_SYNC);
  			textEngine.close();
  			domDb.close();
***************
*** 2527,2538 ****
  	}
  
! 	public void sync() {
! 		Runtime runtime = Runtime.getRuntime();
! 		LOG.debug("Memory: " + (runtime.totalMemory() / 1024) + "K total; " +
! 				(runtime.freeMemory() / 1024) + "K free");
! 		// uncomment this to get statistics on page buffer usage
! 		elementsDb.printStatistics();
! 		collectionsDb.printStatistics();
! 		domDb.printStatistics();
  		try {
  			Lock lock = collectionsDb.getLock();
--- 2528,2532 ----
  	}
  
! 	public void sync(int syncEvent) {
  		try {
  			Lock lock = collectionsDb.getLock();
***************
*** 2556,2561 ****
  			}
  			.run();
! 			elementIndex.sync();
! 			textEngine.sync();
  		} catch (DBException dbe) {
  			dbe.printStackTrace();
--- 2550,2566 ----
  			}
  			.run();
! 			if(syncEvent == Sync.MAJOR_SYNC) {
! 				elementIndex.sync();
! 				textEngine.sync();
! 				
! 				Runtime runtime = Runtime.getRuntime();
! 				LOG.debug("Memory: " + (runtime.totalMemory() / 1024) + "K total; " +
! 						(runtime.freeMemory() / 1024) + "K free");
! 				
! 				// uncomment this to get statistics on page buffer usage
! 				elementsDb.printStatistics();
! 				collectionsDb.printStatistics();
! 				domDb.printStatistics();
! 			}
  		} catch (DBException dbe) {
  			dbe.printStackTrace();

Index: DBBroker.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/storage/DBBroker.java,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** DBBroker.java	6 Aug 2004 17:36:37 -0000	1.42
--- DBBroker.java	16 Aug 2004 19:47:11 -0000	1.43
***************
*** 546,554 ****
  	public abstract void consistencyCheck(DocumentImpl doc) throws EXistException;
  	
! 	public void sync() {
! 		/*
! 		 *  do nothing
! 		 */
! 	}
  
  	/**
--- 546,550 ----
  	public abstract void consistencyCheck(DocumentImpl doc) throws EXistException;
  	
! 	public abstract void sync(int syncEvent);
  
  	/**

Index: BrokerPool.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/storage/BrokerPool.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** BrokerPool.java	10 Aug 2004 20:27:14 -0000	1.28
--- BrokerPool.java	16 Aug 2004 19:47:11 -0000	1.29
***************
*** 175,178 ****
--- 175,179 ----
  	private String instanceId;
  	private boolean syncRequired = false;
+ 	private int syncEvent = 0;
  	private boolean initializing = true;
  	
***************
*** 232,236 ****
  		syncDaemon = new SyncDaemon();
  		if (syncPeriod > 0)
! 			syncDaemon.executePeriodically(syncPeriod, new Sync(this), false);
  		conf = config;
  		xqueryCache = new XQueryPool();
--- 233,237 ----
  		syncDaemon = new SyncDaemon();
  		if (syncPeriod > 0)
! 			syncDaemon.executePeriodically(2000, new Sync(this, syncPeriod), false);
  		conf = config;
  		xqueryCache = new XQueryPool();
***************
*** 401,405 ****
  			pool.push(broker);
  			if (syncRequired && threads.size() == 0) {
! 				sync(broker);
  				syncRequired = false;
  			}
--- 402,406 ----
  			pool.push(broker);
  			if (syncRequired && threads.size() == 0) {
! 				sync(broker, syncEvent);
  				syncRequired = false;
  			}
***************
*** 415,421 ****
  	 * @param broker
  	 */
! 	public void sync(DBBroker broker) {
! 		LOG.debug("syncing buffers to disk");
! 		broker.sync();
  	}
  
--- 416,421 ----
  	 * @param broker
  	 */
! 	public void sync(DBBroker broker, int syncEvent) {
! 		broker.sync(syncEvent);
  	}
  
***************
*** 468,479 ****
  	}
  
! 	public void triggerSync() {
  		synchronized (this) {
  			if (pool.size() == brokers) {
  				DBBroker broker = (DBBroker) pool.peek();
! 				sync(broker);
  				syncRequired = false;
! 			} else
  				syncRequired = true;
  		}
  	}
--- 468,483 ----
  	}
  
! 	public void triggerSync(int event) {
  		synchronized (this) {
+ 			if(pool.size() == 0)
+ 				return;
  			if (pool.size() == brokers) {
  				DBBroker broker = (DBBroker) pool.peek();
! 				sync(broker, syncEvent);
  				syncRequired = false;
! 			} else {
! 				syncEvent = event;
  				syncRequired = true;
+ 			}
  		}
  	}

[Exist-commits] eXist-1.0/src/org/exist/storage/store DOMFile.java,1.50,1.51 BFile.java,1.33,1.34

[Wolfgang M. M. <wol...@us...>]

Update of /cvsroot/exist/eXist-1.0/src/org/exist/storage/store
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18472/src/org/exist/storage/store

Modified Files:
	DOMFile.java BFile.java 
Log Message:
Removed the cache sync events that had been triggered by every database file independantly. Instead, the global BrokerPool will now trigger all sync events 
(through the SyncDaemon background thread). It distinguishes between minor and major syncs. Major syncs write all caches to disk, minor syncs only write
the main document store (dom.dbx + collections.dbx). Minor syncs occur every 2 seconds, major syncs after a configurable period of time.

As BrokerPool controls all sync events, it is guaranteed that only one cache is written at the same time. This has a positive effect on indexing performance.

Index: DOMFile.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/storage/store/DOMFile.java,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -d -r1.50 -r1.51
*** DOMFile.java	15 Aug 2004 20:29:10 -0000	1.50
--- DOMFile.java	16 Aug 2004 19:47:11 -0000	1.51
***************
*** 130,148 ****
          dataCache.setFileName("dom.dbx");
          
!         Runnable syncAction = new Runnable() {
!             public void run() {
!                 if(dataCache.hasDirtyItems()) {
! 	                try {
! 	                    lock.acquire(Lock.WRITE_LOCK);
! 	                    dataCache.flush();
! 	                } catch (LockException e) {
! 	                    LOG.warn("Failed to acquire lock on dom.dbx");
! 	                } finally {
! 	                    lock.release();
! 	                }
!                 }
!             }
!         };
!         pool.getSyncDaemon().executePeriodically(DATA_SYNC_PERIOD, syncAction, false);
      }
  
--- 130,148 ----
          dataCache.setFileName("dom.dbx");
          
! //        Runnable syncAction = new Runnable() {
! //            public void run() {
! //                if(dataCache.hasDirtyItems()) {
! //	                try {
! //	                    lock.acquire(Lock.WRITE_LOCK);
! //	                    dataCache.flush();
! //	                } catch (LockException e) {
! //	                    LOG.warn("Failed to acquire lock on dom.dbx");
! //	                } finally {
! //	                    lock.release();
! //	                }
! //                }
! //            }
! //        };
! //        pool.getSyncDaemon().executePeriodically(DATA_SYNC_PERIOD, syncAction, false);
      }
  

Index: BFile.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/storage/store/BFile.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** BFile.java	15 Aug 2004 20:29:10 -0000	1.33
--- BFile.java	16 Aug 2004 19:47:11 -0000	1.34
***************
*** 112,130 ****
          lock = new ReentrantReadWriteLock(file.getName());
          
!         Runnable syncAction = new Runnable() {
!             public void run() {
!                 if(dataCache.hasDirtyItems()) {
! 	                try {
! 	                    lock.acquire(Lock.WRITE_LOCK);
! 	                    dataCache.flush();
! 	                } catch (LockException e) {
! 	                    LOG.warn("Failed to acquire lock on " + getFile().getName());
! 	                } finally {
! 	                    lock.release();
! 	                }
!                 }
!             }
!         };
!         pool.getSyncDaemon().executePeriodically(getDataSyncPeriod(), syncAction, false);
      }
  
--- 112,130 ----
          lock = new ReentrantReadWriteLock(file.getName());
          
! //        Runnable syncAction = new Runnable() {
! //            public void run() {
! //                if(dataCache.hasDirtyItems()) {
! //	                try {
! //	                    lock.acquire(Lock.WRITE_LOCK);
! //	                    dataCache.flush();
! //	                } catch (LockException e) {
! //	                    LOG.warn("Failed to acquire lock on " + getFile().getName());
! //	                } finally {
! //	                    lock.release();
! //	                }
! //                }
! //            }
! //        };
! //        pool.getSyncDaemon().executePeriodically(getDataSyncPeriod(), syncAction, false);
      }
  

[Exist-commits] eXist-1.0/src/org/dbxml/core/filer BTree.java,1.27,1.28

[Wolfgang M. M. <wol...@us...>]

Update of /cvsroot/exist/eXist-1.0/src/org/dbxml/core/filer
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18472/src/org/dbxml/core/filer

Modified Files:
	BTree.java 
Log Message:
Removed the cache sync events that had been triggered by every database file independantly. Instead, the global BrokerPool will now trigger all sync events 
(through the SyncDaemon background thread). It distinguishes between minor and major syncs. Major syncs write all caches to disk, minor syncs only write
the main document store (dom.dbx + collections.dbx). Minor syncs occur every 2 seconds, major syncs after a configurable period of time.

As BrokerPool controls all sync events, it is guaranteed that only one cache is written at the same time. This has a positive effect on indexing performance.

Index: BTree.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/dbxml/core/filer/BTree.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** BTree.java	8 Jun 2004 08:16:09 -0000	1.27
--- BTree.java	16 Aug 2004 19:47:10 -0000	1.28
***************
*** 154,173 ****
  		cache.setFileName(getFile().getName());
  		
! 		Runnable syncAction = new Runnable() {
!             public void run() {
!                 if(cache.hasDirtyItems()) {
! 	                try {
! 	//                    LOG.debug("Triggering cache sync for " + getFile().getName());
! 	                    lock.acquire(Lock.WRITE_LOCK);
! 	                    cache.flush();
! 	                } catch (LockException e) {
! 	                    LOG.warn("Failed to acquire lock on dom.dbx");
! 	                } finally {
! 	                    lock.release();
! 	                }
!                 }
!             }
!         };
!         pool.getSyncDaemon().executePeriodically(getBTreeSyncPeriod(), syncAction, false);
  	}
  	
--- 154,173 ----
  		cache.setFileName(getFile().getName());
  		
! //		Runnable syncAction = new Runnable() {
! //            public void run() {
! //                if(cache.hasDirtyItems()) {
! //	                try {
! //	//                    LOG.debug("Triggering cache sync for " + getFile().getName());
! //	                    lock.acquire(Lock.WRITE_LOCK);
! //	                    cache.flush();
! //	                } catch (LockException e) {
! //	                    LOG.warn("Failed to acquire lock on dom.dbx");
! //	                } finally {
! //	                    lock.release();
! //	                }
! //                }
! //            }
! //        };
! //        pool.getSyncDaemon().executePeriodically(getBTreeSyncPeriod(), syncAction, false);
  	}
  	

[Exist-commits] eXist-1.0/src/org/exist/cocoon XQueryGenerator.java,1.20,1.21

[Wolfgang M. M. <wol...@us...>]

Update of /cvsroot/exist/eXist-1.0/src/org/exist/cocoon
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7580/src/org/exist/cocoon

Modified Files:
	XQueryGenerator.java 
Log Message:
Applied Martin's patch: calculation of baseURI had been wrong.

Index: XQueryGenerator.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/cocoon/XQueryGenerator.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** XQueryGenerator.java	23 Jul 2004 14:19:52 -0000	1.20
--- XQueryGenerator.java	16 Aug 2004 18:56:41 -0000	1.21
***************
*** 155,164 ****
  		Context context = ObjectModelHelper.getContext(objectModel);
  		Session session = request.getSession(createSession);
! 		String baseURI = request.getRequestURI();
! 		int p = baseURI.lastIndexOf('/');
! 		if (p > -1)
! 			baseURI = baseURI.substring(0, p);
! 		baseURI = context.getRealPath(baseURI.substring(request
! 				.getContextPath().length()));
  		String user = null;
  		String password = null;
--- 155,167 ----
  		Context context = ObjectModelHelper.getContext(objectModel);
  		Session session = request.getSession(createSession);
! 		
! 		final String servletPath = request.getServletPath();
! 		final String pathInfo = request.getPathInfo();
! 		StringBuffer baseURIBuffer = new StringBuffer(servletPath);
! 		if (pathInfo != null) baseURIBuffer.append(pathInfo);
! 		int p = baseURIBuffer.lastIndexOf("/");
! 		if (p > -1)  baseURIBuffer.delete(p,baseURIBuffer.length());            
! 		final String baseURI = context.getRealPath(baseURIBuffer.toString());
! 		
  		String user = null;
  		String password = null;

[Exist-commits] eXist-1.0/webapp/apps applications.xml,1.1,1.2

[Jean-Marc V. <jm...@us...>]

Update of /cvsroot/exist/eXist-1.0/webapp/apps
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9356

Modified Files:
	applications.xml 
Log Message:
Added Dublin Core elements, etc


Index: applications.xml
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/webapp/apps/applications.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** applications.xml	14 Aug 2004 11:32:19 -0000	1.1
--- applications.xml	16 Aug 2004 06:42:15 -0000	1.2
***************
*** 1,14 ****
! <applications>
!  <application open-source='yes'>
!    <name>Botanical Database</name>
!    <domain>biology, taxonomy, botany</domain>
!    <description> Search engine for Flora of China descriptions.
!      Aims at being a computer-aided identification tool for specimens.
!    </description>
!    <author>J.M. Vanel - http://jmvanel.free.fr/ </author>
!    <production-site> http://jmvanel.free.fr/protea.html</production-site>
!    <dev-site> http://wwbota.free.fr/</dev-site>
!    <dev-notes> XSP pages, XSLT styles, java classes interpretating user input and generating XQuery </dev-notes>
!    <institution> Worldwide Botanical Knowledge </institution>
   </application>
  </applications>
--- 1,29 ----
! <applications
!     xmlns="http://exist-db.org/"
!     using="http://exist-db.org/"
!     xmlns:dc="http://purl.org/dc/elements/1.1/"
!     xmlns:html="http://www.w3.org/1999/xhtml"
!  >
!  <application>
!      <dc:creator><html:a href="http://jmvanel.free.fr/">J.M. Vanel</html:a></dc:creator>
!      <dc:identifier>http://wwbota.free.fr/</dc:identifier>
!      <dc:rights>GPL</dc:rights>
!      <dc:title>Botanical Database</dc:title>
!      <dc:subject>biology</dc:subject>
!      <dc:subject>taxonomy</dc:subject>
!      <dc:subject>botany</dc:subject>
!      <dc:description> Search engine for Flora of China descriptions.
!           Aims at being a computer-aided identification tool for specimens.
!      </dc:description>
!      <dc:publisher> Worldwide Botanical Knowledge </dc:publisher>
!      <dc:format>eXist distribution add-on: Cocoon sub-sitemap</dc:format>
! 
!   <dev-site>http://wwbota.free.fr/</dev-site>
!   <production-site>http://jmvanel.free.fr/protea.html</production-site>
!   <feature-used>XQuery</feature-used>
!   <feature-used>Cocoon</feature-used>
!   <database size="30Mb" documents="1" updates="rare" security='read for all' />
!   <dev-notes> XSP pages, XSLT styles, java classes interpreting user input and generating XQuery </dev-notes>
!   <submitter />
   </application>
  </applications>

[Exist-commits] eXist-1.0 build.xml,1.51,1.52

[Wolfgang M. M. <wol...@us...>]

Update of /cvsroot/exist/eXist-1.0
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24578

Modified Files:
	build.xml 
Log Message:
Modified build target "docs", which creates a static version of the main documentation (excluding examples) in build/docs/html. The generated pages can 
now be directly copied to the sourceforge web directory. No further editing is required.

Index: build.xml
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/build.xml,v
retrieving revision 1.51
retrieving revision 1.52
diff -C2 -d -r1.51 -r1.52
*** build.xml	9 Aug 2004 10:25:17 -0000	1.51
--- build.xml	15 Aug 2004 21:03:27 -0000	1.52
***************
*** 10,13 ****
--- 10,14 ----
      <property name="jetty.dir" value="Jetty-4.1.4"/>
      <property name="src" value="./src"/>
+     <property name="src.webapp" value="./webapp"/>
  	<property name="samples" value="./samples"/>
  	<property name="bin" value="./bin"/>
***************
*** 21,24 ****
--- 22,27 ----
      <property name="build.classes" value="${build}/classes"/>
      <property name="build.docs" value="${build}/docs"/>
+     <property name="build.docs.src" value="${build.docs}/source"/>
+     <property name="build.docs.html" value="${build.docs}/html"/>
      <property name="ant.home" value="."/>
      <property name="dist" value="./dist"/>
***************
*** 80,93 ****
  	</taskdef>
      
      <!-- =================================================================== -->
      <!-- Prepare the build                                                   -->
      <!-- =================================================================== -->
      <target name="prepare">
          <echo message="eXist ${project.version} build"/>
!         <echo message="----------------------------"/>
  		<echo message="basedir=${basedir}"/>
          <mkdir dir="${build}"/>
          <mkdir dir="${build.classes}"/>
  		<mkdir dir="${jetty.dir}/logs"/>
      </target>
  
--- 83,104 ----
  	</taskdef>
      
+     <taskdef name="cocoon" classname="org.apache.cocoon.CocoonTask">
+         <classpath refid="classpath.core"/>
+     </taskdef>
+     
      <!-- =================================================================== -->
      <!-- Prepare the build                                                   -->
      <!-- =================================================================== -->
      <target name="prepare">
+     	<echo message="-------------------------"/>
          <echo message="eXist ${project.version} build"/>
!         <echo message="-------------------------"/>
  		<echo message="basedir=${basedir}"/>
          <mkdir dir="${build}"/>
          <mkdir dir="${build.classes}"/>
  		<mkdir dir="${jetty.dir}/logs"/>
+         <tstamp/>
+ 		<filter token="version" value="${project.version}-${DSTAMP}"/>
+ 		<copy file="${src.webapp}/header.xml.tmpl" tofile="${src.webapp}/header.xml" filtering="true"/>
      </target>
  
***************
*** 101,105 ****
  			destdir="${build.classes}" encoding="UTF-8"
  			optimize="${build.optimize}" srcdir="${src}" target="1.4">
! 			<include name="org/**"/>
  			<exclude name="org/exist/http/realm/**"/>
              <classpath>
--- 112,117 ----
  			destdir="${build.classes}" encoding="UTF-8"
  			optimize="${build.optimize}" srcdir="${src}" target="1.4">
!         	<include name="org/**"/>
!         	<exclude name="org/exist/schema/**"/>
  			<exclude name="org/exist/http/realm/**"/>
              <classpath>
***************
*** 596,600 ****
  			classname="com.izforge.izpack.ant.IzPackTask"/>
  		<tstamp/>
- 		<filter token="version" value="${project.version}"/>
  		<echo message="Calling IzPack to create installer ..."/>
  		<izpack input="installer/install.xml"
--- 608,611 ----
***************
*** 607,612 ****
  		<taskdef name="izpack" classpath="${izpack.dir}/lib/compiler.jar"
  			classname="com.izforge.izpack.ant.IzPackTask"/>
- 		<tstamp/>
- 		<filter token="version" value="${DSTAMP}-dev"/>
  		<copy file="installer/install.xml.tmpl" tofile="installer/install.xml" filtering="true"/>
  		<echo message="Calling IzPack to create installer ..."/>
--- 618,621 ----
***************
*** 621,716 ****
      <!-- ================================================================== -->
  	<target depends="jar" name="prepare-docs">
          <delete dir="${build.docs}" failonerror="false"/>
          <mkdir dir="${build.docs}"/>
!         <echo message="Copying docs to temporary location ${build.docs}"/>
!         <copy todir="${build.docs}">
! 	        <fileset dir="webapp">
!                 <exclude name="**/*~"/>
                  <exclude name="WEB-INF/data/*"/>
-                 <exclude name="**.xsp"/>
-                 <exclude name="adminLogin.xml"/>
-                 <exclude name="biblio.xml"/>
- 				<exclude name="login.xml"/>
- 				<exclude name="xse/**"/>
              </fileset>
          </copy>
-         <echo message="Making links to examples absolute"/>
- 
- 		<replace dir="${build.docs}" includes="sidebar.xml"
- 			token="index.xml#articles" summary="true"
- 			value="index.html#articles"/>
          
! 		<replace dir="${build.docs}" includes="sidebar.xml"
! 			token="index.xml#mailing" summary="true"
! 			value="index.html#mailing"/>
! 		
!         <replace dir="${build.docs}" includes="index.xml sidebar.xml"
! 			token="examples.xml" summary="true"
! 			value="http://demo.exist-db.org/exist/examples.xml"/>
! 
!         <replace dir="${build.docs}" includes="sidebar.xml"
! 			token="xquery/acronyms.xq" summary="true"
! 			value="http://demo.exist-db.org/exist/xquery/acronyms.xq"/>
! 
!         <replace dir="${build.docs}" includes="sidebar.xml"
! 			token="xquery/biblio.xml" summary="true"
! 			value="http://demo.exist-db.org/exist/xquery/biblio.xml"/>
!         
!         <replace dir="${build.docs}" includes="sidebar.xml"
! 			token="xquery/xquery.xq" summary="true"
! 			value="http://demo.exist-db.org/exist/xquery/xquery.xq"/>
! 
!         <replace dir="${build.docs}" includes="sidebar.xml"
! 			token="xmldb/db/" summary="true"
! 			value="http://demo.exist-db.org/exist/xmldb/db/"/>
! 
!         <replace dir="${build.docs}" includes="sidebar.xml"
! 			token="xadmin.xsp" summary="true"
! 			value="http://demo.exist-db.org/exist/xadmin.xsp"/>
! 
! 		<replace dir="${build.docs}" includes="sidebar.xml"
! 			token="status" summary="true"
! 			value="http://demo.exist-db.org/exist/status"/>
! 		
! 		<replace dir="${build.docs}" includes="index.xml quickstart.xml xquery.xml"
! 			token="examples.xml" summary="true"
! 			value="http://demo.exist-db.org/exist/examples.xml"/>
! 		
! 		<replace dir="${build.docs}" includes="xquery.xml"
! 			token="xquery/functions.xq" summary="true"
! 			value="http://demo.exist-db.org/exist/xquery/functions.xq"/>
      </target>
      
! 	<target name="docs">
! 	    <mkdir dir="${build.docs}"/>
  	    <delete dir="${build}/work"/>
  	    <echo message="Calling Cocoon ..."/>
! 	    <java classname="org.apache.cocoon.Main" dir="${build.docs}"
!             failonerror="true" fork="true" output="${build}/cocoon.output">
!             <arg value="-c."/>
!             <arg value="-CWEB-INF/cocoon.xconf"/>
!             <arg value="-d."/>
!             <arg value="-w../work"/>
!             <arg value="-l../work/cocoon.log"/>
! 			<arg value="-V"/>
!             <arg value="index.xml"/>
! 			<classpath>
! 				<path refid="classpath.core"/>
!             </classpath>
!         </java>
! 	</target>
! 
! 	<target name="rename-files">
!         <echo message="Renaming files ..."/>    
!         <move todir="${build.docs}">
!             <fileset dir="${build.docs}">
!                 <include name="**.xml.html"/>
              </fileset>
!             <mapper type="glob" from="*.xml.html" to="*.html"/>
          </move>
!         <replace dir="${build.docs}" summary="true"
!             token=".xml.html" value=".html"/>
! 		<replace dir="${build.docs}" summary="true"
! 			token=".jpg.jpeg" value=".jpg"/>
  	</target>
  
--- 630,739 ----
      <!-- ================================================================== -->
  	<target depends="jar" name="prepare-docs">
+         <property name="demo.host" value="http://demo.exist-db.org/exist"/>
          <delete dir="${build.docs}" failonerror="false"/>
          <mkdir dir="${build.docs}"/>
!         <mkdir dir="${build.docs.src}"/>
!         
!         <echo message="Copying docs to temporary location ${build.docs.src}"/>
!         <copy todir="${build.docs.src}">
! 	        <fileset dir="${src.webapp}">
!                 <include name="WEB-INF/**"/>
!                 <include name="*.xml"/>
!                 <include name="sitemap.xmap"/>
!                 <include name="styles/**"/>
!                 <include name="stylesheets/**"/>
                  <exclude name="WEB-INF/data/*"/>
              </fileset>
          </copy>
          
!         <echo message="Adjusting links ..."/>
!         <replace dir="${build.docs.src}" summary="true"
!             includes="*.xml">
!             <replacefilter token="index.xml" value="index.html"/>
!             <replacefilter token="ant-tasks.xml" value="ant-tasks.html"/>
!             <replacefilter token="changes.xml" value="changes.html"/>
!             <replacefilter token="client.xml" value="client.html"/>
!             <replacefilter token="configuration.xml" value="configuration.html"/>
!             <replacefilter token="credits.xml" value="credits.html"/>
!             <replacefilter token="deployment.xml" value="deployment.html"/>
!             <replacefilter token="devguide.xml" value="devguide.html"/>
!             <replacefilter token="documentation.xml" value="documentation.html"/>
!             <replacefilter token="donations.xml" value="donations.html"/>
!             <replacefilter token="facts.xml" value="facts.html"/>
!             <replacefilter token="howtos.xml" value="howtos.html"/>
!             <replacefilter token="performance.xml" value="performance.html"/>
!             <replacefilter token="quickstart.xml" value="quickstart.html"/>
!             <replacefilter token="security.xml" value="security.html"/>
!             <replacefilter token="xquery.xml" value="xquery.html"/>
!             <replacefilter token='"xinclude.xml' value='"xinclude.html'/>
!             
!             <replacefilter token="examples.xml" value="${demo.host}/examples.xml"/>
!             <replacefilter token="xquery/acronyms.xml" value="${demo.host}/xquery/acronyms.xml"/>
!             <replacefilter token="xquery/biblio.xml" value="${demo.host}/xquery/biblio.xml"/>
!             <replacefilter token="xquery/xquery.xq" value="${demo.host}/xquery/xquery.xq"/>
!             <replacefilter token='url="xmldb/db/' value='url="${demo.host}/xmldb/db/'/>
!             <replacefilter token="xadmin.xsp" value="${demo.host}/xadmin.xsp"/>
!             <replacefilter token="xquery/functions.xq" value="${demo.host}/xquery/functions.xq"/>
!             <replacefilter token='url="xquery/guess.xql' value='url="${demo.host}/xquery/guess.xql'/>
!             <replacefilter token="xquery/login.xql" value="${demo.host}/xquery/login.xql"/>
!         </replace>
      </target>
      
! 	<target depends="prepare-docs" name="docs">
!         <mkdir dir="${build.docs.html}"/>
!         
  	    <delete dir="${build}/work"/>
+         
  	    <echo message="Calling Cocoon ..."/>
!         
!         <cocoon verbose="true"
!             classpathref="classpath.core"
!             precompile-only="false" 
!             confirm-extensions="false"
!             context-dir="${build.docs.src}"
!             config-file="${build.docs.src}/WEB-INF/cocoon.xconf"
!             work-dir="${build}/work"
!             dest-dir="${build.docs.html}"
!             extension=".html"
!             accept="*/*">
!             <logging log-kit="${build.docs.src}/WEB-INF/logkit.xconf" logger="cli" level="DEBUG" />
!             <uris name="site" follow-links="false">
!                <uri type="append" src="index.xml"/>
!                <uri type="append" src="ant-tasks.xml"/>
!                <uri type="append" src="changes.xml"/>
!                <uri type="append" src="client.xml"/>
!                <uri type="append" src="configuration.xml"/>
!                <uri type="append" src="credits.xml"/>
!                <uri type="append" src="deployment.xml"/>
!                <uri type="append" src="devguide.xml"/>
!                <uri type="append" src="documentation.xml"/>
!                <uri type="append" src="donations.xml"/>
!                <uri type="append" src="examples.xml"/>
!                <uri type="append" src="facts.xml"/>
!                <uri type="append" src="howtos.xml"/>
!                <uri type="append" src="performance.xml"/>
!                <uri type="append" src="quickstart.xml"/>
!                <uri type="append" src="security.xml"/>
!                <uri type="append" src="xquery.xml"/>
!                <uri type="append" src="xinclude.xml"/>
!            </uris>
!         </cocoon>
!         
!         <echo message="Renaming files ..."/>
!         <move todir="${build.docs.html}">
!             <fileset dir="${build.docs.html}">
!                 <include name="**.xml"/>
              </fileset>
!             <mapper type="glob" from="*.xml" to="*.html"/>
          </move>
!         
!         <copy todir="${build.docs.html}">
! 	        <fileset dir="webapp">
!                 <include name="styles/**"/>
!                 <include name="resources/**"/>
!                 <include name="*.jpg"/>
!                 <include name="*.png"/>
!             </fileset>
!         </copy>
  	</target>
  

[Exist-commits] eXist-1.0/webapp/xquery/styles default-style.css,1.1,1.2

[Wolfgang M. M. <wol...@us...>]

Update of /cvsroot/exist/eXist-1.0/webapp/xquery/styles
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23196/webapp/xquery/styles

Modified Files:
	default-style.css 
Log Message:
Adopted examples to new web site layout.

Index: default-style.css
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/webapp/xquery/styles/default-style.css,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** default-style.css	22 Jul 2004 19:00:48 -0000	1.1
--- default-style.css	15 Aug 2004 20:55:34 -0000	1.2
***************
*** 92,95 ****
--- 92,103 ----
  }
  
+ #version-info {
+     color: #666666;
+     text-align: right;
+     margin-top: 3px;
+     font-size: 8pt;
+     margin-bottom: 5px;
+ }
+ 
  .toc {
  	margin-top: 10px;
***************
*** 327,331 ****
      font-family: Courier, monospace;
      text-align: left;
!     background: #AABBCC;
  }
  
--- 335,339 ----
      font-family: Courier, monospace;
      text-align: left;
!     background: #ddd;
  }
  
***************
*** 399,400 ****
--- 407,417 ----
      margin-right: 15px;
  }
+ 
+ #login {
+     padding: 10px;
+     display: block;
+     border: 1px solid #999;
+     background: #fafafa;
+     margin-left: 15px;
+     margin-right: 15px;
+ }

[Exist-commits] eXist-1.0/webapp/xquery header.xml,1.2,1.3

[Wolfgang M. M. <wol...@us...>]

Update of /cvsroot/exist/eXist-1.0/webapp/xquery
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23196/webapp/xquery

Modified Files:
	header.xml 
Log Message:
Adopted examples to new web site layout.

Index: header.xml
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/webapp/xquery/header.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** header.xml	27 Jul 2004 12:38:34 -0000	1.2
--- header.xml	15 Aug 2004 20:55:33 -0000	1.3
***************
*** 3,7 ****
  <header>
      <logo src="logo.jpg"/>
!         <title>Open Source Native XML Database</title>
  	<author email="wol...@ex...">Wolfgang M. Meier</author>
  </header>
--- 3,7 ----
  <header>
      <logo src="logo.jpg"/>
!     <title>Open Source Native XML Database</title>
  	<author email="wol...@ex...">Wolfgang M. Meier</author>
  </header>

[Exist-commits] eXist-1.0/webapp header.xml.tmpl,NONE,1.1 index.xml,1.21,1.22 login.xml,1.3,1.4 xquery.xml,1.7,1.8 header.xml,1.3,1.4 facts.xml,1.3,1.4 documentation.xml,1.1,1.2 default.css,1.5,NONE login.css,1.1,NONE adminLogin.xml,1.1,NONE

[Wolfgang M. M. <wol...@us...>]

Update of /cvsroot/exist/eXist-1.0/webapp
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23196/webapp

Modified Files:
	index.xml login.xml xquery.xml header.xml facts.xml 
	documentation.xml 
Added Files:
	header.xml.tmpl 
Removed Files:
	default.css login.css adminLogin.xml 
Log Message:
Adopted examples to new web site layout.

Index: index.xml
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/webapp/index.xml,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** index.xml	23 Jul 2004 14:24:23 -0000	1.21
--- index.xml	15 Aug 2004 20:55:32 -0000	1.22
***************
*** 18,22 ****
                  processing, automatic indexing,
                  extensions for full-text search, 
!                 <a href="http://www.xmldb.org/xupdate/">XUpdate</a> support 
                  and tight integration with existing XML development 
                  tools. The database implements the current 
--- 18,22 ----
                  processing, automatic indexing,
                  extensions for full-text search, 
!                 <a href="http://www.smb-tec.com/xmldb/xupdate/index.html">XUpdate</a> support 
                  and tight integration with existing XML development 
                  tools. The database implements the current 
***************
*** 32,38 ****
              
              <p>Implemented features include: user-defined functions and modules, 
!             static type checking, type casts, constructors, order by, ...</p>
              
!             <p>Additional features: Java binding, fultext-search functions, 
              extension modules for HTTP support, database manipulation and 
              XSL transformations.</p>
--- 32,38 ----
              
              <p>Implemented features include: user-defined functions and modules, 
!             type checking, type casts, constructors, order by, ...</p>
              
!             <p>Additional features: Java binding, fulltext-search functions, 
              extension modules for HTTP support, database manipulation and 
              XSL transformations.</p>
***************
*** 53,61 ****
          </section>
  
-         <section title="Online demos">
-             <p>Several <b>online demos</b> are available. Please have a look at
-                 the list of <link href="examples.xml">available examples</link>.</p>
-         </section>
- 
          <section id="download" title="Download">
              <p>eXist is released to the public under the terms of the <link href="http://www.gnu.org/copyleft/lesser.html">GNU
--- 53,56 ----
***************
*** 128,151 ****
              
          </section>
-         <section id="articles" title="Articles">
-             <p>If you would like to know more about the internal workings of eXist, you may
-                 read the following article:</p>
- 
-             <p>
-                 <i>Wolfgang Meier</i>. <link href="http://exist-db.org/webdb.pdf">eXist: An 
-             Open Source Native XML Database</link>. 
-             In: Akmal B. Chaudri, Mario Jeckle, Erhard Rahm, Rainer Unland (Eds.): 
-             Web, Web-Services, and Database Systems. NODe 2002 Web- and Database-Related 
-             Workshops, Erfurt, Germany, October 2002. Springer LNCS Series, 2593.</p>
- 			
-             <p>A chapter about eXist is also contained in the book:</p>
- 			
-             <p>Akmal B. Chaudri, Awais Rashid, Roberto Zicari (Eds.): 
- 			<link href="http://www.aw.com/catalog/academic/product/1,4096,0201844524,00.html">XML 
- 			Data Management: Native XML and XML-Enabled Database Systems</link>. 
- 			ISBN: 0-201-84452-4. Published by Addison Wesley Professional,
- 			March, 2003.</p>
- 
-         </section>
      </body>
  </document>
--- 123,126 ----

Index: xquery.xml
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/webapp/xquery.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** xquery.xml	27 Jul 2004 12:38:34 -0000	1.7
--- xquery.xml	15 Aug 2004 20:55:32 -0000	1.8
***************
*** 54,60 ****
                      is always treated as xs:untypedAtomic.</listitem>
  
-                 <listitem>Computed node constructors are not supported. Normal
-                     node constructors are fully supported.</listitem>
- 
                  <listitem>Collations: specifying another collation than the default is not
                      possible.</listitem>
--- 54,57 ----

Index: header.xml
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/webapp/header.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** header.xml	27 Jul 2004 12:38:34 -0000	1.3
--- header.xml	15 Aug 2004 20:55:32 -0000	1.4
***************
*** 3,7 ****
  <header>
      <logo src="logo.jpg"/>
!         <title>Open Source Native XML Database</title>
  	<author email="wol...@ex...">Wolfgang M. Meier</author>
  </header>
--- 3,8 ----
  <header>
      <logo src="logo.jpg"/>
!     <title>Open Source Native XML Database</title>
  	<author email="wol...@ex...">Wolfgang M. Meier</author>
+     <version>1.0-dev-20040815</version>
  </header>

Index: documentation.xml
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/webapp/documentation.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** documentation.xml	13 Aug 2004 19:10:00 -0000	1.1
--- documentation.xml	15 Aug 2004 20:55:32 -0000	1.2
***************
*** 23,64 ****
  		<title>Documentation</title>
          
!         <unorderedlist>
!             <listitem>
!                 <para><ulink href="xquery.xml">XQuery Docs <img src="resources/new.gif" border="0"/></ulink></para>
!             </listitem>
!             <listitem>
!                 <para><ulink href="devguide.xml">Developer's Guide</ulink></para>
!             </listitem>
!             <listitem>
!                 <para><ulink href="client.xml">Java Admin Client</ulink></para>
!             </listitem>
!             <listitem>
!                 <para><ulink href="deployment.xml">Deployment</ulink></para>
!             </listitem>
!             <listitem>
!                 <para><ulink href="security.xml">Security</ulink></para>
!             </listitem>
!             <listitem>
!                 <para><ulink href="xinclude.xml">XInclude</ulink></para>
!             </listitem>
!             <listitem>
!                 <para><ulink href="configuration.xml">Server Configuration</ulink></para>
!             </listitem>
!             <listitem>
!                 <para><ulink href="ant-tasks.xml">Ant Tasks</ulink></para>
!             </listitem>
!             <listitem>
!                 <para><ulink href="index.xml#articles">Articles</ulink></para>
!             </listitem>
!             <listitem>
!                 <para><ulink href="changes.xml">Changes</ulink></para>
!             </listitem>
!             <listitem>
!                 <para><ulink href="performance.xml">Performance Issues</ulink></para>
!             </listitem>
!             <listitem>
!                 <para><ulink href="howtos.xml">Misc HowTos</ulink></para>
!             </listitem>
!         </unorderedlist>
      </chapter>
  </book>
--- 23,96 ----
  		<title>Documentation</title>
          
!         <section>
!             <title>Available Documentation</title>
!             
!             <unorderedlist>
!                 <listitem>
!                     <para><ulink href="quickstart.xml">Quick Start</ulink>: getting started with eXist.</para>
!                 </listitem>
!                 <listitem>
!                     <para><ulink href="xquery.xml">XQuery</ulink>: current status, supported
!                     features and extensions.</para>
!                 </listitem>
!                 <listitem>
!                     <para><ulink href="devguide.xml">Developer's Guide</ulink>: describes the
!                     various interfaces: XML:DB API, XML-RPC, REST, SOAP.</para>
!                 </listitem>
!                 <listitem>
!                     <para><ulink href="client.xml">Java Admin Client</ulink>: manual for the 
!                     GUI client.</para>
!                 </listitem>
!                 <listitem>
!                     <para><ulink href="deployment.xml">Deployment</ulink>: eXist supports different
!                     alternatives for server deployment.</para>
!                 </listitem>
!                 <listitem>
!                     <para><ulink href="security.xml">Security</ulink>: creating/changing users, passwords
!                     and permissions.</para>
!                 </listitem>
!                 <listitem>
!                     <para><ulink href="configuration.xml">Server Configuration</ulink>: configuration
!                     options for the server.</para>
!                 </listitem>
!                 <listitem>
!                     <para><ulink href="xinclude.xml">XInclude</ulink>: XInclude support in eXist.</para>
!                 </listitem>
!                 <listitem>
!                     <para><ulink href="ant-tasks.xml">Ant Tasks</ulink>: how to automate tasks with Ant.</para>
!                 </listitem>
!                 <listitem>
!                     <para><ulink href="changes.xml">Changes</ulink></para>
!                 </listitem>
!                 <listitem>
!                     <para><ulink href="performance.xml">Performance Issues</ulink></para>
!                 </listitem>
!                 <listitem>
!                     <para><ulink href="howtos.xml">Misc HowTos</ulink></para>
!                 </listitem>
!             </unorderedlist>
!         </section>
!         <section>
!             <title>Articles</title>
!             
!             <p>If you would like to know more about the internal workings of eXist, you may
!                 read the following article:</p>
! 
!             <p>
!                 Wolfgang Meier. <ulink href="http://exist-db.org/webdb.pdf">eXist: An 
!             Open Source Native XML Database</ulink>. 
!             In: Akmal B. Chaudri, Mario Jeckle, Erhard Rahm, Rainer Unland (Eds.): 
!             Web, Web-Services, and Database Systems. NODe 2002 Web- and Database-Related 
!             Workshops, Erfurt, Germany, October 2002. Springer LNCS Series, 2593.</p>
! 			
!             <p>A chapter about eXist is also contained in the book:</p>
! 			
!             <p>Akmal B. Chaudri, Awais Rashid, Roberto Zicari (Eds.): 
! 			<link href="http://www.aw.com/catalog/academic/product/1,4096,0201844524,00.html">XML 
! 			Data Management: Native XML and XML-Enabled Database Systems</link>. 
! 			ISBN: 0-201-84452-4. Published by Addison Wesley Professional,
! 			March, 2003.</p>
! 
!         </section>
      </chapter>
  </book>

--- adminLogin.xml DELETED ---

Index: facts.xml
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/webapp/facts.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** facts.xml	2 Feb 2004 15:30:30 -0000	1.3
--- facts.xml	15 Aug 2004 20:55:32 -0000	1.4
***************
*** 216,223 ****
                  <topic name="WebDAV">
  
!                     <p>Limited support by <link
!                             href="http://metzner.org/projects/xincon/">XinCon</link>.
!                         No longer maintained. Should be replaced by a better
!                         implementation in the near future.</p>
                  </topic>
  
--- 216,223 ----
                  <topic name="WebDAV">
  
!                     <p>Limited support in version 1.0b1 through Xincon. Has been
!                     completely reimplemented for 1.0b2. The new WebDAV module is now
!                     based on the internal database API to get full access to eXist's
!                     security management.</p>
                  </topic>
  

--- default.css DELETED ---

--- login.css DELETED ---

--- NEW FILE: header.xml.tmpl ---
<?xml version="1.0"?>

<header>
    <logo src="logo.jpg"/>
    <title>Open Source Native XML Database</title>
	<author email="wol...@ex...">Wolfgang M. Meier</author>
    <version>@version@</version>
</header>

Index: login.xml
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/webapp/login.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** login.xml	25 Nov 2003 12:54:15 -0000	1.3
--- login.xml	15 Aug 2004 20:55:32 -0000	1.4
***************
*** 2,16 ****
  
  <!-- Author: Wolfgang Meier "me...@if..." -->
- 
  <document xmlns:xi="http://www.w3.org/2001/XInclude">
!     
!     <header>
!         <logo src="logo.jpg"/>
!         <title>Open Source XML Database</title>
!         <author email="me...@if...">Wolfgang M. Meier</author>
!         <style href="login.css"/>
!     </header>
! 
!     <!-- include sidebar -->
      <xi:include href="sidebar.xml"/>
    
--- 2,8 ----
  
  <!-- Author: Wolfgang Meier "me...@if..." -->
  <document xmlns:xi="http://www.w3.org/2001/XInclude">
!     <!-- include header -->
!     <xi:include href="header.xml"/>
      <xi:include href="sidebar.xml"/>
    
***************
*** 23,28 ****
  			as &quot;guest&quot; with password &quot;guest&quot;.</p>
              
!             <form action="xadmin.xsp" method="POST">
!                 <table class="login" border="0">
                      <tr>
                          <td width="30%">
--- 15,20 ----
  			as &quot;guest&quot; with password &quot;guest&quot;.</p>
              
!             <form action="xadmin.xsp" method="POST" id="login">
!                 <table border="0">
                      <tr>
                          <td width="30%">
***************
*** 42,46 ****
                      </tr>
                      <tr>
!                         <td colspan="2" align="left">
                              <input type="submit"/>
                          </td>
--- 34,38 ----
                      </tr>
                      <tr>
!                         <td colspan="2" align="right">
                              <input type="submit"/>
                          </td>

[Exist-commits] eXist-1.0/webapp/styles default-style.css,1.2,1.3

[Wolfgang M. M. <wol...@us...>]

Update of /cvsroot/exist/eXist-1.0/webapp/styles
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23196/webapp/styles

Modified Files:
	default-style.css 
Log Message:
Adopted examples to new web site layout.

Index: default-style.css
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/webapp/styles/default-style.css,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** default-style.css	23 Jul 2004 14:24:24 -0000	1.2
--- default-style.css	15 Aug 2004 20:55:33 -0000	1.3
***************
*** 92,95 ****
--- 92,103 ----
  }
  
+ #version-info {
+     color: #666666;
+     text-align: right;
+     margin-top: 3px;
+     font-size: 8pt;
+     margin-bottom: 5px;
+ }
+ 
  .toc {
  	margin-top: 10px;
***************
*** 399,400 ****
--- 407,417 ----
      margin-right: 15px;
  }
+ 
+ #login {
+     padding: 10px;
+     display: block;
+     border: 1px solid #999;
+     background: #fafafa;
+     margin-left: 15px;
+     margin-right: 15px;
+ }

[Exist-commits] eXist-1.0/webapp/stylesheets doc2html-2.xsl,1.9,1.10 db2html.xsl,1.6,1.7

[Wolfgang M. M. <wol...@us...>]

Update of /cvsroot/exist/eXist-1.0/webapp/stylesheets
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23196/webapp/stylesheets

Modified Files:
	doc2html-2.xsl db2html.xsl 
Log Message:
Adopted examples to new web site layout.

Index: db2html.xsl
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/webapp/stylesheets/db2html.xsl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** db2html.xsl	22 Jul 2004 19:00:47 -0000	1.6
--- db2html.xsl	15 Aug 2004 20:55:33 -0000	1.7
***************
*** 101,104 ****
--- 101,107 ----
              <xsl:attribute name="name"><xsl:value-of select="generate-id()"/></xsl:attribute>
          </a>
+         <xsl:if test="@id">
+             <a name="{@id}"></a>
+         </xsl:if>
          <xsl:apply-templates/>
      </xsl:template>

Index: doc2html-2.xsl
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/webapp/stylesheets/doc2html-2.xsl,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** doc2html-2.xsl	22 Jul 2004 19:00:47 -0000	1.9
--- doc2html-2.xsl	15 Aug 2004 20:55:33 -0000	1.10
***************
*** 56,59 ****
--- 56,60 ----
                          </tr>
                      </table>
+                     <div id="version-info">Site based on <xsl:value-of select="header/version"/></div>
                  </div>
                  <xsl:apply-templates select="sidebar:sidebar"/>
***************
*** 98,101 ****
--- 99,103 ----
          <div id="sidebar">
              <xsl:apply-templates select="sidebar:group"/>
+             
              <xsl:apply-templates select="sidebar:banner"/>
          </div>

[Exist-commits] eXist-1.0/webapp/acronyms/styles default-style.css,NONE,1.1

[Wolfgang M. M. <wol...@us...>]

Update of /cvsroot/exist/eXist-1.0/webapp/acronyms/styles
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23196/webapp/acronyms/styles

Added Files:
	default-style.css 
Log Message:
Adopted examples to new web site layout.

--- NEW FILE: default-style.css ---
body {
    font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;
    font-size: 13px;
    line-height: 1.4;
}


p, ul, ol {
    font-size: 13px;
    margin-left: 15px;
    margin-right: 15px;
}

table {
    font-size: 13px;
}

table p {
    margin: 0px;
}

#notes {
    border-top: solid 1px #DEDEDE;
}

#top {
    margin-bottom: 5px;
}

#top #menubar {
    width: 100%;
    padding-top: 4px;
    padding-bottom: 4px;
    margin-top: 5px;
    border-top: solid 1px #DEDEDE;
    border-bottom: solid 1px #DEDEDE;
}

#menubar #header {
    color: #0A0AA0;
    text-align: left;
    font-size: 14pt;
    font-weight: normal;
    margin: 0;
    padding: 0;
}

#menubar a {
    margin-left: 10px;
    color: #666666;
}

#footer {
    padding: 10px;
}

#sidebar {
    position: absolute;
    margin-top: 15px;
    width: 16%;
    display: block;
    overflow: hidden;
}

#content2col {
    position: absolute;
    left: 18%;
    width: 81%;
    margin-top: 15px;
    display: block;
    background-color: white;
    overflow: hidden;
}

#content {
    position: absolute;
    left: 18%;
    width: 62%;
    margin-top: 15px;
    display: block;
    background-color: white;
    overflow: hidden;
}

#news {
    position: absolute;
    width: 18%;
    left: 82%;
    margin-top: 15px;
    display: block;
    overflow: hidden;
}

#version-info {
    color: #666666;
    text-align: right;
    margin-top: 3px;
    font-size: 8pt;
    margin-bottom: 5px;
}

.toc {
	margin-top: 10px;
	margin-bottom: 5px;
	font-size: 80%;
	padding-left: 40px;
	padding-bottom: 5px;
}

.tocitem2 {
	padding-left: 15px;
}

h1 { 
    font-size: 160%;
    font-weight: normal;
    color: white;
    background-color: #0990EE;
    border: 1px solid #999;
    margin-left: 0px;
    margin-bottom: 15px;
    margin-top: 0px;
    padding-left: 5px;
    padding-right: 5px;
    padding-bottom: 5px;
}

h2 { 
    font-size: 160%;
    font-weight: normal;
    color: #666666;
    margin-left: 0px;
    margin-top: 25px;
    margin-bottom: 5px;
    margin-right: 20px;
    text-align: left;
    border-bottom: 1px solid ;
}

h3 { 
    font-size: 12pt;
    font-weight: normal;
    color: #666666;
    font-style: italic;
    text-align: left;
    padding-left: 15px;
    margin-right: 20px;
}

h4 {
    font-weight: bold;
    padding-left: 15px;
}

.record {
    margin: 10px;
    padding: 10px;
    width: 457px;
    border: solid 1px #DEDEDE;
}
			
.citation {
    
}
			
.heading {
    font-weight: bold;
}
			
.title {
    font-weight: bold;
    font-size: 12px;
}
			
.citekey {
    color: #50497A;
    margin-left: 20px;
}
			
.note {
}
			
a {
    color: #0A0AA0;
    font-weight: bold;
    text-decoration: none;
}

a:hover {
    border-bottom: solid 1px gray;
}

input.mark {
    float: left;
    margin-left: -30px;
}

input.search {
    margin-left: 40px;
    padding: 10px;
    background-color: transparent;
    font-size: 10px;
    font-weight: bold;
}

input.view{
    margin-left: 40px;
    margin-top: 10px;
    font-size: 9px;
}

input.search-button{
    margin-left: 20px;
    font-size: 9px;
    width: 70px;
}

select.choose {
    font-size: 9px;
    margin-left: 10px;
    margin-top: 10px;
    background-color: #E1DD68;
}

.banner {
    text-align: center;
    margin-top: 20px;
}

.block {
    margin:0px 6px 12px 6px;
	padding: 4px;
	background: #fff;
	border: 1px solid #999; 
}

.block h3 {
	background: #ddd;
	color: #000;
	margin: -4px -4px 4px -4px;
	padding: 4px;
	border-bottom: 1px solid #999;
	font-size: 11px;
}

.block ul {
    margin: 0;
    padding: 0;
    list-style-type: none;
}

.block li {
}

.block .date {
    text-align: right;
    font-size: 9.5pt;
    font-style: italic;
    border-bottom: 1px solid #999;
}

.block .headline {
    margin-bottom: 10px;
}

.block a {
    display: block;
    padding: 3px;
    font-size: small;
    color: #666666;
    font-weight: normal;
}

.block a:link, a:visited {
    text-decoration: none;
    padding-left: 10px;
    padding-right: 10px;
}

.block a:hover   {
    background-color: #ddd;
    color: #666666;
    border-bottom: none;
}

#sidebar input.search-sidebar {
    margin-left: 10px;
    width: 120px;
}

#sidebar input.search-button {
    margin-top: 5px;
    margin-bottom: 15px;
}

.xmlsrc {
    margin-top: 20px;
    margin-bottom: 20px;
    padding-right: 10px;
    text-align: right;
}

.filename {
    font-family: Courier, monospace;
    font-size: 120%;
}

.option {
    font-family: Courier, monospace;
}

.classname {
    text-decoration: underline;
}

.methodname {
    text-decoration: underline;
}

.command {
    font-weight: bold;
}

.variablelist {
    margin-left: 15px;
}

div.screen {
    font-family: Courier, monospace;
}

div.synopsis {
    margin: 15px;
    padding-left: 5px;
    font-family: Courier, monospace;
    text-align: left;
    background: #ddd;
}

.note_title {
    font-decoration: underline;
    font-weight: bold;
}

div.note {
    margin-top: 10px;
    margin-bottom: 10px;
    padding-left: 5px;
    padding-right: 5px;
    padding-top: 5px;
    padding-bottom: 5px;
    border: 1px solid #203cd8;
}

.important_title {
    font-decoration: underline;
    font-color: red;
    font-weight: bold;
}

div.important {
    margin-top: 10px;
    margin-bottom: 10px;
    padding-left: 5px;
    padding-right: 5px;
    padding-top: 5px;
    padding-bottom: 5px;
    border: 1px solid red;
}

.example {
    margin-top: 15px;
    margin-bottom: 15px;
    padding-left: 10px;
    padding-right: 15px;
    padding-top: 10px;
    padding-bottom: 10px;
    text-align: left;
    background: #fafafa;
    border: 1px solid #999;
}

div.example_title {
    font-size: 14px;
    font-weight: bold;
    margin-bottom: 5px;
    text-decoration: underline;
}

.figure {
    margin-top: 15px;
    margin-bottom: 15px;
    margin-left: 25px;
    margin-right: 25px;
    padding-left: 15px;
    alignment: center;
}

.figtitle {
    font-size: 14px;
    font-weight: bold;
    text-decoration: underline;
}

.variablelist {
    margin-left: 15px;
    margin-right: 15px;
}

#login {
    padding: 10px;
    display: block;
    border: 1px solid #999;
    background: #fafafa;
    margin-left: 15px;
    margin-right: 15px;
}

[Exist-commits] eXist-1.0/webapp/library/styles default-style.css,NONE,1.1

[Wolfgang M. M. <wol...@us...>]

Update of /cvsroot/exist/eXist-1.0/webapp/library/styles
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23196/webapp/library/styles

Added Files:
	default-style.css 
Log Message:
Adopted examples to new web site layout.

--- NEW FILE: default-style.css ---
body {
    font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;
    font-size: 13px;
    line-height: 1.4;
}


p, ul, ol {
    font-size: 13px;
    margin-left: 15px;
    margin-right: 15px;
}

table {
    font-size: 13px;
}

table p {
    margin: 0px;
}

#notes {
    border-top: solid 1px #DEDEDE;
}

#top {
    margin-bottom: 5px;
}

#top #menubar {
    width: 100%;
    padding-top: 4px;
    padding-bottom: 4px;
    margin-top: 5px;
    border-top: solid 1px #DEDEDE;
    border-bottom: solid 1px #DEDEDE;
}

#menubar #header {
    color: #0A0AA0;
    text-align: left;
    font-size: 14pt;
    font-weight: normal;
    margin: 0;
    padding: 0;
}

#menubar a {
    margin-left: 10px;
    color: #666666;
}

#footer {
    padding: 10px;
}

#sidebar {
    position: absolute;
    margin-top: 15px;
    width: 16%;
    display: block;
    overflow: hidden;
}

#content2col {
    position: absolute;
    left: 18%;
    width: 81%;
    margin-top: 15px;
    display: block;
    background-color: white;
    overflow: hidden;
}

#content {
    position: absolute;
    left: 18%;
    width: 62%;
    margin-top: 15px;
    display: block;
    background-color: white;
    overflow: hidden;
}

#news {
    position: absolute;
    width: 18%;
    left: 82%;
    margin-top: 15px;
    display: block;
    overflow: hidden;
}

#version-info {
    color: #666666;
    text-align: right;
    margin-top: 3px;
    font-size: 8pt;
    margin-bottom: 5px;
}

.toc {
	margin-top: 10px;
	margin-bottom: 5px;
	font-size: 80%;
	padding-left: 40px;
	padding-bottom: 5px;
}

.tocitem2 {
	padding-left: 15px;
}

h1 { 
    font-size: 160%;
    font-weight: normal;
    color: white;
    background-color: #0990EE;
    border: 1px solid #999;
    margin-left: 0px;
    margin-bottom: 15px;
    margin-top: 0px;
    padding-left: 5px;
    padding-right: 5px;
    padding-bottom: 5px;
}

h2 { 
    font-size: 160%;
    font-weight: normal;
    color: #666666;
    margin-left: 0px;
    margin-top: 25px;
    margin-bottom: 5px;
    margin-right: 20px;
    text-align: left;
    border-bottom: 1px solid ;
}

h3 { 
    font-size: 12pt;
    font-weight: normal;
    color: #666666;
    font-style: italic;
    text-align: left;
    padding-left: 15px;
    margin-right: 20px;
}

h4 {
    font-weight: bold;
    padding-left: 15px;
}

.record {
    margin: 10px;
    padding: 10px;
    width: 457px;
    border: solid 1px #DEDEDE;
}
			
.citation {
    
}
			
.heading {
    font-weight: bold;
}
			
.title {
    font-weight: bold;
    font-size: 12px;
}
			
.citekey {
    color: #50497A;
    margin-left: 20px;
}
			
.note {
}
			
a {
    color: #0A0AA0;
    font-weight: bold;
    text-decoration: none;
}

a:hover {
    border-bottom: solid 1px gray;
}

input.mark {
    float: left;
    margin-left: -30px;
}

input.search {
    margin-left: 40px;
    padding: 10px;
    background-color: transparent;
    font-size: 10px;
    font-weight: bold;
}

input.view{
    margin-left: 40px;
    margin-top: 10px;
    font-size: 9px;
}

input.search-button{
    margin-left: 20px;
    font-size: 9px;
    width: 70px;
}

select.choose {
    font-size: 9px;
    margin-left: 10px;
    margin-top: 10px;
    background-color: #E1DD68;
}

.banner {
    text-align: center;
    margin-top: 20px;
}

.block {
    margin:0px 6px 12px 6px;
	padding: 4px;
	background: #fff;
	border: 1px solid #999; 
}

.block h3 {
	background: #ddd;
	color: #000;
	margin: -4px -4px 4px -4px;
	padding: 4px;
	border-bottom: 1px solid #999;
	font-size: 11px;
}

.block ul {
    margin: 0;
    padding: 0;
    list-style-type: none;
}

.block li {
}

.block .date {
    text-align: right;
    font-size: 9.5pt;
    font-style: italic;
    border-bottom: 1px solid #999;
}

.block .headline {
    margin-bottom: 10px;
}

.block a {
    display: block;
    padding: 3px;
    font-size: small;
    color: #666666;
    font-weight: normal;
}

.block a:link, a:visited {
    text-decoration: none;
    padding-left: 10px;
    padding-right: 10px;
}

.block a:hover   {
    background-color: #ddd;
    color: #666666;
    border-bottom: none;
}

#sidebar input.search-sidebar {
    margin-left: 10px;
    width: 120px;
}

#sidebar input.search-button {
    margin-top: 5px;
    margin-bottom: 15px;
}

.xmlsrc {
    margin-top: 20px;
    margin-bottom: 20px;
    padding-right: 10px;
    text-align: right;
}

.filename {
    font-family: Courier, monospace;
    font-size: 120%;
}

.option {
    font-family: Courier, monospace;
}

.classname {
    text-decoration: underline;
}

.methodname {
    text-decoration: underline;
}

.command {
    font-weight: bold;
}

.variablelist {
    margin-left: 15px;
}

div.screen {
    font-family: Courier, monospace;
}

div.synopsis {
    margin: 15px;
    padding-left: 5px;
    font-family: Courier, monospace;
    text-align: left;
    background: #ddd;
}

.note_title {
    font-decoration: underline;
    font-weight: bold;
}

div.note {
    margin-top: 10px;
    margin-bottom: 10px;
    padding-left: 5px;
    padding-right: 5px;
    padding-top: 5px;
    padding-bottom: 5px;
    border: 1px solid #203cd8;
}

.important_title {
    font-decoration: underline;
    font-color: red;
    font-weight: bold;
}

div.important {
    margin-top: 10px;
    margin-bottom: 10px;
    padding-left: 5px;
    padding-right: 5px;
    padding-top: 5px;
    padding-bottom: 5px;
    border: 1px solid red;
}

.example {
    margin-top: 15px;
    margin-bottom: 15px;
    padding-left: 10px;
    padding-right: 15px;
    padding-top: 10px;
    padding-bottom: 10px;
    text-align: left;
    background: #fafafa;
    border: 1px solid #999;
}

div.example_title {
    font-size: 14px;
    font-weight: bold;
    margin-bottom: 5px;
    text-decoration: underline;
}

.figure {
    margin-top: 15px;
    margin-bottom: 15px;
    margin-left: 25px;
    margin-right: 25px;
    padding-left: 15px;
    alignment: center;
}

.figtitle {
    font-size: 14px;
    font-weight: bold;
    text-decoration: underline;
}

.variablelist {
    margin-left: 15px;
    margin-right: 15px;
}

#login {
    padding: 10px;
    display: block;
    border: 1px solid #999;
    background: #fafafa;
    margin-left: 15px;
    margin-right: 15px;
}

[Exist-commits] eXist-1.0/webapp/acronyms query.xsp,1.8,1.9

[Wolfgang M. M. <wol...@us...>]

Update of /cvsroot/exist/eXist-1.0/webapp/acronyms
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23196/webapp/acronyms

Modified Files:
	query.xsp 
Log Message:
Adopted examples to new web site layout.

Index: query.xsp
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/webapp/acronyms/query.xsp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** query.xsp	10 May 2004 12:07:40 -0000	1.8
--- query.xsp	15 Aug 2004 20:55:35 -0000	1.9
***************
*** 7,17 ****
      xmlns:xsp="http://apache.org/xsp">
     
! 	<document>
     	
      	<!-- include header -->
! 		<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="context://header.xml"/>
  
      	<!-- include sidebar -->
! 		<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sidebar.xml"/>
    
  		<body>
--- 7,17 ----
      xmlns:xsp="http://apache.org/xsp">
     
! 	<document xmlns:xi="http://www.w3.org/2001/XInclude">
     	
      	<!-- include header -->
! 		<xi:include href="context://header.xml"/>
  
      	<!-- include sidebar -->
! 		<xi:include href="sidebar.xml"/>
    
  		<body>

[Exist-commits] eXist-1.0/webapp/acronyms/resources powered.gif,NONE,1.1

[Wolfgang M. M. <wol...@us...>]

Update of /cvsroot/exist/eXist-1.0/webapp/acronyms/resources
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23196/webapp/acronyms/resources

Added Files:
	powered.gif 
Log Message:
Adopted examples to new web site layout.

--- NEW FILE: powered.gif ---
(This appears to be a binary file; contents omitted.)

[Exist-commits] eXist-1.0/webapp/simple/styles default-style.css,NONE,1.1

[Wolfgang M. M. <wol...@us...>]

Update of /cvsroot/exist/eXist-1.0/webapp/simple/styles
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23196/webapp/simple/styles

Added Files:
	default-style.css 
Log Message:
Adopted examples to new web site layout.

--- NEW FILE: default-style.css ---
body {
    font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;
    font-size: 13px;
    line-height: 1.4;
}


p, ul, ol {
    font-size: 13px;
    margin-left: 15px;
    margin-right: 15px;
}

table {
    font-size: 13px;
}

table p {
    margin: 0px;
}

#notes {
    border-top: solid 1px #DEDEDE;
}

#top {
    margin-bottom: 5px;
}

#top #menubar {
    width: 100%;
    padding-top: 4px;
    padding-bottom: 4px;
    margin-top: 5px;
    border-top: solid 1px #DEDEDE;
    border-bottom: solid 1px #DEDEDE;
}

#menubar #header {
    color: #0A0AA0;
    text-align: left;
    font-size: 14pt;
    font-weight: normal;
    margin: 0;
    padding: 0;
}

#menubar a {
    margin-left: 10px;
    color: #666666;
}

#footer {
    padding: 10px;
}

#sidebar {
    position: absolute;
    margin-top: 15px;
    width: 16%;
    display: block;
    overflow: hidden;
}

#content2col {
    position: absolute;
    left: 18%;
    width: 81%;
    margin-top: 15px;
    display: block;
    background-color: white;
    overflow: hidden;
}

#content {
    position: absolute;
    left: 18%;
    width: 62%;
    margin-top: 15px;
    display: block;
    background-color: white;
    overflow: hidden;
}

#news {
    position: absolute;
    width: 18%;
    left: 82%;
    margin-top: 15px;
    display: block;
    overflow: hidden;
}

#version-info {
    color: #666666;
    text-align: right;
    margin-top: 3px;
    font-size: 8pt;
    margin-bottom: 5px;
}

.toc {
	margin-top: 10px;
	margin-bottom: 5px;
	font-size: 80%;
	padding-left: 40px;
	padding-bottom: 5px;
}

.tocitem2 {
	padding-left: 15px;
}

h1 { 
    font-size: 160%;
    font-weight: normal;
    color: white;
    background-color: #0990EE;
    border: 1px solid #999;
    margin-left: 0px;
    margin-bottom: 15px;
    margin-top: 0px;
    padding-left: 5px;
    padding-right: 5px;
    padding-bottom: 5px;
}

h2 { 
    font-size: 160%;
    font-weight: normal;
    color: #666666;
    margin-left: 0px;
    margin-top: 25px;
    margin-bottom: 5px;
    margin-right: 20px;
    text-align: left;
    border-bottom: 1px solid ;
}

h3 { 
    font-size: 12pt;
    font-weight: normal;
    color: #666666;
    font-style: italic;
    text-align: left;
    padding-left: 15px;
    margin-right: 20px;
}

h4 {
    font-weight: bold;
    padding-left: 15px;
}

.record {
    margin: 10px;
    padding: 10px;
    width: 457px;
    border: solid 1px #DEDEDE;
}
			
.citation {
    
}
			
.heading {
    font-weight: bold;
}
			
.title {
    font-weight: bold;
    font-size: 12px;
}
			
.citekey {
    color: #50497A;
    margin-left: 20px;
}
			
.note {
}
			
a {
    color: #0A0AA0;
    font-weight: bold;
    text-decoration: none;
}

a:hover {
    border-bottom: solid 1px gray;
}

input.mark {
    float: left;
    margin-left: -30px;
}

input.search {
    margin-left: 40px;
    padding: 10px;
    background-color: transparent;
    font-size: 10px;
    font-weight: bold;
}

input.view{
    margin-left: 40px;
    margin-top: 10px;
    font-size: 9px;
}

input.search-button{
    margin-left: 20px;
    font-size: 9px;
    width: 70px;
}

select.choose {
    font-size: 9px;
    margin-left: 10px;
    margin-top: 10px;
    background-color: #E1DD68;
}

.banner {
    text-align: center;
    margin-top: 20px;
}

.block {
    margin:0px 6px 12px 6px;
	padding: 4px;
	background: #fff;
	border: 1px solid #999; 
}

.block h3 {
	background: #ddd;
	color: #000;
	margin: -4px -4px 4px -4px;
	padding: 4px;
	border-bottom: 1px solid #999;
	font-size: 11px;
}

.block ul {
    margin: 0;
    padding: 0;
    list-style-type: none;
}

.block li {
}

.block .date {
    text-align: right;
    font-size: 9.5pt;
    font-style: italic;
    border-bottom: 1px solid #999;
}

.block .headline {
    margin-bottom: 10px;
}

.block a {
    display: block;
    padding: 3px;
    font-size: small;
    color: #666666;
    font-weight: normal;
}

.block a:link, a:visited {
    text-decoration: none;
    padding-left: 10px;
    padding-right: 10px;
}

.block a:hover   {
    background-color: #ddd;
    color: #666666;
    border-bottom: none;
}

#sidebar input.search-sidebar {
    margin-left: 10px;
    width: 120px;
}

#sidebar input.search-button {
    margin-top: 5px;
    margin-bottom: 15px;
}

.xmlsrc {
    margin-top: 20px;
    margin-bottom: 20px;
    padding-right: 10px;
    text-align: right;
}

.filename {
    font-family: Courier, monospace;
    font-size: 120%;
}

.option {
    font-family: Courier, monospace;
}

.classname {
    text-decoration: underline;
}

.methodname {
    text-decoration: underline;
}

.command {
    font-weight: bold;
}

.variablelist {
    margin-left: 15px;
}

div.screen {
    font-family: Courier, monospace;
}

div.synopsis {
    margin: 15px;
    padding-left: 5px;
    font-family: Courier, monospace;
    text-align: left;
    background: #ddd;
}

.note_title {
    font-decoration: underline;
    font-weight: bold;
}

div.note {
    margin-top: 10px;
    margin-bottom: 10px;
    padding-left: 5px;
    padding-right: 5px;
    padding-top: 5px;
    padding-bottom: 5px;
    border: 1px solid #203cd8;
}

.important_title {
    font-decoration: underline;
    font-color: red;
    font-weight: bold;
}

div.important {
    margin-top: 10px;
    margin-bottom: 10px;
    padding-left: 5px;
    padding-right: 5px;
    padding-top: 5px;
    padding-bottom: 5px;
    border: 1px solid red;
}

.example {
    margin-top: 15px;
    margin-bottom: 15px;
    padding-left: 10px;
    padding-right: 15px;
    padding-top: 10px;
    padding-bottom: 10px;
    text-align: left;
    background: #fafafa;
    border: 1px solid #999;
}

div.example_title {
    font-size: 14px;
    font-weight: bold;
    margin-bottom: 5px;
    text-decoration: underline;
}

.figure {
    margin-top: 15px;
    margin-bottom: 15px;
    margin-left: 25px;
    margin-right: 25px;
    padding-left: 15px;
    alignment: center;
}

.figtitle {
    font-size: 14px;
    font-weight: bold;
    text-decoration: underline;
}

.variablelist {
    margin-left: 15px;
    margin-right: 15px;
}

#login {
    padding: 10px;
    display: block;
    border: 1px solid #999;
    background: #fafafa;
    margin-left: 15px;
    margin-right: 15px;
}

[Exist-commits] eXist-1.0/webapp/simple style.css,1.1,NONE

[Wolfgang M. M. <wol...@us...>]

Update of /cvsroot/exist/eXist-1.0/webapp/simple
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23196/webapp/simple

Removed Files:
	style.css 
Log Message:
Adopted examples to new web site layout.

--- style.css DELETED ---

[Exist-commits] eXist-1.0/webapp/simple/resources powered.gif,NONE,1.1

[Wolfgang M. M. <wol...@us...>]

Update of /cvsroot/exist/eXist-1.0/webapp/simple/resources
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23196/webapp/simple/resources

Added Files:
	powered.gif 
Log Message:
Adopted examples to new web site layout.

--- NEW FILE: powered.gif ---
(This appears to be a binary file; contents omitted.)

[Exist-commits] eXist-1.0/webapp/library/resources powered.gif,NONE,1.1

[Wolfgang M. M. <wol...@us...>]

Update of /cvsroot/exist/eXist-1.0/webapp/library/resources
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23196/webapp/library/resources

Added Files:
	powered.gif 
Log Message:
Adopted examples to new web site layout.

--- NEW FILE: powered.gif ---
(This appears to be a binary file; contents omitted.)

[Exist-commits] eXist-1.0/webapp/images xincon-small.png,1.1,NONE xincon.png,1.1,NONE

[Wolfgang M. M. <wol...@us...>]

Update of /cvsroot/exist/eXist-1.0/webapp/images
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23196/webapp/images

Removed Files:
	xincon-small.png xincon.png 
Log Message:
Adopted examples to new web site layout.

--- xincon.png DELETED ---

--- xincon-small.png DELETED ---

[Exist-commits] eXist-1.0/webapp/status status.jsp,1.2,NONE statusbar.jsp,1.1,NONE status.css,1.1,NONE

[Wolfgang M. M. <wol...@us...>]

Update of /cvsroot/exist/eXist-1.0/webapp/status
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23196/webapp/status

Removed Files:
	status.jsp statusbar.jsp status.css 
Log Message:
Adopted examples to new web site layout.

--- statusbar.jsp DELETED ---

--- status.css DELETED ---

--- status.jsp DELETED ---

[Exist-commits] eXist-1.0/webapp/xquery/resources powered.gif,NONE,1.1

[Wolfgang M. M. <wol...@us...>]

Update of /cvsroot/exist/eXist-1.0/webapp/xquery/resources
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23196/webapp/xquery/resources

Added Files:
	powered.gif 
Log Message:
Adopted examples to new web site layout.

--- NEW FILE: powered.gif ---
(This appears to be a binary file; contents omitted.)

[Exist-commits] eXist-1.0/webapp/xquery/resources - New directory

[Wolfgang M. M. <wol...@us...>]

Update of /cvsroot/exist/eXist-1.0/webapp/xquery/resources
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23111/webapp/xquery/resources

Log Message:
Directory /cvsroot/exist/eXist-1.0/webapp/xquery/resources added to the repository

[Exist-commits] eXist-1.0/webapp/simple/styles - New directory

[Wolfgang M. M. <wol...@us...>]

Update of /cvsroot/exist/eXist-1.0/webapp/simple/styles
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23111/webapp/simple/styles

Log Message:
Directory /cvsroot/exist/eXist-1.0/webapp/simple/styles added to the repository