http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/abfcac88/freemarker-core-test/src/test/resources/org/apache/freemarker/manualtest/AutoEscapingExample-stringLiteral2.ftlh ---------------------------------------------------------------------- diff --git a/freemarker-core-test/src/test/resources/org/apache/freemarker/manualtest/AutoEscapingExample-stringLiteral2.ftlh b/freemarker-core-test/src/test/resources/org/apache/freemarker/manualtest/AutoEscapingExample-stringLiteral2.ftlh deleted file mode 100644 index 52db70b..0000000 --- a/freemarker-core-test/src/test/resources/org/apache/freemarker/manualtest/AutoEscapingExample-stringLiteral2.ftlh +++ /dev/null @@ -1,25 +0,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. ---> -<#-- Markup output value created by escaping plain text: --> -<#assign mo1 = "Foo & bar"?esc> -<#-- Markup output value created outherwise: --> -<#assign mo2 = "<p>Foo"?no_esc> - -${"${mo1} baz"} -${"${mo2} baz"} \ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/abfcac88/freemarker-core-test/src/test/resources/org/apache/freemarker/manualtest/AutoEscapingExample-stringLiteral2.ftlh.out ---------------------------------------------------------------------- diff --git a/freemarker-core-test/src/test/resources/org/apache/freemarker/manualtest/AutoEscapingExample-stringLiteral2.ftlh.out b/freemarker-core-test/src/test/resources/org/apache/freemarker/manualtest/AutoEscapingExample-stringLiteral2.ftlh.out deleted file mode 100644 index f47e521..0000000 --- a/freemarker-core-test/src/test/resources/org/apache/freemarker/manualtest/AutoEscapingExample-stringLiteral2.ftlh.out +++ /dev/null @@ -1,21 +0,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. - */ - -Foo & bar baz -<p>Foo baz \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/abfcac88/freemarker-core-test/src/test/resources/org/apache/freemarker/manualtest/ConfigureOutputFormatExamples1.properties ---------------------------------------------------------------------- diff --git a/freemarker-core-test/src/test/resources/org/apache/freemarker/manualtest/ConfigureOutputFormatExamples1.properties b/freemarker-core-test/src/test/resources/org/apache/freemarker/manualtest/ConfigureOutputFormatExamples1.properties deleted file mode 100644 index 0df9e33..0000000 --- a/freemarker-core-test/src/test/resources/org/apache/freemarker/manualtest/ConfigureOutputFormatExamples1.properties +++ /dev/null @@ -1,21 +0,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. - -templateConfigurations = \ - ConditionalTemplateConfigurationFactory( \ - PathGlobMatcher("mail/**"), \ - TemplateConfiguration(outputFormat = HTMLOutputFormat())) \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/abfcac88/freemarker-core-test/src/test/resources/org/apache/freemarker/manualtest/ConfigureOutputFormatExamples2.properties ---------------------------------------------------------------------- diff --git a/freemarker-core-test/src/test/resources/org/apache/freemarker/manualtest/ConfigureOutputFormatExamples2.properties b/freemarker-core-test/src/test/resources/org/apache/freemarker/manualtest/ConfigureOutputFormatExamples2.properties deleted file mode 100644 index 5d2a738..0000000 --- a/freemarker-core-test/src/test/resources/org/apache/freemarker/manualtest/ConfigureOutputFormatExamples2.properties +++ /dev/null @@ -1,31 +0,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. - -templateConfigurations = \ - FirstMatchTemplateConfigurationFactory( \ - ConditionalTemplateConfigurationFactory( \ - FileExtensionMatcher("xml"), \ - TemplateConfiguration(outputFormat = XMLOutputFormat())), \ - ConditionalTemplateConfigurationFactory( \ - OrMatcher( \ - FileExtensionMatcher("html"), \ - FileExtensionMatcher("htm")), \ - TemplateConfiguration(outputFormat = HTMLOutputFormat())), \ - ConditionalTemplateConfigurationFactory( \ - FileExtensionMatcher("rtf"), \ - TemplateConfiguration(outputFormat = RTFOutputFormat())), \ - allowNoMatch = true) http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/abfcac88/freemarker-core-test/src/test/resources/org/apache/freemarker/manualtest/CustomFormatsExample-alias1.ftlh ---------------------------------------------------------------------- diff --git a/freemarker-core-test/src/test/resources/org/apache/freemarker/manualtest/CustomFormatsExample-alias1.ftlh b/freemarker-core-test/src/test/resources/org/apache/freemarker/manualtest/CustomFormatsExample-alias1.ftlh deleted file mode 100644 index fe9690c..0000000 --- a/freemarker-core-test/src/test/resources/org/apache/freemarker/manualtest/CustomFormatsExample-alias1.ftlh +++ /dev/null @@ -1,22 +0,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. ---> -${p?string.@price} -${w?string.@weight} -${fd?string.@fileDate} -${let?datetime?string.@logEventTime} http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/abfcac88/freemarker-core-test/src/test/resources/org/apache/freemarker/manualtest/CustomFormatsExample-alias1.ftlh.out ---------------------------------------------------------------------- diff --git a/freemarker-core-test/src/test/resources/org/apache/freemarker/manualtest/CustomFormatsExample-alias1.ftlh.out b/freemarker-core-test/src/test/resources/org/apache/freemarker/manualtest/CustomFormatsExample-alias1.ftlh.out deleted file mode 100644 index 717431f..0000000 --- a/freemarker-core-test/src/test/resources/org/apache/freemarker/manualtest/CustomFormatsExample-alias1.ftlh.out +++ /dev/null @@ -1,22 +0,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. - */ -10,000.00 -10.31 -23/Dec/15 10:09 PM -2015-12-23T21:09:04.213Z http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/abfcac88/freemarker-core-test/src/test/resources/org/apache/freemarker/manualtest/CustomFormatsExample-alias2.ftlh ---------------------------------------------------------------------- diff --git a/freemarker-core-test/src/test/resources/org/apache/freemarker/manualtest/CustomFormatsExample-alias2.ftlh b/freemarker-core-test/src/test/resources/org/apache/freemarker/manualtest/CustomFormatsExample-alias2.ftlh deleted file mode 100644 index 624950f..0000000 --- a/freemarker-core-test/src/test/resources/org/apache/freemarker/manualtest/CustomFormatsExample-alias2.ftlh +++ /dev/null @@ -1,19 +0,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. ---> -${10?string.@oct} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/abfcac88/freemarker-core-test/src/test/resources/org/apache/freemarker/manualtest/CustomFormatsExample-alias2.ftlh.out ---------------------------------------------------------------------- diff --git a/freemarker-core-test/src/test/resources/org/apache/freemarker/manualtest/CustomFormatsExample-alias2.ftlh.out b/freemarker-core-test/src/test/resources/org/apache/freemarker/manualtest/CustomFormatsExample-alias2.ftlh.out deleted file mode 100644 index 08d0fea..0000000 --- a/freemarker-core-test/src/test/resources/org/apache/freemarker/manualtest/CustomFormatsExample-alias2.ftlh.out +++ /dev/null @@ -1,19 +0,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. - */ -12 \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/abfcac88/freemarker-core-test/src/test/resources/org/apache/freemarker/manualtest/CustomFormatsExample-modelAware.ftlh ---------------------------------------------------------------------- diff --git a/freemarker-core-test/src/test/resources/org/apache/freemarker/manualtest/CustomFormatsExample-modelAware.ftlh b/freemarker-core-test/src/test/resources/org/apache/freemarker/manualtest/CustomFormatsExample-modelAware.ftlh deleted file mode 100644 index 9a34ac0..0000000 --- a/freemarker-core-test/src/test/resources/org/apache/freemarker/manualtest/CustomFormatsExample-modelAware.ftlh +++ /dev/null @@ -1,20 +0,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. ---> -${10.12356} -${weight} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/abfcac88/freemarker-core-test/src/test/resources/org/apache/freemarker/manualtest/CustomFormatsExample-modelAware.ftlh.out ---------------------------------------------------------------------- diff --git a/freemarker-core-test/src/test/resources/org/apache/freemarker/manualtest/CustomFormatsExample-modelAware.ftlh.out b/freemarker-core-test/src/test/resources/org/apache/freemarker/manualtest/CustomFormatsExample-modelAware.ftlh.out deleted file mode 100644 index 25d6155..0000000 --- a/freemarker-core-test/src/test/resources/org/apache/freemarker/manualtest/CustomFormatsExample-modelAware.ftlh.out +++ /dev/null @@ -1,20 +0,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. - */ -10.1236 -1.5 kg \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/abfcac88/freemarker-core-test/src/test/resources/org/apache/freemarker/manualtest/TemplateConfigurationExamples1.properties ---------------------------------------------------------------------- diff --git a/freemarker-core-test/src/test/resources/org/apache/freemarker/manualtest/TemplateConfigurationExamples1.properties b/freemarker-core-test/src/test/resources/org/apache/freemarker/manualtest/TemplateConfigurationExamples1.properties deleted file mode 100644 index faf8592..0000000 --- a/freemarker-core-test/src/test/resources/org/apache/freemarker/manualtest/TemplateConfigurationExamples1.properties +++ /dev/null @@ -1,25 +0,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. - -templateConfigurations = \ - ConditionalTemplateConfigurationFactory( \ - FileExtensionMatcher("xml"), \ - TemplateConfiguration( \ - sourceEncoding = Charset("utf-8"), \ - outputFormat = XMLOutputFormat() \ - ) \ - ) \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/abfcac88/freemarker-core-test/src/test/resources/org/apache/freemarker/manualtest/TemplateConfigurationExamples2.properties ---------------------------------------------------------------------- diff --git a/freemarker-core-test/src/test/resources/org/apache/freemarker/manualtest/TemplateConfigurationExamples2.properties b/freemarker-core-test/src/test/resources/org/apache/freemarker/manualtest/TemplateConfigurationExamples2.properties deleted file mode 100644 index f879e70..0000000 --- a/freemarker-core-test/src/test/resources/org/apache/freemarker/manualtest/TemplateConfigurationExamples2.properties +++ /dev/null @@ -1,32 +0,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. - -templateConfigurations = \ - ConditionalTemplateConfigurationFactory( \ - PathGlobMatcher("mail/**"), \ - FirstMatchTemplateConfigurationFactory( \ - ConditionalTemplateConfigurationFactory( \ - FileNameGlobMatcher("*.subject.*"), \ - TemplateConfiguration(outputFormat = PlainTextOutputFormat()) \ - ), \ - ConditionalTemplateConfigurationFactory( \ - FileNameGlobMatcher("*.body.*"), \ - TemplateConfiguration(outputFormat = HTMLOutputFormat()) \ - ), \ - noMatchErrorDetails = 'Mail template names must contain ".subject." or ".body."!' \ - ) \ - ) http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/abfcac88/freemarker-core-test/src/test/resources/org/apache/freemarker/manualtest/TemplateConfigurationExamples3.properties ---------------------------------------------------------------------- diff --git a/freemarker-core-test/src/test/resources/org/apache/freemarker/manualtest/TemplateConfigurationExamples3.properties b/freemarker-core-test/src/test/resources/org/apache/freemarker/manualtest/TemplateConfigurationExamples3.properties deleted file mode 100644 index ce72fef..0000000 --- a/freemarker-core-test/src/test/resources/org/apache/freemarker/manualtest/TemplateConfigurationExamples3.properties +++ /dev/null @@ -1,47 +0,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. - -templateConfigurations = \ - MergingTemplateConfigurationFactory( \ - ConditionalTemplateConfigurationFactory( \ - FileNameGlobMatcher("*.stats.*"), \ - TemplateConfiguration( \ - dateTimeFormat = "iso", \ - dateFormat = "iso", \ - timeFormat = "iso", \ - timeZone = TimeZone("UTC") \ - ) \ - ), \ - ConditionalTemplateConfigurationFactory( \ - PathGlobMatcher("mail/**"), \ - TemplateConfiguration(sourceEncoding = Charset("utf-8")) \ - ), \ - FirstMatchTemplateConfigurationFactory( \ - ConditionalTemplateConfigurationFactory( \ - FileExtensionMatcher("xml"), \ - TemplateConfiguration(outputFormat = XMLOutputFormat()) \ - ), \ - ConditionalTemplateConfigurationFactory( \ - OrMatcher( \ - FileExtensionMatcher("html"), \ - FileExtensionMatcher("htm") \ - ), \ - TemplateConfiguration(outputFormat = HTMLOutputFormat()) \ - ), \ - allowNoMatch = true \ - ) \ - ) http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/abfcac88/freemarker-core-test/src/test/resources/org/apache/freemarker/manualtest/test.ftlh ---------------------------------------------------------------------- diff --git a/freemarker-core-test/src/test/resources/org/apache/freemarker/manualtest/test.ftlh b/freemarker-core-test/src/test/resources/org/apache/freemarker/manualtest/test.ftlh deleted file mode 100644 index 852b82b..0000000 --- a/freemarker-core-test/src/test/resources/org/apache/freemarker/manualtest/test.ftlh +++ /dev/null @@ -1,28 +0,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. ---> -<html> -<head> - <title>Welcome!</title> -</head> -<body> - <h1>Welcome ${user}!</h1> - <p>Our latest product: - <a href="${latestProduct.url}">${latestProduct.name}</a>! -</body> -</html> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/abfcac88/freemarker-core/src/manual/en_US/FM3-CHANGE-LOG.txt ---------------------------------------------------------------------- diff --git a/freemarker-core/src/manual/en_US/FM3-CHANGE-LOG.txt b/freemarker-core/src/manual/en_US/FM3-CHANGE-LOG.txt deleted file mode 100644 index 64a2a38..0000000 --- a/freemarker-core/src/manual/en_US/FM3-CHANGE-LOG.txt +++ /dev/null @@ -1,232 +0,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. - */ - -Because the Manual won't be updated for a good while, I will lead -the FreeMarer 3 changelog here: - -- Increased version number to 3.0.0 (nightly aka. SNAPSHOT) -- Removed legacy extensions: rhyno, jython, xml (not to be confused with dom), jdom, ant. -- Removed JSP 2.0 support (2.1 and Servlet 2.5 is the minimum for now, but maybe it will be 2.2 and Servlet 3.0 later). -- Removed freemarker.ext.log, our log abstraction layer from the old times when there was no clear winner on this field. - Added org.slf4j:slf4j-api as required dependency instead. -- Removed all classes with "main" methods that were part of freemarker.jar. Such tools should be separate artifacts, - not part of the library, and they are often classified as CWE-489 "Leftover Debug Code". The removed classes are: - freemarker.core.CommandLine, freemarker.ext.dom.Transform, freemarker.template.utility.ToCanonical -- Removed classic_compatible (classicCompatible) setting, which was used to emulate some of the FreeMarker 1.x behavior -- Removed utility TemplateModel-s that can very easily mean a security problem: freemarker.template.utility.Execute and - freemarker.template.utility.ObjectConstructor -- Removed TemplateClassResolver.SAFER_RESOLVER, because the classes it has blocked were removed from FreeMarker, so it's - the same as UNRESTRICTED_RESOLVER -- Removed the strict_syntax setting, and so also the support for FTL tags without #. This was a FreeMarker 1.x - compatibility option. -- Removed deprecated FMParser contstructors. -- Minimum Java version increased to 7, but without try-with-resource as that's unavailable before Android 4.4 KitKat. -- Totally redesigned TemplateLoader interface. The FM2 TemplateLoader can't be adapted (wrapped) to it, but usually - it's fairly trivial to "rearrange" an old custom TemplateLoader for the new interface. The new TemplateLoader comes - with several advantages, such as: - - It can work more efficiently with sophisticated storage mechanisms like a database, as it's now possible to pack - together the existence check, the last modification change check, and reading operations into less storage level - operations (like you can do all of them with a single SQL statement). - - The new TemplateLoader allows returning the template content either as an InputStream or as a Reader. Almost all - TemplateLoader-s should return InputStream, and FreeMarker takes care of charset issues transparently (as a result, - TemplateLoader-s don't have to support re-reading a template anymore, as we solve charset detection misses in - memory). TemplateLoader-s that are inherently backed by text (String-s), such as templates stored in a varchar or - CLOB column, should return a Reader. Note that templates created from a Reader will have template.getEncoding() - null (logically, as no charset was involved), which was impossible in FreeMarker 2. - - The change detection of the template doesn't have to rely on a millisecond resolution timestamp anymore; you can - use what's most appropriate for the storage mechanism, such as a cryptographic hash or a revision number. - - Template lookups (where you try multiple names until you find the best template) can now be transactional and/or - atomic if the backing storage mechanism supports that, by utilizing the TemplateLoaderSession interface. - - TemplateLoader can now return template-level settings like the output format (MIME type basically) of the loaded - template, in case the backing storage stores such extra information. This mechanism can be used together with - the TemplateConfiguration mechanism (already familiar from FreeMarker 2), and overrides the individual settings - coming from there. -- Template constructors won't close the Reader passed in as agrument anymore (because a Reader should be closed - by who has created it). This avoids some surprises from the past, such as the unablility to reset a Reader to a mark - after parsing. If you call those constructors, be sure that you close the Reader yourself. (Obviously, it doesn't - mater for StringReader-s.) -- Renamed top level java package from freemarker to org.apache.freemarker -- Reorganized package structure. We will have a freemarker-core and a freemarker-servlet module later, so - we got org.apache.freemarker.core (has nothing to do with the old freemarker.core) and - org.apache.freemarker.servlet (this replaced freemarker.ext.servlet and freemarker.ext.jsp). - Directly inside org.apache.freemarker.core we have most of the classes that were in - freemarker.template and freemarker.core, however, model related classes (and object wrappers) - were moved to org.apache.freemarker.core.model, and template loading and caching related classes - to org.apache.freemarker.core.templateresolver (because later we will have a class called - TemplateResolver, which is the central class of loading and caching and template name rules). - OutputFormat realted classes were moved to org.apache.freemarker.core.outputformat. - ValueFormat related classes were moved to org.apache.freemarker.core.valueformat. - ArithmeticEngine related classes were moved to org.apache.freemarker.core.arithmetic. - freemarker.ext.dom was moved into org.apache.freemarker.dom. -- Moved the all the static final ObjectWrapper-s to the new _StaticObjectWrappers class, and made them - write protected (non-configurable). Also now they come from the pool that ObjectWrapper builders use. -- WrappingTemplateModel.objectWrapper is now final, and its statically stored default value can't be set anymore. -- Removed SimpleObjectWrapper deprecated paramerless constructor -- Removed ResourceBundleLocalizedString and LocalizedString: Hardly anybody has discovered these, and they had no - JUnit coverage. -- Added early draft of TemplateResolver, renamed TemplateCache to DefaultTemplateResolver. TemplateResolver is not - yet directly used in Configuration. This was only added in a hurry, so that it's visible why the - o.a.f.core.templateresolver subpackage name makes sense. -- Marked most static utility classes as internal, and renamed them to start with "_" (for example StringUtils was - renamed to _StringUtil, thus people won't accidentally use it when they wanted to autocomplete to Apache Commons - StringUtil). Created published static utility class, o.a.f.core.util.FTLUtil, which contains some methods moved - over from the now internal utility classes. -- Deleted o.a.f.core.util.DOMNodeModel (it has noting to do with the standard XML support, o.a.f.core.model.dom) -- All CacheStorage-s must be thread safe from now on (removed ConcurrentCacheStorage marker interface) -- Removed support for incompatibleImprovements before 3.0.0. So currently 3.0.0 is the only support value. -- Changed the default of logTemplateExceptions to false. -- Removed `String Configurable.getSetting(String)` and `Properties getSettings()`. It has never worked well, - and is impossible to implement properly. -- Even for setting values that are class names without following `()` or other argument list, the INSTANCE field and - the builder class will be searched now, and used instead of the constructor of the class. Earlier they weren't for - backward compatibility. -- Removed several deprecated methods and constants. Some notes: - - strict_bean_models configuration setting was removed, as it should be set on the BeansWrapper itself - - .template_name now means the same as .current_template_name (it doesn't emulate 2.3 glitches anymore) - - Removed the deprecated BeansWrapper.nullModel setting. So null is always wrapped to null now. - - Removed the overridable BeansWrapper.finetuneMethodAppearance method, which was deprecated by the - finetuneMethodAppearance setting (BeansWrapper.setFinetuneMethodAppearance). - - Removed NodeModel static utility classes dealing with parsing XML to DOM. How it's best to do that is environment - and application dependent, and it has security implications. Since XML loading/parsing is not the topic of the - project, these were removed. Static methods that simplify an already loaded DOM have remained, because that's - FreeMarker-specific functionality. - - Removed parameterless DefaultObjectWrapper and BeansWrapper constructors. Now specifying the - incomplatibleImprovement version is required. - - Removed the static default Configuration instance. (It's not possible to create a template with null Configuration - constructor argument anymore.) - - When specifying the templateUpdateDelay configuration setting with a String (with Properties), the time unit is - required, unless the value is 0. -- setSetting (and the like) doesn't throw ParseException (the same exception used when parsing templates) anymore, - but ConfigurationException. Also, on the places where ParseException was used for other than template parsing, - o.a.f.core.util.GenericParseException is used now instead, which doesn't have the template parsing related fields - that we can't fill. -- Removed DefaultObjectWrapper settings that only exist so that you can set backward compatible behavior instead of - the recommended value: useAdaptersForContainers, forceLegacyNonListCollections, iterableSupport, simpleMapWrapper -- Removed BeansWrapper, which was the superclass of DefaultObjectWrapper, but wasn't recommended to be used as is. - Removed many BeansWrapper-related classes that DefaultObjectWrapper doesn't use. This includes ModelCache and - related classes, because DefaultObjectWrapper has only used the cache for "generic" classes (because that's where it - has fallen back to BeansWrapper.wrap), which is inconsistent and doesn't worth the caching overhead and complexity. -- Java methods (when using DefaultObjectWrapper) won't be accessible as sequences anyore. That is, earlier, instead of - obj.m(1), you could write obj.m[1]. This strange feature has led to some tricky cases, while almost nobody has - utilized it. -- SimpleObjectWrapper was renamed to RestrictedObjectWrapper, also the "simple" setting value was rename to - "restricted". -- Removed the global static final ObjectWrapper-s. It had a "few" consequences: - - Standard TemplateModel implementations that can have an ObjectWrapper contrucor parameter don't allow null there anymore. - Also, any constructor overloads where you cold omit the ObjectWrapper were removed (these were deprecated in FM2 too). - In FM2, such overloads has used the global static default DefaltObjectWrapper, but that was removed. - - If the ObjectWrapper is not a DefaultObjectWrapper (or a subclass of it), `className?new(args)` will only accept 0 arguments. - (Earlier we have fallen back to using the global static default DefaultObjectWrapper instance to handle argument unwrapping - and overloaded constructors.) Note that ?new is only used to instantiate TemplateModel-s, typically, template language - functions/directives implemented in Java, and so they hardly ever has an argument. - - FreemarkerServlet now requires that the ObjectWrapper it uses implements ObjectWrapperAndUnwrapper. (Thus, the return type - of FreemarerServlet.createDefaultObjectWrapper() has changed to ObjectWrapperAndUnwrapper.) The unwrapping functionality is - required when calling JSP custom tags/functions, and in FreeMarker 2 this was worked around with using the - global static default DefaultObjectWrapper when the ObjectWrapper wasn't an ObjectWrapperAndUnwrapper. -- Removed some long deprecated template language directives: - - <#call ...> (deprecated by <@... />) - - <#comment>...</#comment> (deprecated by <#-- ... -->) - - <#transform ...>...</#transform> (deprecated by <@...>...</@...>) - - <#foreach x in xs>...</#foreach> (deprecated by <#list xs as x>...</#list>) -- If for an indexed JavaBean property there's both an indexed read method (like `Foo getFoo(int index)`) and a normal read method - (like Foo[] getFoo()), we prefer the normal read method, and so the result will be a clean FTL sequence (not a multi-type value - with sequence+method type). If there's only an indexed read method, then we don't expose the property anymore, but the indexed - read method can still be called as an usual method (as `myObj.getFoo(index)`). These changes were made because building on the - indexed read method we can't create a proper sequence (which the value of the property should be), since sequences are required - to support returning their size. (In FreeMarker 2 such sequences has thrown exception on calling size(), which caused more - problems and confusion than it solved.) -- When looking for a builder class in builder expressions used in setting values like `com.example.Foo()`, now we first - look for com.example.Foo.Builder, and only then com.example.FooBuilder. -- Removed DefaultObjectWrapper.methodsShadowItems setting, in effect defaulting it to true. This has decided if the generic - get method (`get(String)`) had priority over methods of similar name. The generic get method is only recognized from its - name and parameter type, so it's a quite consfusing feature, and might will be removed alltogether. -- DefaultObjectWrapper is now immutable (has no setter methods), and can only be constructed with DefaultObjectWrapper.Builder -- Configuration.getTemplate has no "parse" parameter anymore. Similarly #include has no "parse" parameter anymore. Whether a - template is parsed can be specified via Configuration.templateConfigurations, for example based on the file extension. Thus, - a certain template is either always parsed or never parsed, and whoever gets or include it need not know about that. - Also added a new setting, "templateLanguage", which decides this; the two available values are - TemplateLanguage.FTL and TemplateLanguage.STATIC_TEXT. -- Configuration.getTemplate has no "encoding" parameter anymore. Similarly #include has no "encoding" parameter either. The charset - of templates can be specified via Configuration.defaultEncoding and Configuration.templateConfigurations (for example based on the - directory it is in), or wirh the #ftl directive inside the template. Thus, a given template always has the same charset, no mater how - it's accessed. -- #include-d/#import-ed templates don't inheirit the charset (encoding) of the #include-ing/#import-ing template. (Because, - again, the charset of a template file is independent of how you access it.) -- Removed Configuration.setEncoding(java.util.Locale, String) and the related other methods. Because of the new logic of template - encodings, the locale to encoding mapping doesn't make much sense anymore. -- Require customLookupCondition-s to be Serializable. -- Various refactorings of Configurable and its subclasses. This is part of the preparation for making such classes immutable, and offer - builders to create them. - - Removed CustomAttribute class. Custom attribute keys can be anything at the moment (this will be certainly restricted later) - - As customAttributes won't be modifiable after Builder.build(), they can't be used for on-demand created data structures anymore (such as - Template-scoped caches) anymore. To fulfill that role, the CustomStateKey class and the CustomStateScope interface was introduced, which - is somewhat similar to the now removed CustomAttribute. CustomStateScope contains one method, Object getCustomState(CustomStateKey), which - may calls CustomStateKey.create() to lazily create the state object for the key. Configuration, Template and Environment implements - CustomStateScope. - - Added getter/setter to access custom attributes as a Map. (This is to make it less an exceptional setting.) - - Environment.setCustomState(Object, Object) and getCustomState(Object) was replaced with CustomStateScope.getCustomState(CustomStateKey). - - Added ProcessingConfiguration interface for the read-only access of template processing settings. This is similar to the - already existing (in FM2) ParserConfiguration interface. - - Renamed Configurable to MutableProcessingAndParserConfiguration. Made it abstract too. - - Renamed Configuration.defaultEncoding to sourceEncoding, also added sourceEncoding to ParserConfiguration, and renamed - TemplateConfiguration.encoding and Template.encoding to sourceEncoding. (Before this, defaultEncoding was exclusive - to Configuration, but now it's like any other ParserConfiguration setting that can be overidden on the 3 levels.) - - Made TemplateConfiguration immutable, added a TemplateConfiguration.Builder. - - Made Template immutable (via public API-s). Template-specific settings now can only come from the TemplateConfiguration associated - to the template, or from the #ftl header for some settings (most notably for custom attributes). - - Renamed ParserConfiguration to ParsingConfiguration, so that the name is more consistent with the new ProcessingConfiguration. -- Settings that have contained a charset name (sourceEncoding, outputEncoding, URLEscapingCharset) are now of type Charset, - not String. For string based configuration sources (such as .properties files) this means that: - - Unrecognized charset names are now errors - - For recognized names the charset name will be normalized (like "latin1" becomes to "ISO-8859-1"). - - In "object builder expressions" Charset values can now be constructed like `Charset("ISO-8859-5")`. - Note that as the type of the settings have changed, now you can't just write something like - `TemplateConfiguration(sourceEncoding = "UTF-8")`, but `TemplateConfiguration(sourceEncoding = Charset("UTF-8"))`. -- Removed Template.templateLanguageVersion, as we solely rely on incompatibleImprovements instead. -- Template.sourceEncoding was renamed to Template.actualSourceEncoding, to emphasize that it's not the template-layer - equivalent of the sourceEncoding ParserConfiguration setting. This is in line with Template.actualTagSyntax and the - other "actual" properties. (Just as in FM2, Template.getParserConfiguration() still can be used get the - sourceEncoding used during parsing.) -- Made TemplateModel classes used by the parser for literals Serializable. (Without this attribute values set in the #ftl - header wouldn't be always Serializable, which in turn will sabotage making Template-s Serializable in the future.) -- Removed hasCustomFormats() from configuration related API-s (we don't need it anymore) -- Template.name (getName()) was renamed to Template.lookupName (getLookupName()), and Template.sourceName (Template.getSourceName()) - doesn't fall back to the lookup name anymore when it's null (however, Template.getSourceOrLookupName() was added for that). There's - no Template.name anymore, because since sourceName was introduced, and hence the concept of template name was split into the - lookup and the source name, its meaning wasn't clean (but it meant the lookup name). TemplateException and ParseException - now also have the same properites: getTemplateSourceName(), getTemplateLookupName(), and even getSourceOrLookupName(). - Location information in error messages show getTemplateSourceOrLookupName(). -- Configuration.setSharedVaribles (not the typo in it) was renamed to setSharedVariables -- Configuration is now immutable. Instead, you should use Configuration.Builder to set up the setting values, then create - the Configuration with the builder's build() method. Further notes: - - Most of the mutator methods (like setters) were moved from Configuration to Configuration.Builder. However, - setClassForTemplateLoader, setDirectoryForTemplateLoading and the like were removed, instead there's just - setTemplateLoader. So for example. instead of setClassForTemplateLoader(Foo.class, "templates") now you have - to write setTemplateLoader(new ClassTemplateLoader(Foo.class, "templates")). While it's a bit longer, it shows - more clearly what's happening, and always supports all TemplateLoader constructor overloads. - - It's now possible to change the Configuration setting defaults by using a custom Configuration.ExtendableBuilder - subclass instead of Configuration.Builder (which is also an ExtendableBuilder subclass). FreemarkerServlet has - switched to this approach, using its own builder subclass to provide defaults that makes the sense in that particular - application. Its API-s which were used for customizing FreemarkerServlet has bean changed accordingly. -- Modularized the project. Now we have these published jar-s: - - org.apache.freemarker:freemarker-core - - org.apache.freemarker:freemarker-servlet - - [TODO] org.apache.freemarker:freemarker-dom - There are several other internal modules related to testing; these aren't published. -- Migrated buiding from Ant to Gradle. [TODO: This is only partially done; jar building, testing and javadoc works.] \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/abfcac88/freemarker-core/src/manual/en_US/book.xml ---------------------------------------------------------------------- diff --git a/freemarker-core/src/manual/en_US/book.xml b/freemarker-core/src/manual/en_US/book.xml deleted file mode 100644 index 72bf6bc..0000000 --- a/freemarker-core/src/manual/en_US/book.xml +++ /dev/null @@ -1,82 +0,0 @@ -<?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. ---> -<book conformance="docgen" version="5.0" xml:lang="en" - xmlns="http://docbook.org/ns/docbook"; - xmlns:xlink="http://www.w3.org/1999/xlink"; - xmlns:xi="http://www.w3.org/2001/XInclude"; - xmlns:ns5="http://www.w3.org/1999/xhtml"; - xmlns:ns4="http://www.w3.org/2000/svg"; - xmlns:ns3="http://www.w3.org/1998/Math/MathML"; - xmlns:ns="http://docbook.org/ns/docbook";> - <info> - <title>Apache FreeMarker Manual</title> - - <titleabbrev>Manual</titleabbrev> - - <productname>Freemarker 3.0.0</productname> - </info> - - <preface role="index.html" xml:id="preface"> - <title>TODO</title> - - <para>TODO... Eventually, we might copy the FM2 Manual and rework - it.</para> - - <para>Anchors to satisfy Docgen:</para> - - <itemizedlist> - <listitem> - <para xml:id="app_versions">app_versions</para> - </listitem> - - <listitem> - <para xml:id="app_license">app_license</para> - </listitem> - - <listitem> - <para xml:id="exp_cheatsheet">exp_cheatsheet</para> - </listitem> - - <listitem> - <para xml:id="ref_directive_alphaidx">ref_directive_alphaidx</para> - </listitem> - - <listitem> - <para xml:id="ref_builtins_alphaidx">ref_builtins_alphaidx</para> - </listitem> - - <listitem> - <para xml:id="ref_specvar">ref_specvar</para> - </listitem> - - <listitem> - <para xml:id="alphaidx">alphaidx</para> - </listitem> - - <listitem> - <para xml:id="gloss">gloss</para> - </listitem> - - <listitem> - <para xml:id="app_faq">app_faq</para> - </listitem> - </itemizedlist> - </preface> -</book> http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/abfcac88/freemarker-core/src/manual/en_US/docgen-help/editors-readme.txt ---------------------------------------------------------------------- diff --git a/freemarker-core/src/manual/en_US/docgen-help/editors-readme.txt b/freemarker-core/src/manual/en_US/docgen-help/editors-readme.txt deleted file mode 100644 index 24436e8..0000000 --- a/freemarker-core/src/manual/en_US/docgen-help/editors-readme.txt +++ /dev/null @@ -1,130 +0,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. - */ - -Guide to FreeMarker Manual for Editors -====================================== - -Non-technical -------------- - -- The Template Author's Guide is for Web designers. Assume that a - designer is not a programmer, (s)he doesn't even know what is Java. - Forget that FM is implemented in Java when you edit the Template - Author's Guide. Try to avoid technical writing. - -- In the Guide chapters, be careful not to mention things that were - not explained earlier. The Guide chapters should be understandable - if you read them continuously. - -- If you add a new topic or term, don't forget to add it to the Index. - Also, consider adding entries for it to the Glossary. - -- Don't use too sophisticated English. Use basic words and grammar. - - -Technical ---------- - -- For the editing use XXE (XMLmind XML Editor), with its default XML - *source* formatting settings (identation, max line length and like). - You should install the "DocBook 5 for Freemarker" addon, which you can - find inside the "docgen" top-level SVN module. - -- The HTML is generated with Docgen (docgen.jar), which will check some - of the rules described here. To invoke it, issue "ant manual" from - the root of the "freemarker" module. (Note: you may need to check out - and build "docgen" first.) - -- Understand all document conventions in the Preface chapter. Note that - all "programlisting"-s should have a "role" attribute with a value that - is either: "template", "dataModel", "output", "metaTemplate" or - "unspecified". (If you miss this, the XXE addon will show the - "programlisting" in red.) - -- Verbatim content in flow text: - - * In flow text, all data object names, class names, FTL fragments, - HTML fragments, and all other verbatim content is inside "literal" - element. - - * Use replaceable element inside literal element for replaceable - parts and meta-variables like: - <literal<if <replaceable>condition</replaceable>></literal> - <literal><replaceable>templateDir</replaceable>/copyright.ftl</literal> - -- Hierarchy: - - * The hierarchy should look like: - - book -> part -> chapter -> section -> section -> section -> section - - where the "part" and the "section"-s are optional. - Instead of chapter you may have "preface" or "appendix". - - * Don't use "sect1", "sect2", etc. Instead nest "section"-s into each other, - but not deeper than 3 levels. - - * Use "simplesect" if you want to divide up something visually, but - you don't want those sections to appear in the ToC, or go into their own - HTML page. "simplesect"-s can appear under all "section" nesting - levels, and they always look the same regardless of the "section" - nesting levels. - -- Lists: - - * When you have list where the list items are short (a few words), - you should give spacing="compact" to the "itemizedlist" or - "orderedlist" element. - - * Don't putting listings inside "para"-s. Put them between "para"-s instead. - -- Xrefs, id-s, links: - - * id-s of parts, chapters, sections and similar elements must - contain US-ASCII lower case letters, US-ASCII numbers, and - underscore only. id-s of parts and chapters are used as the - filenames of HTML-s generated for that block. - When you find out the id, deduce it from the position in the ToC - hierarchy. The underscore is used as the separator between the path - steps. - - * All other id-s must use prefix: - - example: E.g.: id="example.foreach" - - ref: Reference information... - * directive: about a directive. E.g.: "ref.directive.foreach" - * builtin - - gloss: Term in the Glossary - - topic: The recommended point of document in a certain topic - * designer: for designers. - E.g.: id="topic.designer.methodDataObject" - * programmer: for programmers - * or omit the secondary category if it is for everybody - - misc: Anything doesn't fit in the above categories - - * When you refer to a part, chapter or section, often you should use - xref, not link. The xreflabel attribute of the link-end should not be set; - then it's deduced from the titles. - -- The "book" element must have this attribute: conformance="docgen" - -- It sometimes happens that you want to change some content that you see in - the generated output, which you can't find in the DocBook XML. In such case, - check the contents docgen.cjson, which should be in the same directory as - the XML. If it's not there either, it's perhaps hard-wired into the - templates in docgen. http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/abfcac88/freemarker-core/src/manual/en_US/docgen-misc/copyrightComment.txt ---------------------------------------------------------------------- diff --git a/freemarker-core/src/manual/en_US/docgen-misc/copyrightComment.txt b/freemarker-core/src/manual/en_US/docgen-misc/copyrightComment.txt deleted file mode 100644 index 60b675e..0000000 --- a/freemarker-core/src/manual/en_US/docgen-misc/copyrightComment.txt +++ /dev/null @@ -1,16 +0,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. http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/abfcac88/freemarker-core/src/manual/en_US/docgen-misc/googleAnalytics.html ---------------------------------------------------------------------- diff --git a/freemarker-core/src/manual/en_US/docgen-misc/googleAnalytics.html b/freemarker-core/src/manual/en_US/docgen-misc/googleAnalytics.html deleted file mode 100644 index 759564e..0000000 --- a/freemarker-core/src/manual/en_US/docgen-misc/googleAnalytics.html +++ /dev/null @@ -1,14 +0,0 @@ -<!-- - This snippet was generated by Google Analytics. - Thus, the standard FreeMarker copyright comment was intentionally omitted. - <#DO_NOT_UPDATE_COPYRIGHT> ---> -<script> - (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){ - (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o), - m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m) - })(window,document,'script','//www.google-analytics.com/analytics.js','ga'); - - ga('create', 'UA-55420501-1', 'auto'); - ga('send', 'pageview'); -</script> http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/abfcac88/freemarker-core/src/manual/en_US/docgen-originals/figures/model2sketch_with_alpha.png ---------------------------------------------------------------------- diff --git a/freemarker-core/src/manual/en_US/docgen-originals/figures/model2sketch_with_alpha.png b/freemarker-core/src/manual/en_US/docgen-originals/figures/model2sketch_with_alpha.png deleted file mode 100644 index ce120cc..0000000 Binary files a/freemarker-core/src/manual/en_US/docgen-originals/figures/model2sketch_with_alpha.png and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/abfcac88/freemarker-core/src/manual/en_US/docgen-originals/figures/odg-convert-howto.txt ---------------------------------------------------------------------- diff --git a/freemarker-core/src/manual/en_US/docgen-originals/figures/odg-convert-howto.txt b/freemarker-core/src/manual/en_US/docgen-originals/figures/odg-convert-howto.txt deleted file mode 100644 index e55acec..0000000 --- a/freemarker-core/src/manual/en_US/docgen-originals/figures/odg-convert-howto.txt +++ /dev/null @@ -1,43 +0,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. - */ - -Converting to SVG: -1. Open the ODG file with Libeoffice/OpenOffice Draw -2. Ctrl+A to select all objects -3. File/Export..., chose SVG format, and then tick "Selection" -4. Check the result. If contour lines at the right and bottom edge of the - figure are partically clipped (stroke width is halved), set a stroke with - other than 0 for all shapes. - -Converting to a decent quality (though non-transparent) PNG: -1. Open the ODG file with Libeoffice/OpenOffice Draw -2. Export to PDF -3. Open PDF in Adobe Acrobat Reader -4. Go to Adobe Acrobat Reader preferences and set it to not use subpixel - anti-aliasing, just normal anti-aliasing. They used to call this LCD vs - Monitor mode. -5. Zoom in/out until you get the desired size in pixels, take a - screen shot, crop it in some image editor, save it as PNG. - -Converting to transparent but somewhat ugly PNG: -1. Convert to SVG as described earlier -2. Use Apache Batik Rasterizer command line utility like: - $BARIK_INSTALLATION\batik-rasterizer-1.8.jar -dpi 72 -m image/png ${FIGURE}.svg - If Batik fails (as it doesn't support all SVG features), use Inkscape. - Of course avoid supixel anti-aliasing, as it's not device independent. http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/abfcac88/freemarker-core/src/manual/en_US/docgen-originals/figures/overview.odg ---------------------------------------------------------------------- diff --git a/freemarker-core/src/manual/en_US/docgen-originals/figures/overview.odg b/freemarker-core/src/manual/en_US/docgen-originals/figures/overview.odg deleted file mode 100644 index 0533b7c..0000000 Binary files a/freemarker-core/src/manual/en_US/docgen-originals/figures/overview.odg and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/abfcac88/freemarker-core/src/manual/en_US/docgen-originals/figures/tree_with_alpha.png ---------------------------------------------------------------------- diff --git a/freemarker-core/src/manual/en_US/docgen-originals/figures/tree_with_alpha.png b/freemarker-core/src/manual/en_US/docgen-originals/figures/tree_with_alpha.png deleted file mode 100644 index dc4fba8..0000000 Binary files a/freemarker-core/src/manual/en_US/docgen-originals/figures/tree_with_alpha.png and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/abfcac88/freemarker-core/src/manual/en_US/docgen.cjson ---------------------------------------------------------------------- diff --git a/freemarker-core/src/manual/en_US/docgen.cjson b/freemarker-core/src/manual/en_US/docgen.cjson deleted file mode 100644 index 076e8f3..0000000 --- a/freemarker-core/src/manual/en_US/docgen.cjson +++ /dev/null @@ -1,132 +0,0 @@ -//charset: 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. - -deployUrl: "http://freemarker.org/docs/"; -onlineTrackerHTML: "docgen-misc/googleAnalytics.html" -searchKey: "003127866208504630097:arjqbv_znfw" -validation: { - programlistingsRequireRole - // programlistingsRequireLanguage - maximumProgramlistingWidth: 100 -} -showXXELogo -generateEclipseTOC -// eclipse: { -// link_to: "freemarker-toc.xml#ManualLink" -// } - -removeNodesWhenOnline: [ "preface" ] - -copyrightHolder: "The Apache Software Foundation" -copyrightHolderSite: "http://apache.org/"; -copyrightSuffix: "Apache FreeMarker, FreeMarker, Apache Incubator, Apache, the Apache FreeMarker logo are trademarks of The Apache Software Foundation." -copyrightStartYear: 1999 -copyrightCommentFile: "docgen-misc/copyrightComment.txt" - -seoMeta: { - "dgui_quickstart": { - "title": "Getting Started with template writing" - } - "pgui_quickstart": { - "title": "Getting Started with the Java API" - } -} - -logo: { - href: "http://freemarker.org"; - src: logo.png, - alt: "FreeMarker" -} - -olinks: { - homepage: "http://freemarker.org/"; - api: "api/index.html" - - // Homepage links: - freemarkerdownload: "http://freemarker.org/freemarkerdownload.html"; - contribute: "http://freemarker.org/contribute.html"; - history: "http://freemarker.org/history.html"; - what-is-freemarker: "http://freemarker.org/"; - mailing-lists: "http://freemarker.org/mailing-lists.html"; - - // External URL-s: - onlineTemplateTester: "http://freemarker-online.kenshoo.com/"; - twitter: "https://twitter.com/freemarker"; - sourceforgeProject: "https://sourceforge.net/projects/freemarker/"; - githubProject: "https://github.com/freemarker/freemarker"; - newBugReport: "https://issues.apache.org/jira/browse/FREEMARKER/"; - newStackOverflowQuestion: "http://stackoverflow.com/questions/ask?tags=freemarker"; -} - -internalBookmarks: { - "Alpha. index": alphaidx - "Glossary": gloss - "Expressions": exp_cheatsheet - "?builtins": ref_builtins_alphaidx - "#directives": ref_directive_alphaidx - ".spec_vars": ref_specvar - "FAQ": app_faq -} - -tabs: { - "Home": "olink:homepage" - "Manual": "" // Empty => We are here - "Java API": "olink:api" -} - -// Available icons: -// .icon-heart -// .icon-bug -// .icon-download -// .icon-star -secondaryTabs: { - "Contribute": { class: "icon-heart", href: "olink:contribute" } - "Report a Bug": { class: "icon-bug", href: "olink:newBugReport" } - "Download": { class: "icon-download", href: "olink:freemarkerdownload" } -} - -footerSiteMap: { - "Overview": { - "What is FreeMarker?": "olink:what-is-freemarker" - "Download": "olink:freemarkerdownload" - "Version history": "id:app_versions" - "About us": "olink:history" - "License": "id:app_license" - } - "Handy stuff": { - "Try template online": "olink:onlineTemplateTester" - "Expressions cheatsheet": "id:exp_cheatsheet" - "#directives": "id:ref_directive_alphaidx" - "?built_ins": "id:ref_builtins_alphaidx" - ".special_vars": "id:ref_specvar" - } - "Community": { - "FreeMarker on Github": "olink:githubProject" - "Follow us on Twitter": "olink:twitter" - "Report a bug": "olink:newBugReport" - "Ask a question": "olink:newStackOverflowQuestion" - "Mailing lists": "olink:mailing-lists" - } -} - -socialLinks: { - "Github": { class: "github", href: "olink:githubProject" } - "Twitter": { class: "twitter", href: "olink:twitter" } - "Stack Overflow": { class: "stack-overflow", href: "olink:newStackOverflowQuestion" } -} http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/abfcac88/freemarker-core/src/manual/en_US/favicon.png ---------------------------------------------------------------------- diff --git a/freemarker-core/src/manual/en_US/favicon.png b/freemarker-core/src/manual/en_US/favicon.png deleted file mode 100644 index ce0de20..0000000 Binary files a/freemarker-core/src/manual/en_US/favicon.png and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/abfcac88/freemarker-core/src/manual/en_US/figures/model2sketch.png ---------------------------------------------------------------------- diff --git a/freemarker-core/src/manual/en_US/figures/model2sketch.png b/freemarker-core/src/manual/en_US/figures/model2sketch.png deleted file mode 100644 index 93f9a6b..0000000 Binary files a/freemarker-core/src/manual/en_US/figures/model2sketch.png and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/abfcac88/freemarker-core/src/manual/en_US/figures/overview.png ---------------------------------------------------------------------- diff --git a/freemarker-core/src/manual/en_US/figures/overview.png b/freemarker-core/src/manual/en_US/figures/overview.png deleted file mode 100644 index b32e0bd..0000000 Binary files a/freemarker-core/src/manual/en_US/figures/overview.png and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/abfcac88/freemarker-core/src/manual/en_US/figures/tree.png ---------------------------------------------------------------------- diff --git a/freemarker-core/src/manual/en_US/figures/tree.png b/freemarker-core/src/manual/en_US/figures/tree.png deleted file mode 100644 index dcd9bf3..0000000 Binary files a/freemarker-core/src/manual/en_US/figures/tree.png and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/abfcac88/freemarker-core/src/manual/en_US/logo.png ---------------------------------------------------------------------- diff --git a/freemarker-core/src/manual/en_US/logo.png b/freemarker-core/src/manual/en_US/logo.png deleted file mode 100644 index 193dc11..0000000 Binary files a/freemarker-core/src/manual/en_US/logo.png and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/abfcac88/freemarker-core/src/manual/zh_CN/book.xml ---------------------------------------------------------------------- diff --git a/freemarker-core/src/manual/zh_CN/book.xml b/freemarker-core/src/manual/zh_CN/book.xml deleted file mode 100644 index c26677f..0000000 --- a/freemarker-core/src/manual/zh_CN/book.xml +++ /dev/null @@ -1,82 +0,0 @@ -<?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. ---> -<book conformance="docgen" version="5.0" xml:lang="en" - xmlns="http://docbook.org/ns/docbook"; - xmlns:xlink="http://www.w3.org/1999/xlink"; - xmlns:xi="http://www.w3.org/2001/XInclude"; - xmlns:ns5="http://www.w3.org/1999/xhtml"; - xmlns:ns4="http://www.w3.org/2000/svg"; - xmlns:ns3="http://www.w3.org/1998/Math/MathML"; - xmlns:ns="http://docbook.org/ns/docbook";> - <info> - <title>Apache FreeMarker æå</title> - - <titleabbrev>æå</titleabbrev> - - <productname>Freemarker 3.0.0</productname> - </info> - - <preface role="index.html" xml:id="preface"> - <title>TODO</title> - - <para>TODO... Eventually, we might copy the FM2 Manual and rework - it.</para> - - <para>Anchors to satisfy Docgen:</para> - - <itemizedlist> - <listitem> - <para xml:id="app_versions">app_versions</para> - </listitem> - - <listitem> - <para xml:id="app_license">app_license</para> - </listitem> - - <listitem> - <para xml:id="exp_cheatsheet">exp_cheatsheet</para> - </listitem> - - <listitem> - <para xml:id="ref_directive_alphaidx">ref_directive_alphaidx</para> - </listitem> - - <listitem> - <para xml:id="ref_builtins_alphaidx">ref_builtins_alphaidx</para> - </listitem> - - <listitem> - <para xml:id="ref_specvar">ref_specvar</para> - </listitem> - - <listitem> - <para xml:id="alphaidx">alphaidx</para> - </listitem> - - <listitem> - <para xml:id="gloss">gloss</para> - </listitem> - - <listitem> - <para xml:id="app_faq">app_faq</para> - </listitem> - </itemizedlist> - </preface> -</book> http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/abfcac88/freemarker-core/src/manual/zh_CN/docgen-help/README ---------------------------------------------------------------------- diff --git a/freemarker-core/src/manual/zh_CN/docgen-help/README b/freemarker-core/src/manual/zh_CN/docgen-help/README deleted file mode 100644 index 6ebc928..0000000 --- a/freemarker-core/src/manual/zh_CN/docgen-help/README +++ /dev/null @@ -1,2 +0,0 @@ -Put the locale-specific or translated guides to editors here. -For the non-localized guides see the similar folder of the en_US Manual. \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/abfcac88/freemarker-core/src/manual/zh_CN/docgen-misc/googleAnalytics.html ---------------------------------------------------------------------- diff --git a/freemarker-core/src/manual/zh_CN/docgen-misc/googleAnalytics.html b/freemarker-core/src/manual/zh_CN/docgen-misc/googleAnalytics.html deleted file mode 100644 index 759564e..0000000 --- a/freemarker-core/src/manual/zh_CN/docgen-misc/googleAnalytics.html +++ /dev/null @@ -1,14 +0,0 @@ -<!-- - This snippet was generated by Google Analytics. - Thus, the standard FreeMarker copyright comment was intentionally omitted. - <#DO_NOT_UPDATE_COPYRIGHT> ---> -<script> - (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){ - (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o), - m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m) - })(window,document,'script','//www.google-analytics.com/analytics.js','ga'); - - ga('create', 'UA-55420501-1', 'auto'); - ga('send', 'pageview'); -</script> http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/abfcac88/freemarker-core/src/manual/zh_CN/docgen-originals/figures/README ---------------------------------------------------------------------- diff --git a/freemarker-core/src/manual/zh_CN/docgen-originals/figures/README b/freemarker-core/src/manual/zh_CN/docgen-originals/figures/README deleted file mode 100644 index f3a8221..0000000 --- a/freemarker-core/src/manual/zh_CN/docgen-originals/figures/README +++ /dev/null @@ -1,2 +0,0 @@ -Put the translated originals (sources) of the figures used in the manual here. -For figures that aren't translated, see the similar folder of the en_US Manual. \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/abfcac88/freemarker-core/src/manual/zh_CN/docgen.cjson ---------------------------------------------------------------------- diff --git a/freemarker-core/src/manual/zh_CN/docgen.cjson b/freemarker-core/src/manual/zh_CN/docgen.cjson deleted file mode 100644 index ecff859..0000000 --- a/freemarker-core/src/manual/zh_CN/docgen.cjson +++ /dev/null @@ -1,130 +0,0 @@ -//charset: 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. - -deployUrl: "http://freemarker.org/docs/"; -onlineTrackerHTML: "docgen-misc/googleAnalytics.html" -searchKey: "014728049242975963158:8awjt03uofm" -validation: { - programlistingsRequireRole - // programlistingsRequireLanguage - maximumProgramlistingWidth: 100 -} -showXXELogo -generateEclipseTOC -// eclipse: { -// link_to: "freemarker-toc.xml#ManualLink" -// } - -removeNodesWhenOnline: [ "preface" ] - -copyrightHolder: "The Apache Software Foundation" -copyrightStartYear: 1999 -copyrightCommentFile: "../en_US/docgen-misc/copyrightComment.txt" - -seoMeta: { - "dgui_quickstart": { - "title": "Getting Started with template writing" - } - "pgui_quickstart": { - "title": "Getting Started with the Java API" - } -} - -logo: { - href: "http://freemarker.org"; - src: logo.png, - alt: "FreeMarker" -} - -olinks: { - homepage: "http://freemarker.org/"; - api: "api/index.html" - - // Homepage links: - freemarkerdownload: "http://freemarker.org/freemarkerdownload.html"; - contribute: "http://freemarker.org/contribute.html"; - history: "http://freemarker.org/history.html"; - what-is-freemarker: "http://freemarker.org/"; - mailing-lists: "http://freemarker.org/mailing-lists.html"; - - // External URL-s: - onlineTemplateTester: "http://freemarker-online.kenshoo.com/"; - twitter: "https://twitter.com/freemarker"; - sourceforgeProject: "https://sourceforge.net/projects/freemarker/"; - githubProject: "https://github.com/freemarker/freemarker"; - newBugReport: "https://sourceforge.net/p/freemarker/bugs/new/"; - newStackOverflowQuestion: "http://stackoverflow.com/questions/ask?tags=freemarker"; -} - -internalBookmarks: { - "Alpha. index": alphaidx - "Glossary": gloss - "Expressions": exp_cheatsheet - "?builtins": ref_builtins_alphaidx - "#directives": ref_directive_alphaidx - ".spec_vars": ref_specvar - "FAQ": app_faq -} - -tabs: { - "Home": "olink:homepage" - "Manual": "" // Empty => We are here - "Java API": "olink:api" -} - -// Available icons: -// .icon-heart -// .icon-bug -// .icon-download -// .icon-star -secondaryTabs: { - "Contribute": { class: "icon-heart", href: "olink:contribute" } - "Report a Bug": { class: "icon-bug", href: "olink:newBugReport" } - "Download": { class: "icon-download", href: "olink:freemarkerdownload" } -} - -footerSiteMap: { - "Overview": { - "What is FreeMarker?": "olink:what-is-freemarker" - "Download": "olink:freemarkerdownload" - "Version history": "id:app_versions" - "About us": "olink:history" - "License": "id:app_license" - } - "Handy stuff": { - "Try template online": "olink:onlineTemplateTester" - "Expressions cheatsheet": "id:exp_cheatsheet" - "#directives": "id:ref_directive_alphaidx" - "?built_ins": "id:ref_builtins_alphaidx" - ".special_vars": "id:ref_specvar" - } - "Community": { - "FreeMarker on Github": "olink:githubProject" - "Follow us on Twitter": "olink:twitter" - "Report a bug": "olink:newBugReport" - "Ask a question": "olink:newStackOverflowQuestion" - "Mailing lists": "olink:mailing-lists" - } -} - -socialLinks: { - "Github": { class: "github", href: "olink:githubProject" } - "Twitter": { class: "twitter", href: "olink:twitter" } - "Stack Overflow": { class: "stack-overflow", href: "olink:newStackOverflowQuestion" } -} http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/abfcac88/freemarker-core/src/manual/zh_CN/favicon.png ---------------------------------------------------------------------- diff --git a/freemarker-core/src/manual/zh_CN/favicon.png b/freemarker-core/src/manual/zh_CN/favicon.png deleted file mode 100644 index ce0de20..0000000 Binary files a/freemarker-core/src/manual/zh_CN/favicon.png and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/abfcac88/freemarker-core/src/manual/zh_CN/figures/model2sketch.png ---------------------------------------------------------------------- diff --git a/freemarker-core/src/manual/zh_CN/figures/model2sketch.png b/freemarker-core/src/manual/zh_CN/figures/model2sketch.png deleted file mode 100644 index 93f9a6b..0000000 Binary files a/freemarker-core/src/manual/zh_CN/figures/model2sketch.png and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/abfcac88/freemarker-core/src/manual/zh_CN/figures/overview.png ---------------------------------------------------------------------- diff --git a/freemarker-core/src/manual/zh_CN/figures/overview.png b/freemarker-core/src/manual/zh_CN/figures/overview.png deleted file mode 100644 index b32e0bd..0000000 Binary files a/freemarker-core/src/manual/zh_CN/figures/overview.png and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/abfcac88/freemarker-core/src/manual/zh_CN/figures/tree.png ---------------------------------------------------------------------- diff --git a/freemarker-core/src/manual/zh_CN/figures/tree.png b/freemarker-core/src/manual/zh_CN/figures/tree.png deleted file mode 100644 index dcd9bf3..0000000 Binary files a/freemarker-core/src/manual/zh_CN/figures/tree.png and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/abfcac88/freemarker-core/src/manual/zh_CN/logo.png ---------------------------------------------------------------------- diff --git a/freemarker-core/src/manual/zh_CN/logo.png b/freemarker-core/src/manual/zh_CN/logo.png deleted file mode 100644 index 193dc11..0000000 Binary files a/freemarker-core/src/manual/zh_CN/logo.png and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/abfcac88/freemarker-manual/build.gradle ---------------------------------------------------------------------- diff --git a/freemarker-manual/build.gradle b/freemarker-manual/build.gradle new file mode 100644 index 0000000..bec8b70 --- /dev/null +++ b/freemarker-manual/build.gradle @@ -0,0 +1,26 @@ +description = "FreeMarker Manual (i.e., the documention)" + +dependencies { + compile project(":freemarker-core") + compile project(":freemarker-test-utils") + + testRuntime "jaxen:jaxen:1.0-FCS" + testRuntime "saxpath:saxpath:1.0-FCS" + testRuntime("xalan:xalan:2.7.0") { + // xml-apis is part of Java SE since version 1.4: + exclude group: "xml-apis", module: "xml-apis" + } +} + +// TODO Generate the HTML-s with Docgen; see in the old Ant build. + +// We have nothing to put into the jar, as we have test classes only +jar.enabled = false + +javadoc.enabled = false + +// Must not be deployed to a public Maven repository +uploadArchives.enabled = false + +// Doesn't make sense to Maven "install" this, as the artifact won't contain anything +install.enabled = false http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/abfcac88/freemarker-manual/src/main/docgen/en_US/book.xml ---------------------------------------------------------------------- diff --git a/freemarker-manual/src/main/docgen/en_US/book.xml b/freemarker-manual/src/main/docgen/en_US/book.xml new file mode 100644 index 0000000..72bf6bc --- /dev/null +++ b/freemarker-manual/src/main/docgen/en_US/book.xml @@ -0,0 +1,82 @@ +<?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. +--> +<book conformance="docgen" version="5.0" xml:lang="en" + xmlns="http://docbook.org/ns/docbook"; + xmlns:xlink="http://www.w3.org/1999/xlink"; + xmlns:xi="http://www.w3.org/2001/XInclude"; + xmlns:ns5="http://www.w3.org/1999/xhtml"; + xmlns:ns4="http://www.w3.org/2000/svg"; + xmlns:ns3="http://www.w3.org/1998/Math/MathML"; + xmlns:ns="http://docbook.org/ns/docbook";> + <info> + <title>Apache FreeMarker Manual</title> + + <titleabbrev>Manual</titleabbrev> + + <productname>Freemarker 3.0.0</productname> + </info> + + <preface role="index.html" xml:id="preface"> + <title>TODO</title> + + <para>TODO... Eventually, we might copy the FM2 Manual and rework + it.</para> + + <para>Anchors to satisfy Docgen:</para> + + <itemizedlist> + <listitem> + <para xml:id="app_versions">app_versions</para> + </listitem> + + <listitem> + <para xml:id="app_license">app_license</para> + </listitem> + + <listitem> + <para xml:id="exp_cheatsheet">exp_cheatsheet</para> + </listitem> + + <listitem> + <para xml:id="ref_directive_alphaidx">ref_directive_alphaidx</para> + </listitem> + + <listitem> + <para xml:id="ref_builtins_alphaidx">ref_builtins_alphaidx</para> + </listitem> + + <listitem> + <para xml:id="ref_specvar">ref_specvar</para> + </listitem> + + <listitem> + <para xml:id="alphaidx">alphaidx</para> + </listitem> + + <listitem> + <para xml:id="gloss">gloss</para> + </listitem> + + <listitem> + <para xml:id="app_faq">app_faq</para> + </listitem> + </itemizedlist> + </preface> +</book>
