Repository: openmeetings Updated Branches: refs/heads/3.3.x 4f6bcb2ff -> 1c7fe5f78
no jira: build improved to have site available at target/site (for Jenkins) Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/1c7fe5f7 Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/1c7fe5f7 Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/1c7fe5f7 Branch: refs/heads/3.3.x Commit: 1c7fe5f78702c2cf2ffc8aed16a424dd00da8157 Parents: 4f6bcb2 Author: Maxim Solodovnik <[email protected]> Authored: Mon Jul 10 18:18:51 2017 +0700 Committer: Maxim Solodovnik <[email protected]> Committed: Mon Jul 10 18:18:51 2017 +0700 ---------------------------------------------------------------------- openmeetings-server/pom.xml | 35 +++++- .../src/main/assembly/components/all.xml | 87 +-------------- openmeetings-server/src/main/assembly/quick.xml | 6 +- .../src/main/assembly/server.xml | 6 +- openmeetings-server/src/main/assembly/site.xml | 110 +++++++++++++++++++ openmeetings-server/src/main/assembly/src.xml | 6 +- .../src/site/xdoc/ReleaseGuide.xml | 4 +- .../src/site/xdoc/WebsiteGuide.xml | 2 +- 8 files changed, 158 insertions(+), 98 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1c7fe5f7/openmeetings-server/pom.xml ---------------------------------------------------------------------- diff --git a/openmeetings-server/pom.xml b/openmeetings-server/pom.xml index 324ab36..9acd4c3 100644 --- a/openmeetings-server/pom.xml +++ b/openmeetings-server/pom.xml @@ -16,8 +16,8 @@ limitations under the License. --> <project xmlns="http://maven.apache.org/POM/4.0.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.openmeetings</groupId> @@ -55,6 +55,7 @@ <properties> <assembly.finalName>server</assembly.finalName> <assembly.descriptor>quick</assembly.descriptor> + <site.skip>true</site.skip> </properties> <build> <plugins> @@ -188,6 +189,21 @@ <skip>${om.quick.build}</skip> </configuration> </execution> + <execution> + <id>copy-site</id> + <phase>package</phase> + <configuration> + <target> + <copy todir="../target/site" overwrite="true" force="true"> + <fileset dir="${project.build.directory}/site"/> + </copy> + </target> + <skip>${site.skip}</skip> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> </executions> </plugin> <plugin> @@ -234,6 +250,21 @@ <artifactId>maven-assembly-plugin</artifactId> <executions> <execution> + <id>prepare-site</id> + <phase>prepare-package</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <descriptors> + <descriptor>${project.basedir}/src/main/assembly/site.xml</descriptor> + </descriptors> + <appendAssemblyId>false</appendAssemblyId> + <finalName>site</finalName> + <skipAssembly>${site.skip}</skipAssembly> + </configuration> + </execution> + <execution> <id>make-assembly</id> <phase>package</phase> <goals> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1c7fe5f7/openmeetings-server/src/main/assembly/components/all.xml ---------------------------------------------------------------------- diff --git a/openmeetings-server/src/main/assembly/components/all.xml b/openmeetings-server/src/main/assembly/components/all.xml index 0ac6bea..48edce3 100644 --- a/openmeetings-server/src/main/assembly/components/all.xml +++ b/openmeetings-server/src/main/assembly/components/all.xml @@ -16,9 +16,9 @@ limitations under the License. --> <component - xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/component/1.1.3"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/component/1.1.3 http://maven.apache.org/xsd/component-1.1.3.xsd";> + xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/component/1.1.3"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/component/1.1.3 http://maven.apache.org/xsd/component-1.1.3.xsd";> <fileSets> <fileSet> <directory>${server.dir}</directory> @@ -142,86 +142,5 @@ <directory>target/site</directory> <outputDirectory>${om.webapp}/docs</outputDirectory> </fileSet> - <fileSet> - <directory>${project.parent.basedir}/openmeetings-core/target/site</directory><!-- FIXME should be implemented differently --> - <outputDirectory>${om.webapp}/docs/openmeetings-core</outputDirectory> - <excludes> - <exclude>javadoc.sh</exclude> - <exclude>options</exclude> - <exclude>packages</exclude> - </excludes> - </fileSet> - <fileSet> - <directory>${project.parent.basedir}/openmeetings-db/target/site</directory><!-- FIXME should be implemented differently --> - <outputDirectory>${om.webapp}/docs/openmeetings-db</outputDirectory> - <excludes> - <exclude>javadoc.sh</exclude> - <exclude>options</exclude> - <exclude>packages</exclude> - </excludes> - </fileSet> - <fileSet> - <directory>${project.parent.basedir}/openmeetings-flash/target/site</directory><!-- FIXME should be implemented differently --> - <outputDirectory>${om.webapp}/docs/openmeetings-flash</outputDirectory> - <excludes> - <exclude>javadoc.sh</exclude> - <exclude>options</exclude> - <exclude>packages</exclude> - </excludes> - </fileSet> - <fileSet> - <directory>${project.parent.basedir}/openmeetings-install/target/site</directory><!-- FIXME should be implemented differently --> - <outputDirectory>${om.webapp}/docs/openmeetings-install</outputDirectory> - <excludes> - <exclude>javadoc.sh</exclude> - <exclude>options</exclude> - <exclude>packages</exclude> - </excludes> - </fileSet> - <fileSet> - <directory>${project.parent.basedir}/openmeetings-screenshare/target/site</directory><!-- FIXME should be implemented differently --> - <outputDirectory>${om.webapp}/docs/openmeetings-screenshare</outputDirectory> - <excludes> - <exclude>javadoc.sh</exclude> - <exclude>options</exclude> - <exclude>packages</exclude> - </excludes> - </fileSet> - <fileSet> - <directory>${project.parent.basedir}/openmeetings-service/target/site</directory><!-- FIXME should be implemented differently --> - <outputDirectory>${om.webapp}/docs/openmeetings-service</outputDirectory> - <excludes> - <exclude>javadoc.sh</exclude> - <exclude>options</exclude> - <exclude>packages</exclude> - </excludes> - </fileSet> - <fileSet> - <directory>${project.parent.basedir}/openmeetings-util/target/site</directory><!-- FIXME should be implemented differently --> - <outputDirectory>${om.webapp}/docs/openmeetings-util</outputDirectory> - <excludes> - <exclude>javadoc.sh</exclude> - <exclude>options</exclude> - <exclude>packages</exclude> - </excludes> - </fileSet> - <fileSet> - <directory>${project.parent.basedir}/openmeetings-web/target/site</directory><!-- FIXME should be implemented differently --> - <outputDirectory>${om.webapp}/docs/openmeetings-web</outputDirectory> - <excludes> - <exclude>javadoc.sh</exclude> - <exclude>options</exclude> - <exclude>packages</exclude> - </excludes> - </fileSet> - <fileSet> - <directory>${project.parent.basedir}/openmeetings-webservice/target/site</directory><!-- FIXME should be implemented differently --> - <outputDirectory>${om.webapp}/docs/openmeetings-webservice</outputDirectory> - <excludes> - <exclude>javadoc.sh</exclude> - <exclude>options</exclude> - <exclude>packages</exclude> - </excludes> - </fileSet> </fileSets> </component> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1c7fe5f7/openmeetings-server/src/main/assembly/quick.xml ---------------------------------------------------------------------- diff --git a/openmeetings-server/src/main/assembly/quick.xml b/openmeetings-server/src/main/assembly/quick.xml index 4bdc200..f128925 100644 --- a/openmeetings-server/src/main/assembly/quick.xml +++ b/openmeetings-server/src/main/assembly/quick.xml @@ -16,9 +16,9 @@ limitations under the License. --> <assembly - xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd";> + xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd";> <id>server</id> <formats> <format>dir</format> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1c7fe5f7/openmeetings-server/src/main/assembly/server.xml ---------------------------------------------------------------------- diff --git a/openmeetings-server/src/main/assembly/server.xml b/openmeetings-server/src/main/assembly/server.xml index 9bee506..4934b16 100644 --- a/openmeetings-server/src/main/assembly/server.xml +++ b/openmeetings-server/src/main/assembly/server.xml @@ -16,9 +16,9 @@ limitations under the License. --> <assembly - xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd";> + xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd";> <id>server</id> <formats> <format>tar.gz</format> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1c7fe5f7/openmeetings-server/src/main/assembly/site.xml ---------------------------------------------------------------------- diff --git a/openmeetings-server/src/main/assembly/site.xml b/openmeetings-server/src/main/assembly/site.xml new file mode 100644 index 0000000..6454a33 --- /dev/null +++ b/openmeetings-server/src/main/assembly/site.xml @@ -0,0 +1,110 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<assembly + xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd";> + <id>site</id> + <formats> + <format>dir</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + <fileSets> + <fileSet> + <directory>${project.parent.basedir}/openmeetings-core/target/site</directory> + <outputDirectory>openmeetings-core</outputDirectory> + <excludes> + <exclude>javadoc.sh</exclude> + <exclude>options</exclude> + <exclude>packages</exclude> + </excludes> + </fileSet> + <fileSet> + <directory>${project.parent.basedir}/openmeetings-db/target/site</directory> + <outputDirectory>openmeetings-db</outputDirectory> + <excludes> + <exclude>javadoc.sh</exclude> + <exclude>options</exclude> + <exclude>packages</exclude> + </excludes> + </fileSet> + <fileSet> + <directory>${project.parent.basedir}/openmeetings-flash/target/site</directory> + <outputDirectory>openmeetings-flash</outputDirectory> + <excludes> + <exclude>javadoc.sh</exclude> + <exclude>options</exclude> + <exclude>packages</exclude> + </excludes> + </fileSet> + <fileSet> + <directory>${project.parent.basedir}/openmeetings-install/target/site</directory> + <outputDirectory>openmeetings-install</outputDirectory> + <excludes> + <exclude>javadoc.sh</exclude> + <exclude>options</exclude> + <exclude>packages</exclude> + </excludes> + </fileSet> + <fileSet> + <directory>${project.parent.basedir}/openmeetings-screenshare/target/site</directory> + <outputDirectory>openmeetings-screenshare</outputDirectory> + <excludes> + <exclude>javadoc.sh</exclude> + <exclude>options</exclude> + <exclude>packages</exclude> + </excludes> + </fileSet> + <fileSet> + <directory>${project.parent.basedir}/openmeetings-service/target/site</directory> + <outputDirectory>openmeetings-service</outputDirectory> + <excludes> + <exclude>javadoc.sh</exclude> + <exclude>options</exclude> + <exclude>packages</exclude> + </excludes> + </fileSet> + <fileSet> + <directory>${project.parent.basedir}/openmeetings-util/target/site</directory> + <outputDirectory>openmeetings-util</outputDirectory> + <excludes> + <exclude>javadoc.sh</exclude> + <exclude>options</exclude> + <exclude>packages</exclude> + </excludes> + </fileSet> + <fileSet> + <directory>${project.parent.basedir}/openmeetings-web/target/site</directory> + <outputDirectory>openmeetings-web</outputDirectory> + <excludes> + <exclude>javadoc.sh</exclude> + <exclude>options</exclude> + <exclude>packages</exclude> + </excludes> + </fileSet> + <fileSet> + <directory>${project.parent.basedir}/openmeetings-webservice/target/site</directory> + <outputDirectory>openmeetings-webservice</outputDirectory> + <excludes> + <exclude>javadoc.sh</exclude> + <exclude>options</exclude> + <exclude>packages</exclude> + </excludes> + </fileSet> + </fileSets> +</assembly> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1c7fe5f7/openmeetings-server/src/main/assembly/src.xml ---------------------------------------------------------------------- diff --git a/openmeetings-server/src/main/assembly/src.xml b/openmeetings-server/src/main/assembly/src.xml index 27e9726..0c5b353 100644 --- a/openmeetings-server/src/main/assembly/src.xml +++ b/openmeetings-server/src/main/assembly/src.xml @@ -16,9 +16,9 @@ limitations under the License. --> <assembly - xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd";> + xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd";> <id>src</id> <formats> <format>tar.gz</format> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1c7fe5f7/openmeetings-server/src/site/xdoc/ReleaseGuide.xml ---------------------------------------------------------------------- diff --git a/openmeetings-server/src/site/xdoc/ReleaseGuide.xml b/openmeetings-server/src/site/xdoc/ReleaseGuide.xml index 5bad83b..11364fe 100644 --- a/openmeetings-server/src/site/xdoc/ReleaseGuide.xml +++ b/openmeetings-server/src/site/xdoc/ReleaseGuide.xml @@ -13,8 +13,8 @@ limitations under the License. --> <document xmlns="http://maven.apache.org/XDOC/2.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd";> + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd";> <properties> <title>Release Guide</title> <author email="[email protected]">Apache OpenMeetings Team</author> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1c7fe5f7/openmeetings-server/src/site/xdoc/WebsiteGuide.xml ---------------------------------------------------------------------- diff --git a/openmeetings-server/src/site/xdoc/WebsiteGuide.xml b/openmeetings-server/src/site/xdoc/WebsiteGuide.xml index e908757..e72d54a 100644 --- a/openmeetings-server/src/site/xdoc/WebsiteGuide.xml +++ b/openmeetings-server/src/site/xdoc/WebsiteGuide.xml @@ -59,7 +59,7 @@ git checkout asf-site then you run the command: <source><![CDATA[mvn install -P allModules,unpacked -DskipTests=true]]></source> control the output locally in the folder <tt>openmeetings-server/target/server/webapps/openmeetings/docs/</tt><br/> - copy site contents into target folder: <source><![CDATA[cp -r openmeetings-server/target/server/webapps/openmeetings/docs/* ../site/]]></source> + copy site contents into target folder: <source><![CDATA[cp -r target/site/* ../site/]]></source> And then commit your changes into the Git <i>both</i> the edited xml(s) and generated html files. </div> <p>
