Repository: incubator-freemarker-docgen Updated Branches: refs/heads/master 1fe002aa6 -> fcd3269d2
http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/blob/fcd3269d/src/main/org/freemarker/docgen/Transform.java ---------------------------------------------------------------------- diff --git a/src/main/org/freemarker/docgen/Transform.java b/src/main/org/freemarker/docgen/Transform.java index 51db781..908a050 100644 --- a/src/main/org/freemarker/docgen/Transform.java +++ b/src/main/org/freemarker/docgen/Transform.java @@ -1506,10 +1506,6 @@ public final class Transform { copyCommonStatic("fonts/icomoon.woff"); copyCommonStatic("fonts/NOTICE"); - for (int i = 1; i < 15; i++) { - copyCommonStatic("img/callouts/" + i + ".gif"); - } - if (showXXELogo) { copyCommonStatic("img/xxe.png"); } http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/blob/fcd3269d/src/main/org/freemarker/docgen/statics/img/callouts/1.gif ---------------------------------------------------------------------- diff --git a/src/main/org/freemarker/docgen/statics/img/callouts/1.gif b/src/main/org/freemarker/docgen/statics/img/callouts/1.gif deleted file mode 100644 index 0d66977..0000000 Binary files a/src/main/org/freemarker/docgen/statics/img/callouts/1.gif and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/blob/fcd3269d/src/main/org/freemarker/docgen/statics/img/callouts/10.gif ---------------------------------------------------------------------- diff --git a/src/main/org/freemarker/docgen/statics/img/callouts/10.gif b/src/main/org/freemarker/docgen/statics/img/callouts/10.gif deleted file mode 100644 index fb50b06..0000000 Binary files a/src/main/org/freemarker/docgen/statics/img/callouts/10.gif and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/blob/fcd3269d/src/main/org/freemarker/docgen/statics/img/callouts/11.gif ---------------------------------------------------------------------- diff --git a/src/main/org/freemarker/docgen/statics/img/callouts/11.gif b/src/main/org/freemarker/docgen/statics/img/callouts/11.gif deleted file mode 100644 index 9f5dba4..0000000 Binary files a/src/main/org/freemarker/docgen/statics/img/callouts/11.gif and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/blob/fcd3269d/src/main/org/freemarker/docgen/statics/img/callouts/12.gif ---------------------------------------------------------------------- diff --git a/src/main/org/freemarker/docgen/statics/img/callouts/12.gif b/src/main/org/freemarker/docgen/statics/img/callouts/12.gif deleted file mode 100644 index a373d0b..0000000 Binary files a/src/main/org/freemarker/docgen/statics/img/callouts/12.gif and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/blob/fcd3269d/src/main/org/freemarker/docgen/statics/img/callouts/13.gif ---------------------------------------------------------------------- diff --git a/src/main/org/freemarker/docgen/statics/img/callouts/13.gif b/src/main/org/freemarker/docgen/statics/img/callouts/13.gif deleted file mode 100644 index b00b163..0000000 Binary files a/src/main/org/freemarker/docgen/statics/img/callouts/13.gif and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/blob/fcd3269d/src/main/org/freemarker/docgen/statics/img/callouts/14.gif ---------------------------------------------------------------------- diff --git a/src/main/org/freemarker/docgen/statics/img/callouts/14.gif b/src/main/org/freemarker/docgen/statics/img/callouts/14.gif deleted file mode 100644 index 6d6642e..0000000 Binary files a/src/main/org/freemarker/docgen/statics/img/callouts/14.gif and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/blob/fcd3269d/src/main/org/freemarker/docgen/statics/img/callouts/15.gif ---------------------------------------------------------------------- diff --git a/src/main/org/freemarker/docgen/statics/img/callouts/15.gif b/src/main/org/freemarker/docgen/statics/img/callouts/15.gif deleted file mode 100644 index cdd7072..0000000 Binary files a/src/main/org/freemarker/docgen/statics/img/callouts/15.gif and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/blob/fcd3269d/src/main/org/freemarker/docgen/statics/img/callouts/2.gif ---------------------------------------------------------------------- diff --git a/src/main/org/freemarker/docgen/statics/img/callouts/2.gif b/src/main/org/freemarker/docgen/statics/img/callouts/2.gif deleted file mode 100644 index 100ff79..0000000 Binary files a/src/main/org/freemarker/docgen/statics/img/callouts/2.gif and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/blob/fcd3269d/src/main/org/freemarker/docgen/statics/img/callouts/3.gif ---------------------------------------------------------------------- diff --git a/src/main/org/freemarker/docgen/statics/img/callouts/3.gif b/src/main/org/freemarker/docgen/statics/img/callouts/3.gif deleted file mode 100644 index 5008ca7..0000000 Binary files a/src/main/org/freemarker/docgen/statics/img/callouts/3.gif and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/blob/fcd3269d/src/main/org/freemarker/docgen/statics/img/callouts/4.gif ---------------------------------------------------------------------- diff --git a/src/main/org/freemarker/docgen/statics/img/callouts/4.gif b/src/main/org/freemarker/docgen/statics/img/callouts/4.gif deleted file mode 100644 index 0e5617d..0000000 Binary files a/src/main/org/freemarker/docgen/statics/img/callouts/4.gif and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/blob/fcd3269d/src/main/org/freemarker/docgen/statics/img/callouts/5.gif ---------------------------------------------------------------------- diff --git a/src/main/org/freemarker/docgen/statics/img/callouts/5.gif b/src/main/org/freemarker/docgen/statics/img/callouts/5.gif deleted file mode 100644 index 9bc75ad..0000000 Binary files a/src/main/org/freemarker/docgen/statics/img/callouts/5.gif and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/blob/fcd3269d/src/main/org/freemarker/docgen/statics/img/callouts/6.gif ---------------------------------------------------------------------- diff --git a/src/main/org/freemarker/docgen/statics/img/callouts/6.gif b/src/main/org/freemarker/docgen/statics/img/callouts/6.gif deleted file mode 100644 index d396407..0000000 Binary files a/src/main/org/freemarker/docgen/statics/img/callouts/6.gif and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/blob/fcd3269d/src/main/org/freemarker/docgen/statics/img/callouts/7.gif ---------------------------------------------------------------------- diff --git a/src/main/org/freemarker/docgen/statics/img/callouts/7.gif b/src/main/org/freemarker/docgen/statics/img/callouts/7.gif deleted file mode 100644 index c90b2f3..0000000 Binary files a/src/main/org/freemarker/docgen/statics/img/callouts/7.gif and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/blob/fcd3269d/src/main/org/freemarker/docgen/statics/img/callouts/8.gif ---------------------------------------------------------------------- diff --git a/src/main/org/freemarker/docgen/statics/img/callouts/8.gif b/src/main/org/freemarker/docgen/statics/img/callouts/8.gif deleted file mode 100644 index 6fe3287..0000000 Binary files a/src/main/org/freemarker/docgen/statics/img/callouts/8.gif and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/blob/fcd3269d/src/main/org/freemarker/docgen/statics/img/callouts/9.gif ---------------------------------------------------------------------- diff --git a/src/main/org/freemarker/docgen/statics/img/callouts/9.gif b/src/main/org/freemarker/docgen/statics/img/callouts/9.gif deleted file mode 100644 index bc5c812..0000000 Binary files a/src/main/org/freemarker/docgen/statics/img/callouts/9.gif and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/blob/fcd3269d/src/test/1/docgen.cjson ---------------------------------------------------------------------- diff --git a/src/test/1/docgen.cjson b/src/test/1/docgen.cjson index 8003c8e..14d70d7 100644 --- a/src/test/1/docgen.cjson +++ b/src/test/1/docgen.cjson @@ -1,4 +1,21 @@ -olinks: { +// 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. + +olinks: { homepage: "http://freemarker.org/"; api: "api/index.html" } http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/blob/fcd3269d/src/test/2/docgen.cjson ---------------------------------------------------------------------- diff --git a/src/test/2/docgen.cjson b/src/test/2/docgen.cjson index bf7fd01..df4e380 100644 --- a/src/test/2/docgen.cjson +++ b/src/test/2/docgen.cjson @@ -1,4 +1,22 @@ // charset: ISO-8859-1 + +// 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. + validation: { programlistingsRequireLanguage outputFilesCanUseAutoID http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/blob/fcd3269d/src/test/3/docgen.cjson ---------------------------------------------------------------------- diff --git a/src/test/3/docgen.cjson b/src/test/3/docgen.cjson index 2c857b2..adf7306 100644 --- a/src/test/3/docgen.cjson +++ b/src/test/3/docgen.cjson @@ -1,3 +1,20 @@ +// 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. + contentDirectory: "../2" validation: { outputFilesCanUseAutoID http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/blob/fcd3269d/src/test/4/docgen.cjson ---------------------------------------------------------------------- diff --git a/src/test/4/docgen.cjson b/src/test/4/docgen.cjson index 92d5937..5405bcd 100644 --- a/src/test/4/docgen.cjson +++ b/src/test/4/docgen.cjson @@ -1,5 +1,22 @@ // charset: ISO-8859-2 +// 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. + contentDirectory: "../1" validation: { http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/blob/fcd3269d/src/test/5/docgen.cjson ---------------------------------------------------------------------- diff --git a/src/test/5/docgen.cjson b/src/test/5/docgen.cjson index b621484..87c9fd2 100644 --- a/src/test/5/docgen.cjson +++ b/src/test/5/docgen.cjson @@ -1,3 +1,20 @@ +// 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. + validation: { outputFilesCanUseAutoID } http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/blob/fcd3269d/src/test/6/docgen.cjson ---------------------------------------------------------------------- diff --git a/src/test/6/docgen.cjson b/src/test/6/docgen.cjson index be337e4..dd179d2 100644 --- a/src/test/6/docgen.cjson +++ b/src/test/6/docgen.cjson @@ -1,5 +1,21 @@ -lowestFileElementRank: chapter +// 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. +lowestFileElementRank: chapter // Available icons: // .icon-heart http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/blob/fcd3269d/src/test/7/docgen.cjson ---------------------------------------------------------------------- diff --git a/src/test/7/docgen.cjson b/src/test/7/docgen.cjson index 3ec4e54..fdd2978 100644 --- a/src/test/7/docgen.cjson +++ b/src/test/7/docgen.cjson @@ -1,3 +1,20 @@ +// 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. + contentDirectory: "../6" validation: { http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/blob/fcd3269d/src/test/8/docgen.cjson ---------------------------------------------------------------------- diff --git a/src/test/8/docgen.cjson b/src/test/8/docgen.cjson index 67fffb9..3b65e5b 100644 --- a/src/test/8/docgen.cjson +++ b/src/test/8/docgen.cjson @@ -1,3 +1,20 @@ +// 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. + contentDirectory: "../6" lowestFileElementRank: chapter http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/blob/fcd3269d/src/test/9/docgen.cjson ---------------------------------------------------------------------- diff --git a/src/test/9/docgen.cjson b/src/test/9/docgen.cjson index 8b8e7f6..6330738 100644 --- a/src/test/9/docgen.cjson +++ b/src/test/9/docgen.cjson @@ -1,4 +1,21 @@ -contentDirectory: "../1" +// 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. + +contentDirectory: "../1" lowestFileElementRank: "book" http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/blob/fcd3269d/test.xml ---------------------------------------------------------------------- diff --git a/test.xml b/test.xml index d8f6daf..a16633a 100644 --- a/test.xml +++ b/test.xml @@ -1,4 +1,22 @@ <!-- + 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 separated from the build.xml to prevent the classloading mess caused by that build.xml (re)creates lib/docgen.jar.
