You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by cr...@apache.org on 2006/03/23 06:17:19 UTC
svn commit: r388041 [3/10] - in /cocoon/trunk: ./
cocoon-ajax/cocoon-ajax-impl/src/main/java/org/apache/cocoon/ajax/resources/macros/
cocoon-ajax/cocoon-ajax-impl/src/main/java/org/apache/cocoon/ajax/resources/xslt/
cocoon-ajax/cocoon-ajax-sample/src/m...
Modified: cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/test/mocks/validBlock-06/blockRoot/META-INF/block.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/test/mocks/validBlock-06/blockRoot/META-INF/block.xml?rev=388041&r1=388040&r2=388041&view=diff
==============================================================================
--- cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/test/mocks/validBlock-06/blockRoot/META-INF/block.xml (original)
+++ cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/test/mocks/validBlock-06/blockRoot/META-INF/block.xml Wed Mar 22 21:16:59 2006
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright 2006 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<block xmlns="http://apache.org/cocoon/blocks/cob/1.0"
- id="anyblock:anyblock-06:1.0">
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 2006 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<block xmlns="http://apache.org/cocoon/blocks/cob/1.0"
+ id="anyblock:anyblock-06:1.0">
+
<implements>
<interface id="interface-02"/>
- </implements>
-
+ </implements>
+
<requirements>
<requires interface="interface-03" name="b01" default="anyblock:anyblock-07:1.0"/>
- </requirements>
-
+ </requirements>
+
</block>
Propchange: cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/test/mocks/validBlock-06/blockRoot/META-INF/block.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/test/mocks/validBlock-07/blockRoot/META-INF/block.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/test/mocks/validBlock-07/blockRoot/META-INF/block.xml?rev=388041&r1=388040&r2=388041&view=diff
==============================================================================
--- cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/test/mocks/validBlock-07/blockRoot/META-INF/block.xml (original)
+++ cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/test/mocks/validBlock-07/blockRoot/META-INF/block.xml Wed Mar 22 21:16:59 2006
@@ -1,24 +1,24 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright 2006 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<block xmlns="http://apache.org/cocoon/blocks/cob/1.0"
- id="anyblock:anyblock-07:1.0">
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 2006 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<block xmlns="http://apache.org/cocoon/blocks/cob/1.0"
+ id="anyblock:anyblock-07:1.0">
+
<implements>
<interface id="interface-03"/>
- </implements>
-
+ </implements>
+
</block>
Propchange: cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/test/mocks/validBlock-07/blockRoot/META-INF/block.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/test/mocks/validDeploy-02/deploy.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/test/mocks/validDeploy-02/deploy.xml?rev=388041&r1=388040&r2=388041&view=diff
==============================================================================
--- cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/test/mocks/validDeploy-02/deploy.xml (original)
+++ cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/test/mocks/validDeploy-02/deploy.xml Wed Mar 22 21:16:59 2006
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright 2005 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<deploy xmlns="http://apache.org/cocoon/blocks/deploy/1.0">
-
- <cocoon target-url="./validDeploy-02/myServer"
- urn="org.apache.cocoon:cocoon-minimal-webapp:1.0-SNAPSHOT:war" exclusive="true"/>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 2005 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<deploy xmlns="http://apache.org/cocoon/blocks/deploy/1.0">
+
+ <cocoon target-url="./validDeploy-02/myServer"
+ urn="org.apache.cocoon:cocoon-minimal-webapp:1.0-SNAPSHOT:war" exclusive="true"/>
+
<block id="block02" urn="validBlock-02:validBlock-02:1.0">
<properties>
<property name="prop2" value="new-value"/>
</properties>
- </block>
-
+ </block>
+
</deploy>
Propchange: cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/test/mocks/validDeploy-02/deploy.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/test/mocks/validDeploy-03/deploy.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/test/mocks/validDeploy-03/deploy.xml?rev=388041&r1=388040&r2=388041&view=diff
==============================================================================
--- cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/test/mocks/validDeploy-03/deploy.xml (original)
+++ cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/test/mocks/validDeploy-03/deploy.xml Wed Mar 22 21:16:59 2006
@@ -1,35 +1,35 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright 2005 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<deploy xmlns="http://apache.org/cocoon/blocks/deploy/1.0">
-
- <cocoon target-url="./validDeploy-02/myServer"
- urn="org.apache.cocoon:cocoon-minimal-webapp:1.0-SNAPSHOT:war" exclusive="true"/>
-
- <block id="block02" urn="validBlock-02:validBlock-02:1.0">
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 2005 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<deploy xmlns="http://apache.org/cocoon/blocks/deploy/1.0">
+
+ <cocoon target-url="./validDeploy-02/myServer"
+ urn="org.apache.cocoon:cocoon-minimal-webapp:1.0-SNAPSHOT:war" exclusive="true"/>
+
+ <block id="block02" urn="validBlock-02:validBlock-02:1.0">
<connections>
<connection name="db" block="db"/>
</connections>
<properties>
<property name="prop1" value="new-value"/>
</properties>
- </block>
-
- <block id="db" urn="validBlock-03:validBlock-03:1.0"/>
-
- <block id="db1" urn="validBlock-03:validBlock-03:1.0"/>
-
+ </block>
+
+ <block id="db" urn="validBlock-03:validBlock-03:1.0"/>
+
+ <block id="db1" urn="validBlock-03:validBlock-03:1.0"/>
+
</deploy>
Propchange: cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/test/mocks/validDeploy-03/deploy.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/test/mocks/validDeploy-04/deploy.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/test/mocks/validDeploy-04/deploy.xml?rev=388041&r1=388040&r2=388041&view=diff
==============================================================================
--- cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/test/mocks/validDeploy-04/deploy.xml (original)
+++ cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/test/mocks/validDeploy-04/deploy.xml Wed Mar 22 21:16:59 2006
@@ -1,36 +1,36 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright 2006 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<deploy xmlns="http://apache.org/cocoon/blocks/deploy/1.0">
-
- <cocoon target-url="target/test/validDeploy-02/myServer"
- webapp-urn="org.apache.cocoon:cocoon-minimal-webapp:2.0-SNAPSHOT:war" exclusive="true"/>
-
- <block id="b03" urn="validBlock-03:validBlock-03:1.0">
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 2006 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<deploy xmlns="http://apache.org/cocoon/blocks/deploy/1.0">
+
+ <cocoon target-url="target/test/validDeploy-02/myServer"
+ webapp-urn="org.apache.cocoon:cocoon-minimal-webapp:2.0-SNAPSHOT:war" exclusive="true"/>
+
+ <block id="b03" urn="validBlock-03:validBlock-03:1.0">
<connections>
<connection name="db" block="db"/>
</connections>
<properties>
<property name="prop1" value="new-value"/>
</properties>
- </block>
-
- <block id="db" urn="validBlock-04:validBlock-04:1.0"/>
-
- <block id="db1" urn="validBlock-04:validBlock-04:1.0"
- location="src/test/mocks/validBlock-04/blockRoot"/>
-
+ </block>
+
+ <block id="db" urn="validBlock-04:validBlock-04:1.0"/>
+
+ <block id="db1" urn="validBlock-04:validBlock-04:1.0"
+ location="src/test/mocks/validBlock-04/blockRoot"/>
+
</deploy>
Propchange: cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/test/mocks/validDeploy-04/deploy.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/test/mocks/validMonolithicBlock-02/blockRoot/COB-INF/block-sitemap.xmap
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/test/mocks/validMonolithicBlock-02/blockRoot/COB-INF/block-sitemap.xmap?rev=388041&r1=388040&r2=388041&view=diff
==============================================================================
--- cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/test/mocks/validMonolithicBlock-02/blockRoot/COB-INF/block-sitemap.xmap (original)
+++ cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/test/mocks/validMonolithicBlock-02/blockRoot/COB-INF/block-sitemap.xmap Wed Mar 22 21:16:59 2006
@@ -1,26 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright 2005 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
- <map:pipelines>
- <map:pipeline>
- <map:match pattern="test">
- <map:generate src="test.xml"/>
- <map:serialize/>
- </map:match>
- </map:pipeline>
- </map:pipelines>
-</map:sitemap>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 2005 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
+ <map:pipelines>
+ <map:pipeline>
+ <map:match pattern="test">
+ <map:generate src="test.xml"/>
+ <map:serialize/>
+ </map:match>
+ </map:pipeline>
+ </map:pipelines>
+</map:sitemap>
Propchange: cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/test/mocks/validMonolithicBlock-02/blockRoot/COB-INF/block-sitemap.xmap
------------------------------------------------------------------------------
svn:eol-style = native
Modified: cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/test/mocks/validMonolithicBlock-02/blockRoot/COB-INF/test.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/test/mocks/validMonolithicBlock-02/blockRoot/COB-INF/test.xml?rev=388041&r1=388040&r2=388041&view=diff
==============================================================================
--- cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/test/mocks/validMonolithicBlock-02/blockRoot/COB-INF/test.xml (original)
+++ cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/test/mocks/validMonolithicBlock-02/blockRoot/COB-INF/test.xml Wed Mar 22 21:16:59 2006
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright 2005 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 2005 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
<test/>
Propchange: cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/test/mocks/validMonolithicBlock-02/blockRoot/COB-INF/test.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/test/mocks/validMonolithicBlock-02/blockRoot/META-INF/legacy/sitemap-additions/sa.xmap
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/test/mocks/validMonolithicBlock-02/blockRoot/META-INF/legacy/sitemap-additions/sa.xmap?rev=388041&r1=388040&r2=388041&view=diff
==============================================================================
--- cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/test/mocks/validMonolithicBlock-02/blockRoot/META-INF/legacy/sitemap-additions/sa.xmap (original)
+++ cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/test/mocks/validMonolithicBlock-02/blockRoot/META-INF/legacy/sitemap-additions/sa.xmap Wed Mar 22 21:16:59 2006
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright 2006 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 2006 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
<xconf/>
Propchange: cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/test/mocks/validMonolithicBlock-02/blockRoot/META-INF/legacy/sitemap-additions/sa.xmap
------------------------------------------------------------------------------
svn:eol-style = native
Modified: cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/test/mocks/validMonolithicBlock-02/blockRoot/META-INF/legacy/xconf/my-webdav-server.xconf
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/test/mocks/validMonolithicBlock-02/blockRoot/META-INF/legacy/xconf/my-webdav-server.xconf?rev=388041&r1=388040&r2=388041&view=diff
==============================================================================
--- cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/test/mocks/validMonolithicBlock-02/blockRoot/META-INF/legacy/xconf/my-webdav-server.xconf (original)
+++ cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/test/mocks/validMonolithicBlock-02/blockRoot/META-INF/legacy/xconf/my-webdav-server.xconf Wed Mar 22 21:16:59 2006
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright 2006 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 2006 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
<xconf/>
Propchange: cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/test/mocks/validMonolithicBlock-02/blockRoot/META-INF/legacy/xconf/my-webdav-server.xconf
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/trunk/cocoon-block-deployer/cocoon-deployer-plugin-demo/src/main/resources/META-INF/legacy/xconf/test.xconf
------------------------------------------------------------------------------
svn:eol-style = native
Modified: cocoon/trunk/cocoon-block-deployer/cocoon-deployer-webapp-sample/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-block-deployer/cocoon-deployer-webapp-sample/pom.xml?rev=388041&r1=388040&r2=388041&view=diff
==============================================================================
--- cocoon/trunk/cocoon-block-deployer/cocoon-deployer-webapp-sample/pom.xml (original)
+++ cocoon/trunk/cocoon-block-deployer/cocoon-deployer-webapp-sample/pom.xml Wed Mar 22 21:16:59 2006
@@ -1,77 +1,77 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright 2006 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.cocoon</groupId>
- <artifactId>cocoon-deployer</artifactId>
- <version>1.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>cocoon-deployer-webapp-sample</artifactId>
- <version>1.0-SNAPSHOT</version>
- <packaging>war</packaging>
-
- <name>Demo Cocoon web application</name>
- <url>http://cocoon.apache.org</url>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 2006 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.cocoon</groupId>
+ <artifactId>cocoon-deployer</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>cocoon-deployer-webapp-sample</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <packaging>war</packaging>
+
+ <name>Demo Cocoon web application</name>
+ <url>http://cocoon.apache.org</url>
+
<build>
- <finalName>demo</finalName>
- <plugins>
- <plugin>
- <groupId>org.apache.cocoon</groupId>
- <artifactId>cocoon-deployer-plugin</artifactId>
- <version>1.0-SNAPSHOT</version>
- </plugin>
- <plugin>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>maven-jetty6-plugin</artifactId>
- <version>6.0.0beta10</version>
- <configuration>
- <connectors>
- <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
- <port>8888</port>
- <maxIdleTime>30000</maxIdleTime>
- </connector>
- </connectors>
- <webAppSourceDirectory>target/demo</webAppSourceDirectory>
- <contextPath>/</contextPath>
- <systemProperties>
- <systemProperty>
- <name>org.apache.commons.logging.Log</name>
- <value>org.apache.commons.logging.impl.SimpleLog</value>
- </systemProperty>
- </systemProperties>
- </configuration>
- </plugin>
+ <finalName>demo</finalName>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.cocoon</groupId>
+ <artifactId>cocoon-deployer-plugin</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </plugin>
+ <plugin>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>maven-jetty6-plugin</artifactId>
+ <version>6.0.0beta10</version>
+ <configuration>
+ <connectors>
+ <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
+ <port>8888</port>
+ <maxIdleTime>30000</maxIdleTime>
+ </connector>
+ </connectors>
+ <webAppSourceDirectory>target/demo</webAppSourceDirectory>
+ <contextPath>/</contextPath>
+ <systemProperties>
+ <systemProperty>
+ <name>org.apache.commons.logging.Log</name>
+ <value>org.apache.commons.logging.impl.SimpleLog</value>
+ </systemProperty>
+ </systemProperties>
+ </configuration>
+ </plugin>
</plugins>
- </build>
-
- <dependencies>
- <!-- this is just a runtime dependency for the Jetty6 plugin - I (rpoetz) don't understand
- why the plugin requires it as it is added to WEB-INF/lib by the deployer ... -->
- <dependency>
- <groupId>org.apache.cocoon</groupId>
- <artifactId>cocoon-default</artifactId>
- <version>1.0-SNAPSHOT</version>
- </dependency>
- </dependencies>
-
-</project>
+ </build>
+
+ <dependencies>
+ <!-- this is just a runtime dependency for the Jetty6 plugin - I (rpoetz) don't understand
+ why the plugin requires it as it is added to WEB-INF/lib by the deployer ... -->
+ <dependency>
+ <groupId>org.apache.cocoon</groupId>
+ <artifactId>cocoon-default</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+
+</project>
Propchange: cocoon/trunk/cocoon-block-deployer/cocoon-deployer-webapp-sample/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-ecm-impl/src/main/java/org/apache/cocoon/core/container/handler/PoolableComponentHandlerMBean.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-ecm-impl/src/main/java/org/apache/cocoon/core/container/handler/PoolableComponentHandlerObserver.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-ecm-impl/src/main/java/org/apache/cocoon/core/container/handler/SingleThreadedComponentHandlerMBean.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-ecm-impl/src/main/java/org/apache/cocoon/core/container/handler/mbean.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-ecm-impl/src/main/java/org/apache/cocoon/util/JMXUtils.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-servlet-impl/src/test/java/org/apache/cocoon/blocks/servlet/BlocksManagerTestCase.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-servlet-impl/src/test/java/org/apache/cocoon/blocks/servlet/BlocksManagerTestCase.java?rev=388041&r1=388040&r2=388041&view=diff
==============================================================================
--- cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-servlet-impl/src/test/java/org/apache/cocoon/blocks/servlet/BlocksManagerTestCase.java (original)
+++ cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-servlet-impl/src/test/java/org/apache/cocoon/blocks/servlet/BlocksManagerTestCase.java Wed Mar 22 21:16:59 2006
@@ -1,73 +1,73 @@
-/*
- * Copyright 1999-2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.cocoon.blocks.servlet;
-
-import org.apache.cocoon.ServletTestCase;
-
-public class BlocksManagerTestCase extends ServletTestCase {
-
- public void testBlockSource1() throws Exception {
- pipeTest("/test1/test", "test1/COB-INF/test.xml");
- }
-
- public void testBlockSource2() throws Exception {
- pipeTest("/test1/test2", "test2/COB-INF/test.xml");
- }
-
- public void testBlockSource3() throws Exception {
- pipeTest("/test1/test3", "test1/COB-INF/test.xml");
- }
-
- public void testBlockSource4() throws Exception {
- pipeTest("/test1/test4", "test1/META-INF/classes/test.xml");
- }
-
- public void testBlockSourceSub1() throws Exception {
- pipeTest("/test1/sub/test", "test1/COB-INF/sub/test.xml");
- }
-
- public void testBlockSourceSub2() throws Exception {
- pipeTest("/test1/sub/test2", "test1/COB-INF/sub/test.xml");
- }
-
- public void testBlockSourceSub3() throws Exception {
- pipeTest("/test1/sub/test3", "test1/COB-INF/test.xml");
- }
-
- public void testBlockExtend1() throws Exception {
- pipeTest("/test3/test", "test3/COB-INF/test.xml");
- }
-
- public void testBlockExtend2() throws Exception {
- pipeTest("/test3/test2", "test2/COB-INF/test.xml");
- }
-
- public void testBlockExtend3() throws Exception {
- pipeTest("/test3/test3", "test3/COB-INF/test.xml");
- }
-
- public void testBlockExtend4() throws Exception {
- pipeTest("/test3/test4", "test1/COB-INF/test.xml");
- }
-
- public void testBlockProperty() throws Exception {
- pipeTest("/test3/prop", "test3/COB-INF/prop-expected.xml");
- }
-
- public void testAbsolutize() throws Exception {
- pipeTest("/test1/sub/abs", "test1/COB-INF/sub/path-expected.xml");
- }
-}
+/*
+ * Copyright 1999-2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.cocoon.blocks.servlet;
+
+import org.apache.cocoon.ServletTestCase;
+
+public class BlocksManagerTestCase extends ServletTestCase {
+
+ public void testBlockSource1() throws Exception {
+ pipeTest("/test1/test", "test1/COB-INF/test.xml");
+ }
+
+ public void testBlockSource2() throws Exception {
+ pipeTest("/test1/test2", "test2/COB-INF/test.xml");
+ }
+
+ public void testBlockSource3() throws Exception {
+ pipeTest("/test1/test3", "test1/COB-INF/test.xml");
+ }
+
+ public void testBlockSource4() throws Exception {
+ pipeTest("/test1/test4", "test1/META-INF/classes/test.xml");
+ }
+
+ public void testBlockSourceSub1() throws Exception {
+ pipeTest("/test1/sub/test", "test1/COB-INF/sub/test.xml");
+ }
+
+ public void testBlockSourceSub2() throws Exception {
+ pipeTest("/test1/sub/test2", "test1/COB-INF/sub/test.xml");
+ }
+
+ public void testBlockSourceSub3() throws Exception {
+ pipeTest("/test1/sub/test3", "test1/COB-INF/test.xml");
+ }
+
+ public void testBlockExtend1() throws Exception {
+ pipeTest("/test3/test", "test3/COB-INF/test.xml");
+ }
+
+ public void testBlockExtend2() throws Exception {
+ pipeTest("/test3/test2", "test2/COB-INF/test.xml");
+ }
+
+ public void testBlockExtend3() throws Exception {
+ pipeTest("/test3/test3", "test3/COB-INF/test.xml");
+ }
+
+ public void testBlockExtend4() throws Exception {
+ pipeTest("/test3/test4", "test1/COB-INF/test.xml");
+ }
+
+ public void testBlockProperty() throws Exception {
+ pipeTest("/test3/prop", "test3/COB-INF/prop-expected.xml");
+ }
+
+ public void testAbsolutize() throws Exception {
+ pipeTest("/test1/sub/abs", "test1/COB-INF/sub/path-expected.xml");
+ }
+}
Propchange: cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-servlet-impl/src/test/java/org/apache/cocoon/blocks/servlet/BlocksManagerTestCase.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/trunk/cocoon-captcha/cocoon-captcha-impl/src/main/java/org/apache/cocoon/reading/CaptchaReader.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/trunk/cocoon-captcha/cocoon-captcha-sample/src/main/resources/samples/captcha.js
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/trunk/cocoon-captcha/cocoon-captcha-sample/src/main/resources/samples/captcha.xsamples
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/trunk/cocoon-captcha/cocoon-captcha-sample/src/main/resources/samples/custom.xhtml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/trunk/cocoon-captcha/cocoon-captcha-sample/src/main/resources/samples/simple-failure.jx
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/trunk/cocoon-captcha/cocoon-captcha-sample/src/main/resources/samples/simple-success.jx
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/trunk/cocoon-captcha/cocoon-captcha-sample/src/main/resources/samples/simple.jx
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/trunk/cocoon-captcha/cocoon-captcha-sample/src/main/resources/samples/sitemap.xmap
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/trunk/cocoon-captcha/cocoon-captcha-sample/src/main/resources/samples/welcome.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: cocoon/trunk/cocoon-core-components/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-core-components/pom.xml?rev=388041&r1=388040&r2=388041&view=diff
==============================================================================
--- cocoon/trunk/cocoon-core-components/pom.xml (original)
+++ cocoon/trunk/cocoon-core-components/pom.xml Wed Mar 22 21:16:59 2006
@@ -1,37 +1,37 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright 2006 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<!--+
- | @version $Id: pom.xml 368524 2006-01-13 00:11:43Z danielf $
- |
- +-->
-<project>
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <artifactId>cocoon</artifactId>
- <groupId>org.apache.cocoon</groupId>
- <version>2.2.0-SNAPSHOT</version>
- </parent>
-
- <groupId>org.apache.cocoon</groupId>
- <artifactId>cocoon-core-components</artifactId>
- <version>1.0-SNAPSHOT</version>
-
- <packaging>jar</packaging>
- <name>Cocoon Core Components</name>
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 2006 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<!--+
+ | @version $Id: pom.xml 368524 2006-01-13 00:11:43Z danielf $
+ |
+ +-->
+<project>
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <artifactId>cocoon</artifactId>
+ <groupId>org.apache.cocoon</groupId>
+ <version>2.2.0-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.apache.cocoon</groupId>
+ <artifactId>cocoon-core-components</artifactId>
+ <version>1.0-SNAPSHOT</version>
+
+ <packaging>jar</packaging>
+ <name>Cocoon Core Components</name>
+
+</project>
Propchange: cocoon/trunk/cocoon-core-components/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: cocoon/trunk/cocoon-core-components/src/main/resources/META-INF/block.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-core-components/src/main/resources/META-INF/block.xml?rev=388041&r1=388040&r2=388041&view=diff
==============================================================================
--- cocoon/trunk/cocoon-core-components/src/main/resources/META-INF/block.xml (original)
+++ cocoon/trunk/cocoon-core-components/src/main/resources/META-INF/block.xml Wed Mar 22 21:16:59 2006
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright 2006 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<block xmlns="http://apache.org/cocoon/blocks/cob/1.0"
- id="org.apache.cocoon:cocoon-core-components:1.0-SNAPSHOT">
-
- <components class="x">
- <include src="META-INF/core-components.xconf"/>
- </components>
-
- <implements>
- <interface id="http://cocoon.apache.org/blocks/core-components/1.0"/>
- </implements>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 2006 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<block xmlns="http://apache.org/cocoon/blocks/cob/1.0"
+ id="org.apache.cocoon:cocoon-core-components:1.0-SNAPSHOT">
+
+ <components class="x">
+ <include src="META-INF/core-components.xconf"/>
+ </components>
+
+ <implements>
+ <interface id="http://cocoon.apache.org/blocks/core-components/1.0"/>
+ </implements>
+
</block>
Propchange: cocoon/trunk/cocoon-core-components/src/main/resources/META-INF/block.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: cocoon/trunk/cocoon-core-components/src/main/resources/META-INF/core-components.xconf
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-core-components/src/main/resources/META-INF/core-components.xconf?rev=388041&r1=388040&r2=388041&view=diff
==============================================================================
--- cocoon/trunk/cocoon-core-components/src/main/resources/META-INF/core-components.xconf (original)
+++ cocoon/trunk/cocoon-core-components/src/main/resources/META-INF/core-components.xconf Wed Mar 22 21:16:59 2006
@@ -1,68 +1,68 @@
-<?xml version="1.0"?>
-<!--
- Copyright 2005 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<components>
-
- <include src="resource://org/apache/cocoon/cocoon.roles"/>
-
- <xml-parser class="org.apache.excalibur.xml.impl.JaxpParser">
- <parameter name="validate" value="false"/>
- <parameter name="namespace-prefixes" value="false"/>
- <parameter name="stop-on-warning" value="true"/>
- <parameter name="stop-on-recoverable-error" value="true"/>
- <parameter name="reuse-parsers" value="false"/>
- </xml-parser>
-
- <xmlizer/>
-
- <source-resolver/>
-
- <fam/>
-
- <source-factories>
- <component-instance class="org.apache.excalibur.source.impl.ResourceSourceFactory" name="resource"/>
- <component-instance class="org.apache.cocoon.components.source.impl.ContextSourceFactory" name="context"/>
- <component-instance class="org.apache.excalibur.source.impl.FileSourceFactory" name="file"/>
- <component-instance class="org.apache.cocoon.components.source.impl.BlockSourceFactory" name="block" />
- <component-instance class="org.apache.excalibur.source.impl.URLSourceFactory" name="*"/>
- </source-factories>
-
- <generators default="file">
- <generator name="file" src="org.apache.cocoon.generation.FileGenerator"/>
- </generators>
-
- <transformers default="xslt">
- <transformer name="xslt" src="org.apache.cocoon.transformation.TraxTransformer"/>
- </transformers>
-
- <serializers default="xml">
- <serializer mime-type="text/xml" name="xml" src="org.apache.cocoon.serialization.XMLSerializer" />
- </serializers>
-
- <matchers default="wildcard">
- <matcher name="wildcard" src="org.apache.cocoon.matching.WildcardURIMatcher"/>
- </matchers>
-
- <pipes default="noncaching">
- <pipe name="noncaching" src="org.apache.cocoon.components.pipeline.impl.NonCachingProcessingPipeline"/>
- </pipes>
-
- <input-modules>
- <component-instance name="block-path" class="org.apache.cocoon.components.modules.input.BlockPathModule" />
- </input-modules>
-
-</components>
+<?xml version="1.0"?>
+<!--
+ Copyright 2005 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<components>
+
+ <include src="resource://org/apache/cocoon/cocoon.roles"/>
+
+ <xml-parser class="org.apache.excalibur.xml.impl.JaxpParser">
+ <parameter name="validate" value="false"/>
+ <parameter name="namespace-prefixes" value="false"/>
+ <parameter name="stop-on-warning" value="true"/>
+ <parameter name="stop-on-recoverable-error" value="true"/>
+ <parameter name="reuse-parsers" value="false"/>
+ </xml-parser>
+
+ <xmlizer/>
+
+ <source-resolver/>
+
+ <fam/>
+
+ <source-factories>
+ <component-instance class="org.apache.excalibur.source.impl.ResourceSourceFactory" name="resource"/>
+ <component-instance class="org.apache.cocoon.components.source.impl.ContextSourceFactory" name="context"/>
+ <component-instance class="org.apache.excalibur.source.impl.FileSourceFactory" name="file"/>
+ <component-instance class="org.apache.cocoon.components.source.impl.BlockSourceFactory" name="block" />
+ <component-instance class="org.apache.excalibur.source.impl.URLSourceFactory" name="*"/>
+ </source-factories>
+
+ <generators default="file">
+ <generator name="file" src="org.apache.cocoon.generation.FileGenerator"/>
+ </generators>
+
+ <transformers default="xslt">
+ <transformer name="xslt" src="org.apache.cocoon.transformation.TraxTransformer"/>
+ </transformers>
+
+ <serializers default="xml">
+ <serializer mime-type="text/xml" name="xml" src="org.apache.cocoon.serialization.XMLSerializer" />
+ </serializers>
+
+ <matchers default="wildcard">
+ <matcher name="wildcard" src="org.apache.cocoon.matching.WildcardURIMatcher"/>
+ </matchers>
+
+ <pipes default="noncaching">
+ <pipe name="noncaching" src="org.apache.cocoon.components.pipeline.impl.NonCachingProcessingPipeline"/>
+ </pipes>
+
+ <input-modules>
+ <component-instance name="block-path" class="org.apache.cocoon.components.modules.input.BlockPathModule" />
+ </input-modules>
+
+</components>
Propchange: cocoon/trunk/cocoon-core-components/src/main/resources/META-INF/core-components.xconf
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/components/flow/ContinuationsManagerImplMBean.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/components/flow/mbean.properties
------------------------------------------------------------------------------
svn:eol-style = native
Modified: cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/environment/http/ContextURLException.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/environment/http/ContextURLException.java?rev=388041&r1=388040&r2=388041&view=diff
==============================================================================
--- cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/environment/http/ContextURLException.java (original)
+++ cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/environment/http/ContextURLException.java Wed Mar 22 21:16:59 2006
@@ -1,31 +1,31 @@
-/*
- * Copyright 1999-2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.cocoon.environment.http;
-
-import org.apache.avalon.framework.CascadingRuntimeException;
-
-public final class ContextURLException extends CascadingRuntimeException
-{
- public ContextURLException(String message)
- {
- super(message, null);
- }
-
- public ContextURLException(String message, Throwable cause)
- {
- super(message, cause);
- }
-}
+/*
+ * Copyright 1999-2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.cocoon.environment.http;
+
+import org.apache.avalon.framework.CascadingRuntimeException;
+
+public final class ContextURLException extends CascadingRuntimeException
+{
+ public ContextURLException(String message)
+ {
+ super(message, null);
+ }
+
+ public ContextURLException(String message, Throwable cause)
+ {
+ super(message, cause);
+ }
+}
Propchange: cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/environment/http/ContextURLException.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/environment/http/RequestEncodingException.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/environment/http/RequestEncodingException.java?rev=388041&r1=388040&r2=388041&view=diff
==============================================================================
--- cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/environment/http/RequestEncodingException.java (original)
+++ cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/environment/http/RequestEncodingException.java Wed Mar 22 21:16:59 2006
@@ -1,31 +1,31 @@
-/*
- * Copyright 1999-2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.cocoon.environment.http;
-
-import org.apache.avalon.framework.CascadingRuntimeException;
-
-public final class RequestEncodingException extends CascadingRuntimeException
-{
- public RequestEncodingException(String message)
- {
- super(message, null);
- }
-
- public RequestEncodingException(String message, Throwable cause)
- {
- super(message, cause);
- }
-}
+/*
+ * Copyright 1999-2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.cocoon.environment.http;
+
+import org.apache.avalon.framework.CascadingRuntimeException;
+
+public final class RequestEncodingException extends CascadingRuntimeException
+{
+ public RequestEncodingException(String message)
+ {
+ super(message, null);
+ }
+
+ public RequestEncodingException(String message, Throwable cause)
+ {
+ super(message, cause);
+ }
+}
Propchange: cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/environment/http/RequestEncodingException.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/environment/internal/EnvironmentHelperException.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/environment/internal/EnvironmentHelperException.java?rev=388041&r1=388040&r2=388041&view=diff
==============================================================================
--- cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/environment/internal/EnvironmentHelperException.java (original)
+++ cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/environment/internal/EnvironmentHelperException.java Wed Mar 22 21:16:59 2006
@@ -1,33 +1,33 @@
-/*
- * Copyright 1999-2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.cocoon.environment.internal;
-
-import org.apache.avalon.framework.CascadingRuntimeException;
-
-/**
- * @version $Id$
- * @since 2.2
- */
-public class EnvironmentHelperException extends CascadingRuntimeException {
-
- public EnvironmentHelperException(String message) {
- super(message, null);
- }
-
- public EnvironmentHelperException(String message, Throwable cause) {
- super(message, cause);
- }
-}
+/*
+ * Copyright 1999-2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.cocoon.environment.internal;
+
+import org.apache.avalon.framework.CascadingRuntimeException;
+
+/**
+ * @version $Id$
+ * @since 2.2
+ */
+public class EnvironmentHelperException extends CascadingRuntimeException {
+
+ public EnvironmentHelperException(String message) {
+ super(message, null);
+ }
+
+ public EnvironmentHelperException(String message, Throwable cause) {
+ super(message, cause);
+ }
+}
Propchange: cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/environment/internal/EnvironmentHelperException.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/environment/internal/UnableToPopEnvironmentException.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/environment/internal/UnableToPopEnvironmentException.java?rev=388041&r1=388040&r2=388041&view=diff
==============================================================================
--- cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/environment/internal/UnableToPopEnvironmentException.java (original)
+++ cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/environment/internal/UnableToPopEnvironmentException.java Wed Mar 22 21:16:59 2006
@@ -1,31 +1,31 @@
-/*
- * Copyright 2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.cocoon.environment.internal;
-
-/**
- * @version $Id$
- * @since 2.2
- */
-public final class UnableToPopEnvironmentException extends EnvironmentHelperException {
-
- public UnableToPopEnvironmentException(String message) {
- super(message, null);
- }
-
- public UnableToPopEnvironmentException(String message, Throwable cause) {
- super(message, cause);
- }
-}
+/*
+ * Copyright 2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.cocoon.environment.internal;
+
+/**
+ * @version $Id$
+ * @since 2.2
+ */
+public final class UnableToPopEnvironmentException extends EnvironmentHelperException {
+
+ public UnableToPopEnvironmentException(String message) {
+ super(message, null);
+ }
+
+ public UnableToPopEnvironmentException(String message, Throwable cause) {
+ super(message, cause);
+ }
+}
Propchange: cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/environment/internal/UnableToPopEnvironmentException.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/environment/internal/UnableToPushEnvironmentException.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/environment/internal/UnableToPushEnvironmentException.java?rev=388041&r1=388040&r2=388041&view=diff
==============================================================================
--- cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/environment/internal/UnableToPushEnvironmentException.java (original)
+++ cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/environment/internal/UnableToPushEnvironmentException.java Wed Mar 22 21:16:59 2006
@@ -1,31 +1,31 @@
-/*
- * Copyright 2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.cocoon.environment.internal;
-
-/**
- * @version $Id$
- * @since 2.2
- */
-public final class UnableToPushEnvironmentException extends EnvironmentHelperException {
-
- public UnableToPushEnvironmentException(String message) {
- super(message, null);
- }
-
- public UnableToPushEnvironmentException(String message, Throwable cause) {
- super(message, cause);
- }
-}
+/*
+ * Copyright 2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.cocoon.environment.internal;
+
+/**
+ * @version $Id$
+ * @since 2.2
+ */
+public final class UnableToPushEnvironmentException extends EnvironmentHelperException {
+
+ public UnableToPushEnvironmentException(String message) {
+ super(message, null);
+ }
+
+ public UnableToPushEnvironmentException(String message, Throwable cause) {
+ super(message, cause);
+ }
+}
Propchange: cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/environment/internal/UnableToPushEnvironmentException.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/generation/RequestParseException.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/generation/RequestParseException.java?rev=388041&r1=388040&r2=388041&view=diff
==============================================================================
--- cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/generation/RequestParseException.java (original)
+++ cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/generation/RequestParseException.java Wed Mar 22 21:16:59 2006
@@ -1,31 +1,31 @@
-/*
- * Copyright 1999-2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.cocoon.generation;
-
-import org.xml.sax.SAXException;
-
-public final class RequestParseException extends SAXException
-{
- public RequestParseException(String message)
- {
- super(message, null);
- }
-
- public RequestParseException(String message, Exception cause)
- {
- super(message, cause);
- }
-}
+/*
+ * Copyright 1999-2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.cocoon.generation;
+
+import org.xml.sax.SAXException;
+
+public final class RequestParseException extends SAXException
+{
+ public RequestParseException(String message)
+ {
+ super(message, null);
+ }
+
+ public RequestParseException(String message, Exception cause)
+ {
+ super(message, cause);
+ }
+}
Propchange: cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/generation/RequestParseException.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/util/jmx/ModelMBeanImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/util/jmx/TypeUtil.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/trunk/cocoon-core/src/main/resources/org/apache/cocoon/components/flow/mbean.properties
------------------------------------------------------------------------------
svn:eol-style = native
Modified: cocoon/trunk/cocoon-core/src/main/resources/org/apache/cocoon/components/store/impl/ehcache.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-core/src/main/resources/org/apache/cocoon/components/store/impl/ehcache.xml?rev=388041&r1=388040&r2=388041&view=diff
==============================================================================
--- cocoon/trunk/cocoon-core/src/main/resources/org/apache/cocoon/components/store/impl/ehcache.xml (original)
+++ cocoon/trunk/cocoon-core/src/main/resources/org/apache/cocoon/components/store/impl/ehcache.xml Wed Mar 22 21:16:59 2006
@@ -1,68 +1,68 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright 1999-2004 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<ehcache>
-
- <!-- Sets the path to the directory where cache .data files are created.
-
- If the path is a Java System Property it is replaced by
- its value in the running VM.
-
- The following properties are translated:
- user.home - User's home directory
- user.dir - User's current working directory
- java.io.tmpdir - Default temp file path -->
- <diskStore path="java.io.tmpdir"/>
-
- <!--Default Cache configuration. These will be applied to caches programmatically created through
- the CacheManager.
-
- The following attributes are required:
-
- maxElementsInMemory - Sets the maximum number of objects that will be created in memory
- eternal - Sets whether elements are eternal. If eternal, timeouts are ignored and the
- element is never expired.
- overflowToDisk - Sets whether elements can overflow to disk when the in-memory cache
- has reached the maxInMemory limit.
-
- The following attributes are optional:
- timeToIdleSeconds - Sets the time to idle for an element before it expires.
- i.e. The maximum amount of time between accesses before an element expires
- Is only used if the element is not eternal.
- Optional attribute. A value of 0 means that an Element can idle for infinity.
- The default value is 0.
- timeToLiveSeconds - Sets the time to live for an element before it expires.
- i.e. The maximum time between creation time and when an element expires.
- Is only used if the element is not eternal.
- Optional attribute. A value of 0 means that and Element can live for infinity.
- The default value is 0.
- diskPersistent - Whether the disk store persists between restarts of the Virtual Machine.
- The default value is false.
- diskExpiryThreadIntervalSeconds- The number of seconds between runs of the disk expiry thread. The default value
- is 120 seconds.
- -->
-
- <defaultCache
- maxElementsInMemory="10000"
- eternal="true"
- timeToIdleSeconds="0"
- timeToLiveSeconds="0"
- overflowToDisk="true"
- diskPersistent="true"
- diskExpiryThreadIntervalSeconds="120"
- />
-
-</ehcache>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 1999-2004 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<ehcache>
+
+ <!-- Sets the path to the directory where cache .data files are created.
+
+ If the path is a Java System Property it is replaced by
+ its value in the running VM.
+
+ The following properties are translated:
+ user.home - User's home directory
+ user.dir - User's current working directory
+ java.io.tmpdir - Default temp file path -->
+ <diskStore path="java.io.tmpdir"/>
+
+ <!--Default Cache configuration. These will be applied to caches programmatically created through
+ the CacheManager.
+
+ The following attributes are required:
+
+ maxElementsInMemory - Sets the maximum number of objects that will be created in memory
+ eternal - Sets whether elements are eternal. If eternal, timeouts are ignored and the
+ element is never expired.
+ overflowToDisk - Sets whether elements can overflow to disk when the in-memory cache
+ has reached the maxInMemory limit.
+
+ The following attributes are optional:
+ timeToIdleSeconds - Sets the time to idle for an element before it expires.
+ i.e. The maximum amount of time between accesses before an element expires
+ Is only used if the element is not eternal.
+ Optional attribute. A value of 0 means that an Element can idle for infinity.
+ The default value is 0.
+ timeToLiveSeconds - Sets the time to live for an element before it expires.
+ i.e. The maximum time between creation time and when an element expires.
+ Is only used if the element is not eternal.
+ Optional attribute. A value of 0 means that and Element can live for infinity.
+ The default value is 0.
+ diskPersistent - Whether the disk store persists between restarts of the Virtual Machine.
+ The default value is false.
+ diskExpiryThreadIntervalSeconds- The number of seconds between runs of the disk expiry thread. The default value
+ is 120 seconds.
+ -->
+
+ <defaultCache
+ maxElementsInMemory="10000"
+ eternal="true"
+ timeToIdleSeconds="0"
+ timeToLiveSeconds="0"
+ overflowToDisk="true"
+ diskPersistent="true"
+ diskExpiryThreadIntervalSeconds="120"
+ />
+
+</ehcache>
Propchange: cocoon/trunk/cocoon-core/src/main/resources/org/apache/cocoon/components/store/impl/ehcache.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/trunk/cocoon-core/src/main/resources/org/apache/cocoon/core/container/handler/mbean.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/trunk/cocoon-core/src/test/java/org/apache/cocoon/acting/LocaleActionTestCase.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: cocoon/trunk/cocoon-core/src/test/resources/org/apache/cocoon/acting/LocaleActionTestCase.xtest
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-core/src/test/resources/org/apache/cocoon/acting/LocaleActionTestCase.xtest?rev=388041&r1=388040&r2=388041&view=diff
==============================================================================
--- cocoon/trunk/cocoon-core/src/test/resources/org/apache/cocoon/acting/LocaleActionTestCase.xtest (original)
+++ cocoon/trunk/cocoon-core/src/test/resources/org/apache/cocoon/acting/LocaleActionTestCase.xtest Wed Mar 22 21:16:59 2006
@@ -1,90 +1,90 @@
-<?xml version="1.0" ?>
-<!--
- Copyright 2006 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<testcase>
- <roles>
- <role name="org.apache.excalibur.source.SourceFactorySelector"
- shorthand="source-factories"
- default-class="org.apache.avalon.excalibur.component.ExcaliburComponentSelector"/>
-
- <role name="org.apache.excalibur.source.SourceResolver"
- shorthand="source-resolver"
- default-class="org.apache.excalibur.source.impl.SourceResolverImpl"/>
-
- <role name="org.apache.cocoon.acting.ActionSelector"
- shorthand="actions"
- default-class="org.apache.cocoon.components.ExtendedComponentSelector"/>
- </roles>
-
- <components>
- <source-factories>
- <component-instance class="org.apache.excalibur.source.impl.ResourceSourceFactory" name="resource"/>
- <component-instance class="org.apache.excalibur.source.impl.URLSourceFactory" name="*"/>
- </source-factories>
-
- <source-resolver class="org.apache.excalibur.source.impl.SourceResolverImpl"/>
-
- <actions logger="test">
- <component-instance name="locale0" class="org.apache.cocoon.acting.LocaleAction"/>
- <component-instance name="locale1" class="org.apache.cocoon.acting.LocaleAction">
- <locale-attribute>locale</locale-attribute>
- <use-locale>false</use-locale>
- <default-locale/>
- <store-in-request>false</store-in-request>
- <create-session>false</create-session>
- <store-in-session>false</store-in-session>
- <store-in-cookie>false</store-in-cookie>
- </component-instance>
- <component-instance name="locale2" class="org.apache.cocoon.acting.LocaleAction">
- <locale-attribute>locale</locale-attribute>
- <use-locale>false</use-locale>
- <default-locale language="de" country="DE" variant="EURO"/>
- <store-in-request>false</store-in-request>
- <create-session>false</create-session>
- <store-in-session>false</store-in-session>
- <store-in-cookie>false</store-in-cookie>
- </component-instance>
- <component-instance name="locale3" class="org.apache.cocoon.acting.LocaleAction">
- <locale-attribute>locale</locale-attribute>
- <use-locale>true</use-locale>
- <default-locale language="de" country="DE" variant="WIN"/>
- <store-in-request>false</store-in-request>
- <create-session>false</create-session>
- <store-in-session>false</store-in-session>
- <store-in-cookie>false</store-in-cookie>
- </component-instance>
- <component-instance name="locale4" class="org.apache.cocoon.acting.LocaleAction">
- <locale-attribute>locale</locale-attribute>
- <use-locale>false</use-locale>
- <default-locale language="no" country="NO" variant="B"/>
- <store-in-request>true</store-in-request>
- <create-session>false</create-session>
- <store-in-session>true</store-in-session>
- <store-in-cookie>true</store-in-cookie>
- </component-instance>
- <component-instance name="locale5" class="org.apache.cocoon.acting.LocaleAction">
- <locale-attribute>locale</locale-attribute>
- <use-locale>false</use-locale>
- <default-locale language="en" country="GB" variant="SCOUSE"/>
- <store-in-request>true</store-in-request>
- <create-session>true</create-session>
- <store-in-session>true</store-in-session>
- <store-in-cookie>true</store-in-cookie>
- </component-instance>
- </actions>
- </components>
-
-</testcase>
+<?xml version="1.0" ?>
+<!--
+ Copyright 2006 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<testcase>
+ <roles>
+ <role name="org.apache.excalibur.source.SourceFactorySelector"
+ shorthand="source-factories"
+ default-class="org.apache.avalon.excalibur.component.ExcaliburComponentSelector"/>
+
+ <role name="org.apache.excalibur.source.SourceResolver"
+ shorthand="source-resolver"
+ default-class="org.apache.excalibur.source.impl.SourceResolverImpl"/>
+
+ <role name="org.apache.cocoon.acting.ActionSelector"
+ shorthand="actions"
+ default-class="org.apache.cocoon.components.ExtendedComponentSelector"/>
+ </roles>
+
+ <components>
+ <source-factories>
+ <component-instance class="org.apache.excalibur.source.impl.ResourceSourceFactory" name="resource"/>
+ <component-instance class="org.apache.excalibur.source.impl.URLSourceFactory" name="*"/>
+ </source-factories>
+
+ <source-resolver class="org.apache.excalibur.source.impl.SourceResolverImpl"/>
+
+ <actions logger="test">
+ <component-instance name="locale0" class="org.apache.cocoon.acting.LocaleAction"/>
+ <component-instance name="locale1" class="org.apache.cocoon.acting.LocaleAction">
+ <locale-attribute>locale</locale-attribute>
+ <use-locale>false</use-locale>
+ <default-locale/>
+ <store-in-request>false</store-in-request>
+ <create-session>false</create-session>
+ <store-in-session>false</store-in-session>
+ <store-in-cookie>false</store-in-cookie>
+ </component-instance>
+ <component-instance name="locale2" class="org.apache.cocoon.acting.LocaleAction">
+ <locale-attribute>locale</locale-attribute>
+ <use-locale>false</use-locale>
+ <default-locale language="de" country="DE" variant="EURO"/>
+ <store-in-request>false</store-in-request>
+ <create-session>false</create-session>
+ <store-in-session>false</store-in-session>
+ <store-in-cookie>false</store-in-cookie>
+ </component-instance>
+ <component-instance name="locale3" class="org.apache.cocoon.acting.LocaleAction">
+ <locale-attribute>locale</locale-attribute>
+ <use-locale>true</use-locale>
+ <default-locale language="de" country="DE" variant="WIN"/>
+ <store-in-request>false</store-in-request>
+ <create-session>false</create-session>
+ <store-in-session>false</store-in-session>
+ <store-in-cookie>false</store-in-cookie>
+ </component-instance>
+ <component-instance name="locale4" class="org.apache.cocoon.acting.LocaleAction">
+ <locale-attribute>locale</locale-attribute>
+ <use-locale>false</use-locale>
+ <default-locale language="no" country="NO" variant="B"/>
+ <store-in-request>true</store-in-request>
+ <create-session>false</create-session>
+ <store-in-session>true</store-in-session>
+ <store-in-cookie>true</store-in-cookie>
+ </component-instance>
+ <component-instance name="locale5" class="org.apache.cocoon.acting.LocaleAction">
+ <locale-attribute>locale</locale-attribute>
+ <use-locale>false</use-locale>
+ <default-locale language="en" country="GB" variant="SCOUSE"/>
+ <store-in-request>true</store-in-request>
+ <create-session>true</create-session>
+ <store-in-session>true</store-in-session>
+ <store-in-cookie>true</store-in-cookie>
+ </component-instance>
+ </actions>
+ </components>
+
+</testcase>
Propchange: cocoon/trunk/cocoon-core/src/test/resources/org/apache/cocoon/acting/LocaleActionTestCase.xtest
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/trunk/cocoon-core/src/test/resources/org/apache/cocoon/selection/RegexpHeaderSelectorTestCase.xtest
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/trunk/cocoon-databases/cocoon-databases-impl/src/main/resources/org/apache/cocoon/components/database/database.roles
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/trunk/cocoon-default/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/trunk/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/datatype/convertor/BeanConvertor.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/trunk/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/datatype/convertor/BeanConvertorBuilder.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/trunk/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/samples/dreamteam/Team.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/trunk/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/samples/dreamteam/TeamMember.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/trunk/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/system/i18n/messages_el.xml
------------------------------------------------------------------------------
svn:eol-style = native