Author: sylvain
Date: Fri Apr 8 10:33:05 2005
New Revision: 160568
URL: http://svn.apache.org/viewcvs?view=rev&rev=160568
Log:
merging ECM++ into the main src/java directory
Added:
cocoon/trunk/src/java/org/apache/cocoon/Constants.java
- copied unchanged from r160562,
cocoon/trunk/src/core/java/org/apache/cocoon/Constants.java
cocoon/trunk/src/java/org/apache/cocoon/cocoon.properties
- copied unchanged from r160562,
cocoon/trunk/src/core/java/org/apache/cocoon/cocoon.properties
cocoon/trunk/src/java/org/apache/cocoon/components/ComponentInfo.java
- copied unchanged from r160562,
cocoon/trunk/src/core/java/org/apache/cocoon/components/ComponentInfo.java
cocoon/trunk/src/java/org/apache/cocoon/components/ContextHelper.java
- copied unchanged from r160562,
cocoon/trunk/src/core/java/org/apache/cocoon/components/ContextHelper.java
cocoon/trunk/src/java/org/apache/cocoon/components/LifecycleHelper.java
- copied unchanged from r160562,
cocoon/trunk/src/core/java/org/apache/cocoon/components/LifecycleHelper.java
cocoon/trunk/src/java/org/apache/cocoon/components/source/impl/ContextSourceFactory.java
- copied unchanged from r160562,
cocoon/trunk/src/core/java/org/apache/cocoon/components/source/impl/ContextSourceFactory.java
cocoon/trunk/src/java/org/apache/cocoon/components/source/impl/TraversableContextSource.java
- copied unchanged from r160562,
cocoon/trunk/src/core/java/org/apache/cocoon/components/source/impl/TraversableContextSource.java
cocoon/trunk/src/java/org/apache/cocoon/configuration/
cocoon/trunk/src/java/org/apache/cocoon/configuration/ConfigurationBuilder.java
- copied unchanged from r160562,
cocoon/trunk/src/core/java/org/apache/cocoon/configuration/ConfigurationBuilder.java
cocoon/trunk/src/java/org/apache/cocoon/configuration/Settings.java
- copied unchanged from r160562,
cocoon/trunk/src/core/java/org/apache/cocoon/configuration/Settings.java
cocoon/trunk/src/java/org/apache/cocoon/core/
cocoon/trunk/src/java/org/apache/cocoon/core/Core.java
- copied unchanged from r160562,
cocoon/trunk/src/core/java/org/apache/cocoon/core/Core.java
cocoon/trunk/src/java/org/apache/cocoon/core/CoreUtil.java
- copied unchanged from r160562,
cocoon/trunk/src/core/java/org/apache/cocoon/core/CoreUtil.java
cocoon/trunk/src/java/org/apache/cocoon/core/container/
cocoon/trunk/src/java/org/apache/cocoon/core/container/AbstractServiceManager.java
- copied unchanged from r160562,
cocoon/trunk/src/core/java/org/apache/cocoon/core/container/AbstractServiceManager.java
cocoon/trunk/src/java/org/apache/cocoon/core/container/ComponentEnvironment.java
- copied unchanged from r160562,
cocoon/trunk/src/core/java/org/apache/cocoon/core/container/ComponentEnvironment.java
cocoon/trunk/src/java/org/apache/cocoon/core/container/ComponentFactory.java
- copied unchanged from r160562,
cocoon/trunk/src/core/java/org/apache/cocoon/core/container/ComponentFactory.java
cocoon/trunk/src/java/org/apache/cocoon/core/container/CoreServiceManager.java
- copied unchanged from r160562,
cocoon/trunk/src/core/java/org/apache/cocoon/core/container/CoreServiceManager.java
cocoon/trunk/src/java/org/apache/cocoon/core/container/DefaultServiceSelector.java
- copied unchanged from r160562,
cocoon/trunk/src/core/java/org/apache/cocoon/core/container/DefaultServiceSelector.java
cocoon/trunk/src/java/org/apache/cocoon/core/container/RoleManager.java
- copied unchanged from r160562,
cocoon/trunk/src/core/java/org/apache/cocoon/core/container/RoleManager.java
cocoon/trunk/src/java/org/apache/cocoon/core/container/StandaloneServiceSelector.java
- copied unchanged from r160562,
cocoon/trunk/src/core/java/org/apache/cocoon/core/container/StandaloneServiceSelector.java
cocoon/trunk/src/java/org/apache/cocoon/core/container/handler/
cocoon/trunk/src/java/org/apache/cocoon/core/container/handler/AbstractComponentHandler.java
- copied unchanged from r160562,
cocoon/trunk/src/core/java/org/apache/cocoon/core/container/handler/AbstractComponentHandler.java
cocoon/trunk/src/java/org/apache/cocoon/core/container/handler/AbstractFactoryHandler.java
- copied unchanged from r160562,
cocoon/trunk/src/core/java/org/apache/cocoon/core/container/handler/AbstractFactoryHandler.java
cocoon/trunk/src/java/org/apache/cocoon/core/container/handler/AliasComponentHandler.java
- copied unchanged from r160562,
cocoon/trunk/src/core/java/org/apache/cocoon/core/container/handler/AliasComponentHandler.java
cocoon/trunk/src/java/org/apache/cocoon/core/container/handler/ComponentHandler.java
- copied unchanged from r160562,
cocoon/trunk/src/core/java/org/apache/cocoon/core/container/handler/ComponentHandler.java
cocoon/trunk/src/java/org/apache/cocoon/core/container/handler/InstanceComponentHandler.java
- copied unchanged from r160562,
cocoon/trunk/src/core/java/org/apache/cocoon/core/container/handler/InstanceComponentHandler.java
cocoon/trunk/src/java/org/apache/cocoon/core/container/handler/LazyHandler.java
- copied unchanged from r160562,
cocoon/trunk/src/core/java/org/apache/cocoon/core/container/handler/LazyHandler.java
cocoon/trunk/src/java/org/apache/cocoon/core/container/handler/NonThreadSafePoolableComponentHandler.java
- copied unchanged from r160562,
cocoon/trunk/src/core/java/org/apache/cocoon/core/container/handler/NonThreadSafePoolableComponentHandler.java
cocoon/trunk/src/java/org/apache/cocoon/core/container/handler/PoolableComponentHandler.java
- copied unchanged from r160562,
cocoon/trunk/src/core/java/org/apache/cocoon/core/container/handler/PoolableComponentHandler.java
cocoon/trunk/src/java/org/apache/cocoon/core/container/handler/SingleThreadedComponentHandler.java
- copied unchanged from r160562,
cocoon/trunk/src/core/java/org/apache/cocoon/core/container/handler/SingleThreadedComponentHandler.java
cocoon/trunk/src/java/org/apache/cocoon/core/container/handler/ThreadSafeComponentHandler.java
- copied unchanged from r160562,
cocoon/trunk/src/core/java/org/apache/cocoon/core/container/handler/ThreadSafeComponentHandler.java
cocoon/trunk/src/java/org/apache/cocoon/core/container/util/
cocoon/trunk/src/java/org/apache/cocoon/core/container/util/PropertyHelper.java
- copied unchanged from r160562,
cocoon/trunk/src/core/java/org/apache/cocoon/core/container/util/PropertyHelper.java
cocoon/trunk/src/java/org/apache/cocoon/core/source/
cocoon/trunk/src/java/org/apache/cocoon/core/source/SimpleSourceResolver.java
- copied unchanged from r160562,
cocoon/trunk/src/core/java/org/apache/cocoon/core/source/SimpleSourceResolver.java
cocoon/trunk/src/java/org/apache/cocoon/environment/Context.java
- copied unchanged from r160562,
cocoon/trunk/src/core/java/org/apache/cocoon/environment/Context.java
cocoon/trunk/src/java/org/apache/cocoon/environment/Cookie.java
- copied unchanged from r160562,
cocoon/trunk/src/core/java/org/apache/cocoon/environment/Cookie.java
cocoon/trunk/src/java/org/apache/cocoon/environment/ObjectModelHelper.java
- copied unchanged from r160562,
cocoon/trunk/src/core/java/org/apache/cocoon/environment/ObjectModelHelper.java
cocoon/trunk/src/java/org/apache/cocoon/environment/Request.java
- copied unchanged from r160562,
cocoon/trunk/src/core/java/org/apache/cocoon/environment/Request.java
cocoon/trunk/src/java/org/apache/cocoon/environment/Response.java
- copied unchanged from r160562,
cocoon/trunk/src/core/java/org/apache/cocoon/environment/Response.java
cocoon/trunk/src/java/org/apache/cocoon/environment/Session.java
- copied unchanged from r160562,
cocoon/trunk/src/core/java/org/apache/cocoon/environment/Session.java
cocoon/trunk/src/java/org/apache/cocoon/matching/helpers/WildcardHelper.java
- copied unchanged from r160562,
cocoon/trunk/src/core/java/org/apache/cocoon/matching/helpers/WildcardHelper.java
cocoon/trunk/src/java/org/apache/cocoon/util/ClassUtils.java
- copied unchanged from r160562,
cocoon/trunk/src/core/java/org/apache/cocoon/util/ClassUtils.java
cocoon/trunk/src/java/org/apache/cocoon/util/log/DeprecationLogger.java
- copied unchanged from r160562,
cocoon/trunk/src/core/java/org/apache/cocoon/util/log/DeprecationLogger.java
cocoon/trunk/src/java/org/apache/cocoon/util/log/Log4JConfigurator.java
- copied unchanged from r160562,
cocoon/trunk/src/core/java/org/apache/cocoon/util/log/Log4JConfigurator.java
cocoon/trunk/src/java/org/apache/cocoon/util/log/LoggingHelper.java
- copied unchanged from r160562,
cocoon/trunk/src/core/java/org/apache/cocoon/util/log/LoggingHelper.java
cocoon/trunk/src/test/org/apache/cocoon/core/
cocoon/trunk/src/test/org/apache/cocoon/core/container/
cocoon/trunk/src/test/org/apache/cocoon/core/container/ContainerTestCase.java
- copied unchanged from r160562,
cocoon/trunk/src/core/test/org/apache/cocoon/core/container/ContainerTestCase.java
cocoon/trunk/src/test/org/apache/cocoon/core/container/RoleManagerTestCase.java
- copied unchanged from r160562,
cocoon/trunk/src/core/test/org/apache/cocoon/core/container/RoleManagerTestCase.java
cocoon/trunk/src/test/org/apache/cocoon/core/container/util/
cocoon/trunk/src/test/org/apache/cocoon/core/container/util/PropertyHelperTestCase.java
- copied unchanged from r160562,
cocoon/trunk/src/core/test/org/apache/cocoon/core/container/util/PropertyHelperTestCase.java
Removed:
cocoon/trunk/src/core/
Modified:
cocoon/trunk/build.properties
cocoon/trunk/tools/targets/compile-build.xml
cocoon/trunk/tools/targets/ide-build.xml
cocoon/trunk/tools/targets/init-build.xml
Modified: cocoon/trunk/build.properties
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/build.properties?view=diff&r1=160567&r2=160568
==============================================================================
--- cocoon/trunk/build.properties (original)
+++ cocoon/trunk/build.properties Fri Apr 8 10:33:05 2005
@@ -145,8 +145,6 @@
# Directory Layout
src=src
-src.core=${src}/core/java
-src.core.test=${src}/core/test
java=${src}/java
mocks=${src}/mocks
test=${src}/test
Modified: cocoon/trunk/tools/targets/compile-build.xml
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/tools/targets/compile-build.xml?view=diff&r1=160567&r2=160568
==============================================================================
--- cocoon/trunk/tools/targets/compile-build.xml (original)
+++ cocoon/trunk/tools/targets/compile-build.xml Fri Apr 8 10:33:05 2005
@@ -48,22 +48,8 @@
<exclude name="**/*.java"/>
</fileset>
</copy>
- <copy todir="${build.dest}">
- <fileset dir="${src.core}">
- <exclude name="**/*.java"/>
- </fileset>
- </copy>
<echo message="Compiling Cocoon Core"/>
- <javac srcdir="${src.core}"
- destdir="${build.dest}"
- debug="${compiler.debug}"
- optimize="${compiler.optimize}"
- deprecation="${compiler.deprecation}"
- target="${target.vm}"
- source="${source.vm}"
- nowarn="${compiler.nowarn}"
- classpathref="classpath"/>
<javac srcdir="${java}"
destdir="${build.dest}"
@@ -126,7 +112,6 @@
source="${source.vm}"
compiler="${compiler}"
classpathref="test.classpath">
- <src path="${src.core.test}"/>
<src path="${test}"/>
</javac>
</target>
Modified: cocoon/trunk/tools/targets/ide-build.xml
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/tools/targets/ide-build.xml?view=diff&r1=160567&r2=160568
==============================================================================
--- cocoon/trunk/tools/targets/ide-build.xml (original)
+++ cocoon/trunk/tools/targets/ide-build.xml Fri Apr 8 10:33:05 2005
@@ -60,14 +60,12 @@
<!-- prepare the various paths that will form the project -->
<path id="srcs">
<!-- main source dir -->
- <pathelement path="${src.core}"/>
<pathelement path="${java}"/>
<!-- samples source dir -->
<pathelement path="${src}/samples"/>
<!-- deprecated source dir -->
<pathelement path="${src}/deprecated/java"/>
<!-- test source dir -->
- <pathelement path="${src.core.test}"/>
<pathelement path="${src}/test"/>
<!-- blocks source dirs -->
<dirset dir="${blocks}">
Modified: cocoon/trunk/tools/targets/init-build.xml
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/tools/targets/init-build.xml?view=diff&r1=160567&r2=160568
==============================================================================
--- cocoon/trunk/tools/targets/init-build.xml (original)
+++ cocoon/trunk/tools/targets/init-build.xml Fri Apr 8 10:33:05 2005
@@ -27,7 +27,7 @@
<tstamp/>
<!-- Get the (constant) cocoon properties -->
- <property file="src/core/java/org/apache/cocoon/cocoon.properties"/>
+ <property file="src/java/org/apache/cocoon/cocoon.properties"/>
<!-- Detecting the current jvm -->
<condition property="target.vm" value="${ant.java.version}">
