This is an automated email from the ASF dual-hosted git repository. dblevins pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tomee-site-generator.git
commit e870306ff0334d0e4b770ebd0a0f905e5adf97c2 Author: David Blevins <[email protected]> AuthorDate: Sun Jan 6 13:05:13 2019 -0800 Add Jakarta EE javadoc. Move git repo list to Configuration class. --- .../org/apache/tomee/website/Configuration.java | 66 ++++++++++++++++++++++ src/main/java/org/apache/tomee/website/JBake.java | 22 +------- 2 files changed, 68 insertions(+), 20 deletions(-) diff --git a/src/main/java/org/apache/tomee/website/Configuration.java b/src/main/java/org/apache/tomee/website/Configuration.java new file mode 100644 index 0000000..8b09b52 --- /dev/null +++ b/src/main/java/org/apache/tomee/website/Configuration.java @@ -0,0 +1,66 @@ +/* + * 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. + */ +package org.apache.tomee.website; + +public class Configuration { + public static Source[] getSources() { + final Source[] microProfile2 = new Source[]{ + new Source("https://github.com/eclipse/microprofile-jwt-auth.git";, "1.1.1", "microprofile-jwt-1.1").filterJavadoc(".*/api/src/main/java/.*", ""), + new Source("https://github.com/eclipse/microprofile-config.git";, "1.3", "microprofile-config-1.3").filterJavadoc(".*/api/src/main/java/.*", ""), + new Source("https://github.com/eclipse/microprofile-fault-tolerance";, "1.1.4", "microprofile-fault-tolerance-1.1").filterJavadoc(".*/api/src/main/java/.*", ""), + new Source("https://github.com/eclipse/microprofile-health";, "1.0", "microprofile-health-1.0").filterJavadoc(".*/api/src/main/java/.*", ""), + new Source("https://github.com/eclipse/microprofile-metrics";, "1.1.1", "microprofile-metrics-1.1").filterJavadoc(".*/api/src/main/java/.*", ""), + new Source("https://github.com/eclipse/microprofile-open-api";, "1.0.2", "microprofile-open-api-1.0").filterJavadoc(".*/api/src/main/java/.*", ""), + new Source("https://github.com/eclipse/microprofile-opentracing";, "1.1", "microprofile-opentracing-1.1").filterJavadoc(".*/api/src/main/java/.*", ""), + new Source("https://github.com/eclipse/microprofile-rest-client";, "1.1", "microprofile-rest-client-1.1").filterJavadoc(".*/api/src/main/java/.*", ""), + }; + + final Source[] jakartaEE8 = { + new Source("https://github.com/eclipse-ee4j/common-annotations-api.git";, "EE4J_8", "common-annotations-api-EE4J_81.0"), + new Source("https://github.com/eclipse-ee4j/concurrency-api.git";, "EE4J_8", "concurrency-api-EE4J_81.0"), + new Source("https://github.com/eclipse-ee4j/ejb-api.git";, "EE4J_8", "ejb-api-EE4J_81.0"), + new Source("https://github.com/eclipse-ee4j/interceptor-api.git";, "EE4J_8", "interceptor-api-EE4J_81.0"), + new Source("https://github.com/eclipse-ee4j/jax-rpc-api.git";, "EE4J_8", "jax-rpc-api-EE4J_81.0"), + new Source("https://github.com/eclipse-ee4j/jax-ws-api.git";, "EE4J_8", "jax-ws-api-EE4J_81.0"), + new Source("https://github.com/eclipse-ee4j/jaxb-api.git";, "EE4J_8", "jaxb-api-EE4J_81.0"), + new Source("https://github.com/eclipse-ee4j/jaxr-api.git";, "EE4J_8", "jaxr-api-EE4J_81.0"), + new Source("https://github.com/eclipse-ee4j/jaxrs-api.git";, "EE4J_8", "jaxrs-api-EE4J_81.0"), + new Source("https://github.com/eclipse-ee4j/jca-api.git";, "EE4J_8", "jca-api-EE4J_81.0"), + new Source("https://github.com/eclipse-ee4j/jms-api.git";, "EE4J_8", "jms-api-EE4J_81.0"), + new Source("https://github.com/eclipse-ee4j/jpa-api.git";, "EE4J_8", "jpa-api-EE4J_81.0"), + new Source("https://github.com/eclipse-ee4j/jsonb-api.git";, "EE4J_8", "jsonb-api-EE4J_81.0"), + new Source("https://github.com/eclipse-ee4j/jsp-api.git";, "EE4J_8", "jsp-api-EE4J_81.0"), + new Source("https://github.com/eclipse-ee4j/jstl-api.git";, "EE4J_8", "jstl-api-EE4J_81.0"), + new Source("https://github.com/eclipse-ee4j/jta-api.git";, "EE4J_8", "jta-api-EE4J_81.0"), + new Source("https://github.com/eclipse-ee4j/jws-api.git";, "EE4J_8", "jws-api-EE4J_81.0"), + new Source("https://github.com/eclipse-ee4j/management-api.git";, "EE4J_8", "management-api-EE4J_81.0"), + new Source("https://github.com/eclipse-ee4j/saaj-api.git";, "EE4J_8", "saaj-api-EE4J_81.0"), + new Source("https://github.com/eclipse-ee4j/security-api.git";, "EE4J_8", "security-api-EE4J_81.0"), + new Source("https://github.com/eclipse-ee4j/servlet-api.git";, "EE4J_8", "servlet-api-EE4J_81.0"), + new Source("https://github.com/eclipse-ee4j/websocket-api.git";, "EE4J_8", "websocket-api-EE4J_81.0") + }; + + return new Source[]{ + new Source("https://gitbox.apache.org/repos/asf/tomee.git";, "master", "tomee-8.0", true).related(microProfile2).related(jakartaEE8), + new Source("https://gitbox.apache.org/repos/asf/tomee.git";, "tomee-7.1.0", "tomee-7.1"), + new Source("https://gitbox.apache.org/repos/asf/tomee.git";, "tomee-7.0.5", "tomee-7.0"), + new Source("https://gitbox.apache.org/repos/asf/tomee.git";, "master", "master"), + new Source("https://github.com/eclipse/microprofile-bom.git";, "master", "microprofile-2.0").related(microProfile2), + new Source("https://github.com/eclipse-ee4j/jakartaee-platform.git";, "master", "jakartaee-8.0").related(jakartaEE8) + }; + } +} diff --git a/src/main/java/org/apache/tomee/website/JBake.java b/src/main/java/org/apache/tomee/website/JBake.java index 15ef459..91b6c27 100755 --- a/src/main/java/org/apache/tomee/website/JBake.java +++ b/src/main/java/org/apache/tomee/website/JBake.java @@ -36,27 +36,9 @@ public class JBake { final File destination = args == null || args.length < 2 ? new File("target/site-tmp") : new File(args[1]); final boolean startHttp = args == null || args.length < 2 || Boolean.parseBoolean(args[2]); // by default we dev - final Source[] microProfile2 = new Source[]{ - new Source("https://github.com/eclipse/microprofile-jwt-auth.git";, "1.1.1", "microprofile-jwt-1.1").filterJavadoc(".*/api/src/main/java/.*", ""), - new Source("https://github.com/eclipse/microprofile-config.git";, "1.3", "microprofile-config-1.3").filterJavadoc(".*/api/src/main/java/.*", ""), - new Source("https://github.com/eclipse/microprofile-fault-tolerance";, "1.1.4", "microprofile-fault-tolerance-1.1").filterJavadoc(".*/api/src/main/java/.*", ""), - new Source("https://github.com/eclipse/microprofile-health";, "1.0", "microprofile-health-1.0").filterJavadoc(".*/api/src/main/java/.*", ""), - new Source("https://github.com/eclipse/microprofile-metrics";, "1.1.1", "microprofile-metrics-1.1").filterJavadoc(".*/api/src/main/java/.*", ""), - new Source("https://github.com/eclipse/microprofile-open-api";, "1.0.2", "microprofile-open-api-1.0").filterJavadoc(".*/api/src/main/java/.*", ""), - new Source("https://github.com/eclipse/microprofile-opentracing";, "1.1", "microprofile-opentracing-1.1").filterJavadoc(".*/api/src/main/java/.*", ""), - new Source("https://github.com/eclipse/microprofile-rest-client";, "1.1", "microprofile-rest-client-1.1").filterJavadoc(".*/api/src/main/java/.*", ""), - }; + final Source[] website = org.apache.tomee.website.Configuration.getSources(); - final Sources sources = new Sources( - new File("target/jbake"), - new File("repos"), - new File("src/main/jbake"), - destination, - new Source("https://gitbox.apache.org/repos/asf/tomee.git";, "master", "tomee-8.0", true).related(microProfile2), - new Source("https://gitbox.apache.org/repos/asf/tomee.git";, "tomee-7.1.0", "tomee-7.1"), - new Source("https://gitbox.apache.org/repos/asf/tomee.git";, "tomee-7.0.5", "tomee-7.0"), - new Source("https://gitbox.apache.org/repos/asf/tomee.git";, "master", "master") - ); + final Sources sources = new Sources(new File("target/jbake"), new File("repos"), new File("src/main/jbake"), destination, website); sources.prepare();
