Author: cziegeler Date: Fri Jan 21 02:06:44 2005 New Revision: 125912 URL: http://svn.apache.org/viewcvs?view=rev&rev=125912 Log: Move context source factory to core - we need it there! Added: cocoon/trunk/src/core/java/org/apache/cocoon/Constants.java - copied unchanged from r125902, cocoon/trunk/src/java/org/apache/cocoon/Constants.java cocoon/trunk/src/core/java/org/apache/cocoon/cocoon.properties - copied unchanged from r125902, cocoon/trunk/src/java/org/apache/cocoon/cocoon.properties cocoon/trunk/src/core/java/org/apache/cocoon/components/source/ cocoon/trunk/src/core/java/org/apache/cocoon/components/source/impl/ cocoon/trunk/src/core/java/org/apache/cocoon/components/source/impl/ContextSourceFactory.java - copied unchanged from r125902, cocoon/trunk/src/java/org/apache/cocoon/components/source/impl/ContextSourceFactory.java cocoon/trunk/src/core/java/org/apache/cocoon/components/source/impl/TraversableContextSource.java - copied, changed from r125902, cocoon/trunk/src/java/org/apache/cocoon/components/source/impl/TraversableContextSource.java cocoon/trunk/src/core/java/org/apache/cocoon/environment/ cocoon/trunk/src/core/java/org/apache/cocoon/environment/Context.java - copied, changed from r125902, cocoon/trunk/src/java/org/apache/cocoon/environment/Context.java Removed: cocoon/trunk/src/java/org/apache/cocoon/Constants.java cocoon/trunk/src/java/org/apache/cocoon/cocoon.properties cocoon/trunk/src/java/org/apache/cocoon/components/source/impl/ContextSourceFactory.java cocoon/trunk/src/java/org/apache/cocoon/components/source/impl/TraversableContextSource.java cocoon/trunk/src/java/org/apache/cocoon/environment/Context.java Modified: cocoon/trunk/tools/targets/init-build.xml
Copied: cocoon/trunk/src/core/java/org/apache/cocoon/Constants.java (from r125902, cocoon/trunk/src/java/org/apache/cocoon/Constants.java) Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/core/java/org/apache/cocoon/Constants.java?view=diff&rev=125912&p1=cocoon/trunk/src/java/org/apache/cocoon/Constants.java&r1=125902&p2=cocoon/trunk/src/core/java/org/apache/cocoon/Constants.java&r2=125912 ============================================================================== Copied: cocoon/trunk/src/core/java/org/apache/cocoon/cocoon.properties (from r125902, cocoon/trunk/src/java/org/apache/cocoon/cocoon.properties) Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/core/java/org/apache/cocoon/cocoon.properties?view=diff&rev=125912&p1=cocoon/trunk/src/java/org/apache/cocoon/cocoon.properties&r1=125902&p2=cocoon/trunk/src/core/java/org/apache/cocoon/cocoon.properties&r2=125912 ============================================================================== Copied: cocoon/trunk/src/core/java/org/apache/cocoon/components/source/impl/ContextSourceFactory.java (from r125902, cocoon/trunk/src/java/org/apache/cocoon/components/source/impl/ContextSourceFactory.java) Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/core/java/org/apache/cocoon/components/source/impl/ContextSourceFactory.java?view=diff&rev=125912&p1=cocoon/trunk/src/java/org/apache/cocoon/components/source/impl/ContextSourceFactory.java&r1=125902&p2=cocoon/trunk/src/core/java/org/apache/cocoon/components/source/impl/ContextSourceFactory.java&r2=125912 ============================================================================== Copied: cocoon/trunk/src/core/java/org/apache/cocoon/components/source/impl/TraversableContextSource.java (from r125902, cocoon/trunk/src/java/org/apache/cocoon/components/source/impl/TraversableContextSource.java) Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/core/java/org/apache/cocoon/components/source/impl/TraversableContextSource.java?view=diff&rev=125912&p1=cocoon/trunk/src/java/org/apache/cocoon/components/source/impl/TraversableContextSource.java&r1=125902&p2=cocoon/trunk/src/core/java/org/apache/cocoon/components/source/impl/TraversableContextSource.java&r2=125912 ============================================================================== --- cocoon/trunk/src/java/org/apache/cocoon/components/source/impl/TraversableContextSource.java (original) +++ cocoon/trunk/src/core/java/org/apache/cocoon/components/source/impl/TraversableContextSource.java Fri Jan 21 02:06:44 2005 @@ -30,7 +30,7 @@ import org.apache.excalibur.source.TraversableSource; /** - * @version SVN $Id: ContextSourceFactory.java 30941 2004-07-29 19:56:58Z vgritsenko $ + * @version SVN $Id$ */ public class TraversableContextSource implements Source, TraversableSource { Copied: cocoon/trunk/src/core/java/org/apache/cocoon/environment/Context.java (from r125902, cocoon/trunk/src/java/org/apache/cocoon/environment/Context.java) Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/core/java/org/apache/cocoon/environment/Context.java?view=diff&rev=125912&p1=cocoon/trunk/src/java/org/apache/cocoon/environment/Context.java&r1=125902&p2=cocoon/trunk/src/core/java/org/apache/cocoon/environment/Context.java&r2=125912 ============================================================================== --- cocoon/trunk/src/java/org/apache/cocoon/environment/Context.java (original) +++ cocoon/trunk/src/core/java/org/apache/cocoon/environment/Context.java Fri Jan 21 02:06:44 2005 @@ -24,7 +24,7 @@ * Defines an interface to provide client context information . * * @author <a href="mailto:[EMAIL PROTECTED]">Davanum Srinivas</a> - * @version CVS $Id: Context.java,v 1.2 2004/03/05 13:02:54 bdelacretaz Exp $ + * @version CVS $Id$ * */ Deleted: /cocoon/trunk/src/java/org/apache/cocoon/Constants.java Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/Constants.java?view=auto&rev=125911 ============================================================================== Deleted: /cocoon/trunk/src/java/org/apache/cocoon/cocoon.properties Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/cocoon.properties?view=auto&rev=125911 ============================================================================== Deleted: /cocoon/trunk/src/java/org/apache/cocoon/components/source/impl/ContextSourceFactory.java Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/components/source/impl/ContextSourceFactory.java?view=auto&rev=125911 ============================================================================== Deleted: /cocoon/trunk/src/java/org/apache/cocoon/components/source/impl/TraversableContextSource.java Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/components/source/impl/TraversableContextSource.java?view=auto&rev=125911 ============================================================================== Deleted: /cocoon/trunk/src/java/org/apache/cocoon/environment/Context.java Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/environment/Context.java?view=auto&rev=125911 ============================================================================== Modified: cocoon/trunk/tools/targets/init-build.xml Url: http://svn.apache.org/viewcvs/cocoon/trunk/tools/targets/init-build.xml?view=diff&rev=125912&p1=cocoon/trunk/tools/targets/init-build.xml&r1=125911&p2=cocoon/trunk/tools/targets/init-build.xml&r2=125912 ============================================================================== --- cocoon/trunk/tools/targets/init-build.xml (original) +++ cocoon/trunk/tools/targets/init-build.xml Fri Jan 21 02:06:44 2005 @@ -27,7 +27,7 @@ <tstamp/> <!-- Get the (constant) cocoon properties --> - <property file="src/java/org/apache/cocoon/cocoon.properties"/> + <property file="src/core/java/org/apache/cocoon/cocoon.properties"/> <!-- Detecting the current jvm --> <condition property="target.vm" value="${ant.java.version}">
