Author: solomax
Date: Wed Feb 1 17:48:25 2017
New Revision: 1781290
URL: http://svn.apache.org/viewvc?rev=1781290&view=rev
Log:
no jira: source folders are not being polluted with generated files
Modified:
openmeetings/application/branches/3.2.x/openmeetings-core/src/ (props
changed)
openmeetings/application/branches/3.2.x/openmeetings-db/src/ (props
changed)
openmeetings/application/branches/3.2.x/openmeetings-flash/src/ (props
changed)
openmeetings/application/branches/3.2.x/openmeetings-install/src/ (props
changed)
openmeetings/application/branches/3.2.x/openmeetings-screenshare/src/
(props changed)
openmeetings/application/branches/3.2.x/openmeetings-server/pom.xml
openmeetings/application/branches/3.2.x/openmeetings-service/src/ (props
changed)
openmeetings/application/branches/3.2.x/openmeetings-util/src/ (props
changed)
openmeetings/application/branches/3.2.x/openmeetings-web/src/ (props
changed)
openmeetings/application/branches/3.2.x/openmeetings-webservice/src/
(props changed)
openmeetings/application/branches/3.2.x/pom.xml
openmeetings/application/trunk/openmeetings-core/src/ (props changed)
openmeetings/application/trunk/openmeetings-db/src/ (props changed)
openmeetings/application/trunk/openmeetings-flash/src/ (props changed)
openmeetings/application/trunk/openmeetings-install/src/ (props changed)
openmeetings/application/trunk/openmeetings-screenshare/src/ (props
changed)
openmeetings/application/trunk/openmeetings-server/pom.xml
openmeetings/application/trunk/openmeetings-service/src/ (props changed)
openmeetings/application/trunk/openmeetings-util/src/ (props changed)
openmeetings/application/trunk/openmeetings-web/src/ (props changed)
openmeetings/application/trunk/openmeetings-webservice/src/ (props
changed)
openmeetings/application/trunk/pom.xml
Propchange: openmeetings/application/branches/3.2.x/openmeetings-core/src/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Feb 1 17:48:25 2017
@@ -1,2 +1 @@
-site
Propchange: openmeetings/application/branches/3.2.x/openmeetings-db/src/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Feb 1 17:48:25 2017
@@ -1,2 +1 @@
-site
Propchange: openmeetings/application/branches/3.2.x/openmeetings-flash/src/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Feb 1 17:48:25 2017
@@ -1,2 +1 @@
-site
Propchange: openmeetings/application/branches/3.2.x/openmeetings-install/src/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Feb 1 17:48:25 2017
@@ -1,2 +1 @@
-site
Propchange:
openmeetings/application/branches/3.2.x/openmeetings-screenshare/src/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Feb 1 17:48:25 2017
@@ -1,2 +1 @@
-site
Modified: openmeetings/application/branches/3.2.x/openmeetings-server/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-server/pom.xml?rev=1781290&r1=1781289&r2=1781290&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-server/pom.xml
(original)
+++ openmeetings/application/branches/3.2.x/openmeetings-server/pom.xml Wed Feb
1 17:48:25 2017
@@ -171,32 +171,39 @@
<artifactId>xml-maven-plugin</artifactId>
<executions>
<execution>
- <id>generate-errors-doc</id>
+
<id>generate-errors-doc-site</id>
<phase>pre-site</phase>
<goals>
<goal>transform</goal>
</goals>
- <configuration>
- <transformationSets>
-
<transformationSet>
-
<dir>${webapp.languages.dir}</dir>
-
<includes>
-
<include>errorvalues.xml</include>
-
</includes>
-
<stylesheet>src/site/stylesheets/errortable.xsl</stylesheet>
-
<outputDir>${project.build.directory}/generated-site/xdoc</outputDir>
-
<parameters>
-
<parameter>
-
<name>languagesDir</name>
-
<value>${project.baseUri}/${languages.dir}</value>
-
</parameter>
-
</parameters>
-
</transformationSet>
- </transformationSets>
-
<skip>${om.quick.build}</skip>
- </configuration>
+ </execution>
+ <execution>
+
<id>generate-errors-doc-build</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>transform</goal>
+ </goals>
</execution>
</executions>
+ <configuration>
+ <transformationSets>
+ <transformationSet>
+
<dir>${webapp.languages.dir}</dir>
+ <includes>
+
<include>errorvalues.xml</include>
+ </includes>
+
<stylesheet>src/site/stylesheets/errortable.xsl</stylesheet>
+
<outputDir>${project.build.directory}/generated-site/xdoc</outputDir>
+ <parameters>
+ <parameter>
+
<name>languagesDir</name>
+
<value>${project.baseUri}/${languages.dir}</value>
+ </parameter>
+ </parameters>
+ </transformationSet>
+ </transformationSets>
+ <skip>${om.quick.build}</skip>
+ </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Propchange: openmeetings/application/branches/3.2.x/openmeetings-service/src/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Feb 1 17:48:25 2017
@@ -1,2 +1 @@
-site
Propchange: openmeetings/application/branches/3.2.x/openmeetings-util/src/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Feb 1 17:48:25 2017
@@ -1,2 +1 @@
-site
Propchange: openmeetings/application/branches/3.2.x/openmeetings-web/src/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Feb 1 17:48:25 2017
@@ -1,2 +1 @@
-site
Propchange: openmeetings/application/branches/3.2.x/openmeetings-webservice/src/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Feb 1 17:48:25 2017
@@ -1,2 +1 @@
-site
Modified: openmeetings/application/branches/3.2.x/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/pom.xml?rev=1781290&r1=1781289&r2=1781290&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/pom.xml (original)
+++ openmeetings/application/branches/3.2.x/pom.xml Wed Feb 1 17:48:25 2017
@@ -668,25 +668,32 @@
<artifactId>maven-resources-plugin</artifactId>
<executions>
<execution>
- <id>copy-siteresources</id>
+
<id>copy-siteresources-build</id>
<phase>generate-resources</phase>
<goals>
<goal>copy-resources</goal>
</goals>
- <configuration>
-
<outputDirectory>${project.basedir}/src/site</outputDirectory>
- <resources>
- <resource>
-
<directory>${site.basedir}/src/site/resources</directory>
-
<includes>
-
<include>*.xml</include>
-
</includes>
- </resource>
- </resources>
-
<skip>${skip.site.copy}</skip>
- </configuration>
+ </execution>
+ <execution>
+ <id>copy-siteresources-ste</id>
+ <phase>pre-site</phase>
+ <goals>
+
<goal>copy-resources</goal>
+ </goals>
</execution>
</executions>
+ <configuration>
+
<outputDirectory>${project.build.directory}/generated-site</outputDirectory>
+ <resources>
+ <resource>
+
<directory>${site.basedir}/src/site/resources</directory>
+ <includes>
+
<include>*.xml</include>
+ </includes>
+ </resource>
+ </resources>
+ <skip>${skip.site.copy}</skip>
+ </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -801,9 +808,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>${maven-site.version}</version>
- <configuration>
-
<generatedSiteDirectory>${project.build.directory}/generated-site</generatedSiteDirectory>
- </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Propchange: openmeetings/application/trunk/openmeetings-core/src/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Feb 1 17:48:25 2017
@@ -1,2 +1 @@
-site
Propchange: openmeetings/application/trunk/openmeetings-db/src/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Feb 1 17:48:25 2017
@@ -1,2 +1 @@
-site
Propchange: openmeetings/application/trunk/openmeetings-flash/src/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Feb 1 17:48:25 2017
@@ -1,2 +1 @@
-site
Propchange: openmeetings/application/trunk/openmeetings-install/src/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Feb 1 17:48:25 2017
@@ -1,2 +1 @@
-site
Propchange: openmeetings/application/trunk/openmeetings-screenshare/src/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Feb 1 17:48:25 2017
@@ -1,2 +1 @@
-site
Modified: openmeetings/application/trunk/openmeetings-server/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-server/pom.xml?rev=1781290&r1=1781289&r2=1781290&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-server/pom.xml (original)
+++ openmeetings/application/trunk/openmeetings-server/pom.xml Wed Feb 1
17:48:25 2017
@@ -171,32 +171,39 @@
<artifactId>xml-maven-plugin</artifactId>
<executions>
<execution>
- <id>generate-errors-doc</id>
+
<id>generate-errors-doc-site</id>
<phase>pre-site</phase>
<goals>
<goal>transform</goal>
</goals>
- <configuration>
- <transformationSets>
-
<transformationSet>
-
<dir>${webapp.languages.dir}</dir>
-
<includes>
-
<include>errorvalues.xml</include>
-
</includes>
-
<stylesheet>src/site/stylesheets/errortable.xsl</stylesheet>
-
<outputDir>${project.build.directory}/generated-site/xdoc</outputDir>
-
<parameters>
-
<parameter>
-
<name>languagesDir</name>
-
<value>${project.baseUri}/${languages.dir}</value>
-
</parameter>
-
</parameters>
-
</transformationSet>
- </transformationSets>
-
<skip>${om.quick.build}</skip>
- </configuration>
+ </execution>
+ <execution>
+
<id>generate-errors-doc-build</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>transform</goal>
+ </goals>
</execution>
</executions>
+ <configuration>
+ <transformationSets>
+ <transformationSet>
+
<dir>${webapp.languages.dir}</dir>
+ <includes>
+
<include>errorvalues.xml</include>
+ </includes>
+
<stylesheet>src/site/stylesheets/errortable.xsl</stylesheet>
+
<outputDir>${project.build.directory}/generated-site/xdoc</outputDir>
+ <parameters>
+ <parameter>
+
<name>languagesDir</name>
+
<value>${project.baseUri}/${languages.dir}</value>
+ </parameter>
+ </parameters>
+ </transformationSet>
+ </transformationSets>
+ <skip>${om.quick.build}</skip>
+ </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Propchange: openmeetings/application/trunk/openmeetings-service/src/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Feb 1 17:48:25 2017
@@ -1,2 +1 @@
-site
Propchange: openmeetings/application/trunk/openmeetings-util/src/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Feb 1 17:48:25 2017
@@ -1,2 +1 @@
-site
Propchange: openmeetings/application/trunk/openmeetings-web/src/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Feb 1 17:48:25 2017
@@ -1,2 +1 @@
-site
Propchange: openmeetings/application/trunk/openmeetings-webservice/src/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Feb 1 17:48:25 2017
@@ -1,2 +1 @@
-site
Modified: openmeetings/application/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/pom.xml?rev=1781290&r1=1781289&r2=1781290&view=diff
==============================================================================
--- openmeetings/application/trunk/pom.xml (original)
+++ openmeetings/application/trunk/pom.xml Wed Feb 1 17:48:25 2017
@@ -668,25 +668,32 @@
<artifactId>maven-resources-plugin</artifactId>
<executions>
<execution>
- <id>copy-siteresources</id>
+
<id>copy-siteresources-build</id>
<phase>generate-resources</phase>
<goals>
<goal>copy-resources</goal>
</goals>
- <configuration>
-
<outputDirectory>${project.basedir}/src/site</outputDirectory>
- <resources>
- <resource>
-
<directory>${site.basedir}/src/site/resources</directory>
-
<includes>
-
<include>*.xml</include>
-
</includes>
- </resource>
- </resources>
-
<skip>${skip.site.copy}</skip>
- </configuration>
+ </execution>
+ <execution>
+ <id>copy-siteresources-ste</id>
+ <phase>pre-site</phase>
+ <goals>
+
<goal>copy-resources</goal>
+ </goals>
</execution>
</executions>
+ <configuration>
+
<outputDirectory>${project.build.directory}/generated-site</outputDirectory>
+ <resources>
+ <resource>
+
<directory>${site.basedir}/src/site/resources</directory>
+ <includes>
+
<include>*.xml</include>
+ </includes>
+ </resource>
+ </resources>
+ <skip>${skip.site.copy}</skip>
+ </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -801,9 +808,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>${maven-site.version}</version>
- <configuration>
-
<generatedSiteDirectory>${project.build.directory}/generated-site</generatedSiteDirectory>
- </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
