Repository: openmeetings Updated Branches: refs/heads/master 8691939cf -> 382cbc2bb
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/382cbc2b Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/382cbc2b Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/382cbc2b Branch: refs/heads/master Commit: 382cbc2bb3718420e678c963950fdffbea047624 Parents: 8691939 Author: Maxim Solodovnik <[email protected]> Authored: Mon Jul 10 19:50:21 2017 +0700 Committer: Maxim Solodovnik <[email protected]> Committed: Mon Jul 10 23:35:57 2017 +0700 ---------------------------------------------------------------------- openmeetings-server/pom.xml | 100 ++++++++++++------- .../src/site/xdoc/WebsiteGuide.xml | 8 +- 2 files changed, 69 insertions(+), 39 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/382cbc2b/openmeetings-server/pom.xml ---------------------------------------------------------------------- diff --git a/openmeetings-server/pom.xml b/openmeetings-server/pom.xml index 3b8aff5..3b39df5 100644 --- a/openmeetings-server/pom.xml +++ b/openmeetings-server/pom.xml @@ -173,40 +173,6 @@ </executions> </plugin> <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <id>unpack-red5-server</id> - <phase>prepare-package</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <target> - <untar src="${red5-server-file.dir}/red5-server-${red5-server.version}.tar.gz" dest="${project.build.directory}" - compression="gzip" overwrite="true"/> - </target> - <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> <groupId>org.codehaus.mojo</groupId> <artifactId>xml-maven-plugin</artifactId> <executions> @@ -250,8 +216,23 @@ <artifactId>maven-assembly-plugin</artifactId> <executions> <execution> + <id>prepare-site-site</id> + <phase>site</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>prepare-site</id> - <phase>prepare-package</phase> + <phase>package</phase> <goals> <goal>single</goal> </goals> @@ -297,6 +278,55 @@ </execution> </executions> </plugin> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>unpack-red5-server</id> + <phase>prepare-package</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <target> + <untar src="${red5-server-file.dir}/red5-server-${red5-server.version}.tar.gz" dest="${project.build.directory}" + compression="gzip" overwrite="true"/> + </target> + <skip>${om.quick.build}</skip> + </configuration> + </execution> + <execution> + <id>copy-site-site</id> + <phase>site</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> + <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> </plugins> <pluginManagement> <plugins> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/382cbc2b/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 e72d54a..6d50a36 100644 --- a/openmeetings-server/src/site/xdoc/WebsiteGuide.xml +++ b/openmeetings-server/src/site/xdoc/WebsiteGuide.xml @@ -52,14 +52,14 @@ <div> To update the website you need to clone asf-site:<br /> <source><![CDATA[ -git clone https://git-wip-us.apache.org/repos/asf/openmeetings-site.git +git clone https://git-wip-us.apache.org/repos/asf/openmeetings-site.git site git checkout asf-site ]]></source> edit the files in the folder <tt>openmeetings-server/src/site</tt><br/> 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 target/site/* ../site/]]></source> + <source><![CDATA[mvn site]]></source> + control the output locally in the folder <tt>target/site</tt><br/> + copy site contents into target folder: <source><![CDATA[cp -r target/site/* <location of site>]]></source> And then commit your changes into the Git <i>both</i> the edited xml(s) and generated html files. </div> <p>
