Author: solomax
Date: Mon May 26 03:09:30 2014
New Revision: 1597504
URL: http://svn.apache.org/r1597504
Log:
[OPENMEETINGS-940] maven build seems to be fixed
Added:
openmeetings/trunk/singlewebapp/openmeetings-flash/openlaszlo.xml
- copied, changed from r1597427,
openmeetings/trunk/singlewebapp/openlaszlo.xml
openmeetings/trunk/singlewebapp/openmeetings-server/src/site/
- copied from r1597427, openmeetings/trunk/singlewebapp/src/site/
openmeetings/trunk/singlewebapp/openmeetings-server/src/site/stylesheets/
- copied from r1597427,
openmeetings/trunk/singlewebapp/src/site/xdoc/stylesheets/
Removed:
openmeetings/trunk/singlewebapp/openlaszlo.xml
openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/stylesheets/
openmeetings/trunk/singlewebapp/src/
Modified:
openmeetings/trunk/singlewebapp/openmeetings-core/pom.xml
openmeetings/trunk/singlewebapp/openmeetings-db/pom.xml
openmeetings/trunk/singlewebapp/openmeetings-flash/pom.xml
openmeetings/trunk/singlewebapp/openmeetings-install/pom.xml
openmeetings/trunk/singlewebapp/openmeetings-screenshare/pom.xml
openmeetings/trunk/singlewebapp/openmeetings-server/pom.xml
openmeetings/trunk/singlewebapp/openmeetings-server/src/main/assembly/components/all.xml
openmeetings/trunk/singlewebapp/openmeetings-server/src/main/assembly/server.xml
openmeetings/trunk/singlewebapp/openmeetings-server/src/site/site.xml
openmeetings/trunk/singlewebapp/openmeetings-server/src/site/stylesheets/errortable.xsl
openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/ (props
changed)
openmeetings/trunk/singlewebapp/openmeetings-service/pom.xml
openmeetings/trunk/singlewebapp/openmeetings-web/pom.xml
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/js/history.js
openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureUsersSearch.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/domain/TestAddGroup.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/domain/TestUserGroupAggregation.java
openmeetings/trunk/singlewebapp/openmeetings-webservice/pom.xml
openmeetings/trunk/singlewebapp/pom.xml
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/pom.xml?rev=1597504&r1=1597503&r2=1597504&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/pom.xml Mon May 26
03:09:30 2014
@@ -45,13 +45,6 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<executions>
<execution>
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/pom.xml?rev=1597504&r1=1597503&r2=1597504&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/pom.xml Mon May 26 03:09:30
2014
@@ -91,13 +91,6 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-maven-plugin</artifactId>
<version>${openjpa.version}</version>
@@ -125,18 +118,6 @@
</dependency>
</dependencies>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>javadoc</goal>
- </goals>
- <phase>site</phase>
- </execution>
- </executions>
- </plugin>
</plugins>
<pluginManagement>
<plugins>
Copied: openmeetings/trunk/singlewebapp/openmeetings-flash/openlaszlo.xml (from
r1597427, openmeetings/trunk/singlewebapp/openlaszlo.xml)
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-flash/openlaszlo.xml?p2=openmeetings/trunk/singlewebapp/openmeetings-flash/openlaszlo.xml&p1=openmeetings/trunk/singlewebapp/openlaszlo.xml&r1=1597427&r2=1597504&rev=1597504&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openlaszlo.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-flash/openlaszlo.xml Mon May
26 03:09:30 2014
@@ -42,7 +42,10 @@
<path id="laszlo46.lib">
<fileset dir="${laszlo46.home}/WEB-INF/lib" includes="*.jar" />
</path>
- <target name="client.only"
depends="compile.laszlo.main.as3,compile.laszlo.main,compile.laszlo.networktesting"
/>
+
+ <target name="client.only" depends="compile.laszlo.main.as3,
compile.laszlo.main, compile.laszlo.networktesting"
unless="client-already-built">
+ <property name="client-already-built" value="true"/>
+ </target>
<target name="client.debug.only"
depends="compile.laszlo.main.debug.as3,compile.laszlo.main.debug,compile.laszlo.networktesting.debug"
/>
Modified: openmeetings/trunk/singlewebapp/openmeetings-flash/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-flash/pom.xml?rev=1597504&r1=1597503&r2=1597504&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-flash/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-flash/pom.xml Mon May 26
03:09:30 2014
@@ -38,20 +38,14 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- <plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
<phase>package</phase>
<configuration>
+
<exportAntProperties>true</exportAntProperties>
<target>
- <ant
antfile="${basedir}/../openlaszlo.xml" target="client.only"/>
+ <ant
antfile="${basedir}/openlaszlo.xml" target="client.only"/>
</target>
</configuration>
<goals>
Modified: openmeetings/trunk/singlewebapp/openmeetings-install/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-install/pom.xml?rev=1597504&r1=1597503&r2=1597504&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-install/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-install/pom.xml Mon May 26
03:09:30 2014
@@ -33,17 +33,6 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<commons-cli.version>1.2</commons-cli.version>
</properties>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- </plugins>
- </build>
<dependencies>
<dependency>
<groupId>org.springframework</groupId>
Modified: openmeetings/trunk/singlewebapp/openmeetings-screenshare/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-screenshare/pom.xml?rev=1597504&r1=1597503&r2=1597504&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-screenshare/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-screenshare/pom.xml Mon May 26
03:09:30 2014
@@ -64,14 +64,7 @@
</dependencies>
<build>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- <plugin>
+ <!-- plugin> FIXME review after
http://jira.codehaus.org/browse/MWEBSTART-266 is fixed
<groupId>com.google.code.maven-replacer-plugin</groupId>
<artifactId>replacer</artifactId>
<executions>
@@ -149,7 +142,7 @@
</configuration>
</execution>
</executions>
- </plugin>
+ </plugin-->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
@@ -174,7 +167,7 @@
<groupId>org.codehaus.mojo</groupId>
<artifactId>webstart-maven-plugin</artifactId>
<executions>
- <execution>
+ <!-- execution> FIXME review after
http://jira.codehaus.org/browse/MWEBSTART-266 is fixed
<id>generate-jnlp-template-for-signing</id>
<phase>process-resources</phase>
<goals>
@@ -212,10 +205,10 @@
</jnlp>
<makeArchive>false</makeArchive>
</configuration>
- </execution>
+ </execution-->
<execution>
<id>generate-jnlp-and-sign-libs</id>
- <phase>process-resources</phase>
+ <phase>package</phase>
<goals>
<goal>jnlp</goal>
</goals>
@@ -280,7 +273,7 @@
</execution>
</executions>
</plugin>
- <plugin>
+ <!-- plugin> FIXME review after
http://jira.codehaus.org/browse/MWEBSTART-266 is fixed
<groupId>org.codehaus.mojo</groupId>
<artifactId>truezip-maven-plugin</artifactId>
<executions>
@@ -322,7 +315,7 @@
<removeExistingSignatures>true</removeExistingSignatures>
<verbose>true</verbose>
</configuration>
- </plugin>
+ </plugin-->
</plugins>
<pluginManagement>
<plugins>
Modified: openmeetings/trunk/singlewebapp/openmeetings-server/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-server/pom.xml?rev=1597504&r1=1597503&r2=1597504&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-server/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-server/pom.xml Mon May 26
03:09:30 2014
@@ -32,15 +32,26 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<server.dir>${project.build.directory}/red5-server</server.dir>
+
<languages.dir>${project.parent.basedir}/openmeetings-web/src/main/webapp/languages</languages.dir>
<dist.dir>${project.build.directory}/${project.build.finalName}</dist.dir>
<dist.webapps>${dist.dir}/webapps</dist.webapps>
<om.webapp>webapps/openmeetings</om.webapp>
<root.webapp>webapps/root</root.webapp>
<assembly.finalName>${project.build.finalName}</assembly.finalName>
<assembly.descriptor>server</assembly.descriptor>
+
<red5-server.file.name>red5-server-1.0.2-RELEASE-server.zip</red5-server.file.name><!--
FIXME duplicate variable -->
</properties>
<profiles>
<profile>
+ <id>Skip download red5-server</id>
+ <activation>
+
<file><exists>target/${red5-server.file.name}</exists></file>
+ </activation>
+ <properties>
+
<red5-server.dwnd.skip>true</red5-server.dwnd.skip>
+ </properties>
+ </profile>
+ <profile>
<id>Quick</id>
<activation>
<property>
@@ -51,6 +62,7 @@
<properties>
<maven.test.skip>true</maven.test.skip>
<om.quick.build>true</om.quick.build>
+
<red5-server.dwnd.skip>true</red5-server.dwnd.skip>
<assembly.finalName>server</assembly.finalName>
<assembly.descriptor>quick</assembly.descriptor>
</properties>
@@ -74,13 +86,6 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>wagon-maven-plugin</artifactId>
<executions>
@@ -92,9 +97,9 @@
</goals>
<configuration>
<url>https://github.com/Red5/red5-server/releases/download</url>
-
<fromFile>v${red5-server.version}/red5-server-${red5-server.version}-server.zip</fromFile>
+
<fromFile>v${red5-server.version}/${red5-server.file.name}</fromFile>
<toDir>${project.build.directory}</toDir>
-
<skip>${om.quick.build}</skip>
+
<skip>${red5-server.dwnd.skip}</skip>
</configuration>
</execution>
</executions>
@@ -111,7 +116,7 @@
<phase>process-resources</phase>
<configuration>
<fileset>
-
<directory>${project.build.directory}/red5-server-${red5-server.version}-server.zip/red5-server-${red5-server.version}</directory>
+
<directory>${project.build.directory}/${red5-server.file.name}/red5-server-${red5-server.version}</directory>
<outputDirectory>${server.dir}</outputDirectory>
</fileset>
<skip>${om.quick.build}</skip>
@@ -120,6 +125,53 @@
</executions>
</plugin>
<plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>xml-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>generate-errors-doc</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>transform</goal>
+ </goals>
+ <configuration>
+ <transformationSets>
+
<transformationSet>
+
<dir>${languages.dir}</dir>
+
<includes>
+
<include>errorvalues.xml</include>
+
</includes>
+
<stylesheet>src/site/stylesheets/errortable.xsl</stylesheet>
+
<outputDir>${basedir}/src/site/xdoc</outputDir>
+
<parameters>
+
<parameter>
+
<name>languagesDir</name>
+
<value>${languages.dir}</value>
+
</parameter>
+
</parameters>
+
</transformationSet>
+ </transformationSets>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <configuration>
+ <skip>false</skip>
+ </configuration>
+ <executions>
+ <execution>
+ <id>generate-site</id>
+
<phase>generate-resources</phase>
+ <goals>
+ <goal>site</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
@@ -177,6 +229,32 @@
<ignore></ignore>
</action>
</pluginExecution>
+
<pluginExecution>
+
<pluginExecutionFilter>
+
<groupId>org.codehaus.mojo</groupId>
+
<artifactId>xml-maven-plugin</artifactId>
+
<versionRange>[1.0,)</versionRange>
+
<goals>
+
<goal>transform</goal>
+
</goals>
+
</pluginExecutionFilter>
+ <action>
+
<ignore></ignore>
+
</action>
+
</pluginExecution>
+
<pluginExecution>
+
<pluginExecutionFilter>
+
<groupId>org.apache.maven.plugins</groupId>
+
<artifactId>maven-site-plugin</artifactId>
+
<versionRange>[3.3,)</versionRange>
+
<goals>
+
<goal>site</goal>
+
</goals>
+
</pluginExecutionFilter>
+ <action>
+
<ignore></ignore>
+
</action>
+
</pluginExecution>
</pluginExecutions>
</lifecycleMappingMetadata>
</configuration>
Modified:
openmeetings/trunk/singlewebapp/openmeetings-server/src/main/assembly/components/all.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-server/src/main/assembly/components/all.xml?rev=1597504&r1=1597503&r2=1597504&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-server/src/main/assembly/components/all.xml
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-server/src/main/assembly/components/all.xml
Mon May 26 03:09:30 2014
@@ -70,6 +70,18 @@
</includes>
</fileSet>
<fileSet>
+
<directory>${project.parent.basedir}/openmeetings-web/target/openmeetings-web-${project.version}</directory><!--
FIXME should be implemented differently -->
+ <outputDirectory>${om.webapp}</outputDirectory>
+ <excludes>
+ <exclude>META-INF/**</exclude>
+ <exclude>WEB-INF/lib/aopalliance*</exclude>
+ <exclude>WEB-INF/lib/slf4j-*</exclude>
+ <exclude>WEB-INF/lib/spring-*</exclude>
+ <exclude>WEB-INF/lib/geronimo-jpa*</exclude>
+
<exclude>WEB-INF/lib/commons-fileupload*</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
<directory>${project.parent.basedir}/openmeetings-web/target/openmeetings-web-${project.version}/WEB-INF/lib</directory><!--
FIXME should be implemented differently -->
<outputDirectory>lib</outputDirectory>
<includes>
@@ -78,25 +90,18 @@
<include>commons-fileupload*</include>
</includes>
</fileSet>
+ <fileSet>
+ <directory>target/site</directory>
+ <outputDirectory>${om.webapp}/docs</outputDirectory>
+ </fileSet>
+ <fileSet>
+
<directory>${project.parent.basedir}/openmeetings-webservice/target/apidocs</directory><!--
FIXME should be implemented differently -->
+
<outputDirectory>${om.webapp}/docs/webservices</outputDirectory>
+ <excludes>
+ <exclude>javadoc.sh</exclude>
+ <exclude>options</exclude>
+ <exclude>packages</exclude>
+ </excludes>
+ </fileSet>
</fileSets>
- <dependencySets>
- <dependencySet>
- <includes>
-
<include>org.apache.openmeetings:openmeetings-web:war</include>
- </includes>
- <outputDirectory>${om.webapp}</outputDirectory>
- <unpack>true</unpack>
- <useProjectArtifact>false</useProjectArtifact>
- <unpackOptions>
- <excludes>
- <exclude>META-INF/**</exclude>
-
<exclude>WEB-INF/lib/aopalliance*</exclude>
- <exclude>WEB-INF/lib/slf4j-*</exclude>
- <exclude>WEB-INF/lib/spring-*</exclude>
-
<exclude>WEB-INF/lib/geronimo-jpa*</exclude>
-
<exclude>WEB-INF/lib/commons-fileupload*</exclude>
- </excludes>
- </unpackOptions>
- </dependencySet>
- </dependencySets>
-</component>
\ No newline at end of file
+</component>
Modified:
openmeetings/trunk/singlewebapp/openmeetings-server/src/main/assembly/server.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-server/src/main/assembly/server.xml?rev=1597504&r1=1597503&r2=1597504&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-server/src/main/assembly/server.xml
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-server/src/main/assembly/server.xml
Mon May 26 03:09:30 2014
@@ -23,7 +23,6 @@
<formats>
<format>tar.gz</format>
<format>zip</format>
- <format>dir</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
<componentDescriptors>
Modified: openmeetings/trunk/singlewebapp/openmeetings-server/src/site/site.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-server/src/site/site.xml?rev=1597504&r1=1597427&r2=1597504&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-server/src/site/site.xml
(original)
+++ openmeetings/trunk/singlewebapp/openmeetings-server/src/site/site.xml Mon
May 26 03:09:30 2014
@@ -70,7 +70,7 @@
<item name="Ldap and ADS"
href="/LdapAndADS.html" />
<item name="OAuth2" href="/oauth2.html" />
<item name="VoIP and SIP"
href="/voip-sip-integration.html" />
- <item name="Errors table"
href="/ErrorsTable.html" />
+ <item name="Errors table"
href="/errorvalues.html" />
</item>
<item name="Plugins" href="#plugins">
<item name="Moodle Plugin"
href="/MoodlePlugin.html" />
Modified:
openmeetings/trunk/singlewebapp/openmeetings-server/src/site/stylesheets/errortable.xsl
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-server/src/site/stylesheets/errortable.xsl?rev=1597504&r1=1597427&r2=1597504&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-server/src/site/stylesheets/errortable.xsl
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-server/src/site/stylesheets/errortable.xsl
Mon May 26 03:09:30 2014
@@ -13,6 +13,7 @@
limitations under the License.
-->
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; version="1.0">
+ <xsl:param name="languagesDir"/>
<xsl:output method="xml"/>
<xsl:template match="ROOT">
@@ -50,6 +51,7 @@
</xsl:template>
<xsl:template match="row">
+ <xsl:variable name="englishPath"><xsl:value-of
select="concat($languagesDir, '/english.xml')"/></xsl:variable>
<tr>
<td>-<xsl:value-of
select="field[@name='errorvalues_id']"/></td>
<td>
@@ -60,11 +62,11 @@
<xsl:otherwise>323</xsl:otherwise>
</xsl:choose>
</xsl:variable>
- <xsl:value-of
select="document('../../openmeetings-web/src/main/webapp/languages/english.xml')/language/string[@id=$x]/value"
/>
+ <xsl:value-of
select="document($englishPath)/language/string[@id=$x]/value" />
</td>
<td>
<xsl:variable name="descId"
select="field[@name='fieldvalues_id']"/>
- <xsl:value-of
select="document('../../openmeetings-web/src/main/webapp/languages/english.xml')/language/string[@id=$descId]/value"
/>
+ <xsl:value-of
select="document($englishPath)/language/string[@id=$descId]/value" />
</td>
</tr>
</xsl:template>
Propchange: openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon May 26 03:09:30 2014
@@ -1 +1,2 @@
-ErrorsTable.xml
+errorvalues.xml
+
Modified: openmeetings/trunk/singlewebapp/openmeetings-service/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-service/pom.xml?rev=1597504&r1=1597503&r2=1597504&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-service/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-service/pom.xml Mon May 26
03:09:30 2014
@@ -32,17 +32,6 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- </plugins>
- </build>
<dependencies>
<dependency>
<groupId>org.apache.openmeetings</groupId>
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/pom.xml?rev=1597504&r1=1597503&r2=1597504&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/pom.xml Mon May 26
03:09:30 2014
@@ -37,6 +37,9 @@
<commons-io.version>2.4</commons-io.version>
<commons-fileupload.version>1.3</commons-fileupload.version>
<mysql.version>5.1.30</mysql.version>
+
<old-backups.dir>${project.build.directory}/old-backups</old-backups.dir>
+
<old-backups.dwnd.skip>${maven.test.skip}</old-backups.dwnd.skip>
+ <backup.to.check>backup_v_2_0_0_r1361497.zip</backup.to.check>
</properties>
<profiles>
<profile>
@@ -56,6 +59,15 @@
</dependencies>
</profile>
<profile>
+ <id>Skip download old backups</id>
+ <activation>
+
<file><exists>target/old-backups/${backup.to.check}</exists></file>
+ </activation>
+ <properties>
+
<old-backups.dwnd.skip>true</old-backups.dwnd.skip>
+ </properties>
+ </profile>
+ <profile>
<id>Quick</id>
<activation>
<property>
@@ -66,6 +78,7 @@
<properties>
<maven.test.skip>true</maven.test.skip>
<om.quick.build>true</om.quick.build>
+
<old-backups.dwnd.skip>true</old-backups.dwnd.skip>
</properties>
</profile>
</profiles>
@@ -73,13 +86,6 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<configuration>
<archiveClasses>true</archiveClasses>
@@ -87,6 +93,15 @@
<filteringDeploymentDescriptors>true</filteringDeploymentDescriptors>
<skip>${om.quick.build}</skip>
</configuration>
+ <executions>
+ <execution>
+ <id>create-war</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>exploded</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -94,7 +109,7 @@
<executions>
<execution>
<id>copy-dependencies</id>
- <phase>package</phase>
+ <phase>prepare-package</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
@@ -184,12 +199,12 @@
<om.home>${project.build.directory}/test-root</om.home>
<languages.home>${project.basedir}/src/main/webapp/languages</languages.home>
<red5.root>red5.root</red5.root>
-
<backups.dir>${project.build.directory}/old-backups</backups.dir>
+
<backups.dir>${old-backups.dir}</backups.dir>
</systemPropertyVariables>
<additionalClasspathElements>
<additionalClasspathElement>${project.build.directory}/${project.build.finalName}/WEB-INF/classes</additionalClasspathElement>
</additionalClasspathElements>
- <skip>${om.quick.build}</skip>
+ <skip>${maven.test.skip}</skip>
</configuration>
</plugin>
<plugin>
@@ -205,8 +220,8 @@
<configuration>
<url>https://openmeetings.googlecode.com/svn/repository</url>
<includes>backup_*.zip</includes>
-
<toDir>${project.build.directory}/old-backups</toDir>
-
<skip>${maven.test.skip}</skip>
+
<toDir>${old-backups.dir}</toDir>
+
<skip>${old-backups.dwnd.skip}</skip>
</configuration>
</execution>
</executions>
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/js/history.js
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/js/history.js?rev=1597504&r1=1597503&r2=1597504&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/js/history.js
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/js/history.js
Mon May 26 03:09:30 2014
@@ -31,7 +31,7 @@ BrowserHistoryUtils = {
elm['on' + evType] = fn;
}
}
-}
+};
BrowserHistory = (function() {
// type of browser
@@ -217,7 +217,7 @@ BrowserHistory = (function() {
function setHash(hash) {
// It would be nice if we could use document.location.hash here,
// but it's faulty sometimes.
- if (hash == '') hash = '#'
+ if (hash == '') hash = '#';
document.location.hash = hash;
}
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureUsersSearch.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureUsersSearch.java?rev=1597504&r1=1597503&r2=1597504&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureUsersSearch.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureUsersSearch.java
Mon May 26 03:09:30 2014
@@ -39,7 +39,7 @@ public class TestDatabaseStructureUsersS
@Test
public void testAddingGroup(){
try {
- List<User> users = userDao.get("first", 0, 10,
"orderby", 1);
+ List<User> users = userDao.get("first", 0, 10,
"lastname", 1);
log.debug("[result]" + users.size());
log.debug("[records]"+ users);
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/domain/TestAddGroup.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/domain/TestAddGroup.java?rev=1597504&r1=1597503&r2=1597504&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/domain/TestAddGroup.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/domain/TestAddGroup.java
Mon May 26 03:09:30 2014
@@ -43,18 +43,18 @@ public class TestAddGroup extends Abstra
long organisation_id = organisationManager.addOrganisation(
"default", 1);
- log.error("new organisation: " + organisation_id);
+ log.debug("new organisation: " + organisation_id);
long organisation_usersid = organisationManager
.addUserToOrganisation(new Long(1),
organisation_id,
new Long(1));
- log.error("new organisation_user: " + organisation_usersid);
+ log.debug("new organisation_user: " + organisation_usersid);
User us = usersDao.get(new Long(1));
- log.error(us.getLastname());
- log.error(us.getAdresses().getTown());
+ log.debug(us.getLastname());
+ log.debug(us.getAdresses().getTown());
/*
* for (Iterator it = us.getAdresses().getEmails().iterator();
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/domain/TestUserGroupAggregation.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/domain/TestUserGroupAggregation.java?rev=1597504&r1=1597503&r2=1597504&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/domain/TestUserGroupAggregation.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/domain/TestUserGroupAggregation.java
Mon May 26 03:09:30 2014
@@ -46,16 +46,16 @@ public class TestUserGroupAggregation ex
assertTrue("Default user must belong to at least one
organisation", orgUser.size() > 0);
for (Organisation orgUserObj : orgUser) {
- log.error("testitNow: organisation Id: '" +
orgUserObj.getOrganisation_id() + "'; name: '" + orgUserObj.getName() + "'");
+ log.debug("testitNow: organisation Id: '" +
orgUserObj.getOrganisation_id() + "'; name: '" + orgUserObj.getName() + "'");
}
List<Organisation> orgUser2 =
organisationManager.getRestOrganisationsByUserId(3,
1, 0, 100, "organisation_id", true);
- log.error("testitNow: rest organisations count: " +
orgUser2.size());
+ log.debug("testitNow: rest organisations count: " +
orgUser2.size());
for (Organisation orgUserObj : orgUser2) {
- log.error("testitNow: organisation Id: '" +
orgUserObj.getOrganisation_id() + "'; name: '" + orgUserObj.getName() + "'");
+ log.debug("testitNow: organisation Id: '" +
orgUserObj.getOrganisation_id() + "'; name: '" + orgUserObj.getName() + "'");
}
}
Modified: openmeetings/trunk/singlewebapp/openmeetings-webservice/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-webservice/pom.xml?rev=1597504&r1=1597503&r2=1597504&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-webservice/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-webservice/pom.xml Mon May 26
03:09:30 2014
@@ -41,8 +41,9 @@
<execution>
<goals>
<goal>javadoc</goal>
+ <goal>aggregate</goal>
</goals>
- <phase>site</phase>
+
<phase>generate-resources</phase>
<configuration>
<groups>
<group>
@@ -50,21 +51,42 @@
<packages>org.apache.openmeetings.webservice</packages>
</group>
</groups>
-
<reportOutputDirectory>../target/site</reportOutputDirectory>
-
<destDir>webservices</destDir>
<excludePackageNames>org.apache.openmeetings.webservice.cluster,org.apache.openmeetings.webservice.dto</excludePackageNames>
</configuration>
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
</plugins>
+ <pluginManagement>
+ <plugins>
+ <!--This plugin's configuration is used to
store Eclipse m2e settings only. It has no influence on the Maven build
itself.-->
+ <plugin>
+ <groupId>org.eclipse.m2e</groupId>
+
<artifactId>lifecycle-mapping</artifactId>
+ <version>1.0.0</version>
+ <configuration>
+ <lifecycleMappingMetadata>
+ <pluginExecutions>
+
<pluginExecution>
+
<pluginExecutionFilter>
+
<groupId>org.apache.maven.plugins</groupId>
+
<artifactId>maven-javadoc-plugin</artifactId>
+
<versionRange>[2.9.1,)</versionRange>
+
<goals>
+
<goal>javadoc</goal>
+
<goal>aggregate</goal>
+
</goals>
+
</pluginExecutionFilter>
+ <action>
+
<ignore></ignore>
+
</action>
+
</pluginExecution>
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
</build>
<dependencies>
<dependency>
Modified: openmeetings/trunk/singlewebapp/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/pom.xml?rev=1597504&r1=1597503&r2=1597504&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/pom.xml Mon May 26 03:09:30 2014
@@ -399,6 +399,13 @@
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
</plugins>
<pluginManagement>
<plugins>
@@ -558,6 +565,11 @@
<artifactId>maven-javadoc-plugin</artifactId>
<version>${maven.javadoc.version}</version>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+
<artifactId>xml-maven-plugin</artifactId>
+ <version>1.0</version>
+ </plugin>
</plugins>
</pluginManagement>
</build>
