You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by il...@apache.org on 2014/03/01 19:02:20 UTC
svn commit: r1573205 [3/5] - in /cocoon/branches/BRANCH_2_1_X-dojo1_1: ./
legal/ lib/ lib/core/ lib/endorsed/ lib/optional/ misc/notes/
src/blocks/auth/java/org/apache/cocoon/auth/
src/blocks/batik/java/org/apache/cocoon/serialization/ src/blocks/batik...
Modified: cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/html/java/org/apache/cocoon/transformation/HTMLTransformer.java
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/html/java/org/apache/cocoon/transformation/HTMLTransformer.java?rev=1573205&r1=1573204&r2=1573205&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/html/java/org/apache/cocoon/transformation/HTMLTransformer.java (original)
+++ cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/html/java/org/apache/cocoon/transformation/HTMLTransformer.java Sat Mar 1 18:02:14 2014
@@ -170,7 +170,7 @@ public class HTMLTransformer
// Extract the document using JTidy and stream it.
ByteArrayInputStream bais =
- new ByteArrayInputStream(text.getBytes());
+ new ByteArrayInputStream(text.getBytes("UTF-8"));
org.w3c.dom.Document doc =
tidy.parseDOM(new BufferedInputStream(bais), null);
Modified: cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/imageop/samples/dir2page.xsl
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/imageop/samples/dir2page.xsl?rev=1573205&r1=1573204&r2=1573205&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/imageop/samples/dir2page.xsl (original)
+++ cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/imageop/samples/dir2page.xsl Sat Mar 1 18:02:14 2014
@@ -30,9 +30,8 @@
</p>
<p>
See documentation for
- <a href="../../docs/userdocs/generators/imagedirectory-generator.html">Image
- Directory Generator</a> and
- <a href="../../docs/userdocs/readers/image-reader.html">Image Reader</a>
+ <a href="http://cocoon.apache.org/2.1/userdocs/imagedirectory-generator.html">Image Directory Generator</a> and
+ <a href="http://cocoon.apache.org/2.1/userdocs/core/image-reader.html">Image Reader</a>
</p>
</body></html>
</xsl:template>
Modified: cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/jcr/samples/repotest/versions/data/dead/beef/facebabecafebabecafebabe/.node.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/jcr/samples/repotest/versions/data/dead/beef/facebabecafebabecafebabe/.node.xml?rev=1573205&r1=1573204&r2=1573205&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/jcr/samples/repotest/versions/data/dead/beef/facebabecafebabecafebabe/.node.xml (original)
+++ cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/jcr/samples/repotest/versions/data/dead/beef/facebabecafebabecafebabe/.node.xml Sat Mar 1 18:02:14 2014
@@ -1,5 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
-<node uuid="deadbeef-face-babe-cafe-babecafebabe" parentUUID="deadbeef-cafe-babe-cafe-babecafebabe" definitionId="1994195451" nodeType="{internal}versionStorage">
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You 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.
+-->
+<node uuid="deadbeef-face-babe-cafe-babecafebabe" parentUUID="deadbeef-cafe-babe-cafe-babecafebabe" definitionId="1994195451" nodeType="{internal}versionStorage" modCount="0">
<mixinTypes>
</mixinTypes>
<properties>
Modified: cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/jcr/samples/repotest/versions/data/dead/beef/facebabecafebabecafebabe/672388333465d36a71297afb5d46001f.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/jcr/samples/repotest/versions/data/dead/beef/facebabecafebabecafebabe/672388333465d36a71297afb5d46001f.xml?rev=1573205&r1=1573204&r2=1573205&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/jcr/samples/repotest/versions/data/dead/beef/facebabecafebabecafebabe/672388333465d36a71297afb5d46001f.xml (original)
+++ cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/jcr/samples/repotest/versions/data/dead/beef/facebabecafebabecafebabe/672388333465d36a71297afb5d46001f.xml Sat Mar 1 18:02:14 2014
@@ -1,5 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
-<property name="{http://www.jcp.org/jcr/1.0}primaryType" parentUUID="deadbeef-face-babe-cafe-babecafebabe" multiValued="false" definitionId="1266667140" type="Name">
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You 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.
+-->
+<property name="{http://www.jcp.org/jcr/1.0}primaryType" parentUUID="deadbeef-face-babe-cafe-babecafebabe" multiValued="false" definitionId="1266667140" type="Name" modCount="0">
<values>
<value>{internal}versionStorage</value>
</values>
Modified: cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/jcr/samples/repotest/workspaces/default/data/cafe/babe/cafebabecafebabecafebabe/.node.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/jcr/samples/repotest/workspaces/default/data/cafe/babe/cafebabecafebabecafebabe/.node.xml?rev=1573205&r1=1573204&r2=1573205&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/jcr/samples/repotest/workspaces/default/data/cafe/babe/cafebabecafebabecafebabe/.node.xml (original)
+++ cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/jcr/samples/repotest/workspaces/default/data/cafe/babe/cafebabecafebabecafebabe/.node.xml Sat Mar 1 18:02:14 2014
@@ -1,5 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
-<node uuid="cafebabe-cafe-babe-cafe-babecafebabe" parentUUID="" definitionId="-1232748307" nodeType="{internal}root">
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You 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.
+-->
+<node uuid="cafebabe-cafe-babe-cafe-babecafebabe" parentUUID="" definitionId="-1232748307" nodeType="{internal}root" modCount="0">
<mixinTypes>
</mixinTypes>
<properties>
Modified: cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/jcr/samples/repotest/workspaces/default/data/cafe/babe/cafebabecafebabecafebabe/672388333465d36a71297afb5d46001f.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/jcr/samples/repotest/workspaces/default/data/cafe/babe/cafebabecafebabecafebabe/672388333465d36a71297afb5d46001f.xml?rev=1573205&r1=1573204&r2=1573205&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/jcr/samples/repotest/workspaces/default/data/cafe/babe/cafebabecafebabecafebabe/672388333465d36a71297afb5d46001f.xml (original)
+++ cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/jcr/samples/repotest/workspaces/default/data/cafe/babe/cafebabecafebabecafebabe/672388333465d36a71297afb5d46001f.xml Sat Mar 1 18:02:14 2014
@@ -1,5 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
-<property name="{http://www.jcp.org/jcr/1.0}primaryType" parentUUID="cafebabe-cafe-babe-cafe-babecafebabe" multiValued="false" definitionId="1266667140" type="Name">
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You 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.
+-->
+<property name="{http://www.jcp.org/jcr/1.0}primaryType" parentUUID="cafebabe-cafe-babe-cafe-babecafebabe" multiValued="false" definitionId="1266667140" type="Name" modCount="0">
<values>
<value>{internal}root</value>
</values>
Modified: cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/jcr/samples/repotest/workspaces/default/data/dead/beef/cafebabecafebabecafebabe/.node.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/jcr/samples/repotest/workspaces/default/data/dead/beef/cafebabecafebabecafebabe/.node.xml?rev=1573205&r1=1573204&r2=1573205&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/jcr/samples/repotest/workspaces/default/data/dead/beef/cafebabecafebabecafebabe/.node.xml (original)
+++ cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/jcr/samples/repotest/workspaces/default/data/dead/beef/cafebabecafebabecafebabe/.node.xml Sat Mar 1 18:02:14 2014
@@ -1,5 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
-<node uuid="deadbeef-cafe-babe-cafe-babecafebabe" parentUUID="cafebabe-cafe-babe-cafe-babecafebabe" definitionId="-1971945898" nodeType="{internal}system">
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You 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.
+-->
+<node uuid="deadbeef-cafe-babe-cafe-babecafebabe" parentUUID="cafebabe-cafe-babe-cafe-babecafebabe" definitionId="-1971945898" nodeType="{internal}system" modCount="0">
<mixinTypes>
</mixinTypes>
<properties>
Modified: cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/jcr/samples/repotest/workspaces/default/data/dead/beef/cafebabecafebabecafebabe/672388333465d36a71297afb5d46001f.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/jcr/samples/repotest/workspaces/default/data/dead/beef/cafebabecafebabecafebabe/672388333465d36a71297afb5d46001f.xml?rev=1573205&r1=1573204&r2=1573205&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/jcr/samples/repotest/workspaces/default/data/dead/beef/cafebabecafebabecafebabe/672388333465d36a71297afb5d46001f.xml (original)
+++ cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/jcr/samples/repotest/workspaces/default/data/dead/beef/cafebabecafebabecafebabe/672388333465d36a71297afb5d46001f.xml Sat Mar 1 18:02:14 2014
@@ -1,5 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
-<property name="{http://www.jcp.org/jcr/1.0}primaryType" parentUUID="deadbeef-cafe-babe-cafe-babecafebabe" multiValued="false" definitionId="1266667140" type="Name">
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You 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.
+-->
+<property name="{http://www.jcp.org/jcr/1.0}primaryType" parentUUID="deadbeef-cafe-babe-cafe-babecafebabe" multiValued="false" definitionId="1266667140" type="Name" modCount="0">
<values>
<value>{internal}system</value>
</values>
Modified: cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/jcr/samples/repotest/workspaces/default/data/dead/beef/cafecafecafebabecafebabe/.node.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/jcr/samples/repotest/workspaces/default/data/dead/beef/cafecafecafebabecafebabe/.node.xml?rev=1573205&r1=1573204&r2=1573205&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/jcr/samples/repotest/workspaces/default/data/dead/beef/cafecafecafebabecafebabe/.node.xml (original)
+++ cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/jcr/samples/repotest/workspaces/default/data/dead/beef/cafecafecafebabecafebabe/.node.xml Sat Mar 1 18:02:14 2014
@@ -1,5 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
-<node uuid="deadbeef-cafe-cafe-cafe-babecafebabe" parentUUID="deadbeef-cafe-babe-cafe-babecafebabe" definitionId="629407203" nodeType="{internal}nodeTypes">
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You 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.
+-->
+<node uuid="deadbeef-cafe-cafe-cafe-babecafebabe" parentUUID="deadbeef-cafe-babe-cafe-babecafebabe" definitionId="629407203" nodeType="{internal}nodeTypes" modCount="0">
<mixinTypes>
</mixinTypes>
<properties>
Modified: cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/jcr/samples/repotest/workspaces/default/data/dead/beef/cafecafecafebabecafebabe/672388333465d36a71297afb5d46001f.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/jcr/samples/repotest/workspaces/default/data/dead/beef/cafecafecafebabecafebabe/672388333465d36a71297afb5d46001f.xml?rev=1573205&r1=1573204&r2=1573205&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/jcr/samples/repotest/workspaces/default/data/dead/beef/cafecafecafebabecafebabe/672388333465d36a71297afb5d46001f.xml (original)
+++ cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/jcr/samples/repotest/workspaces/default/data/dead/beef/cafecafecafebabecafebabe/672388333465d36a71297afb5d46001f.xml Sat Mar 1 18:02:14 2014
@@ -1,5 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
-<property name="{http://www.jcp.org/jcr/1.0}primaryType" parentUUID="deadbeef-cafe-cafe-cafe-babecafebabe" multiValued="false" definitionId="1266667140" type="Name">
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You 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.
+-->
+<property name="{http://www.jcp.org/jcr/1.0}primaryType" parentUUID="deadbeef-cafe-cafe-cafe-babecafebabe" multiValued="false" definitionId="1266667140" type="Name" modCount="0">
<values>
<value>{internal}nodeTypes</value>
</values>
Modified: cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/jcr/samples/repotest/workspaces/default/data/dead/beef/facebabecafebabecafebabe/.node.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/jcr/samples/repotest/workspaces/default/data/dead/beef/facebabecafebabecafebabe/.node.xml?rev=1573205&r1=1573204&r2=1573205&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/jcr/samples/repotest/workspaces/default/data/dead/beef/facebabecafebabecafebabe/.node.xml (original)
+++ cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/jcr/samples/repotest/workspaces/default/data/dead/beef/facebabecafebabecafebabe/.node.xml Sat Mar 1 18:02:14 2014
@@ -1,5 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
-<node uuid="deadbeef-face-babe-cafe-babecafebabe" parentUUID="deadbeef-cafe-babe-cafe-babecafebabe" definitionId="1994195451" nodeType="{internal}versionStorage">
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You 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.
+-->
+<node uuid="deadbeef-face-babe-cafe-babecafebabe" parentUUID="deadbeef-cafe-babe-cafe-babecafebabe" definitionId="1994195451" nodeType="{internal}versionStorage" modCount="0">
<mixinTypes>
</mixinTypes>
<properties>
Modified: cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/jcr/samples/repotest/workspaces/default/data/dead/beef/facebabecafebabecafebabe/672388333465d36a71297afb5d46001f.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/jcr/samples/repotest/workspaces/default/data/dead/beef/facebabecafebabecafebabe/672388333465d36a71297afb5d46001f.xml?rev=1573205&r1=1573204&r2=1573205&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/jcr/samples/repotest/workspaces/default/data/dead/beef/facebabecafebabecafebabe/672388333465d36a71297afb5d46001f.xml (original)
+++ cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/jcr/samples/repotest/workspaces/default/data/dead/beef/facebabecafebabecafebabe/672388333465d36a71297afb5d46001f.xml Sat Mar 1 18:02:14 2014
@@ -1,5 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
-<property name="{http://www.jcp.org/jcr/1.0}primaryType" parentUUID="deadbeef-face-babe-cafe-babecafebabe" multiValued="false" definitionId="1266667140" type="Name">
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You 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.
+-->
+<property name="{http://www.jcp.org/jcr/1.0}primaryType" parentUUID="deadbeef-face-babe-cafe-babecafebabe" multiValued="false" definitionId="1266667140" type="Name" modCount="0">
<values>
<value>{internal}versionStorage</value>
</values>
Modified: cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/mail/java/org/apache/cocoon/mail/transformation/SendMailTransformer.java
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/mail/java/org/apache/cocoon/mail/transformation/SendMailTransformer.java?rev=1573205&r1=1573204&r2=1573205&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/mail/java/org/apache/cocoon/mail/transformation/SendMailTransformer.java (original)
+++ cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/mail/java/org/apache/cocoon/mail/transformation/SendMailTransformer.java Sat Mar 1 18:02:14 2014
@@ -604,7 +604,7 @@ public class SendMailTransformer extends
// make it a simple plain text message in the case of a set plain/text
// mime-type and any attachements
- if (this.bodyMimeType.startsWith("text/plain") && this.attachments.size() == 0) {
+ if (("text/plain").equals(this.bodyMimeType) && this.attachments.size() == 0) {
sm.setText(messageString);
}
// add message as message body part
Modified: cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/mail/samples/mail/docs/mid-col-2/asciiart-generator.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/mail/samples/mail/docs/mid-col-2/asciiart-generator.xml?rev=1573205&r1=1573204&r2=1573205&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/mail/samples/mail/docs/mid-col-2/asciiart-generator.xml (original)
+++ cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/mail/samples/mail/docs/mid-col-2/asciiart-generator.xml Sat Mar 1 18:02:14 2014
@@ -181,7 +181,7 @@
Read more information about
<link href="http://www.w3.org/TR/SVG/">SVG</link>,
and about
- <link href="http://cocoon.apache.org/userdocs/serializers/svg-serializer.html">SVG Serializer</link>
+ <link href="http://cocoon.apache.org/2.1/userdocs/svg-serializer.html">SVG Serializer</link>
family.
</p>
</s1>
Modified: cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/mail/samples/samples.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/mail/samples/samples.xml?rev=1573205&r1=1573204&r2=1573205&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/mail/samples/samples.xml (original)
+++ cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/mail/samples/samples.xml Sat Mar 1 18:02:14 2014
@@ -43,10 +43,10 @@
</group>
<group name="Documentation">
- <sample name="Action documentation" href="/docs/userdocs/actions/sendmail-action.html">
+ <sample name="Action documentation" href="http://cocoon.apache.org/2.1/userdocs/optional/sendmail-action.html">
Documentation for the Sendmail action component.
</sample>
- <sample name="Logicsheet documentation" href="/docs/userdocs/xsp/sendmail.html">
+ <sample name="Logicsheet documentation" href="http://cocoon.apache.org/2.1/userdocs/logicsheets/sendmail.html">
Documentation for the Sendmail logicsheet component.
</sample>
</group>
Modified: cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/mail/samples/sendmail/done.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/mail/samples/sendmail/done.xml?rev=1573205&r1=1573204&r2=1573205&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/mail/samples/sendmail/done.xml (original)
+++ cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/mail/samples/sendmail/done.xml Sat Mar 1 18:02:14 2014
@@ -21,8 +21,8 @@
xmlns:xsp-request="http://apache.org/xsp/request/2.0">
<page>
<resources>
- <resource type="doc" href="userdocs/actions/sendmail-action.html">Actions</resource>
- <resource type="doc" href="userdocs/xsp/sendmail.html">Logicsheet</resource>
+ <resource type="doc" href="http://cocoon.apache.org/2.1/userdocs/optional/sendmail-action.html">Actions</resource>
+ <resource type="doc" href="http://cocoon.apache.org/2.1/userdocs/logicsheets/sendmail.html">Logicsheet</resource>
</resources>
<title>Send EMail using action</title>
Modified: cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/mail/samples/sendmail/form.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/mail/samples/sendmail/form.xml?rev=1573205&r1=1573204&r2=1573205&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/mail/samples/sendmail/form.xml (original)
+++ cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/mail/samples/sendmail/form.xml Sat Mar 1 18:02:14 2014
@@ -20,8 +20,8 @@
xmlns:xsp-request="http://apache.org/xsp/request/2.0">
<page>
<resources>
- <resource type="doc" href="userdocs/actions/sendmail-action.html">Actions</resource>
- <resource type="doc" href="userdocs/xsp/sendmail.html">Logicsheet</resource>
+ <resource type="doc" href="http://cocoon.apache.org/2.1/userdocs/optional/sendmail-action.html">Actions</resource>
+ <resource type="doc" href="http://cocoon.apache.org/2.1/userdocs/logicsheets/sendmail.html">Logicsheet</resource>
</resources>
<title>Send EMail</title>
Modified: cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/mail/samples/sendmail/sendmail_xsp.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/mail/samples/sendmail/sendmail_xsp.xml?rev=1573205&r1=1573204&r2=1573205&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/mail/samples/sendmail/sendmail_xsp.xml (original)
+++ cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/mail/samples/sendmail/sendmail_xsp.xml Sat Mar 1 18:02:14 2014
@@ -22,8 +22,8 @@
xmlns:xsp-request="http://apache.org/xsp/request/2.0">
<page>
<resources>
- <resource type="doc" href="userdocs/actions/sendmail-action.html">Actions</resource>
- <resource type="doc" href="userdocs/xsp/sendmail.html">Logicsheet</resource>
+ <resource type="doc" href="http://cocoon.apache.org/2.1/userdocs/optional/sendmail-action.html">Actions</resource>
+ <resource type="doc" href="http://cocoon.apache.org/2.1/userdocs/logicsheets/sendmail.html">Logicsheet</resource>
</resources>
<title>Send EMail</title>
Propchange: cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/naming/conf/addressbook.xconf
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/naming/conf/naming.xsamples
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/naming/samples/flow/AddressbookManager.js
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/naming/samples/flow/flow.js
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/naming/samples/forms/person-binding.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/naming/samples/forms/person-model.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/naming/samples/forms/person-model.xml?rev=1573205&r1=1573204&r2=1573205&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/naming/samples/forms/person-model.xml (original)
+++ cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/naming/samples/forms/person-model.xml Sat Mar 1 18:02:14 2014
@@ -1 +1,153 @@
-<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
The ASF licenses this file to You 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.
-->
<fd:form xmlns:fd="http://apache.org/cocoon/forms/1.0#definition" xmlns:i18n="http://apache.org/cocoon/i18n/2.1">
<fd:widgets>
<fd:messages id="messages">
<fd:label><i18n:text i18n:catalogue="local">message.label</i18n:text></fd:label>
</fd:messages>
<fd:field id="firstname" required="true">
<fd:label><i18n:text i18n:catalogue="local">field.firstname</i18n:text>: </fd:label>
<fd:hint><i18n:text i18n:catalogue="local">firstname.hint</i18n:text></fd:hint>
<fd:help><i18n:text i18n:catalogue="local">firstname.help</i18n:text></fd:help>
<fd:datatype base="string">
<fd:validation>
<fd:length min="2" max="50"/>
</fd:validation>
</fd:datatype>
</fd:field>
<fd:field id="lastname" required="true">
<fd:label><i18n:text i18n:catalogue="local">field.lastname</i18n:text>: </fd:label>
<fd:hint><i18n:text i18n:catalogue="local">lastname.hint</i18n:text></fd:hint>
<fd:help><i18n:text i18n:catalogue="local">lastname.help</i18n:text></fd:help>
<fd:datatype base="string">
<fd:validation>
<fd:length min="2" max="50"/>
</fd:validation>
</fd:datatype>
</fd:field>
<fd:field id="email" required="true">
<fd:label><i18n:text i18n:catalogue="local">field.email</i18n:text>: </fd:label>
<fd:hint><i18n:text i18n:catalogue="local">email.hint</i18n:text></fd:hint>
<fd:help><i18n:text i18n:catalogue="local">email.help</i18n:text></fd:help>
<fd:datatype base="string">
<fd:validation>
<fd:email/>
</fd:validation>
</fd:datatype>
</fd:field>
<fd:field id="deptName" required="true">
<fd:label><i18n:text i18n:catalogue="local">field.deptName</i18n:text>: </fd:label>
<fd:hint><i18n:text i18n:catalogue="local">deptName.hint</i18n:text></fd:hint>
<fd:help><i18n:text i18n:catalogue="local">deptName.help</i18n:text></fd:help>
<fd:datatype base="string">
<fd:validation>
<fd:length min="2" max="50"/>
</fd:validation>
</fd:datatype>
</fd:field>
<fd:field id="address1" required="true">
<fd:label><i18n:text i18n:catalogue="local">field.address1</i18n:text>: </fd:label>
<fd:hint><i18n:text i18n:catalogue="local">address1.hint</i18n:text></fd:hint>
<fd:help><i18n:text i18n:catalogue="local">address1.help</i18n:text></fd:help>
<fd:datatype base="string"/>
<fd:validation>
<fd:length min="2" max="50"/>
</fd:validation>
</fd:field>
<fd:field id="address2" required="true">
<fd:label><i18n:text i18n:catalogue="local">field.address2</i18n:text>: </fd:label>
<fd:hint><i18n:text i18n:catalogue="local">address2.hint</i18n:text></fd:hint>
<fd:help><i18n:text i18n:catalogue="local">address2.help</i18n:text></fd:help>
<fd:datatype base="string"/>
<fd:validation>
<fd:length min="2" max="50"/>
</fd:validation>
</fd:field>
<fd:field id="address3" required="true">
<fd:label><i18n:text i18n:catalogue="local">field.address3</i18n:text>: </fd:label>
<fd:hint><i18n:text i18n:catalogue="local">address3.hint</i18n:text></fd:hint>
<fd:help><i18n:text i18n:catalogue="local">address3.help</i18n:text></fd:help>
<fd:datatype base="string"/>
<fd:validation>
<fd:length min="2" max="50"/>
</fd:validation>
</fd:field>
<fd:field id="postcode" required="true">
<fd:label><i18n:text i18n:catalogue="local">field.postcode</i18n:text>: </fd:label>
<fd:hint><i18n:text i18n:catalogue="local">postcode.hint</i18n:text></fd:hint>
<fd:help><i18n:text i18n:catalogue="local">postcode.help</i18n:text></fd:help>
<fd:datatype base="string"/>
<fd:validation>
<fd:length min="2" max="50"/>
</fd:validation>
</fd:field>
<fd:field id="ophone" required="true">
<fd:label><i18n:text i18n:catalogue="local">field.ophone</i18n:text>: </fd:label>
<fd:hint><i18n:text i18n:catalogue="local">ophone.hint</i18n:text></fd:hint>
<fd:help><i18n:text i18n:catalogue="local">ophone.help</i18n:text></fd:help>
<fd:datatype base="string"/>
<fd:validation>
<fd:length min="2" max="50"/>
</fd:validation>
</fd:field>
<fd:field id="fphone" required="false">
<fd:label><i18n:text i18n:catalogue="local">field.fphone</i18n:text>: </fd:label>
<fd:hint><i18n:text i18n:catalogue="local">fphone.hint</i18n:text></fd:hint>
<fd:help><i18n:text i18n:catalogue="local">fphone.help</i18n:text></fd:help>
<fd:datatype base="string"/>
<fd:validation>
<fd:length min="2" max="50"/>
</fd:validation>
</fd:field>
<fd:field id="mphone" required="false">
<fd:label><i18n:text i18n:catalogue="local">field.mphone</i18n:text>: </fd:label>
<fd:hint><i18n:text i18n:catalogue="local">mphone.hint</i18n:text></fd:hint>
<fd:help><i18n:text i18n:catalogue="local">mphone.help</i18n:text></fd:help>
<fd:datatype base="string"/>
<fd:validation>
<fd:length min="2" max="50"/>
</fd:validation>
</fd:field>
<fd:field id="hphone" required="false">
<fd:label><i18n:text i18n:catalogue="local">field.hphone</i18n:text>: </fd:label>
<fd:hint><i18n:text i18n:catalogue="local">hphone.hint</i18n:text></fd:hint>
<fd:help><i18n:text i18n:catalogue="local">hphone.help</i18n:text></fd:help>
<fd:datatype base="string"/>
<fd:validation>
<fd:length min="2" max="50"/>
</fd:validation>
</fd:field>
<fd:field id="pager" required="false">
<fd:label><i18n:text i18n:catalogue="local">field.pager</i18n:text>: </fd:label>
<fd:hint><i18n:text i18n:catalogue="local">pager.hint</i18n:text></fd:hint>
<fd:help><i18n:text i18n:catalogue="local">pager.help</i18n:text></fd:help>
<fd:datatype base="string"/>
<fd:validation>
<fd:length min="2" max="50"/>
</fd:validation>
</fd:field>
<fd:submit id="cancel" action-command="cancel" validate="false">
<fd:label>Cancel</fd:label>
<fd:hint><i18n:text i18n:catalogue="local">cancel.hint</i18n:text></fd:hint>
</fd:submit>
<fd:submit id="done" action-command="done" validate="true">
<fd:label>Send</fd:label>
<fd:hint><i18n:text i18n:catalogue="local">submit.hint</i18n:text></fd:hint>
</fd:submit>
</fd:widgets>
</fd:form>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You 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.
+-->
+<fd:form xmlns:fd="http://apache.org/cocoon/forms/1.0#definition" xmlns:i18n="http://apache.org/cocoon/i18n/2.1">
+ <fd:widgets>
+ <fd:messages id="messages">
+ <fd:label><i18n:text i18n:catalogue="local">message.label</i18n:text></fd:label>
+ </fd:messages>
+ <fd:field id="firstname" required="true">
+ <fd:label><i18n:text i18n:catalogue="local">field.firstname</i18n:text>: </fd:label>
+ <fd:hint><i18n:text i18n:catalogue="local">firstname.hint</i18n:text></fd:hint>
+ <fd:help><i18n:text i18n:catalogue="local">firstname.help</i18n:text></fd:help>
+ <fd:datatype base="string">
+ <fd:validation>
+ <fd:length min="2" max="50"/>
+ </fd:validation>
+ </fd:datatype>
+ </fd:field>
+ <fd:field id="lastname" required="true">
+ <fd:label><i18n:text i18n:catalogue="local">field.lastname</i18n:text>: </fd:label>
+ <fd:hint><i18n:text i18n:catalogue="local">lastname.hint</i18n:text></fd:hint>
+ <fd:help><i18n:text i18n:catalogue="local">lastname.help</i18n:text></fd:help>
+ <fd:datatype base="string">
+ <fd:validation>
+ <fd:length min="2" max="50"/>
+ </fd:validation>
+ </fd:datatype>
+ </fd:field>
+ <fd:field id="email" required="true">
+ <fd:label><i18n:text i18n:catalogue="local">field.email</i18n:text>: </fd:label>
+ <fd:hint><i18n:text i18n:catalogue="local">email.hint</i18n:text></fd:hint>
+ <fd:help><i18n:text i18n:catalogue="local">email.help</i18n:text></fd:help>
+ <fd:datatype base="string">
+ <fd:validation>
+ <fd:email/>
+ </fd:validation>
+ </fd:datatype>
+ </fd:field>
+ <fd:field id="deptName" required="true">
+ <fd:label><i18n:text i18n:catalogue="local">field.deptName</i18n:text>: </fd:label>
+ <fd:hint><i18n:text i18n:catalogue="local">deptName.hint</i18n:text></fd:hint>
+ <fd:help><i18n:text i18n:catalogue="local">deptName.help</i18n:text></fd:help>
+ <fd:datatype base="string">
+ <fd:validation>
+ <fd:length min="2" max="50"/>
+ </fd:validation>
+ </fd:datatype>
+ </fd:field>
+ <fd:field id="address1" required="true">
+ <fd:label><i18n:text i18n:catalogue="local">field.address1</i18n:text>: </fd:label>
+ <fd:hint><i18n:text i18n:catalogue="local">address1.hint</i18n:text></fd:hint>
+ <fd:help><i18n:text i18n:catalogue="local">address1.help</i18n:text></fd:help>
+ <fd:datatype base="string"/>
+ <fd:validation>
+ <fd:length min="2" max="50"/>
+ </fd:validation>
+ </fd:field>
+ <fd:field id="address2" required="true">
+ <fd:label><i18n:text i18n:catalogue="local">field.address2</i18n:text>: </fd:label>
+ <fd:hint><i18n:text i18n:catalogue="local">address2.hint</i18n:text></fd:hint>
+ <fd:help><i18n:text i18n:catalogue="local">address2.help</i18n:text></fd:help>
+ <fd:datatype base="string"/>
+ <fd:validation>
+ <fd:length min="2" max="50"/>
+ </fd:validation>
+ </fd:field>
+ <fd:field id="address3" required="true">
+ <fd:label><i18n:text i18n:catalogue="local">field.address3</i18n:text>: </fd:label>
+ <fd:hint><i18n:text i18n:catalogue="local">address3.hint</i18n:text></fd:hint>
+ <fd:help><i18n:text i18n:catalogue="local">address3.help</i18n:text></fd:help>
+ <fd:datatype base="string"/>
+ <fd:validation>
+ <fd:length min="2" max="50"/>
+ </fd:validation>
+ </fd:field>
+ <fd:field id="postcode" required="true">
+ <fd:label><i18n:text i18n:catalogue="local">field.postcode</i18n:text>: </fd:label>
+ <fd:hint><i18n:text i18n:catalogue="local">postcode.hint</i18n:text></fd:hint>
+ <fd:help><i18n:text i18n:catalogue="local">postcode.help</i18n:text></fd:help>
+ <fd:datatype base="string"/>
+ <fd:validation>
+ <fd:length min="2" max="50"/>
+ </fd:validation>
+ </fd:field>
+ <fd:field id="ophone" required="true">
+ <fd:label><i18n:text i18n:catalogue="local">field.ophone</i18n:text>: </fd:label>
+ <fd:hint><i18n:text i18n:catalogue="local">ophone.hint</i18n:text></fd:hint>
+ <fd:help><i18n:text i18n:catalogue="local">ophone.help</i18n:text></fd:help>
+ <fd:datatype base="string"/>
+ <fd:validation>
+ <fd:length min="2" max="50"/>
+ </fd:validation>
+ </fd:field>
+ <fd:field id="fphone" required="false">
+ <fd:label><i18n:text i18n:catalogue="local">field.fphone</i18n:text>: </fd:label>
+ <fd:hint><i18n:text i18n:catalogue="local">fphone.hint</i18n:text></fd:hint>
+ <fd:help><i18n:text i18n:catalogue="local">fphone.help</i18n:text></fd:help>
+ <fd:datatype base="string"/>
+ <fd:validation>
+ <fd:length min="2" max="50"/>
+ </fd:validation>
+ </fd:field>
+ <fd:field id="mphone" required="false">
+ <fd:label><i18n:text i18n:catalogue="local">field.mphone</i18n:text>: </fd:label>
+ <fd:hint><i18n:text i18n:catalogue="local">mphone.hint</i18n:text></fd:hint>
+ <fd:help><i18n:text i18n:catalogue="local">mphone.help</i18n:text></fd:help>
+ <fd:datatype base="string"/>
+ <fd:validation>
+ <fd:length min="2" max="50"/>
+ </fd:validation>
+ </fd:field>
+ <fd:field id="hphone" required="false">
+ <fd:label><i18n:text i18n:catalogue="local">field.hphone</i18n:text>: </fd:label>
+ <fd:hint><i18n:text i18n:catalogue="local">hphone.hint</i18n:text></fd:hint>
+ <fd:help><i18n:text i18n:catalogue="local">hphone.help</i18n:text></fd:help>
+ <fd:datatype base="string"/>
+ <fd:validation>
+ <fd:length min="2" max="50"/>
+ </fd:validation>
+ </fd:field>
+ <fd:field id="pager" required="false">
+ <fd:label><i18n:text i18n:catalogue="local">field.pager</i18n:text>: </fd:label>
+ <fd:hint><i18n:text i18n:catalogue="local">pager.hint</i18n:text></fd:hint>
+ <fd:help><i18n:text i18n:catalogue="local">pager.help</i18n:text></fd:help>
+ <fd:datatype base="string"/>
+ <fd:validation>
+ <fd:length min="2" max="50"/>
+ </fd:validation>
+ </fd:field>
+ <fd:submit id="cancel" action-command="cancel" validate="false">
+ <fd:label>Cancel</fd:label>
+ <fd:hint><i18n:text i18n:catalogue="local">cancel.hint</i18n:text></fd:hint>
+ </fd:submit>
+ <fd:submit id="done" action-command="done" validate="true">
+ <fd:label>Send</fd:label>
+ <fd:hint><i18n:text i18n:catalogue="local">submit.hint</i18n:text></fd:hint>
+ </fd:submit>
+ </fd:widgets>
+</fd:form>
Propchange: cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/naming/samples/forms/person-model.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/naming/samples/forms/person-template.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/naming/samples/i18n/addressbook.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/naming/samples/resources/contact.ldif
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/naming/samples/resources/directory.ldif
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/naming/samples/resources/slapd.conf
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/naming/samples/screens/departments.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/naming/samples/screens/error.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/naming/samples/screens/people.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/naming/samples/screens/person.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/naming/samples/sitemap.xmap
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/naming/samples/styles/addressbook.css
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/naming/samples/welcome.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/naming/samples/xslt/forms.xsl
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/naming/samples/xslt/forms.xsl?rev=1573205&r1=1573204&r2=1573205&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/naming/samples/xslt/forms.xsl (original)
+++ cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/naming/samples/xslt/forms.xsl Sat Mar 1 18:02:14 2014
@@ -1 +1,56 @@
-<?xml version="1.0"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
The ASF licenses this file to You 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.
-->
<xsl:stylesheet
version="1.0"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns:fi="http://apache.org/cocoon/forms/1.0#instance">
<!--
this is a modified copy of the stylesheet "forms-samples-styling.xsl" that comes with CForms
-->
<!--+ Include styling stylesheets, one for the widgets, the other one for the
| page. As 'forms-advanced-field-styling.xsl' is a specialization of
| 'forms-field-styling.xsl' the latter one is imported there. If you don't
| want advanced styling of widgets, change it here!
| See xsl:include as composition and xsl:import as extension/inheritance.
+-->
<xsl:include href="resource://org/apache/cocoon/forms/resources/forms-page-styling.xsl"/>
<xsl:include href="resource://org/apache/cocoon/forms/resources/forms-advanced-field-styling.xsl"/>
<xsl:param name="resources-uri">resources</xsl:param>
<xsl:template match="head">
<head>
<xsl:apply-templates/>
<xsl:apply-templates select="." mode="forms-page"/>
<xsl:apply-templates select="." mode="forms-field"/>
</head>
</xsl:template>
<xsl:template match="body">
<body>
<!--+ !!! If template with mode 'forms-page' adds text or elements
| template with mode 'forms-field' can no longer add attributes!!!
+-->
<xsl:apply-templates select="." mode="forms-page"/>
<xsl:apply-templates select="." mode="forms-field"/>
<xsl:apply-templates/>
</body>
</xsl:template>
<xsl:template match="forms-help-image">
<img src="{$resources-uri}/forms/img/help.gif" alt="helppopup"/>
</xsl:template>
<xsl:template match="fi:output" mode="label">
<xsl:param name="id" select="@id"/>
<label for="{$id}" title="{fi:hint}">
<xsl:copy-of select="fi:label/node()"/>
</label>
</xsl:template>
</xsl:stylesheet>
\ No newline at end of file
+<?xml version="1.0"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You 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.
+-->
+<!--
+ this is a modified copy of the stylesheet "forms-samples-styling.xsl" that comes with CForms
+-->
+<!--+ Include styling stylesheets, one for the widgets, the other one for the
+ | page. As 'forms-advanced-field-styling.xsl' is a specialization of
+ | 'forms-field-styling.xsl' the latter one is imported there. If you don't
+ | want advanced styling of widgets, change it here!
+ | See xsl:include as composition and xsl:import as extension/inheritance.
+ +-->
+ <xsl:include href="resource://org/apache/cocoon/forms/resources/forms-page-styling.xsl"/>
+ <xsl:include href="resource://org/apache/cocoon/forms/resources/forms-advanced-field-styling.xsl"/>
+ <xsl:param name="resources-uri">resources</xsl:param>
+ <xsl:template match="head">
+ <head>
+ <xsl:apply-templates/>
+ <xsl:apply-templates select="." mode="forms-page"/>
+ <xsl:apply-templates select="." mode="forms-field"/>
+ </head>
+ </xsl:template>
+ <xsl:template match="body">
+ <body>
+ <!--+ !!! If template with mode 'forms-page' adds text or elements
+ | template with mode 'forms-field' can no longer add attributes!!!
+ +-->
+ <xsl:apply-templates select="." mode="forms-page"/>
+ <xsl:apply-templates select="." mode="forms-field"/>
+ <xsl:apply-templates/>
+ </body>
+ </xsl:template>
+ <xsl:template match="forms-help-image">
+ <img src="{$resources-uri}/forms/img/help.gif" alt="helppopup"/>
+ </xsl:template>
+ <xsl:template match="fi:output" mode="label">
+ <xsl:param name="id" select="@id"/>
+ <label for="{$id}" title="{fi:hint}">
+ <xsl:copy-of select="fi:label/node()"/>
+ </label>
+ </xsl:template>
+</xsl:stylesheet>
Propchange: cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/naming/samples/xslt/forms.xsl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/naming/samples/xslt/page2html.xsl
------------------------------------------------------------------------------
svn:eol-style = native
Modified: cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/ojb/build.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/ojb/build.xml?rev=1573205&r1=1573204&r2=1573205&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/ojb/build.xml (original)
+++ cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/ojb/build.xml Sat Mar 1 18:02:14 2014
@@ -55,7 +55,7 @@
so we have to do it here "by hand" -->
<target name="compile" unless="unless.exclude.webapp.samples">
<javac compiler="${compiler}" nowarn="${compiler.nowarn}"
- target="${target.vm}" deprecation="${compiler.deprecation}"
+ target="${target.vm}" source="${source.vm}" deprecation="${compiler.deprecation}"
optimize="${compiler.optimize}" debug="${compiler.debug}"
destdir="${build.blocks.ojb.samples}">
<src path="${blocks}/ojb/java"/>
Modified: cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/portal/conf/portal.samplesxconf
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/portal/conf/portal.samplesxconf?rev=1573205&r1=1573204&r2=1573205&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/portal/conf/portal.samplesxconf (original)
+++ cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/portal/conf/portal.samplesxconf Sat Mar 1 18:02:14 2014
@@ -24,102 +24,6 @@
if you use the portal for your own projects that you
remove all unused stuff from the configuration!
-->
-
- <component class="org.apache.cocoon.portal.event.impl.DefaultEventManager" logger="portal"
- role="org.apache.cocoon.portal.event.EventManager">
- <event-aspects>
- <!-- The client should not cache the page. -->
- <aspect type="no-client-caching"/>
- <!-- Uncomment this aspect when marshalling JSR168 portlet events
- <aspect type="convertable"/>
- -->
- <!-- Use the action counter with great care. We recommend turning it off. -->
- <!-- Remove action-counter when using PageLabels -->
- <!-- aspect type="action-counter"/ -->
- <aspect type="frame"/>
- <aspect type="link"/>
- <aspect type="full-screen-coplet"/>
- <!-- Uncomment the following when using PageLabels
- <aspect type="page-label"/>
- -->
- <aspect type="request-parameter">
- <!-- Uncomment the following when marshalling JSR168 portlet events
- <parameter name="parameter-name" value="cocoon-portal-event,url"/>
- -->
- </aspect>
- </event-aspects>
- <!-- add a new instance of each class as a subscriber: -->
- <subscriber-classes>
- <!-- Please note that Subcribers are deprecated. Please use receivers instead. -->
- <!-- class name="CLASSNAME"/> -->
- </subscriber-classes>
- <!-- add each component as a subscriber (the component should be thread safe): -->
- <subscriber-roles>
- <!-- Please note that Subcribers are deprecated. Please use receivers instead. -->
- <!-- <role name="AVALON-ROLE"/> -->
- </subscriber-roles>
- <!-- add a new instance of each class as a receiver: -->
- <receiver-classes>
- <class name="org.apache.cocoon.portal.event.subscriber.impl.DefaulCopletDataEventSubscriber"/>
- <class
- name="org.apache.cocoon.portal.event.subscriber.impl.DefaultChangeAspectDataEventSubscriber"/>
- <class name="org.apache.cocoon.portal.event.subscriber.impl.DefaultJXPathEventSubscriber"/>
- </receiver-classes>
- <!-- add each component as a receiver (the component should be thread safe): -->
- <receiver-roles>
- <!-- <role name="AVALON-ROLE"/> -->
- </receiver-roles>
- </component>
-
- <!-- This is the portal manager.
- The portal manager can be extended with different aspects.
- Currently the JSR-168 aspect is configured/activated.
- If you don't need the JSR-168 support uncomment the aspect.
- -->
- <component class="org.apache.cocoon.portal.impl.PortalManagerImpl"
- logger="portal" role="org.apache.cocoon.portal.PortalManager">
- <aspects>
- <!-- JSR-168 support: -->
- <aspect adapter="portlet"/>
- </aspects>
- <fullScreenNav>true</fullScreenNav>
- </component>
-
-
- <!-- This is the portal service -->
- <component class="org.apache.cocoon.portal.impl.PortalServiceImpl" logger="portal"
- role="org.apache.cocoon.portal.PortalService">
- <portals>
- <!-- Configure your portals here: -->
- </portals>
- </component>
-
- <!-- To enable PageLabels change DefaultLinkService to PageLabelLinkService -->
- <component class="org.apache.cocoon.portal.impl.DefaultLinkService"
- logger="portal"
- role="org.apache.cocoon.portal.LinkService">
- <parameter name="defaultPort" value="8888"/>
- <parameter name="defaultSecurePort" value="443"/>
- </component>
-
- <!-- To enable PageLabels change DefaultEventConverter to PageLabelEventConverter -->
- <component class="org.apache.cocoon.portal.event.impl.DefaultEventConverter" logger="portal"
- role="org.apache.cocoon.portal.event.EventConverter">
- </component>
-
- <!-- Page Label Manager -->
- <component class="org.apache.cocoon.portal.impl.PageLabelManager" logger="portal"
- role="org.apache.cocoon.portal.impl.PageLabelManager">
- <!-- Uncomment to marshall JSR-168 portlet events
- <marshallEvents>true</marshallEvents>
- -->
- <!-- Uncomment to enable non sticky tabs
- <nonStickyTabs>true</nonStickyTabs>
- -->
- <!-- Uncomment to have the label appear in the path instead of as a request parameter
- <urlPath>true</urlPath>
- -->
- </component>
<!-- This security handler makes use of a pipeline for the authentication: -->
<component role="org.apache.cocoon.auth.SecurityHandler/portal"
Modified: cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/portal/conf/portal.xconf
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/portal/conf/portal.xconf?rev=1573205&r1=1573204&r2=1573205&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/portal/conf/portal.xconf (original)
+++ cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/portal/conf/portal.xconf Sat Mar 1 18:02:14 2014
@@ -130,5 +130,114 @@
<parameter name="briefcase:action:email" value="cocoon://email-briefcase"/>
<parameter name="briefcase:action:calc" value="cocoon://calc-briefcase"/>
</component>
+
+ <component class="org.apache.cocoon.portal.event.impl.DefaultEventManager" logger="portal"
+ role="org.apache.cocoon.portal.event.EventManager">
+ <event-aspects>
+ <!-- The client should not cache the page. -->
+ <aspect type="no-client-caching"/>
+ <!-- Uncomment this aspect when marshalling JSR168 portlet events
+ <aspect type="convertable"/>
+ -->
+ <!-- Use the action counter with great care. We recommend turning it off. -->
+ <!-- Remove action-counter when using PageLabels -->
+ <!-- aspect type="action-counter"/ -->
+ <aspect type="frame"/>
+ <aspect type="link"/>
+ <aspect type="full-screen-coplet"/>
+ <!-- Uncomment the following when using PageLabels
+ <aspect type="page-label"/>
+ -->
+ <!-- Uncomment the following if need WSRP: -->
+ <!-- (and see COCOON-2069) -->
+ <!--
+ <aspect type="wsrp"/>
+ -->
+ <aspect type="request-parameter">
+ <!-- Uncomment the following when marshalling JSR168 portlet events
+ <parameter name="parameter-name" value="cocoon-portal-event,url"/>
+ -->
+ </aspect>
+ </event-aspects>
+ <!-- add a new instance of each class as a subscriber: -->
+ <subscriber-classes>
+ <!-- Please note that Subcribers are deprecated. Please use receivers instead. -->
+ <!-- class name="CLASSNAME"/> -->
+ </subscriber-classes>
+ <!-- add each component as a subscriber (the component should be thread safe): -->
+ <subscriber-roles>
+ <!-- Please note that Subcribers are deprecated. Please use receivers instead. -->
+ <!-- <role name="AVALON-ROLE"/> -->
+ </subscriber-roles>
+ <!-- add a new instance of each class as a receiver: -->
+ <receiver-classes>
+ <class name="org.apache.cocoon.portal.event.subscriber.impl.DefaulCopletDataEventSubscriber"/>
+ <class
+ name="org.apache.cocoon.portal.event.subscriber.impl.DefaultChangeAspectDataEventSubscriber"/>
+ <class name="org.apache.cocoon.portal.event.subscriber.impl.DefaultJXPathEventSubscriber"/>
+ </receiver-classes>
+ <!-- add each component as a receiver (the component should be thread safe): -->
+ <receiver-roles>
+ <!-- <role name="AVALON-ROLE"/> -->
+ </receiver-roles>
+ </component>
+
+ <!-- This is the portal manager.
+ The portal manager can be extended with different aspects.
+ Currently the JSR-168 aspect is configured/activated.
+ If you don't need the JSR-168 support uncomment the aspect.
+ In a similar manner the wsrp support works.
+ -->
+ <component class="org.apache.cocoon.portal.impl.PortalManagerImpl"
+ logger="portal" role="org.apache.cocoon.portal.PortalManager">
+ <aspects>
+ <!-- JSR-168 support: -->
+ <aspect adapter="portlet"/>
+ <!-- wsrp support: -->
+ <!-- Uncomment the following if need WSRP: -->
+ <!-- (and see COCOON-2069) -->
+ <!--
+ <aspect adapter="wsrp"/>
+ -->
+ </aspects>
+ <fullScreenNav>true</fullScreenNav>
+ </component>
+
+
+ <!-- This is the portal service -->
+ <component class="org.apache.cocoon.portal.impl.PortalServiceImpl" logger="portal"
+ role="org.apache.cocoon.portal.PortalService">
+ <portals>
+ <!-- Configure your portals here: -->
+ </portals>
+ </component>
+
+ <!-- To enable PageLabels change DefaultLinkService to PageLabelLinkService -->
+ <component class="org.apache.cocoon.portal.impl.DefaultLinkService"
+ logger="portal"
+ role="org.apache.cocoon.portal.LinkService">
+ <parameter name="defaultPort" value="8888"/>
+ <parameter name="defaultSecurePort" value="443"/>
+ </component>
+
+ <!-- To enable PageLabels change DefaultEventConverter to PageLabelEventConverter -->
+ <component class="org.apache.cocoon.portal.event.impl.DefaultEventConverter" logger="portal"
+ role="org.apache.cocoon.portal.event.EventConverter">
+ </component>
+
+ <!-- Page Label Manager -->
+ <component class="org.apache.cocoon.portal.impl.PageLabelManager" logger="portal"
+ role="org.apache.cocoon.portal.impl.PageLabelManager">
+ <!-- Uncomment to marshall JSR-168 portlet events
+ <marshallEvents>true</marshallEvents>
+ -->
+ <!-- Uncomment to enable non sticky tabs
+ <nonStickyTabs>true</nonStickyTabs>
+ -->
+ <!-- Uncomment to have the label appear in the path instead of as a request parameter
+ <urlPath>true</urlPath>
+ -->
+ </component>
+
</xconf>
Modified: cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/portal/mocks/javax/servlet/http/HttpServletRequestWrapper.java
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/portal/mocks/javax/servlet/http/HttpServletRequestWrapper.java?rev=1573205&r1=1573204&r2=1573205&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/portal/mocks/javax/servlet/http/HttpServletRequestWrapper.java (original)
+++ cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/portal/mocks/javax/servlet/http/HttpServletRequestWrapper.java Sat Mar 1 18:02:14 2014
@@ -18,9 +18,11 @@ package javax.servlet.http;
import java.io.BufferedReader;
import java.io.IOException;
+import java.io.UnsupportedEncodingException;
import java.security.Principal;
import java.util.Enumeration;
import java.util.Locale;
+import java.util.Map;
import javax.servlet.RequestDispatcher;
import javax.servlet.ServletInputStream;
@@ -97,6 +99,10 @@ public class HttpServletRequestWrapper i
public String getRequestURI() {
return null;
}
+
+ public StringBuffer getRequestURL() {
+ return null;
+ }
public String getServletPath() {
return null;
@@ -145,6 +151,9 @@ public class HttpServletRequestWrapper i
public String getCharacterEncoding() {
return null;
}
+
+ public void setCharacterEncoding(String string) throws UnsupportedEncodingException {
+ }
public int getContentLength() {
return 0;
@@ -177,6 +186,10 @@ public class HttpServletRequestWrapper i
public String[] getParameterValues(String arg0) {
return null;
}
+
+ public Map getParameterMap() {
+ return null;
+ }
public String getProtocol() {
return null;
Modified: cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/portal/mocks/javax/servlet/http/HttpServletResponseWrapper.java
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/portal/mocks/javax/servlet/http/HttpServletResponseWrapper.java?rev=1573205&r1=1573204&r2=1573205&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/portal/mocks/javax/servlet/http/HttpServletResponseWrapper.java (original)
+++ cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/portal/mocks/javax/servlet/http/HttpServletResponseWrapper.java Sat Mar 1 18:02:14 2014
@@ -136,4 +136,7 @@ public class HttpServletResponseWrapper
public void setLocale(Locale arg0) {
}
+
+ public void resetBuffer() {
+ }
}
\ No newline at end of file
Modified: cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/repository/java/org/apache/cocoon/components/repository/SourceRepositoryImpl.java
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/repository/java/org/apache/cocoon/components/repository/SourceRepositoryImpl.java?rev=1573205&r1=1573204&r2=1573205&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/repository/java/org/apache/cocoon/components/repository/SourceRepositoryImpl.java (original)
+++ cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/repository/java/org/apache/cocoon/components/repository/SourceRepositoryImpl.java Sat Mar 1 18:02:14 2014
@@ -99,7 +99,7 @@ implements Serviceable, ThreadSafe, Sour
int status;
if (exists) {
- status = STATUS_OK;
+ status = STATUS_NO_CONTENT;
}
else {
status = STATUS_CREATED;
Propchange: cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/repository/java/org/apache/cocoon/components/source/helpers/DelaySourceRefresher.java
('eol-style' removed)
Propchange: cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/repository/java/org/apache/cocoon/components/source/helpers/SourceRefresher.java
('eol-style' removed)
Propchange: cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/repository/java/org/apache/cocoon/components/source/impl/CachedSourceResponse.java
('eol-style' removed)
Propchange: cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/repository/java/org/apache/cocoon/components/source/impl/CachingSource.java
('eol-style' removed)
Propchange: cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/repository/java/org/apache/cocoon/components/source/impl/CachingSourceFactory.java
('eol-style' removed)
Propchange: cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/repository/java/org/apache/cocoon/components/source/impl/InspectableTraversableCachingSource.java
('eol-style' removed)
Propchange: cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/repository/java/org/apache/cocoon/components/source/impl/TraversableCachingSource.java
('eol-style' removed)
Modified: cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/serializers/java/org/apache/cocoon/components/serializers/EncodingSerializer.java
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/serializers/java/org/apache/cocoon/components/serializers/EncodingSerializer.java?rev=1573205&r1=1573204&r2=1573205&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/serializers/java/org/apache/cocoon/components/serializers/EncodingSerializer.java (original)
+++ cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/serializers/java/org/apache/cocoon/components/serializers/EncodingSerializer.java Sat Mar 1 18:02:14 2014
@@ -46,6 +46,7 @@ import org.xml.sax.SAXException;
* <serializer class="org.apache.cocoon.components.serializers..." ... >
* <encoding>myencoding</encoding>
* <indent>myindenting</indent>
+ * <setContentLength>false</setContentLength>
* </serializer>
* </pre>
*
@@ -56,6 +57,10 @@ import org.xml.sax.SAXException;
*
* <p>The value indicated by <i>myindenting</i> will control the indenting
* level for each element.<p>
+ *
+ * <p>The value indicated by <em>setContentLength</em> determines if the serializer
+ * sets the <code>Content-Length</code> HTTP header. The parameter is optional, the
+ * default value is <em>false</em>.
*
* @version CVS $Id$
*/
@@ -116,6 +121,9 @@ public abstract class EncodingSerializer
protected int indentPerLevel = 0;
/* ====================================================================== */
+ /** Determine if the serializer should set the Content-Length HTTP header. */
+ private boolean setContentLength;
+
/**
* Create a new instance of this <code>EncodingSerializer</code>
*/
@@ -131,7 +139,7 @@ public abstract class EncodingSerializer
* Test if the component wants to set the content length.
*/
public boolean shouldSetContentLength() {
- return(false);
+ return this.setContentLength;
}
/**
@@ -175,6 +183,8 @@ public abstract class EncodingSerializer
if (indentPerLevel > 0) {
assureIndentBuffer(indentPerLevel * 6);
}
+
+ this.setContentLength = conf.getChild("setContentLength").getValueAsBoolean(false);
}
/* ====================================================================== */
Modified: cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/serializers/java/org/apache/cocoon/components/serializers/HTMLSerializer.java
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/serializers/java/org/apache/cocoon/components/serializers/HTMLSerializer.java?rev=1573205&r1=1573204&r2=1573205&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/serializers/java/org/apache/cocoon/components/serializers/HTMLSerializer.java (original)
+++ cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/serializers/java/org/apache/cocoon/components/serializers/HTMLSerializer.java Sat Mar 1 18:02:14 2014
@@ -74,8 +74,6 @@ public class HTMLSerializer extends XHTM
private static final HTMLEncoder HTML_ENCODER = new HTMLEncoder();
- protected boolean encodeCharacters = true;
-
/**
* Create a new instance of this <code>HTMLSerializer</code>
*/
@@ -196,10 +194,6 @@ public class HTMLSerializer extends XHTM
length++;
}
- // script and style are CDATA sections by default, so no encoding
- if ( "SCRIPT".equals(name) || "STYLE".equals(name) ) {
- this.encodeCharacters = false;
- }
super.startElementImpl(XHTML1_NAMESPACE, name, name, NAMESPACES, at);
}
@@ -231,22 +225,7 @@ public class HTMLSerializer extends XHTM
if (name.equals("META")) return;
if (name.equals("PARAM")) return;
- // script and style are CDATA sections by default, so no encoding
- if ( "SCRIPT".equals(name) || "STYLE".equals(name) ) {
- this.encodeCharacters = true;
- }
super.endElementImpl(XHTML1_NAMESPACE, name, name);
}
- /**
- * Encode and write a specific part of an array of characters.
- */
- protected void encode(char data[], int start, int length)
- throws SAXException {
- if ( !this.encodeCharacters ) {
- this.write(data, start, length);
- return;
- }
- super.encode(data, start, length);
- }
}
Modified: cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/serializers/java/org/apache/cocoon/components/serializers/XHTMLSerializer.java
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/serializers/java/org/apache/cocoon/components/serializers/XHTMLSerializer.java?rev=1573205&r1=1573204&r2=1573205&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/serializers/java/org/apache/cocoon/components/serializers/XHTMLSerializer.java (original)
+++ cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/serializers/java/org/apache/cocoon/components/serializers/XHTMLSerializer.java Sat Mar 1 18:02:14 2014
@@ -23,7 +23,7 @@ import org.apache.cocoon.components.seri
import org.xml.sax.SAXException;
/**
- * <p>A pedantinc XHTML serializer encoding all recognized entities with their
+ * <p>A pedantic XHTML serializer encoding all recognized entities with their
* proper HTML names.</p>
*
* <p>For configuration options of this serializer, please look at the
@@ -42,13 +42,15 @@ import org.xml.sax.SAXException;
*
* <dl>
* <dt>"<code>none</code>"</dt>
- * <dd>Not to emit any dococument type declaration.</dd>
+ * <dd>Not to emit any document type declaration.</dd>
* <dt>"<code>strict</code>"</dt>
* <dd>The XHTML 1.0 Strict document type.</dd>
* <dt>"<code>loose</code>"</dt>
* <dd>The XHTML 1.0 Transitional document type.</dd>
* <dt>"<code>frameset</code>"</dt>
* <dd>The XHTML 1.0 Frameset document type.</dd>
+ * <dt>"<code>xhtml5</code>"</dt>
+ * <dd>The XHTML5 document type.</dd>
* </dl>
*
* @version CVS $Id$
@@ -74,10 +76,15 @@ public class XHTMLSerializer extends XML
"html", "-//W3C//DTD XHTML 1.0 Frameset//EN",
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd");
+ /** A representation of the XHTML5 document type. */
+ public static final DocType XHTML5_DOCTYPE = new DocType("html");
+
/* ====================================================================== */
private static final XHTMLEncoder XHTML_ENCODER = new XHTMLEncoder();
+ protected boolean encodeCharacters = true;
+
/* ====================================================================== */
/** The <code>DocType</code> instance representing the document. */
@@ -128,6 +135,8 @@ public class XHTMLSerializer extends XML
this.doctype_default = XHTML1_DOCTYPE_TRANSITIONAL;
} else if ("frameset".equalsIgnoreCase(doctype)) {
this.doctype_default = XHTML1_DOCTYPE_FRAMESET;
+ } else if ("xhtml5".equalsIgnoreCase(doctype)) {
+ this.doctype_default = XHTML5_DOCTYPE;
} else {
/* Default is transitional */
this.doctype_default = XHTML1_DOCTYPE_TRANSITIONAL;
@@ -181,6 +190,11 @@ public class XHTMLSerializer extends XML
String namespaces[][], String attributes[][])
throws SAXException {
if (uri.length() == 0) uri = XHTML1_NAMESPACE;
+
+ if (isCdataElement(local)) {
+ this.encodeCharacters = false;
+ }
+
super.startElementImpl(uri, local, qual, namespaces, attributes);
}
@@ -202,7 +216,7 @@ public class XHTMLSerializer extends XML
this.closeElement(false);
} else if (local.equalsIgnoreCase("head")) {
String loc = "meta";
- String qua = namespaces.qualify(XHTML1_NAMESPACE, loc, "meta");
+ String qua = this.namespaces.qualify(XHTML1_NAMESPACE, loc, "meta");
String nsp[][] = new String[0][0];
String att[][] = new String[2][ATTRIBUTE_LENGTH];
@@ -217,7 +231,33 @@ public class XHTMLSerializer extends XML
this.endElementImpl(XHTML1_NAMESPACE, loc, qua);
}
}
+
+ if (isCdataElement(local)) {
+ this.encodeCharacters = true;
+ }
+
super.endElementImpl(uri, local, qual);
}
+ /**
+ * script and style are CDATA sections by default, so no encoding
+ * @param localName The local name of the element.
+ * @return If the element should be serialized without encoding.
+ */
+ protected boolean isCdataElement(String localName) {
+ String upperCase = localName.toUpperCase();
+ return "SCRIPT".equals(upperCase) || "STYLE".equals(upperCase);
+ }
+
+ /**
+ * Encode and write a specific part of an array of characters.
+ */
+ protected void encode(char data[], int start, int length)
+ throws SAXException {
+ if (this.encodeCharacters) {
+ super.encode(data, start, length);
+ } else {
+ this.write(data, start, length);
+ }
+ }
}
Modified: cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/serializers/java/org/apache/cocoon/components/serializers/encoding/CharsetFactory.java
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/serializers/java/org/apache/cocoon/components/serializers/encoding/CharsetFactory.java?rev=1573205&r1=1573204&r2=1573205&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/serializers/java/org/apache/cocoon/components/serializers/encoding/CharsetFactory.java (original)
+++ cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/serializers/java/org/apache/cocoon/components/serializers/encoding/CharsetFactory.java Sat Mar 1 18:02:14 2014
@@ -24,6 +24,7 @@ import java.io.IOException;
import java.io.OutputStreamWriter;
import java.io.UnsupportedEncodingException;
import java.net.URL;
+import java.net.URLDecoder;
import java.util.Enumeration;
import java.util.HashMap;
import java.util.zip.ZipEntry;
@@ -126,6 +127,9 @@ public final class CharsetFactory {
String mtch = file.substring(file.indexOf('!'));
file = file.substring(5, file.indexOf('!'));
mtch = mtch.substring(2, mtch.lastIndexOf('/') + 1) + "cs_";
+
+ // COCOON-2286 allow special characters in path (mainly spaces)
+ file = URLDecoder.decode(file, "UTF-8");
ZipFile zip = new ZipFile(file);
Enumeration enumeration = zip.entries();
Modified: cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/serializers/java/org/apache/cocoon/components/serializers/encoding/XHTMLEncoder.java
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/serializers/java/org/apache/cocoon/components/serializers/encoding/XHTMLEncoder.java?rev=1573205&r1=1573204&r2=1573205&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/serializers/java/org/apache/cocoon/components/serializers/encoding/XHTMLEncoder.java (original)
+++ cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/serializers/java/org/apache/cocoon/components/serializers/encoding/XHTMLEncoder.java Sat Mar 1 18:02:14 2014
@@ -42,7 +42,7 @@ public class XHTMLEncoder extends XMLEnc
}
/**
- * Return true or false wether this encoding can encode the specified
+ * Return true or false whether this encoding can encode the specified
* character or not.
* <p>
* This method will return true for the following character range:
Propchange: cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/template/resources/META-INF/license.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/template/resources/META-INF/notice.txt
------------------------------------------------------------------------------
svn:eol-style = native
Modified: cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/web3/samples/samples.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/web3/samples/samples.xml?rev=1573205&r1=1573204&r2=1573205&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/web3/samples/samples.xml (original)
+++ cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/web3/samples/samples.xml Sat Mar 1 18:02:14 2014
@@ -30,7 +30,7 @@
</group>
<group name="web3">
- <sample name="Documentation" href="../../../docs/developing/web3.html">
+ <sample name="Documentation" href="http://cocoon.apache.org/2.1/developing/web3.html">
Documentation for this component.
</sample>
<sample name="Connect to SAP R/3" href="info.html">
Modified: cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/webdav/samples/samples.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/webdav/samples/samples.xml?rev=1573205&r1=1573204&r2=1573205&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/webdav/samples/samples.xml (original)
+++ cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/webdav/samples/samples.xml Sat Mar 1 18:02:14 2014
@@ -26,7 +26,7 @@
<sample name="WebDAV" href="http://wiki.cocoondev.org/Wiki.jsp?page=WebDAVBlock">
How to How to build a poor men's CMS with Cocoon and WebDAV
</sample>
- <sample name="Setting up mod_dav" href="http://httpd.apache.org/docs-2.0/mod/mod_dav.html">
+ <sample name="Setting up mod_dav" href="http://httpd.apache.org/docs/2.0/mod/mod_dav.html">
How to setup the Apache Web server as a WebDAV server
</sample>
</group>
Modified: cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/SOAPHelper.java
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/SOAPHelper.java?rev=1573205&r1=1573204&r2=1573205&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/SOAPHelper.java (original)
+++ cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/SOAPHelper.java Sat Mar 1 18:02:14 2014
@@ -26,6 +26,7 @@ import org.apache.commons.httpclient.Hea
import org.apache.commons.httpclient.HttpConnection;
import org.apache.commons.httpclient.HttpState;
import org.apache.commons.httpclient.methods.PostMethod;
+import org.apache.commons.httpclient.protocol.Protocol;
import org.apache.excalibur.source.SourceUtil;
import org.xml.sax.InputSource;
@@ -72,13 +73,14 @@ public class SOAPHelper {
String host = this.url.getHost();
int port = this.url.getPort();
+ Protocol protocol = Protocol.getProtocol(this.url.getProtocol());
if (System.getProperty("http.proxyHost") != null) {
String proxyHost = System.getProperty("http.proxyHost");
int proxyPort = Integer.parseInt(System.getProperty("http.proxyPort"));
- conn = new HttpConnection(proxyHost, proxyPort, host, port);
+ conn = new HttpConnection(proxyHost, proxyPort, host, null, port, protocol);
} else {
- conn = new HttpConnection(host, port);
+ conn = new HttpConnection(host, port, protocol);
}
PostMethod method = new PostMethod(this.url.getFile());
Propchange: cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/xsp/samples/java/java5.xsp
------------------------------------------------------------------------------
svn:eol-style = native
Modified: cocoon/branches/BRANCH_2_1_X-dojo1_1/src/java/org/apache/cocoon/bean/CocoonBean.java
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X-dojo1_1/src/java/org/apache/cocoon/bean/CocoonBean.java?rev=1573205&r1=1573204&r2=1573205&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X-dojo1_1/src/java/org/apache/cocoon/bean/CocoonBean.java (original)
+++ cocoon/branches/BRANCH_2_1_X-dojo1_1/src/java/org/apache/cocoon/bean/CocoonBean.java Sat Mar 1 18:02:14 2014
@@ -753,7 +753,7 @@ public class CocoonBean extends CocoonWr
String lSep = SystemUtils.LINE_SEPARATOR;
StringBuffer msg = new StringBuffer();
msg.append("------------------------------------------------------------------------ ").append(lSep);
- msg.append(Constants.NAME).append(" ").append(Constants.VERSION).append(lSep);
+ msg.append(Constants.COMPLETE_NAME).append(lSep);
msg.append("Copyright (c) ").append(Constants.YEAR).append(" Apache Software Foundation. All rights reserved.").append(lSep);
msg.append("------------------------------------------------------------------------ ").append(lSep).append(lSep);
return msg.toString();
Modified: cocoon/branches/BRANCH_2_1_X-dojo1_1/src/java/org/apache/cocoon/cocoon.properties
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X-dojo1_1/src/java/org/apache/cocoon/cocoon.properties?rev=1573205&r1=1573204&r2=1573205&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X-dojo1_1/src/java/org/apache/cocoon/cocoon.properties (original)
+++ cocoon/branches/BRANCH_2_1_X-dojo1_1/src/java/org/apache/cocoon/cocoon.properties Sat Mar 1 18:02:14 2014
@@ -20,9 +20,9 @@
# very high chance of breaking the build system. Do it only if you know what
# you're doing.
-version=2.1.12-dojo1_1-dev
-released.version=2.1.11
-year=1999-2008
+version=2.1.13-dojo1_1-dev
+released.version=2.1.12
+year=1999-2013
name=cocoon
Name=Cocoon
fullname=Apache Cocoon