diff --git a/src/it/projects/MJAVADOC-110/verify.bsh b/src/it/projects/MJAVADOC-110/verify.bsh index 7f18bc07..547fb2bb 100644 --- a/src/it/projects/MJAVADOC-110/verify.bsh +++ b/src/it/projects/MJAVADOC-110/verify.bsh @@ -1,54 +1,54 @@ - -/* - * 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. - */ - -import java.io.*; - -boolean result = true; - -try -{ - File target = new File( basedir, "target" ); - if ( !target.exists() || !target.isDirectory() ) - { - System.err.println( "target file is missing or a directory." ); - return false; - } - - File apidocs = new File( target, "site/apidocs" ); - if ( !apidocs.exists() || !apidocs.isDirectory() ) - { - System.err.println( "target/site/apidocs file is missing or a directory." ); - return false; - } - - File htmlFile = new File( apidocs, "Test.html" ); - if ( !htmlFile.isFile() ) - { - System.err.println( "target/site/apidocs/Test.html file is missing or a a file." ); - return false; - } -} -catch( IOException e ) -{ - e.printStackTrace(); - result = false; -} - -return result; + +/* + * 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. + */ + +import java.io.*; + +boolean result = true; + +try +{ + File target = new File( basedir, "target" ); + if ( !target.exists() || !target.isDirectory() ) + { + System.err.println( "target file is missing or a directory." ); + return false; + } + + File apidocs = new File( target, "reports/apidocs" ); + if ( !apidocs.exists() || !apidocs.isDirectory() ) + { + System.err.println( "target/reports/apidocs file is missing or a directory." ); + return false; + } + + File htmlFile = new File( apidocs, "Test.html" ); + if ( !htmlFile.isFile() ) + { + System.err.println( "target/reports/apidocs/Test.html file is missing or a a file." ); + return false; + } +} +catch( IOException e ) +{ + e.printStackTrace(); + result = false; +} + +return result; diff --git a/src/it/projects/MJAVADOC-126/verify.bsh b/src/it/projects/MJAVADOC-126/verify.bsh index 2b94b582..da4e155b 100644 --- a/src/it/projects/MJAVADOC-126/verify.bsh +++ b/src/it/projects/MJAVADOC-126/verify.bsh @@ -1,58 +1,58 @@ - -/* - * 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. - */ - -import java.io.*; - -File target = new File( basedir, "test/target" ); -if ( !target.isDirectory() ) -{ - System.err.println( "target is missing or not a directory." ); - return false; -} - -File apidocs = new File( basedir, "test/target/site/apidocs" ); -if ( !apidocs.isDirectory() ) -{ - System.err.println( apidocs.getAbsolutePath() + " is missing or not a directory." ); - return false; -} - -File file1 = new File( apidocs, "file1.txt" ); -if ( !file1.isFile() ) -{ - System.err.println( file1.getAbsolutePath() + " is missing or a directory." ); - return false; -} - -File file2 = new File( apidocs, "file2.txt" ); -if ( !file2.isFile() ) -{ - System.err.println( file2.getAbsolutePath() + " is missing or a directory." ); - return false; -} - -File metainf = new File( apidocs, "META-INF" ); -if ( metainf.isDirectory() ) -{ - System.err.println( metainf.getAbsolutePath() + " exists." ); - return false; -} - -return true; + +/* + * 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. + */ + +import java.io.*; + +File target = new File( basedir, "test/target" ); +if ( !target.isDirectory() ) +{ + System.err.println( "target is missing or not a directory." ); + return false; +} + +File apidocs = new File( basedir, "test/target/reports/apidocs" ); +if ( !apidocs.isDirectory() ) +{ + System.err.println( apidocs.getAbsolutePath() + " is missing or not a directory." ); + return false; +} + +File file1 = new File( apidocs, "file1.txt" ); +if ( !file1.isFile() ) +{ + System.err.println( file1.getAbsolutePath() + " is missing or a directory." ); + return false; +} + +File file2 = new File( apidocs, "file2.txt" ); +if ( !file2.isFile() ) +{ + System.err.println( file2.getAbsolutePath() + " is missing or a directory." ); + return false; +} + +File metainf = new File( apidocs, "META-INF" ); +if ( metainf.isDirectory() ) +{ + System.err.println( metainf.getAbsolutePath() + " exists." ); + return false; +} + +return true; diff --git a/src/it/projects/MJAVADOC-172/verify.bsh b/src/it/projects/MJAVADOC-172/verify.bsh index 0995c58e..7d82745d 100644 --- a/src/it/projects/MJAVADOC-172/verify.bsh +++ b/src/it/projects/MJAVADOC-172/verify.bsh @@ -1,63 +1,63 @@ - -/* - * 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. - */ - -import java.io.*; -import org.codehaus.plexus.util.*; - -boolean result = true; - -try -{ - File target = new File( basedir, "target" ); - if ( !target.exists() || !target.isDirectory() ) - { - System.err.println( "target file is missing or a directory." ); - return false; - } - - File apidocs = new File( basedir, "target/site/apidocs" ); - if ( !apidocs.exists() || !apidocs.isDirectory() ) - { - System.err.println( "target/site/apidocs file is missing or a directory." ); - return false; - } - - File options = new File( apidocs, "options" ); - if ( !options.exists() || !options.isFile() ) - { - System.err.println( "target/site/apidocs/options file is missing or not a file." ); - return false; - } - - String str = FileUtils.fileRead( options ); - - if ( !str.contains( "junit-4.13.1.jar" ) ) - { - System.err.println( "Javadoc doesn't used correct artifacts." ); - return false; - } -} -catch( IOException e ) -{ - e.printStackTrace(); - result = false; -} - -return result; + +/* + * 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. + */ + +import java.io.*; +import org.codehaus.plexus.util.*; + +boolean result = true; + +try +{ + File target = new File( basedir, "target" ); + if ( !target.exists() || !target.isDirectory() ) + { + System.err.println( "target file is missing or a directory." ); + return false; + } + + File apidocs = new File( basedir, "target/reports/apidocs" ); + if ( !apidocs.exists() || !apidocs.isDirectory() ) + { + System.err.println( "target/reports/apidocs file is missing or a directory." ); + return false; + } + + File options = new File( apidocs, "options" ); + if ( !options.exists() || !options.isFile() ) + { + System.err.println( "target/reports/apidocs/options file is missing or not a file." ); + return false; + } + + String str = FileUtils.fileRead( options ); + + if ( !str.contains( "junit-4.13.1.jar" ) ) + { + System.err.println( "Javadoc doesn't used correct artifacts." ); + return false; + } +} +catch( IOException e ) +{ + e.printStackTrace(); + result = false; +} + +return result; diff --git a/src/it/projects/MJAVADOC-180/verify.bsh b/src/it/projects/MJAVADOC-180/verify.bsh index db279577..325e21be 100644 --- a/src/it/projects/MJAVADOC-180/verify.bsh +++ b/src/it/projects/MJAVADOC-180/verify.bsh @@ -1,61 +1,61 @@ - -/* - * 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. - */ - -import java.io.*; - -boolean result = true; - -try -{ - File target = new File( basedir, "target" ); - if ( !target.exists() || !target.isDirectory() ) - { - System.err.println( "target file is missing or a directory." ); - return false; - } - - File testapidocs = new File( basedir, "target/site/testapidocs" ); - if ( !testapidocs.exists() || !testapidocs.isDirectory() ) - { - System.err.println( "target/site/testapidocs file is missing or a directory." ); - return false; - } - - File options = new File( testapidocs, "options" ); - if ( !options.exists() || !options.isFile() ) - { - System.err.println( "target/site/testapidocs/options file is missing or not a file." ); - return false; - } - - File index = new File( testapidocs, "index.html" ); - if ( !index.exists() || !index.isFile() ) - { - System.err.println( "target/site/testapidocs/index.html file is missing or not a file." ); - return false; - } -} -catch( IOException e ) -{ - e.printStackTrace(); - result = false; -} - -return result; + +/* + * 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. + */ + +import java.io.*; + +boolean result = true; + +try +{ + File target = new File( basedir, "target" ); + if ( !target.exists() || !target.isDirectory() ) + { + System.err.println( "target file is missing or a directory." ); + return false; + } + + File testapidocs = new File( basedir, "target/reports/testapidocs" ); + if ( !testapidocs.exists() || !testapidocs.isDirectory() ) + { + System.err.println( "target/reports/testapidocs file is missing or a directory." ); + return false; + } + + File options = new File( testapidocs, "options" ); + if ( !options.exists() || !options.isFile() ) + { + System.err.println( "target/reports/testapidocs/options file is missing or not a file." ); + return false; + } + + File index = new File( testapidocs, "index.html" ); + if ( !index.exists() || !index.isFile() ) + { + System.err.println( "target/reports/testapidocs/index.html file is missing or not a file." ); + return false; + } +} +catch( IOException e ) +{ + e.printStackTrace(); + result = false; +} + +return result; diff --git a/src/it/projects/MJAVADOC-181/verify.bsh b/src/it/projects/MJAVADOC-181/verify.bsh index c0437510..e325acdf 100644 --- a/src/it/projects/MJAVADOC-181/verify.bsh +++ b/src/it/projects/MJAVADOC-181/verify.bsh @@ -1,67 +1,67 @@ - -/* - * 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. - */ - -import java.io.*; - -boolean result = true; - -try -{ - // Generated files checks - File apidocs = new File( basedir, "application/target/site/apidocs" ); - if ( !apidocs.isDirectory() ) - { - System.err.println( apidocs.getAbsolutePath() + " dir is missing or a directory." ); - return false; - } - apidocs = new File( basedir, "library/module-a/target/site/apidocs" ); - if ( !apidocs.isDirectory() ) - { - System.err.println( apidocs.getAbsolutePath() + " dir is missing or a directory." ); - return false; - } - apidocs = new File( basedir, "library/module-b/target/site/apidocs" ); - if ( !apidocs.isDirectory() ) - { - System.err.println( apidocs.getAbsolutePath() + " dir is missing or a directory." ); - return false; - } - - // Not existing files - apidocs = new File( basedir, "target/site/apidocs" ); - if ( apidocs.exists() ) - { - System.err.println( apidocs.getAbsolutePath() + " has been generated." ); - return false; - } - apidocs = new File( basedir, "library/target/site/apidocs" ); - if ( apidocs.exists() ) - { - System.err.println( apidocs.getAbsolutePath() + " has been generated." ); - return false; - } -} -catch( RuntimeException e ) -{ - e.printStackTrace(); - return false; -} - -return result; + +/* + * 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. + */ + +import java.io.*; + +boolean result = true; + +try +{ + // Generated files checks + File apidocs = new File( basedir, "application/target/reports/apidocs" ); + if ( !apidocs.isDirectory() ) + { + System.err.println( apidocs.getAbsolutePath() + " dir is missing or a directory." ); + return false; + } + apidocs = new File( basedir, "library/module-a/target/reports/apidocs" ); + if ( !apidocs.isDirectory() ) + { + System.err.println( apidocs.getAbsolutePath() + " dir is missing or a directory." ); + return false; + } + apidocs = new File( basedir, "library/module-b/target/reports/apidocs" ); + if ( !apidocs.isDirectory() ) + { + System.err.println( apidocs.getAbsolutePath() + " dir is missing or a directory." ); + return false; + } + + // Not existing files + apidocs = new File( basedir, "target/reports/apidocs" ); + if ( apidocs.exists() ) + { + System.err.println( apidocs.getAbsolutePath() + " has been generated." ); + return false; + } + apidocs = new File( basedir, "library/target/reports/apidocs" ); + if ( apidocs.exists() ) + { + System.err.println( apidocs.getAbsolutePath() + " has been generated." ); + return false; + } +} +catch( RuntimeException e ) +{ + e.printStackTrace(); + return false; +} + +return result; diff --git a/src/it/projects/MJAVADOC-194/verify.bsh b/src/it/projects/MJAVADOC-194/verify.bsh index d9911d06..655e1cfc 100644 --- a/src/it/projects/MJAVADOC-194/verify.bsh +++ b/src/it/projects/MJAVADOC-194/verify.bsh @@ -1,82 +1,82 @@ - -/* - * 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. - */ - -import java.io.*; - -boolean result = true; - -try -{ - File target = new File( basedir, "target" ); - if ( !target.exists() || !target.isDirectory() ) - { - System.err.println( "target file is missing or a directory." ); - return false; - } - - File apidocs = new File( basedir, "target/site/apidocs" ); - if ( !apidocs.exists() || !apidocs.isDirectory() ) - { - System.err.println( "target/site/apidocs file is missing or a directory." ); - return false; - } - - File index = new File( apidocs, "index.html" ); - if ( !index.exists() || !index.isFile() ) - { - System.err.println( "target/site/apidocs/index.html file is missing or not a file." ); - return false; - } - - File test1 = new File( apidocs, "test/Test1.html" ); - if ( !test1.exists() || !test1.isFile() ) - { - System.err.println( "target/site/apidocs/test/Test1.html file is missing or not a file." ); - return false; - } - - File test2 = new File( apidocs, "test/Test2.html" ); - if ( !test2.exists() || !test2.isFile() ) - { - System.err.println( "target/site/apidocs/test/Test2.html file is missing or not a file." ); - return false; - } - - File generatedTest1 = new File( apidocs, "test/GeneratedTest1.html" ); - if ( !generatedTest1.exists() || !generatedTest1.isFile() ) - { - System.err.println( "target/site/apidocs/test/GeneratedTest1.html file is missing or not a file." ); - return false; - } - - File generatedTest2 = new File( apidocs, "test/GeneratedTest2.html" ); - if ( !generatedTest2.exists() || !generatedTest2.isFile() ) - { - System.err.println( "target/site/apidocs/test/GeneratedTest2.html file is missing or not a file." ); - return false; - } -} -catch( IOException e ) -{ - e.printStackTrace(); - result = false; -} - -return result; + +/* + * 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. + */ + +import java.io.*; + +boolean result = true; + +try +{ + File target = new File( basedir, "target" ); + if ( !target.exists() || !target.isDirectory() ) + { + System.err.println( "target file is missing or a directory." ); + return false; + } + + File apidocs = new File( basedir, "target/reports/apidocs" ); + if ( !apidocs.exists() || !apidocs.isDirectory() ) + { + System.err.println( "target/reports/apidocs file is missing or a directory." ); + return false; + } + + File index = new File( apidocs, "index.html" ); + if ( !index.exists() || !index.isFile() ) + { + System.err.println( "target/reports/apidocs/index.html file is missing or not a file." ); + return false; + } + + File test1 = new File( apidocs, "test/Test1.html" ); + if ( !test1.exists() || !test1.isFile() ) + { + System.err.println( "target/reports/apidocs/test/Test1.html file is missing or not a file." ); + return false; + } + + File test2 = new File( apidocs, "test/Test2.html" ); + if ( !test2.exists() || !test2.isFile() ) + { + System.err.println( "target/reports/apidocs/test/Test2.html file is missing or not a file." ); + return false; + } + + File generatedTest1 = new File( apidocs, "test/GeneratedTest1.html" ); + if ( !generatedTest1.exists() || !generatedTest1.isFile() ) + { + System.err.println( "target/reports/apidocs/test/GeneratedTest1.html file is missing or not a file." ); + return false; + } + + File generatedTest2 = new File( apidocs, "test/GeneratedTest2.html" ); + if ( !generatedTest2.exists() || !generatedTest2.isFile() ) + { + System.err.println( "target/reports/apidocs/test/GeneratedTest2.html file is missing or not a file." ); + return false; + } +} +catch( IOException e ) +{ + e.printStackTrace(); + result = false; +} + +return result; diff --git a/src/it/projects/MJAVADOC-262/verify.bsh b/src/it/projects/MJAVADOC-262/verify.bsh index 8cb556c1..ef46108d 100644 --- a/src/it/projects/MJAVADOC-262/verify.bsh +++ b/src/it/projects/MJAVADOC-262/verify.bsh @@ -1,41 +1,41 @@ - -/* - * 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. - */ - -import java.io.*; - -boolean result = true; - -try -{ - // Generated files checks - File apidocs = new File( basedir, "target/site/apidocs" ); - if ( !apidocs.isDirectory() ) - { - System.err.println( apidocs.getAbsolutePath() + " dir is missing or a directory." ); - return false; - } -} -catch( RuntimeException e ) -{ - e.printStackTrace(); - return false; -} - -return result; + +/* + * 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. + */ + +import java.io.*; + +boolean result = true; + +try +{ + // Generated files checks + File apidocs = new File( basedir, "target/reports/apidocs" ); + if ( !apidocs.isDirectory() ) + { + System.err.println( apidocs.getAbsolutePath() + " dir is missing or a directory." ); + return false; + } +} +catch( RuntimeException e ) +{ + e.printStackTrace(); + return false; +} + +return result; diff --git a/src/it/projects/MJAVADOC-278/verify.bsh b/src/it/projects/MJAVADOC-278/verify.bsh index b86a5d6f..0f30f40a 100644 --- a/src/it/projects/MJAVADOC-278/verify.bsh +++ b/src/it/projects/MJAVADOC-278/verify.bsh @@ -1,32 +1,32 @@ - -/* - * 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. - */ - -import java.io.*; -import org.codehaus.plexus.util.*; - -File exampleResourceFile = new File( basedir, "target/site/apidocs/resources/bg.psd" ); - -if ( !exampleResourceFile.exists() ) -{ - System.err.println( exampleResourceFile.getAbsolutePath() + " is missing." ); - return false; -} - + +/* + * 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. + */ + +import java.io.*; +import org.codehaus.plexus.util.*; + +File exampleResourceFile = new File( basedir, "target/reports/apidocs/resources/bg.psd" ); + +if ( !exampleResourceFile.exists() ) +{ + System.err.println( exampleResourceFile.getAbsolutePath() + " is missing." ); + return false; +} + return true; \ No newline at end of file diff --git a/src/it/projects/MJAVADOC-320/verify.groovy b/src/it/projects/MJAVADOC-320/verify.groovy index 7df00534..b29f53f7 100644 --- a/src/it/projects/MJAVADOC-320/verify.groovy +++ b/src/it/projects/MJAVADOC-320/verify.groovy @@ -22,7 +22,7 @@ File target = new File( basedir, "module2/target" ); assert target.exists() assert target.isDirectory() -File apidocs = new File( target, "site/apidocs" ); +File apidocs = new File( target, "reports/apidocs" ); assert apidocs.exists() assert apidocs.isDirectory() diff --git a/src/it/projects/MJAVADOC-365/verify.bsh b/src/it/projects/MJAVADOC-365/verify.bsh index e159e69a..3b17f49b 100644 --- a/src/it/projects/MJAVADOC-365/verify.bsh +++ b/src/it/projects/MJAVADOC-365/verify.bsh @@ -21,8 +21,8 @@ import java.io.*; import org.codehaus.plexus.util.*; -File includedFile = new File( basedir, "target/site/apidocs/foo/Included.html" ); -File excludedFile = new File( basedir, "target/site/apidocs/foo/Excluded.html" ); +File includedFile = new File( basedir, "target/reports/apidocs/foo/Included.html" ); +File excludedFile = new File( basedir, "target/reports/apidocs/foo/Excluded.html" ); if ( !includedFile.exists() ) { diff --git a/src/it/projects/MJAVADOC-384/verify.bsh b/src/it/projects/MJAVADOC-384/verify.bsh index 1c80f44a..b402f933 100644 --- a/src/it/projects/MJAVADOC-384/verify.bsh +++ b/src/it/projects/MJAVADOC-384/verify.bsh @@ -1,54 +1,54 @@ - -/* - * 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. - */ - -import java.io.*; -import org.codehaus.plexus.util.*; - -File[] nonExistingJavadocFiles = new File[] { - new File( basedir, "target/site/apidocs/com/foo/bar/impl/NotApi.html" ), - new File( basedir, "target/site/apidocs/com/foo/bar/internal/NotApi.html" ), - new File( basedir, "target/site/apidocs/com/foo/bar/internal/other/NotApi.html" ), -}; - -for ( File javadocFile : nonExistingJavadocFiles ) -{ - if ( javadocFile.exists() ) - { - System.err.println( javadocFile.getAbsolutePath() + " is present." ); - return false; - } -} - -File[] existingJavadocFiles = new File[] { - new File( basedir, "target/site/apidocs/com/foo/bar/Api.html" ), - new File( basedir, "target/site/apidocs/com/foo/bar/internal/Api.html" ), -}; - -for ( File javadocFile : existingJavadocFiles ) -{ - if ( !javadocFile.exists() ) - { - System.err.println( javadocFile.getAbsolutePath() + " is missing." ); - return false; - } -} - - -return true; + +/* + * 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. + */ + +import java.io.*; +import org.codehaus.plexus.util.*; + +File[] nonExistingJavadocFiles = new File[] { + new File( basedir, "target/reports/apidocs/com/foo/bar/impl/NotApi.html" ), + new File( basedir, "target/reports/apidocs/com/foo/bar/internal/NotApi.html" ), + new File( basedir, "target/reports/apidocs/com/foo/bar/internal/other/NotApi.html" ), +}; + +for ( File javadocFile : nonExistingJavadocFiles ) +{ + if ( javadocFile.exists() ) + { + System.err.println( javadocFile.getAbsolutePath() + " is present." ); + return false; + } +} + +File[] existingJavadocFiles = new File[] { + new File( basedir, "target/reports/apidocs/com/foo/bar/Api.html" ), + new File( basedir, "target/reports/apidocs/com/foo/bar/internal/Api.html" ), +}; + +for ( File javadocFile : existingJavadocFiles ) +{ + if ( !javadocFile.exists() ) + { + System.err.println( javadocFile.getAbsolutePath() + " is missing." ); + return false; + } +} + + +return true; diff --git a/src/it/projects/MJAVADOC-407/verify.bsh b/src/it/projects/MJAVADOC-407/verify.bsh index d6a65439..46a7d3da 100644 --- a/src/it/projects/MJAVADOC-407/verify.bsh +++ b/src/it/projects/MJAVADOC-407/verify.bsh @@ -1,32 +1,32 @@ - -/* - * 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. - */ - -import java.io.*; -import org.codehaus.plexus.util.*; - -File javadocFile = new File( basedir, "target/site/apidocs/foo/Bar.html" ); - -if ( !javadocFile.exists() ) -{ - System.err.println( javadocFile.getAbsolutePath() + " is missing." ); - return false; -} - + +/* + * 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. + */ + +import java.io.*; +import org.codehaus.plexus.util.*; + +File javadocFile = new File( basedir, "target/reports/apidocs/foo/Bar.html" ); + +if ( !javadocFile.exists() ) +{ + System.err.println( javadocFile.getAbsolutePath() + " is missing." ); + return false; +} + return true; \ No newline at end of file diff --git a/src/it/projects/MJAVADOC-414/verify.bsh b/src/it/projects/MJAVADOC-414/verify.bsh index 0a9d3092..cf9faed6 100644 --- a/src/it/projects/MJAVADOC-414/verify.bsh +++ b/src/it/projects/MJAVADOC-414/verify.bsh @@ -1,47 +1,47 @@ - -/* - * 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. - */ - -import java.io.*; -import org.codehaus.plexus.util.*; - -File indexFile = new File( basedir, "target/site/testapidocs/mjavadoc414/test/AppTest.html" ); - -if ( !indexFile.exists() ) -{ - System.err.println( indexFile.getAbsolutePath() + " is missing." ); - return false; -} - -File buildLog = new File( basedir, "build.log" ); -String content = IOUtil.toString( new FileInputStream( buildLog ) ); -String importError = "error: cannot find symbol"; -if ( content.contains( importError ) ) -{ - System.err.println( "build.log contains '" + importError + "'" ); - return false; -} - -String referenceWarning = "Tag @link: reference not found: mjavadoc414.App"; -if ( content.contains( referenceWarning ) ) -{ - System.err.println( "build.log contains '" + referenceWarning + "'" ); - return false; -} -return true; + +/* + * 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. + */ + +import java.io.*; +import org.codehaus.plexus.util.*; + +File indexFile = new File( basedir, "target/reports/testapidocs/mjavadoc414/test/AppTest.html" ); + +if ( !indexFile.exists() ) +{ + System.err.println( indexFile.getAbsolutePath() + " is missing." ); + return false; +} + +File buildLog = new File( basedir, "build.log" ); +String content = IOUtil.toString( new FileInputStream( buildLog ) ); +String importError = "error: cannot find symbol"; +if ( content.contains( importError ) ) +{ + System.err.println( "build.log contains '" + importError + "'" ); + return false; +} + +String referenceWarning = "Tag @link: reference not found: mjavadoc414.App"; +if ( content.contains( referenceWarning ) ) +{ + System.err.println( "build.log contains '" + referenceWarning + "'" ); + return false; +} +return true; diff --git a/src/it/projects/MJAVADOC-427/verify.groovy b/src/it/projects/MJAVADOC-427/verify.groovy index f3ad4b04..8f478567 100644 --- a/src/it/projects/MJAVADOC-427/verify.groovy +++ b/src/it/projects/MJAVADOC-427/verify.groovy @@ -17,7 +17,7 @@ * under the License. */ -def file = new File( basedir, 'target/site/apidocs/mjavadoc427/App.html' ); +def file = new File( basedir, 'target/reports/apidocs/mjavadoc427/App.html' ); assert file.exists() diff --git a/src/it/projects/MJAVADOC-437/verify.bsh b/src/it/projects/MJAVADOC-437/verify.bsh index 0507b02e..1e7e4fd3 100644 --- a/src/it/projects/MJAVADOC-437/verify.bsh +++ b/src/it/projects/MJAVADOC-437/verify.bsh @@ -35,7 +35,7 @@ boolean result = true; try { - File javadoc = new File( basedir, "target/site/apidocs/com/example/bar/Bar.html" ); + File javadoc = new File( basedir, "target/reports/apidocs/com/example/bar/Bar.html" ); if ( !javadoc.exists() ) { System.err.println( javadoc + " is missing" ); diff --git a/src/it/projects/MJAVADOC-449_aggr_modulepath/verify.groovy b/src/it/projects/MJAVADOC-449_aggr_modulepath/verify.groovy index 28fdb1f6..0b179c4f 100644 --- a/src/it/projects/MJAVADOC-449_aggr_modulepath/verify.groovy +++ b/src/it/projects/MJAVADOC-449_aggr_modulepath/verify.groovy @@ -19,20 +19,20 @@ int javaVersion = System.getProperty( "java.specification.version" ) as Integer if ( javaVersion >= 11 ) { - def index = new File( basedir, 'target/site/apidocs/index.html') + def index = new File( basedir, 'target/reports/apidocs/index.html') assert index.text =~ /modulea<\/a>/ assert index.text =~ /moduleb<\/a>/ - assert new File( basedir, 'target/site/apidocs/modulea/module-summary.html').exists() - assert new File( basedir, 'target/site/apidocs/moduleb/module-summary.html').exists() + assert new File( basedir, 'target/reports/apidocs/modulea/module-summary.html').exists() + assert new File( basedir, 'target/reports/apidocs/moduleb/module-summary.html').exists() } else { - def overview = new File( basedir, 'target/site/apidocs/overview-summary.html') + def overview = new File( basedir, 'target/reports/apidocs/overview-summary.html') assert overview.text =~ /modulea<\/a>/ assert overview.text =~ /moduleb<\/a>/ - assert new File( basedir, 'target/site/apidocs/modulea-summary.html').exists() - assert new File( basedir, 'target/site/apidocs/moduleb-summary.html').exists() + assert new File( basedir, 'target/reports/apidocs/modulea-summary.html').exists() + assert new File( basedir, 'target/reports/apidocs/moduleb-summary.html').exists() } diff --git a/src/it/projects/MJAVADOC-450_classifier/verify.groovy b/src/it/projects/MJAVADOC-450_classifier/verify.groovy index ac751d0f..d07b2be3 100644 --- a/src/it/projects/MJAVADOC-450_classifier/verify.groovy +++ b/src/it/projects/MJAVADOC-450_classifier/verify.groovy @@ -20,5 +20,5 @@ def buildLog = new File( basedir, 'build.log' ); assert buildLog.text.contains('[DEBUG] custom.css found in javadoc plugin dependencies.') -def stylesheetCss = new File( basedir, 'target/site/apidocs/stylesheet.css' ); +def stylesheetCss = new File( basedir, 'target/reports/apidocs/stylesheet.css' ); assert stylesheetCss.text.contains('/* CUSTOM CSS */') diff --git a/src/it/projects/MJAVADOC-495_offline-filescheme/verify.groovy b/src/it/projects/MJAVADOC-495_offline-filescheme/verify.groovy index ce90596e..75a25f10 100644 --- a/src/it/projects/MJAVADOC-495_offline-filescheme/verify.groovy +++ b/src/it/projects/MJAVADOC-495_offline-filescheme/verify.groovy @@ -17,7 +17,7 @@ * under the License. */ -assert new File( basedir, 'target/site/apidocs/options').readLines() +assert new File( basedir, 'target/reports/apidocs/options').readLines() .dropWhile{ it != '-link'} .drop(1) .first() diff --git a/src/it/projects/MJAVADOC-497/verify.bsh b/src/it/projects/MJAVADOC-497/verify.bsh index d90f357f..8aa8285f 100644 --- a/src/it/projects/MJAVADOC-497/verify.bsh +++ b/src/it/projects/MJAVADOC-497/verify.bsh @@ -1,58 +1,58 @@ -/* - * 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. - */ - -import java.io.*; - -try -{ - File list; - - String javaVersion = System.getProperty( "java.specification.version" ); - if ( javaVersion.startsWith( "1." ) || javaVersion.equals( "9" ) ) - { - list = new File( basedir, "target/site/apidocs/package-list" ); - } - else - { - list = new File( basedir, "target/site/apidocs/element-list" ); - } - - if ( !list.exists() ) - { - System.err.println( packageList + " is missing" ); - return false; - } - - FileReader fr = new FileReader( list ); - BufferedReader br = new BufferedReader( fr ); - String line = br.readLine(); - if ( !"com.example.foo".equals( line ) || br.readLine() != null ) - { - System.err.println( "package com.example.foo is not the only entry in the package-list" ); - return false; - } - br.close(); -} -catch ( Exception e ) -{ - e.printStackTrace(); - return false; -} - +/* + * 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. + */ + +import java.io.*; + +try +{ + File list; + + String javaVersion = System.getProperty( "java.specification.version" ); + if ( javaVersion.startsWith( "1." ) || javaVersion.equals( "9" ) ) + { + list = new File( basedir, "target/reports/apidocs/package-list" ); + } + else + { + list = new File( basedir, "target/reports/apidocs/element-list" ); + } + + if ( !list.exists() ) + { + System.err.println( packageList + " is missing" ); + return false; + } + + FileReader fr = new FileReader( list ); + BufferedReader br = new BufferedReader( fr ); + String line = br.readLine(); + if ( !"com.example.foo".equals( line ) || br.readLine() != null ) + { + System.err.println( "package com.example.foo is not the only entry in the package-list" ); + return false; + } + br.close(); +} +catch ( Exception e ) +{ + e.printStackTrace(); + return false; +} + return true; \ No newline at end of file diff --git a/src/it/projects/MJAVADOC-506_excl-module-info/verify.groovy b/src/it/projects/MJAVADOC-506_excl-module-info/verify.groovy index 4151588d..99777a19 100644 --- a/src/it/projects/MJAVADOC-506_excl-module-info/verify.groovy +++ b/src/it/projects/MJAVADOC-506_excl-module-info/verify.groovy @@ -19,9 +19,9 @@ def javaVersion = System.getProperty( "java.specification.version" ) if ( javaVersion =~ /(1\..+)|9|10/ ) { - assert new File( basedir, 'target/site/apidocs/com/foo/MyClass.html').exists() + assert new File( basedir, 'target/reports/apidocs/com/foo/MyClass.html').exists() } else { - assert new File( basedir, 'target/site/apidocs/M.N/com/foo/MyClass.html').exists() + assert new File( basedir, 'target/reports/apidocs/M.N/com/foo/MyClass.html').exists() } diff --git a/src/it/projects/MJAVADOC-555_aggr_mixed/verify.groovy b/src/it/projects/MJAVADOC-555_aggr_mixed/verify.groovy index e75b96cf..b0fc0b74 100644 --- a/src/it/projects/MJAVADOC-555_aggr_mixed/verify.groovy +++ b/src/it/projects/MJAVADOC-555_aggr_mixed/verify.groovy @@ -19,20 +19,20 @@ int javaVersion = System.getProperty( "java.specification.version" ) as Integer if ( javaVersion >= 11 ) { - def index = new File( basedir, 'target/site/apidocs/index.html') + def index = new File( basedir, 'target/reports/apidocs/index.html') assert index.text =~ /module1<\/a>/ assert index.text =~ /module2<\/a>/ - assert new File( basedir, 'target/site/apidocs/module1/module-summary.html').exists() - assert new File( basedir, 'target/site/apidocs/module2/module-summary.html').exists() + assert new File( basedir, 'target/reports/apidocs/module1/module-summary.html').exists() + assert new File( basedir, 'target/reports/apidocs/module2/module-summary.html').exists() } else { - def overview = new File( basedir, 'target/site/apidocs/overview-summary.html') + def overview = new File( basedir, 'target/reports/apidocs/overview-summary.html') assert overview.text =~ /module1<\/a>/ assert overview.text =~ /module2<\/a>/ - assert new File( basedir, 'target/site/apidocs/module1-summary.html').exists() - assert new File( basedir, 'target/site/apidocs/module2-summary.html').exists() + assert new File( basedir, 'target/reports/apidocs/module1-summary.html').exists() + assert new File( basedir, 'target/reports/apidocs/module2-summary.html').exists() } diff --git a/src/it/projects/MJAVADOC-555_link-automatic-modules/verify.groovy b/src/it/projects/MJAVADOC-555_link-automatic-modules/verify.groovy index 8c5a23e6..693813e3 100644 --- a/src/it/projects/MJAVADOC-555_link-automatic-modules/verify.groovy +++ b/src/it/projects/MJAVADOC-555_link-automatic-modules/verify.groovy @@ -20,9 +20,9 @@ def classFile int javaVersion = System.getProperty( "java.specification.version" ) as Integer if ( javaVersion >= 11 ) { - classFile = new File( basedir, 'target/site/apidocs/jul_to_slf4j/com/testcase/Testcase.html') + classFile = new File( basedir, 'target/reports/apidocs/jul_to_slf4j/com/testcase/Testcase.html') } else { - classFile = new File( basedir, 'target/site/apidocs/com/testcase/Testcase.html') + classFile = new File( basedir, 'target/reports/apidocs/com/testcase/Testcase.html') } assert classFile.exists() : "Can't locate ${classFile}" diff --git a/src/it/projects/MJAVADOC-575_source8-module-info/verify.groovy b/src/it/projects/MJAVADOC-575_source8-module-info/verify.groovy index 88d201a8..7929159e 100644 --- a/src/it/projects/MJAVADOC-575_source8-module-info/verify.groovy +++ b/src/it/projects/MJAVADOC-575_source8-module-info/verify.groovy @@ -17,4 +17,4 @@ * under the License. */ -assert new File( basedir, 'target/site/apidocs/com/foo/MyClass.html').exists() +assert new File( basedir, 'target/reports/apidocs/com/foo/MyClass.html').exists() diff --git a/src/it/projects/MJAVADOC-580_detectLinks/verify.groovy b/src/it/projects/MJAVADOC-580_detectLinks/verify.groovy index 6fa229a5..f63075b9 100644 --- a/src/it/projects/MJAVADOC-580_detectLinks/verify.groovy +++ b/src/it/projects/MJAVADOC-580_detectLinks/verify.groovy @@ -26,6 +26,6 @@ if ( javaVersion.startsWith('1.') || Integer.parseInt(javaVersion) < 16 ) } else { - def barHtml = new File(basedir,'target/site/apidocs/foo/Bar.html') + def barHtml = new File(basedir,'target/reports/apidocs/foo/Bar.html') assert barHtml.text =~ /= 11 ) { - def index = new File( basedir, 'target/site/apidocs/index.html') + def index = new File( basedir, 'target/reports/apidocs/index.html') assert index.text =~ /modulea<\/a>/ assert index.text =~ /moduleb<\/a>/ - assert new File( basedir, 'target/site/apidocs/modulea/module-summary.html').exists() - assert new File( basedir, 'target/site/apidocs/moduleb/module-summary.html').exists() + assert new File( basedir, 'target/reports/apidocs/modulea/module-summary.html').exists() + assert new File( basedir, 'target/reports/apidocs/moduleb/module-summary.html').exists() } else { - def overview = new File( basedir, 'target/site/apidocs/overview-summary.html') + def overview = new File( basedir, 'target/reports/apidocs/overview-summary.html') assert overview.text =~ /modulea<\/a>/ assert overview.text =~ /moduleb<\/a>/ diff --git a/src/it/projects/MJAVADOC-661_mrjar/verify.groovy b/src/it/projects/MJAVADOC-661_mrjar/verify.groovy index 817ea3de..4906364a 100644 --- a/src/it/projects/MJAVADOC-661_mrjar/verify.groovy +++ b/src/it/projects/MJAVADOC-661_mrjar/verify.groovy @@ -23,7 +23,7 @@ def required = [] versions.each { required << "'com.foo.Taglet" + it + "'" } -def options = new File( basedir, 'target/site/apidocs/options' ); +def options = new File( basedir, 'target/reports/apidocs/options' ); assert options.exists() : options + " not found" diff --git a/src/it/projects/MJAVADOC-770/verify.groovy b/src/it/projects/MJAVADOC-770/verify.groovy index 933b06e5..86ea1df5 100644 --- a/src/it/projects/MJAVADOC-770/verify.groovy +++ b/src/it/projects/MJAVADOC-770/verify.groovy @@ -18,6 +18,6 @@ */ // new style javadoc has a module summary. legacy mode has not. -def moduleFile = new File( basedir, 'target/site/apidocs/mjavadoc770/module-summary.html') +def moduleFile = new File( basedir, 'target/reports/apidocs/mjavadoc770/module-summary.html') assert !moduleFile.exists() diff --git a/src/it/projects/dependencySource-1/verify.bsh b/src/it/projects/dependencySource-1/verify.bsh index 841288c5..c276427a 100644 --- a/src/it/projects/dependencySource-1/verify.bsh +++ b/src/it/projects/dependencySource-1/verify.bsh @@ -19,7 +19,7 @@ import java.io.File; -File distroTarget = new File( basedir, "MJAVADOC-280-1-distro/target/site" ); +File distroTarget = new File( basedir, "MJAVADOC-280-1-distro/target/reports" ); File apidocs = new File( distroTarget, "apidocs" ); File testApidocs = new File( distroTarget, "testapidocs" ); diff --git a/src/it/projects/dependencySource-2/verify.bsh b/src/it/projects/dependencySource-2/verify.bsh index a600f94f..b5d55473 100644 --- a/src/it/projects/dependencySource-2/verify.bsh +++ b/src/it/projects/dependencySource-2/verify.bsh @@ -19,7 +19,7 @@ import java.io.File; -File distroTarget = new File( basedir, "MJAVADOC-280-2-distro/target/site" ); +File distroTarget = new File( basedir, "MJAVADOC-280-2-distro/target/reports" ); File apidocs = new File( distroTarget, "apidocs" ); File testApidocs = new File( distroTarget, "testapidocs" ); diff --git a/src/it/projects/dependencySource-3/verify.bsh b/src/it/projects/dependencySource-3/verify.bsh index 60add4ad..3320b79b 100644 --- a/src/it/projects/dependencySource-3/verify.bsh +++ b/src/it/projects/dependencySource-3/verify.bsh @@ -19,7 +19,7 @@ import java.io.File; -File distroTarget = new File( basedir, "MJAVADOC-280-3-distro/target/site" ); +File distroTarget = new File( basedir, "MJAVADOC-280-3-distro/target/reports" ); File apidocs = new File( distroTarget, "apidocs" ); File testApidocs = new File( distroTarget, "testapidocs" ); diff --git a/src/it/projects/dependencySource-4/verify.bsh b/src/it/projects/dependencySource-4/verify.bsh index 1bc91ee3..11a216d2 100644 --- a/src/it/projects/dependencySource-4/verify.bsh +++ b/src/it/projects/dependencySource-4/verify.bsh @@ -19,7 +19,7 @@ import java.io.File; -File distroTarget = new File( basedir, "MJAVADOC-280-4-distro/target/site" ); +File distroTarget = new File( basedir, "MJAVADOC-280-4-distro/target/reports" ); File apidocs = new File( distroTarget, "apidocs" ); File testApidocs = new File( distroTarget, "testapidocs" ); diff --git a/src/it/projects/detectLinks/verify.bsh b/src/it/projects/detectLinks/verify.bsh index 145ebb41..58802196 100644 --- a/src/it/projects/detectLinks/verify.bsh +++ b/src/it/projects/detectLinks/verify.bsh @@ -1,139 +1,139 @@ - -/* - * 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. - */ - -import java.io.*; -import org.codehaus.plexus.util.*; - -boolean result = true; - -try -{ - // Generated files checks - File apidocs1 = new File( basedir, "module1/target/site/apidocs" ); - if ( !apidocs1.exists() || !apidocs1.isDirectory() ) - { - System.err.println( apidocs1.getAbsolutePath() + " dir is missing or a directory." ); - return false; - } - File apidocs2 = new File( basedir, "module2/target/site/apidocs" ); - if ( !apidocs2.exists() || !apidocs2.isDirectory() ) - { - System.err.println( apidocs2.getAbsolutePath() + " dir is missing or a directory." ); - return false; - } - - File options1 = new File( apidocs1, "options" ); - if ( !options1.exists() || !options1.isFile() ) - { - System.err.println( options1.getAbsolutePath() + " file is missing or not a file." ); - return false; - } - File options2 = new File( apidocs2, "options" ); - if ( !options2.exists() || !options2.isFile() ) - { - System.err.println( options2.getAbsolutePath() + " file is missing or not a file." ); - return false; - } - - // Read files - String contentOptions1 = FileUtils.fileRead( options1 ); - String contentOptions2 = FileUtils.fileRead( options2 ); - String log = FileUtils.fileRead( new File( basedir, "build.log" ) ); - - // Generated files content checks - if ( contentOptions1.contains( "module2" ) ) - { // module1 does not depend on module2, then it should not link - System.err.println( "module1 -linkoffline module2 added: " + options1 ); - return false; - } - int link1 = contentOptions1.indexOf( "-link" ); - if ( link1 == -1 ) - { - System.err.println( "-link not added: " + options1 ); - return false; - } - if ( !contentOptions1.substring( link1 ).contains( "commons.apache.org" ) ) - { - System.err.println( "link for commons-lang not added: " + options1 ); - if ( !log.contains( "Error fetching link: http://commons.apache.org/lang/apidocs" ) ) - { - return false; - } - } - if ( !contentOptions1.substring( link1 ).contains( "junit.org" ) ) - { - System.err.println( "link for junit not added: " + options1 ); - if ( !log.contains( "Error fetching link: http://junit.org/apidocs" ) ) - { - return false; - } - } - if ( contentOptions1.contains( "http://maven.apache.org/maven2/maven-script/maven-script-marmalade/apidocs" ) ) - { - System.err.println( "link for maven-script-marmalade added: " + options1 ); - return false; - } - - int linkoffline2 = contentOptions2.indexOf( "module1" ); - if ( linkoffline2 < 0 ) - { // module2 depends on module1, then it should link - System.err.println( "module2 -linkoffline module1 not added: " + options2 ); - return false; - } - if ( !contentOptions2.substring( linkoffline2 ).contains( apidocs1.getCanonicalPath().replaceAll( "\\\\", "/" ) ) ) - { - System.err.println( apidocs1.getCanonicalPath().replaceAll( "\\\\", "/" ) + " not added: " + options2 ); - return false; - } - int link2 = contentOptions2.indexOf( "-link" ); - if ( link2 == -1 ) - { - System.err.println( "-link not added: " + options2 ); - return false; - } - if ( !contentOptions2.substring( link2 ).contains( "commons.apache.org" ) ) - { - System.err.println( "link for commons-lang not added: " + options2 ); - if ( !log.contains( "Error fetching link: http://commons.apache.org/lang/apidocs" ) ) - { - return false; - } - } - if ( !contentOptions2.substring( link2 ).contains( "junit.org" ) ) - { - System.err.println( "link for junit not added: " + options2 ); - if ( !log.contains( "Error fetching link: http://junit.org/apidocs" ) ) - { - return false; - } - } - if ( contentOptions2.contains( "http://maven.apache.org/maven2/maven-script/maven-script-marmalade/apidocs" ) ) - { - System.err.println( "link for maven-script-marmalade added: " + options2 ); - return false; - } -} -catch( RuntimeException e ) -{ - e.printStackTrace(); - return false; -} - -return result; + +/* + * 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. + */ + +import java.io.*; +import org.codehaus.plexus.util.*; + +boolean result = true; + +try +{ + // Generated files checks + File apidocs1 = new File( basedir, "module1/target/reports/apidocs" ); + if ( !apidocs1.exists() || !apidocs1.isDirectory() ) + { + System.err.println( apidocs1.getAbsolutePath() + " dir is missing or a directory." ); + return false; + } + File apidocs2 = new File( basedir, "module2/target/reports/apidocs" ); + if ( !apidocs2.exists() || !apidocs2.isDirectory() ) + { + System.err.println( apidocs2.getAbsolutePath() + " dir is missing or a directory." ); + return false; + } + + File options1 = new File( apidocs1, "options" ); + if ( !options1.exists() || !options1.isFile() ) + { + System.err.println( options1.getAbsolutePath() + " file is missing or not a file." ); + return false; + } + File options2 = new File( apidocs2, "options" ); + if ( !options2.exists() || !options2.isFile() ) + { + System.err.println( options2.getAbsolutePath() + " file is missing or not a file." ); + return false; + } + + // Read files + String contentOptions1 = FileUtils.fileRead( options1 ); + String contentOptions2 = FileUtils.fileRead( options2 ); + String log = FileUtils.fileRead( new File( basedir, "build.log" ) ); + + // Generated files content checks + if ( contentOptions1.contains( "module2" ) ) + { // module1 does not depend on module2, then it should not link + System.err.println( "module1 -linkoffline module2 added: " + options1 ); + return false; + } + int link1 = contentOptions1.indexOf( "-link" ); + if ( link1 == -1 ) + { + System.err.println( "-link not added: " + options1 ); + return false; + } + if ( !contentOptions1.substring( link1 ).contains( "commons.apache.org" ) ) + { + System.err.println( "link for commons-lang not added: " + options1 ); + if ( !log.contains( "Error fetching link: http://commons.apache.org/lang/apidocs" ) ) + { + return false; + } + } + if ( !contentOptions1.substring( link1 ).contains( "junit.org" ) ) + { + System.err.println( "link for junit not added: " + options1 ); + if ( !log.contains( "Error fetching link: http://junit.org/apidocs" ) ) + { + return false; + } + } + if ( contentOptions1.contains( "http://maven.apache.org/maven2/maven-script/maven-script-marmalade/apidocs" ) ) + { + System.err.println( "link for maven-script-marmalade added: " + options1 ); + return false; + } + + int linkoffline2 = contentOptions2.indexOf( "module1" ); + if ( linkoffline2 < 0 ) + { // module2 depends on module1, then it should link + System.err.println( "module2 -linkoffline module1 not added: " + options2 ); + return false; + } + if ( !contentOptions2.substring( linkoffline2 ).contains( apidocs1.getCanonicalPath().replaceAll( "\\\\", "/" ) ) ) + { + System.err.println( apidocs1.getCanonicalPath().replaceAll( "\\\\", "/" ) + " not added: " + options2 ); + return false; + } + int link2 = contentOptions2.indexOf( "-link" ); + if ( link2 == -1 ) + { + System.err.println( "-link not added: " + options2 ); + return false; + } + if ( !contentOptions2.substring( link2 ).contains( "commons.apache.org" ) ) + { + System.err.println( "link for commons-lang not added: " + options2 ); + if ( !log.contains( "Error fetching link: http://commons.apache.org/lang/apidocs" ) ) + { + return false; + } + } + if ( !contentOptions2.substring( link2 ).contains( "junit.org" ) ) + { + System.err.println( "link for junit not added: " + options2 ); + if ( !log.contains( "Error fetching link: http://junit.org/apidocs" ) ) + { + return false; + } + } + if ( contentOptions2.contains( "http://maven.apache.org/maven2/maven-script/maven-script-marmalade/apidocs" ) ) + { + System.err.println( "link for maven-script-marmalade added: " + options2 ); + return false; + } +} +catch( RuntimeException e ) +{ + e.printStackTrace(); + return false; +} + +return result; diff --git a/src/it/projects/examples/alternate-doclet/verify.groovy b/src/it/projects/examples/alternate-doclet/verify.groovy index c16fc76a..14a8ac49 100644 --- a/src/it/projects/examples/alternate-doclet/verify.groovy +++ b/src/it/projects/examples/alternate-doclet/verify.groovy @@ -17,7 +17,7 @@ * under the License. */ -File options = new File( basedir, 'target/site/apidocs/options' ) +File options = new File( basedir, 'target/reports/apidocs/options' ) assert options.text.readLines().dropWhile{it != '-doclet'}.get(1) == "'org.umlgraph.doclet.UmlGraphDoc'" assert options.text.readLines().dropWhile{it != '-docletpath'}.get(1).contains('org/umlgraph/umlgraph/5.6.6/umlgraph-5.6.6.jar') diff --git a/src/it/projects/examples/exclude-package-names/verify.groovy b/src/it/projects/examples/exclude-package-names/verify.groovy index 42f0db06..fe0ff693 100644 --- a/src/it/projects/examples/exclude-package-names/verify.groovy +++ b/src/it/projects/examples/exclude-package-names/verify.groovy @@ -17,7 +17,7 @@ * under the License. */ -File packages = new File( basedir, 'target/site/apidocs/packages' ) +File packages = new File( basedir, 'target/reports/apidocs/packages' ) def expectedPackages = ['com.mycompany.myapp', 'com.mycompany.myapp.package1', diff --git a/src/it/projects/output-encoding/verify.bsh b/src/it/projects/output-encoding/verify.bsh index 7596f657..d8bf6a4e 100644 --- a/src/it/projects/output-encoding/verify.bsh +++ b/src/it/projects/output-encoding/verify.bsh @@ -1,63 +1,63 @@ -/* - * 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. - */ - -import java.io.*; -import org.codehaus.plexus.util.*; - -boolean result = true; - -boolean checkEncoding( String module, String sourceEncoding, String reportingEncoding ) -{ - print( "module " + module + ", source encoding " + sourceEncoding - + ", expected reporting encoding " + reportingEncoding ); - - File source = new File( basedir, module + "/src/main/java/Test.java" ); - File javadoc = new File( basedir, module + "/target/site/apidocs/Test.html" ); - - String java = FileUtils.fileRead( source, sourceEncoding ); - String html = FileUtils.fileRead( javadoc, reportingEncoding ); - - if ( html.indexOf( "text/html; charset=" + reportingEncoding ) < 0 ) - { - System.err.println( "charset not specified in content-type of " + javadoc ); - return false; - } - - String javaChars = StringUtils.getNestedString( java, "{non-ascii chars delimiter}" ); - String htmlChars = StringUtils.getNestedString( html, "{non-ascii chars delimiter}" ); - - print( "javaChars = " + javaChars ); - print( "htmlChars = " + htmlChars ); - - return javaChars.equals( htmlChars ); -} - -try -{ - result = checkEncoding( "default", "ISO-8859-15", "UTF-8") - && checkEncoding( "encoding", "UTF-8", "UTF-16" ) - && checkEncoding( "docencoding", "UTF-8", "UTF-16" ); -} -catch( IOException e ) -{ - e.printStackTrace(); - result = false; -} - -return result; +/* + * 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. + */ + +import java.io.*; +import org.codehaus.plexus.util.*; + +boolean result = true; + +boolean checkEncoding( String module, String sourceEncoding, String reportingEncoding ) +{ + print( "module " + module + ", source encoding " + sourceEncoding + + ", expected reporting encoding " + reportingEncoding ); + + File source = new File( basedir, module + "/src/main/java/Test.java" ); + File javadoc = new File( basedir, module + "/target/reports/apidocs/Test.html" ); + + String java = FileUtils.fileRead( source, sourceEncoding ); + String html = FileUtils.fileRead( javadoc, reportingEncoding ); + + if ( html.indexOf( "text/html; charset=" + reportingEncoding ) < 0 ) + { + System.err.println( "charset not specified in content-type of " + javadoc ); + return false; + } + + String javaChars = StringUtils.getNestedString( java, "{non-ascii chars delimiter}" ); + String htmlChars = StringUtils.getNestedString( html, "{non-ascii chars delimiter}" ); + + print( "javaChars = " + javaChars ); + print( "htmlChars = " + htmlChars ); + + return javaChars.equals( htmlChars ); +} + +try +{ + result = checkEncoding( "default", "ISO-8859-15", "UTF-8") + && checkEncoding( "encoding", "UTF-8", "UTF-16" ) + && checkEncoding( "docencoding", "UTF-8", "UTF-16" ); +} +catch( IOException e ) +{ + e.printStackTrace(); + result = false; +} + +return result; diff --git a/src/it/projects/reproducible/verify.groovy b/src/it/projects/reproducible/verify.groovy index 47771b45..805c1c2e 100644 --- a/src/it/projects/reproducible/verify.groovy +++ b/src/it/projects/reproducible/verify.groovy @@ -24,7 +24,7 @@ import java.util.jar.*; def target = new File( basedir, 'target' ) assert target.isDirectory() -def apidocs = new File( target, 'site/apidocs' ) +def apidocs = new File( target, 'reports/apidocs' ) assert apidocs.isDirectory() def options = new File( apidocs, 'options' ) diff --git a/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java b/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java index 48c25cd6..23c7a25a 100644 --- a/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java +++ b/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java @@ -1226,7 +1226,7 @@ public abstract class AbstractJavadocMojo extends AbstractMojo { * @see org.apache.maven.reporting.AbstractMavenReport#outputDirectory * @see Doclet option d */ - @Parameter(defaultValue = "${project.reporting.outputDirectory}", readonly = true, required = true) + @Parameter(defaultValue = "${project.build.directory}/reports", required = true) protected File outputDirectory; /** diff --git a/src/main/java/org/apache/maven/plugins/javadoc/ResourcesBundleMojo.java b/src/main/java/org/apache/maven/plugins/javadoc/ResourcesBundleMojo.java index 087fc61a..6697e659 100644 --- a/src/main/java/org/apache/maven/plugins/javadoc/ResourcesBundleMojo.java +++ b/src/main/java/org/apache/maven/plugins/javadoc/ResourcesBundleMojo.java @@ -95,7 +95,7 @@ public class ResourcesBundleMojo extends AbstractJavadocMojo { @Override protected void doExecute() throws MojoExecutionException, MojoFailureException { if (skip) { - getLog().info("Skipping javadoc generation"); + getLog().info("Skipping javadoc resource bundle generation"); return; }