cvs commit: cocoon-2.1/src/blocks/portal/samples/coplets/history path.xsp sitemap.xmap
crossley2003/12/19 17:18:04
Modified:src/blocks/portal/samples/coplets/history path.xsp
sitemap.xmap
Log:
Fix more dos2unix line-endings.
Revision ChangesPath
1.2 +46 -46
cocoon-2.1/src/blocks/portal/samples/coplets/history/path.xsp
Index: path.xsp
===
RCS file:
/home/cvs/cocoon-2.1/src/blocks/portal/samples/coplets/history/path.xsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- path.xsp 18 Dec 2003 13:16:14 - 1.1
+++ path.xsp 20 Dec 2003 01:18:04 - 1.2
@@ -1,46 +1,46 @@
-?xml version=1.0 encoding=ISO-8859-1?
-xsp:page language=java xmlns:xsp=http://apache.org/xsp;
-xsp:structure
-xsp:includeorg.apache.cocoon.portal.acting.helpers.*/xsp:include
-xsp:includejava.lang.String/xsp:include
-/xsp:structure
-links
-
- xsp:logic
-
- List listHistory = (List)
request.getSession().getAttribute( portal-history);
- String strData = untitled;
- for (int i = 1; i lt; listHistory.size()-1; i++)
- {
- List listItem = (List) listHistory.get( i);
- for( int j=0; j lt; listItem.size(); j++)
- {
- Mapping mapping = (Mapping)
listItem.get( j);
- if( mapping instanceof
org.apache.cocoon.portal.acting.helpers.CopletEventDescription)
- {
- CopletEventDescription desc =
(CopletEventDescription) listItem.get( j);
- if( desc.copletId.equals(
MyCoplet))
- {
- strData = (String)
desc.data;
- }
- }
- else if( mapping instanceof
org.apache.cocoon.portal.acting.helpers.LayoutEventDescription)
- {
- LayoutEventDescription desc =
(LayoutEventDescription) listItem.get( j);
- if( desc.layoutId.equals(
maintab) amp;amp; desc.path.equals(parameters/title))
- {
- strData = (String)
desc.data;
- }
- }
- }
- xsp:content
- link
- numberxsp:expri/xsp:expr/number
-
titlexsp:exprstrData/xsp:expr/title
- /link
- /xsp:content
- }
- /xsp:logic
-
-/links
-/xsp:page
+?xml version=1.0 encoding=ISO-8859-1?
+xsp:page language=java xmlns:xsp=http://apache.org/xsp;
+xsp:structure
+xsp:includeorg.apache.cocoon.portal.acting.helpers.*/xsp:include
+xsp:includejava.lang.String/xsp:include
+/xsp:structure
+links
+
+ xsp:logic
+
+ List listHistory = (List)
request.getSession().getAttribute( portal-history);
+ String strData = untitled;
+ for (int i = 1; i lt; listHistory.size()-1; i++)
+ {
+ List listItem = (List) listHistory.get( i);
+ for( int j=0; j lt; listItem.size(); j++)
+ {
+ Mapping mapping = (Mapping)
listItem.get( j);
+ if( mapping instanceof
org.apache.cocoon.portal.acting.helpers.CopletEventDescription)
+ {
+ CopletEventDescription desc =
(CopletEventDescription) listItem.get( j);
+ if( desc.copletId.equals(
MyCoplet))
+ {
+ strData = (String)
desc.data;
+ }
+ }
+ else if( mapping instanceof
org.apache.cocoon.portal.acting.helpers.LayoutEventDescription)
+ {
+ LayoutEventDescription desc =
(LayoutEventDescription) listItem.get( j);
+ if(
cvs commit: cocoon-2.1/tools/bin ant.bat
antonio 2003/12/19 19:11:57 Modified:tools/bin ant.bat Log: Fixing ant.bat Revision ChangesPath 1.3 +2 -1 cocoon-2.1/tools/bin/ant.bat Index: ant.bat === RCS file: /home/cvs//cocoon-2.1/tools/bin/ant.bat,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ant.bat 19 Dec 2003 14:01:33 - 1.2 +++ ant.bat 20 Dec 2003 03:11:57 - 1.3 @@ -4,6 +4,7 @@ REM reserved. if exist %HOME%\antrc_pre.bat call %HOME%\antrc_pre.bat +set ANT_VERSION=1.6.0 if %OS%==Windows_NT @setlocal @@ -29,7 +30,7 @@ :doneStart rem find ANT_HOME if it does not exist due to either an invalid value passed rem by the user or the %0 problem on Windows 9x -if exist %ANT_HOME%\lib\ant.jar goto checkJava +if exist %ANT_HOME%\lib\ant-%ANT_VERSION%.jar goto checkJava rem check for ant in Program Files if not exist %ProgramFiles%\ant goto checkSystemDrive
cvs commit: cocoon-2.1/src/blocks/scratchpad/samples/sitemap-viewer/transforms sitemap2descr.xsl sitemapdescr2html.xsl
crossley2003/12/19 19:41:46 Modified:src/blocks/scratchpad/samples/sitemap-viewer/transforms sitemap2descr.xsl sitemapdescr2html.xsl Log: The 'src' attribute was being handled twice. Revision ChangesPath 1.3 +3 -0 cocoon-2.1/src/blocks/scratchpad/samples/sitemap-viewer/transforms/sitemap2descr.xsl Index: sitemap2descr.xsl === RCS file: /home/cvs/cocoon-2.1/src/blocks/scratchpad/samples/sitemap-viewer/transforms/sitemap2descr.xsl,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sitemap2descr.xsl 12 Dec 2003 04:48:51 - 1.2 +++ sitemap2descr.xsl 20 Dec 2003 03:41:46 - 1.3 @@ -1,4 +1,7 @@ ?xml version=1.0 encoding=UTF-8? + +!-- OLD FILE, not used anymore. Will be deleted soon. -- + xsl:stylesheet version=1.0 xmlns:xsl=http://www.w3.org/1999/XSL/Transform; xmlns:fo=http://www.w3.org/1999/XSL/Format; xmlns:map=http://apache.org/cocoon/sitemap/1.0; xsl:output indent=yes/ 1.5 +2 -2 cocoon-2.1/src/blocks/scratchpad/samples/sitemap-viewer/transforms/sitemapdescr2html.xsl Index: sitemapdescr2html.xsl === RCS file: /home/cvs/cocoon-2.1/src/blocks/scratchpad/samples/sitemap-viewer/transforms/sitemapdescr2html.xsl,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sitemapdescr2html.xsl 18 Dec 2003 05:18:28 - 1.4 +++ sitemapdescr2html.xsl 20 Dec 2003 03:41:46 - 1.5 @@ -401,7 +401,7 @@ /xsl:choose xsl:choose xsl:when test=name()='serialize' or name()='act' or name()='call'xsl:value-of select=name()//xsl:when -xsl:when test=name()='transform'xlst/xsl:when +!--xsl:when test=name()='transform'xslt/xsl:when-- /xsl:choose /td/tr tr class=comments @@ -433,7 +433,7 @@ xsl:value-of select=@parameter/ /xsl:when xsl:when test=@* -xsl:for-each select=@*[name()!='pattern' and name()!='@src' and name()!='ref'] +xsl:for-each select=@*[name()!='pattern' and name()!='src' and name()!='ref'] xsl:value-of select=concat(name(),'=',.)/ xsl:if test=position()1br//xsl:if /xsl:for-each
cvs commit: cocoon-2.1/tools/bin antRun.bat ant.bat lcp.bat
antonio 2003/12/19 22:11:14 Modified:tools/bin antRun.bat ant.bat lcp.bat Log: Fixing UNIX line ending style. Revision ChangesPath 1.3 +31 -31cocoon-2.1/tools/bin/antRun.bat Index: antRun.bat === RCS file: /home/cvs//cocoon-2.1/tools/bin/antRun.bat,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- antRun.bat19 Dec 2003 14:01:33 - 1.2 +++ antRun.bat20 Dec 2003 06:11:14 - 1.3 @@ -1,31 +1,31 @@ [EMAIL PROTECTED] off - -REM Copyright (c) 2001-2002 The Apache Software Foundation. All rights -REM reserved. - -if %OS%==Windows_NT @setlocal - -if %1== goto runCommand - -rem Change drive and directory to %1 -if %OS%==Windows_NT cd /d %1 -if not %OS%==Windows_NT cd %1 -shift - -rem Slurp the command line arguments. This loop allows for an unlimited number -rem of agruments (up to the command line limit, anyway). -set ANT_RUN_CMD=%1 -if %1== goto runCommand -shift -:loop -if %1== goto runCommand -set ANT_RUN_CMD=%ANT_RUN_CMD% %1 -shift -goto loop - -:runCommand -rem echo %ANT_RUN_CMD% -%ANT_RUN_CMD% - -if %OS%==Windows_NT @endlocal - [EMAIL PROTECTED] off + +REM Copyright (c) 2001-2002 The Apache Software Foundation. All rights +REM reserved. + +if %OS%==Windows_NT @setlocal + +if %1== goto runCommand + +rem Change drive and directory to %1 +if %OS%==Windows_NT cd /d %1 +if not %OS%==Windows_NT cd %1 +shift + +rem Slurp the command line arguments. This loop allows for an unlimited number +rem of agruments (up to the command line limit, anyway). +set ANT_RUN_CMD=%1 +if %1== goto runCommand +shift +:loop +if %1== goto runCommand +set ANT_RUN_CMD=%ANT_RUN_CMD% %1 +shift +goto loop + +:runCommand +rem echo %ANT_RUN_CMD% +%ANT_RUN_CMD% + +if %OS%==Windows_NT @endlocal + 1.4 +96 -96cocoon-2.1/tools/bin/ant.bat Index: ant.bat === RCS file: /home/cvs//cocoon-2.1/tools/bin/ant.bat,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- ant.bat 20 Dec 2003 03:11:57 - 1.3 +++ ant.bat 20 Dec 2003 06:11:14 - 1.4 @@ -1,96 +1,96 @@ [EMAIL PROTECTED] off - -REM Copyright (c) 2001-2003 The Apache Software Foundation. All rights -REM reserved. - -if exist %HOME%\antrc_pre.bat call %HOME%\antrc_pre.bat -set ANT_VERSION=1.6.0 - -if %OS%==Windows_NT @setlocal - -rem %~dp0 is expanded pathname of the current script under NT -set DEFAULT_ANT_HOME=%~dp0.. - -if %ANT_HOME%== set ANT_HOME=%DEFAULT_ANT_HOME% -set DEFAULT_ANT_HOME= - -rem Slurp the command line arguments. This loop allows for an unlimited number -rem of arguments (up to the command line limit, anyway). -set ANT_CMD_LINE_ARGS=%1 -if %1== goto doneStart -shift -:setupArgs -if %1== goto doneStart -set ANT_CMD_LINE_ARGS=%ANT_CMD_LINE_ARGS% %1 -shift -goto setupArgs -rem This label provides a place for the argument list loop to break out -rem and for NT handling to skip to. - -:doneStart -rem find ANT_HOME if it does not exist due to either an invalid value passed -rem by the user or the %0 problem on Windows 9x -if exist %ANT_HOME%\lib\ant-%ANT_VERSION%.jar goto checkJava - -rem check for ant in Program Files -if not exist %ProgramFiles%\ant goto checkSystemDrive -set ANT_HOME=%ProgramFiles%\ant -goto checkJava - -:checkSystemDrive -rem check for ant in root directory of system drive -if not exist %SystemDrive%\ant\lib\ant.jar goto checkCDrive -set ANT_HOME=%SystemDrive%\ant -goto checkJava - -:checkCDrive -rem check for ant in C:\ant for Win9X users -if not exist C:\ant\lib\ant.jar goto noAntHome -set ANT_HOME=C:\ant -goto checkJava - -:noAntHome -echo ANT_HOME is set incorrectly or ant could not be located. Please set ANT_HOME. -goto end - -:checkJava -set _JAVACMD=%JAVACMD% - -if %JAVA_HOME% == goto noJavaHome -if not exist %JAVA_HOME%\bin\java.exe goto noJavaHome -if %_JAVACMD% == set _JAVACMD=%JAVA_HOME%\bin\java.exe -goto checkJikes - -:noJavaHome -if %_JAVACMD% == set _JAVACMD=java.exe - -:checkJikes -if not %JIKESPATH%== goto runAntWithJikes - -:runAnt -if not %CLASSPATH%== goto runAntWithClasspath -%_JAVACMD% %ANT_OPTS% -classpath %ANT_HOME%\lib\ant-launcher.jar -Dant.home=%ANT_HOME% org.apache.tools.ant.launch.Launcher %ANT_ARGS% %ANT_CMD_LINE_ARGS% -goto end - -:runAntWithClasspath -%_JAVACMD% %ANT_OPTS% -classpath %ANT_HOME%\lib\ant-launcher.jar -Dant.home=%ANT_HOME% org.apache.tools.ant.launch.Launcher %ANT_ARGS% -lib %CLASSPATH% %ANT_CMD_LINE_ARGS% -goto end - -:runAntWithJikes -if not %CLASSPATH%== goto runAntWithJikesAndClasspath
cvs commit: cocoon-2.1 status.xml
antonio 2003/12/19 22:38:51 Modified:.status.xml Log: Adding fixing credit to bug 25664 Revision ChangesPath 1.218 +4 -1 cocoon-2.1/status.xml Index: status.xml === RCS file: /home/cvs//cocoon-2.1/status.xml,v retrieving revision 1.217 retrieving revision 1.218 diff -u -r1.217 -r1.218 --- status.xml19 Dec 2003 14:01:34 - 1.217 +++ status.xml20 Dec 2003 06:38:51 - 1.218 @@ -190,6 +190,9 @@ changes release version=@version@ date=@date@ + action dev=AG type=fix fixes-bug=25664 due-to-email=[EMAIL PROTECTED] due-to=Karel Vervaeke + build fails on windows without cygwin + /action action dev=AG type=update Updated Ant to 1.6.0 /action
cvs commit: cocoon-2.1/tools/targets init-build.xml
antonio 2003/12/20 00:05:17
Modified:tools/targets init-build.xml
Log:
Defining target VM
Revision ChangesPath
1.3 +30 -28cocoon-2.1/tools/targets/init-build.xml
Index: init-build.xml
===
RCS file: /home/cvs//cocoon-2.1/tools/targets/init-build.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- init-build.xml19 Nov 2003 20:20:50 - 1.2
+++ init-build.xml20 Dec 2003 08:05:17 - 1.3
@@ -1,4 +1,4 @@
-!-- === Initialization Targets
--
+!-- === Initialization Targets ==
--
target name=init
@@ -50,7 +50,7 @@
condition property=unless.exclude.webapp.samples
istrue value=${exclude.webapp.samples}/
/condition
-
+
condition property=unless.exclude.deprecated
istrue value=${exclude.deprecated}/
/condition
@@ -66,7 +66,7 @@
condition property=exclude.validate.xdocs
isfalse value=${validate.xdocs}/
/condition
-
+
filter token=Namevalue=${fullname}/
filter token=namevalue=${fullname}/
filter token=yearvalue=${year}/
@@ -121,54 +121,59 @@
debug=off
optimize=on
deprecation=on
- target=1.3
+ target=${target.vm}
nowarn=on
compiler=${compiler}
classpathref=tasks.classpath/
!-- A task to patch xml files --
-taskdef name=xpatch classname=XConfToolTask
classpath=${tools.tasks.dest}/
+taskdef name=xpatch classname=XConfToolTask
+ classpath=${tools.tasks.dest}/
!-- Jing is used in various targets for XML validation with RELAX NG --
-taskdef name=jing
classname=com.thaiopensource.relaxng.util.JingTask
classpathref=tasks.classpath/
+taskdef name=jing classname=com.thaiopensource.relaxng.util.JingTask
+ classpathref=tasks.classpath/
-!-- compile the loader, used to change classpath especially for the CLI
and Jetty --
+!-- compile the loader, used to change classpath especially for
+ the CLI and Jetty --
mkdir dir=${tools.loader.dest}/
javac srcdir=${tools.loader.src}
destdir=${tools.loader.dest}
debug=off
optimize=on
deprecation=on
- target=1.3
+ target=${target.vm}
nowarn=on
compiler=${compiler}/
/target
-
-!-- === Preparation Targets
=== --
+
+!-- === Preparation Targets =
--
!-- Prepare the build directory --
target name=prepare depends=init-tasks
-
-
echo+---+/echo
-echo ${fullname} ${version} [${year}]/echo
-
echo+---+/echo
-echo Building with ${ant.version}/echo
-echo using build file ${ant.file}/echo
-echo Compiling with debug ${compiler.debug}, optimize
${compiler.optimize}, deprecation ${compiler.deprecation}/echo
-echo+| W A R N I N G
|--+/echo
-echo This build is targeted for use with JVM ${target.vm}/echo
-echo Using this build on a virtual machine other than the one/echo
-echo it is targeted for may result in runtime errors./echo
-
echo+---+/echo
-
+echo
++--+
+ ${fullname} ${version} [${year}]
++--+
+ Building with ${ant.version}
+ using build file ${ant.file}
+ Compiling with debug ${compiler.debug}, optimize ${compiler.optimize},
deprecation ${compiler.deprecation}
++-| W A R N I N G |+
+ This build is targeted for use with JVM ${target.vm}
+ Using this build on a virtual machine other than the one
+ it is targeted for may result in runtime errors.
++--+
+/echo
mkdir dir=${build}/
/target
-!-- === Clean Targets
= --
+!-- === Clean Targets ===
--
!-- Clean --
- target name=clean
depends=clean-cocoon,clean-webapp,clean-standalone-demo description=Cleans
the cocoon build, webapp and standalone-demo/
+ target name=clean
+ depends=clean-cocoon,clean-webapp,clean-standalone-demo
+ description=Cleans
cvs commit: cocoon-2.1/tools/src blocks-build.xsl
antonio 2003/12/20 02:02:39
Modified:tools/targets standalone-demo-build.xml docs-build.xml
compile-build.xml webapp-build.xml
instrumentation-build.xml admin-build.xml
tools/src blocks-build.xsl
Log:
Adding index=true in jar building + some beautify
Revision ChangesPath
1.2 +5 -4 cocoon-2.1/tools/targets/standalone-demo-build.xml
Index: standalone-demo-build.xml
===
RCS file: /home/cvs//cocoon-2.1/tools/targets/standalone-demo-build.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- standalone-demo-build.xml 18 Nov 2003 17:20:23 - 1.1
+++ standalone-demo-build.xml 20 Dec 2003 10:02:39 - 1.2
@@ -55,8 +55,9 @@
/echo
!-- all done --
-echo--- standalone-demo build ready!
-/echo
-echoSee ${readme.txt} for more info./echo
-
echo--/echo
+echo--- standalone-demo build ready!
-
+See ${readme.txt} for more info.
+--
+/echo
/target
1.3 +9 -7 cocoon-2.1/tools/targets/docs-build.xml
Index: docs-build.xml
===
RCS file: /home/cvs//cocoon-2.1/tools/targets/docs-build.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- docs-build.xml19 Nov 2003 20:20:50 - 1.2
+++ docs-build.xml20 Dec 2003 10:02:39 - 1.3
@@ -63,15 +63,18 @@
!-- If generated docs are already up-to-date, print a message saying so.
--
target name=docs_done depends=docs_check if=docs.notrequired
-echo
message=-/
-echo message=Not rebuilding docs, as they are up-to-date:/
-echo message= ${build.docs}/index.html is more recent than/
-echo message= status.xml, ${documentation}/xdocs/*.xml/
-echo
message=-/
+echo-
+Not rebuilding docs, as they are up-to-date:
+ ${build.docs}/index.html is more recent than
+ status.xml, ${documentation}/xdocs/*.xml
+-
+/echo
/target
!-- Create docs --
- target name=docs depends=validate-jars, prepare-docs, validate-xdocs,
docs_done, javadocs, forrest unless=docs.notrequired description=Builds the
documentation
+ target name=docs
+ depends=validate-jars, prepare-docs, validate-xdocs, docs_done,
javadocs, forrest
+ unless=docs.notrequired description=Builds the documentation
!-- The docs are created using forrest, so we simply copy them for now
--
mkdir dir=${build.docs}/
@@ -206,4 +209,3 @@
inheritRefs=false
target=javadocs/
/target
-
1.6 +16 -12cocoon-2.1/tools/targets/compile-build.xml
Index: compile-build.xml
===
RCS file: /home/cvs//cocoon-2.1/tools/targets/compile-build.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- compile-build.xml 26 Nov 2003 16:29:57 - 1.5
+++ compile-build.xml 20 Dec 2003 10:02:39 - 1.6
@@ -1,7 +1,8 @@
-!-- === Compilation Targets
=== --
+!-- === Compilation Targets =
--
!-- compiles everything --
- target name=compile depends=compile-core, compile-deprecated,
compile-tests/
+ target name=compile
+ depends=compile-core, compile-deprecated, compile-tests/
!-- compiles the core --
target name=compile-core depends=prepare
@@ -40,13 +41,14 @@
/target
!-- compiles deprecated code --
- target name=compile-deprecated depends=prepare
unless=unless.exclude.deprecated
+ target name=compile-deprecated depends=prepare
+ unless=unless.exclude.deprecated
mkdir dir=${build.deprecated}/
xpatch file=${build.dest}/org/apache/cocoon/cocoon.roles
srcdir=${deprecated.conf}
includes=**/*.xroles/
-
+
javac srcdir=${deprecated.src}
destdir=${build.deprecated}
debug=${compiler.debug}
@@ -59,7 +61,7 @@
target name=compile-tests depends=compile-core, compile-deprecated
mkdir dir=${build.test}/
-
+
!-- Copy test files to build test dir --
copy todir=${build.test} filtering=on
fileset dir=${test} excludes=**/*.java/
@@ -87,14
cvs commit: cocoon-2.1/src/java/org/apache/cocoon/components/source/impl PartSource.java
sylvain 2003/12/20 06:28:34
Modified:src/java/org/apache/cocoon/components/source/impl
PartSource.java
Log:
Expose the Part object (just like e.g. the FileSource exposes the File object)
Revision ChangesPath
1.4 +5 -1
cocoon-2.1/src/java/org/apache/cocoon/components/source/impl/PartSource.java
Index: PartSource.java
===
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/source/impl/PartSource.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- PartSource.java 9 Nov 2003 16:17:13 - 1.3
+++ PartSource.java 20 Dec 2003 14:28:34 - 1.4
@@ -202,4 +202,8 @@
{
return 0;
}
+
+public Part getPart() {
+return this.part;
+}
}
cvs commit: cocoon-2.1/src/java/org/apache/cocoon/acting CopySourceAction.java
sylvain 2003/12/20 06:29:19
Modified:src/java/org/apache/cocoon/acting CopySourceAction.java
Log:
Handle directories as the destination
Revision ChangesPath
1.2 +17 -1
cocoon-2.1/src/java/org/apache/cocoon/acting/CopySourceAction.java
Index: CopySourceAction.java
===
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/acting/CopySourceAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CopySourceAction.java 5 Nov 2003 17:18:00 - 1.1
+++ CopySourceAction.java 20 Dec 2003 14:29:19 - 1.2
@@ -58,10 +58,12 @@
import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.avalon.framework.thread.ThreadSafe;
+import org.apache.cocoon.components.source.impl.PartSource;
import org.apache.cocoon.environment.Redirector;
import org.apache.excalibur.source.ModifiableSource;
import org.apache.excalibur.source.Source;
import org.apache.excalibur.source.SourceResolver;
+import org.apache.excalibur.source.TraversableSource;
/**
* The CopySourceAction copies the content of it's src attribute to its
dest parameter.
@@ -98,6 +100,20 @@
// Check that dest is writeable
if (! (dest instanceof ModifiableSource)) {
throw new IllegalArgumentException(Non-writeable URI : +
dest.getURI());
+}
+
+if (dest instanceof TraversableSource) {
+TraversableSource trDest = (TraversableSource) dest;
+if (trDest.isCollection()) {
+if (src instanceof TraversableSource) {
+dest =
trDest.getChild(((TraversableSource)src).getName());
+} else if (src instanceof PartSource){
+// FIXME : quick hack to store upload://xxx sources
into directories
+// it would be better for the PartSource to be
Traversable, or to
+// create a new NamedSource interface
+dest =
trDest.getChild(((PartSource)src).getPart().getFileName());
+}
+}
}
ModifiableSource wdest = (ModifiableSource)dest;
cvs commit: cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/binding JXPathBindingBase.java
mpo 2003/12/20 06:54:03
Modified:src/blocks/woody/java/org/apache/cocoon/woody/binding
JXPathBindingBase.java
Log:
Fixing the clumsy removal of the automatic registration
of the DOMFactory for XML backends.
(introduced in 1.5 and wrongfully removed in 1.7)
Revision ChangesPath
1.7 +6 -1
cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/binding/JXPathBindingBase.java
Index: JXPathBindingBase.java
===
RCS file:
/home/cvs/cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/binding/JXPathBindingBase.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- JXPathBindingBase.java18 Dec 2003 07:57:21 - 1.6
+++ JXPathBindingBase.java20 Dec 2003 14:54:03 - 1.7
@@ -52,8 +52,10 @@
import org.apache.avalon.framework.logger.LogEnabled;
import org.apache.avalon.framework.logger.Logger;
+import org.apache.cocoon.util.jxpath.DOMFactory;
import org.apache.cocoon.woody.formmodel.Widget;
import org.apache.commons.jxpath.JXPathContext;
+import org.w3c.dom.Node;
/**
* Provides a base class for hooking up Binding implementations that use the
@@ -158,8 +160,11 @@
if (!(objModel instanceof JXPathContext)) {
jxpc = JXPathContext.newContext(objModel);
jxpc.setLenient(true);
+if (objModel instanceof Node) {
+jxpc.setFactory(new DOMFactory());
+}
} else {
-jxpc = (JXPathContext) objModel;
+jxpc = (JXPathContext) objModel;
}
return jxpc;
}
cvs commit: cocoon-2.2/src/test/org/apache/cocoon/acting AbstractActionTestCase.java
unico 2003/12/20 15:32:07
Modified:src/test/org/apache/cocoon/components/source
SourceResolverAdapter.java
src/test/org/apache/cocoon AbstractCompositeTestCase.java
src/test/org/apache/cocoon/acting
AbstractActionTestCase.java
Log:
migration to fortress
Revision ChangesPath
1.10 +2 -3
cocoon-2.2/src/test/org/apache/cocoon/components/source/SourceResolverAdapter.java
Index: SourceResolverAdapter.java
===
RCS file:
/home/cvs/cocoon-2.2/src/test/org/apache/cocoon/components/source/SourceResolverAdapter.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- SourceResolverAdapter.java15 Oct 2003 20:54:43 - 1.9
+++ SourceResolverAdapter.java20 Dec 2003 23:32:06 - 1.10
@@ -55,7 +55,6 @@
import java.net.MalformedURLException;
import java.util.Map;
-import org.apache.avalon.framework.component.ComponentManager;
import org.apache.cocoon.environment.SourceResolver;
import org.apache.excalibur.source.Source;
import org.apache.excalibur.source.SourceException;
@@ -69,7 +68,7 @@
{
private org.apache.excalibur.source.SourceResolver resolver;
-public SourceResolverAdapter(org.apache.excalibur.source.SourceResolver
resolver, ComponentManager manager) {
+public SourceResolverAdapter(org.apache.excalibur.source.SourceResolver
resolver) {
this.resolver = resolver;
}
1.11 +56 -93
cocoon-2.2/src/test/org/apache/cocoon/AbstractCompositeTestCase.java
Index: AbstractCompositeTestCase.java
===
RCS file:
/home/cvs/cocoon-2.2/src/test/org/apache/cocoon/AbstractCompositeTestCase.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- AbstractCompositeTestCase.java8 Dec 2003 10:23:46 - 1.10
+++ AbstractCompositeTestCase.java20 Dec 2003 23:32:06 - 1.11
@@ -52,8 +52,8 @@
package org.apache.cocoon;
import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
import java.io.IOException;
+import java.io.InputStream;
import java.util.HashMap;
import java.util.Map;
@@ -62,11 +62,9 @@
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamResult;
-import org.apache.avalon.excalibur.testcase.ExcaliburTestCase;
-import org.apache.avalon.framework.component.Component;
-import org.apache.avalon.framework.component.ComponentException;
-import org.apache.avalon.framework.component.ComponentSelector;
+import org.apache.avalon.fortress.testcase.FortressTestCase;
import org.apache.avalon.framework.parameters.Parameters;
+import org.apache.avalon.framework.service.ServiceException;
import org.apache.cocoon.acting.Action;
import org.apache.cocoon.components.source.SourceResolverAdapter;
import org.apache.cocoon.environment.ObjectModelHelper;
@@ -75,8 +73,8 @@
import org.apache.cocoon.environment.mock.MockRequest;
import org.apache.cocoon.environment.mock.MockResponse;
import org.apache.cocoon.generation.Generator;
-import org.apache.cocoon.transformation.Transformer;
import org.apache.cocoon.serialization.Serializer;
+import org.apache.cocoon.transformation.Transformer;
import org.apache.cocoon.xml.WhitespaceFilter;
import org.apache.cocoon.xml.dom.DOMBuilder;
import org.apache.cocoon.xml.dom.DOMStreamer;
@@ -95,7 +93,7 @@
* @author a href=mailto:[EMAIL PROTECTED]Mark Leicester/a
* @version CVS $Id$
*/
-public abstract class AbstractCompositeTestCase extends ExcaliburTestCase
+public abstract class AbstractCompositeTestCase extends FortressTestCase
{
public final static Parameters EMPTY_PARAMS =
Parameters.EMPTY_PARAMETERS;
@@ -104,7 +102,7 @@
private MockContext context = new MockContext();
private MockRedirector redirector = new MockRedirector();
private HashMap objectmodel = new HashMap();
-
+
/**
* Create a new composite test case.
*
@@ -158,27 +156,23 @@
*/
public final Map act(String type, String source, Parameters parameters) {
-ComponentSelector selector = null;
Action action = null;
SourceResolver resolver = null;
Map result = null;
try {
-selector = (ComponentSelector) this.manager.lookup(Action.ROLE +
-Selector);
-assertNotNull(Test lookup of action selector, selector);
-
-resolver = (SourceResolver)
this.manager.lookup(SourceResolver.ROLE);
+
+resolver = (SourceResolver) lookup(SourceResolver.ROLE);
assertNotNull(Test lookup of source resolver, resolver);
