Author: solomax Date: Sun Apr 27 15:44:33 2014 New Revision: 1590407 URL: http://svn.apache.org/r1590407 Log: [OPENMEETINGS-940] tests seems to be fixed
Added:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/assembly/
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/assembly/server.xml
Modified:
openmeetings/trunk/singlewebapp/ (props changed)
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-service/pom.xml
openmeetings/trunk/singlewebapp/openmeetings-util/pom.xml
openmeetings/trunk/singlewebapp/openmeetings-web/pom.xml
openmeetings/trunk/singlewebapp/openmeetings-webservice/pom.xml
Propchange: openmeetings/trunk/singlewebapp/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sun Apr 27 15:44:33 2014
@@ -1,3 +1,4 @@
+bin
build
dist
.ant-targets-build.xml
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/pom.xml?rev=1590407&r1=1590406&r2=1590407&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/pom.xml Sun Apr 27
15:44:33 2014
@@ -25,7 +25,6 @@
<version>3.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.apache.openmeetings</groupId>
<artifactId>openmeetings-core</artifactId>
<packaging>jar</packaging>
<name>Openmeetings Core</name>
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/pom.xml?rev=1590407&r1=1590406&r2=1590407&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/pom.xml Sun Apr 27 15:44:33
2014
@@ -25,7 +25,6 @@
<version>3.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.apache.openmeetings</groupId>
<artifactId>openmeetings-db</artifactId>
<packaging>jar</packaging>
<name>Openmeetings DB</name>
@@ -123,5 +122,34 @@
</dependencies>
</plugin>
</plugins>
- </build>
+ <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.openjpa</groupId>
+
<artifactId>openjpa-maven-plugin</artifactId>
+
<versionRange>[2.3.0,)</versionRange>
+
<goals>
+
<goal>enhance</goal>
+
</goals>
+
</pluginExecutionFilter>
+ <action>
+
<ignore></ignore>
+
</action>
+
</pluginExecution>
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
</project>
Modified: openmeetings/trunk/singlewebapp/openmeetings-flash/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-flash/pom.xml?rev=1590407&r1=1590406&r2=1590407&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-flash/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-flash/pom.xml Sun Apr 27
15:44:33 2014
@@ -24,7 +24,6 @@
<version>3.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.apache.openmeetings</groupId>
<artifactId>openmeetings-flash</artifactId>
<!-- packaging>swf</packaging -->
<name>Openmeetings Flash</name>
Modified: openmeetings/trunk/singlewebapp/openmeetings-install/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-install/pom.xml?rev=1590407&r1=1590406&r2=1590407&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-install/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-install/pom.xml Sun Apr 27
15:44:33 2014
@@ -25,7 +25,6 @@
<version>3.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.apache.openmeetings</groupId>
<artifactId>openmeetings-install</artifactId>
<packaging>jar</packaging>
<name>Openmeetings Install</name>
Modified: openmeetings/trunk/singlewebapp/openmeetings-screenshare/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-screenshare/pom.xml?rev=1590407&r1=1590406&r2=1590407&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-screenshare/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-screenshare/pom.xml Sun Apr 27
15:44:33 2014
@@ -25,7 +25,6 @@
<version>3.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.apache.openmeetings</groupId>
<artifactId>openmeetings-screenshare</artifactId>
<packaging>jar</packaging>
<name>Openmeetings Screen Sharing applet</name>
@@ -68,85 +67,85 @@
</dependencies>
<build>
<plugins>
- <plugin>
- <groupId>com.google.code.maven-replacer-plugin</groupId>
- <artifactId>replacer</artifactId>
- <executions>
- <execution>
- <phase>process-resources</phase>
- <goals>
- <goal>replace</goal>
- </goals>
- <configuration>
-
<file>${project.basedir}/src/main/jnlp/templates/template.jnlp</file>
-
<outputFile>${project.build.directory}/APPLICATION_TEMPLATE.jnlp</outputFile>
- <regex>false</regex>
- <replacements>
- <replacement>
-
<token>$applicationName</token>
- <value>*</value>
- </replacement>
- <replacement>
-
<token>$codebase</token>
- <value>*</value>
- </replacement>
- <replacement>
-
<token>$host</token>
- <value>*</value>
- </replacement>
- <replacement>
-
<token>$port</token>
- <value>*</value>
- </replacement>
- <replacement>
-
<token>$app</token>
- <value>*</value>
- </replacement>
- <replacement>
-
<token>$userId</token>
- <value>*</value>
- </replacement>
- <replacement>
-
<token>$organizationId</token>
- <value>*</value>
- </replacement>
- <replacement>
-
<token>$publicSid</token>
- <value>*</value>
- </replacement>
- <replacement>
-
<token>$labels</token>
- <value>*</value>
- </replacement>
- <replacement>
-
<token>$defaultQuality</token>
- <value>*</value>
- </replacement>
- <replacement>
-
<token>$allowRecording</token>
- <value>*</value>
- </replacement>
- <replacement>
-
<token>$allowPublishing</token>
- <value>*</value>
- </replacement>
- <replacement>
-
<token>$clientClass</token>
- <value>*</value>
- </replacement>
- <replacement>
-
<token>$keystore</token>
- <value>*</value>
- </replacement>
- <replacement>
-
<token>$password</token>
- <value>*</value>
- </replacement>
- </replacements>
- </configuration>
- </execution>
- </executions>
- </plugin>
+ <plugin>
+
<groupId>com.google.code.maven-replacer-plugin</groupId>
+ <artifactId>replacer</artifactId>
+ <executions>
+ <execution>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>replace</goal>
+ </goals>
+ <configuration>
+
<file>${project.basedir}/src/main/jnlp/templates/template.jnlp</file>
+
<outputFile>${project.build.directory}/APPLICATION_TEMPLATE.jnlp</outputFile>
+ <regex>false</regex>
+ <replacements>
+ <replacement>
+
<token>$applicationName</token>
+
<value>*</value>
+ </replacement>
+ <replacement>
+
<token>$codebase</token>
+
<value>*</value>
+ </replacement>
+ <replacement>
+
<token>$host</token>
+
<value>*</value>
+ </replacement>
+ <replacement>
+
<token>$port</token>
+
<value>*</value>
+ </replacement>
+ <replacement>
+
<token>$app</token>
+
<value>*</value>
+ </replacement>
+ <replacement>
+
<token>$userId</token>
+
<value>*</value>
+ </replacement>
+ <replacement>
+
<token>$organizationId</token>
+
<value>*</value>
+ </replacement>
+ <replacement>
+
<token>$publicSid</token>
+
<value>*</value>
+ </replacement>
+ <replacement>
+
<token>$labels</token>
+
<value>*</value>
+ </replacement>
+ <replacement>
+
<token>$defaultQuality</token>
+
<value>*</value>
+ </replacement>
+ <replacement>
+
<token>$allowRecording</token>
+
<value>*</value>
+ </replacement>
+ <replacement>
+
<token>$allowPublishing</token>
+
<value>*</value>
+ </replacement>
+ <replacement>
+
<token>$clientClass</token>
+
<value>*</value>
+ </replacement>
+ <replacement>
+
<token>$keystore</token>
+
<value>*</value>
+ </replacement>
+ <replacement>
+
<token>$password</token>
+
<value>*</value>
+ </replacement>
+ </replacements>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
@@ -321,6 +320,61 @@
</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-dependency-plugin</artifactId>
+
<versionRange>[2.8,)</versionRange>
+
<goals>
+
<goal>copy-dependencies</goal>
+
</goals>
+
</pluginExecutionFilter>
+ <action>
+
<ignore></ignore>
+
</action>
+
</pluginExecution>
+
<pluginExecution>
+
<pluginExecutionFilter>
+
<groupId>org.codehaus.mojo</groupId>
+
<artifactId>webstart-maven-plugin</artifactId>
+
<versionRange>[1.0-beta-6,)</versionRange>
+
<goals>
+
<goal>jnlp</goal>
+
</goals>
+
</pluginExecutionFilter>
+ <action>
+
<ignore></ignore>
+
</action>
+
</pluginExecution>
+
<pluginExecution>
+
<pluginExecutionFilter>
+
<groupId>com.google.code.maven-replacer-plugin</groupId>
+
<artifactId>replacer</artifactId>
+
<versionRange>[1.5.3,)</versionRange>
+
<goals>
+
<goal>replace</goal>
+
</goals>
+
</pluginExecutionFilter>
+ <action>
+
<ignore></ignore>
+
</action>
+
</pluginExecution>
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
</build>
</project>
Modified: openmeetings/trunk/singlewebapp/openmeetings-service/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-service/pom.xml?rev=1590407&r1=1590406&r2=1590407&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-service/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-service/pom.xml Sun Apr 27
15:44:33 2014
@@ -25,7 +25,6 @@
<version>3.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.apache.openmeetings</groupId>
<artifactId>openmeetings-service</artifactId>
<packaging>jar</packaging>
<name>Openmeetings Service</name>
Modified: openmeetings/trunk/singlewebapp/openmeetings-util/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-util/pom.xml?rev=1590407&r1=1590406&r2=1590407&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-util/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-util/pom.xml Sun Apr 27
15:44:33 2014
@@ -25,7 +25,6 @@
<version>3.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.apache.openmeetings</groupId>
<artifactId>openmeetings-util</artifactId>
<packaging>jar</packaging>
<name>Openmeetings Util</name>
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/pom.xml?rev=1590407&r1=1590406&r2=1590407&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/pom.xml Sun Apr 27
15:44:33 2014
@@ -25,7 +25,6 @@
<version>3.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.apache.openmeetings</groupId>
<artifactId>openmeetings-web</artifactId>
<packaging>war</packaging>
<name>Openmeetings Web</name>
@@ -71,6 +70,26 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+
<id>copy-dependencies</id>
+ <phase>package</phase>
+ <goals>
+
<goal>copy-dependencies</goal>
+ </goals>
+ <configuration>
+
<outputDirectory>${project.build.directory}/lib</outputDirectory>
+
<overWriteReleases>false</overWriteReleases>
+
<overWriteSnapshots>false</overWriteSnapshots>
+
<overWriteIfNewer>true</overWriteIfNewer>
+
<excludeTransitive>true</excludeTransitive>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<executions>
<execution>
@@ -117,6 +136,9 @@
<phase>process-resources</phase>
<configuration>
<target>
+ <copy
todir="${project.build.directory}/test-root">
+
<fileset dir="${project.basedir}/src/main/webapp"/>
+ </copy>
<copy
file="${project.basedir}/src/main/webapp/WEB-INF/classes/META-INF/${db}_persistence.xml"
tofile="${project.build.directory}/${project.build.finalName}/WEB-INF/classes/META-INF/persistence.xml"
overwrite="true"/>
@@ -130,14 +152,14 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
+
<artifactId>maven-surefire-plugin</artifactId><!-- maybe integration tests
should be used -->
<inherited>true</inherited>
<configuration>
<workingDirectory>${project.build.directory}</workingDirectory>
<excludedGroups>org.apache.openmeetings.test.selenium.SeleniumTests</excludedGroups>
<systemPropertyVariables>
-
<om.home>${project.build.directory}/${project.build.finalName}</om.home>
-
<languages.home>${project.build.directory}/${project.build.finalName}/languages</languages.home>
+
<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>
</systemPropertyVariables>
@@ -171,6 +193,74 @@
<directory>${project.basedir}/src/main/webapp/WEB-INF/classes</directory>
</testResource>
</testResources>
+ <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-antrun-plugin</artifactId>
+
<versionRange>[1.7,)</versionRange>
+
<goals>
+
<goal>run</goal>
+
</goals>
+
</pluginExecutionFilter>
+ <action>
+
<ignore></ignore>
+
</action>
+
</pluginExecution>
+
<pluginExecution>
+
<pluginExecutionFilter>
+
<groupId>org.codehaus.mojo</groupId>
+
<artifactId>wagon-maven-plugin</artifactId>
+
<versionRange>[1.0-beta-5,)</versionRange>
+
<goals>
+
<goal>download</goal>
+
</goals>
+
</pluginExecutionFilter>
+ <action>
+
<ignore></ignore>
+
</action>
+
</pluginExecution>
+
<pluginExecution>
+
<pluginExecutionFilter>
+
<groupId>org.apache.maven.plugins</groupId>
+
<artifactId>maven-remote-resources-plugin</artifactId>
+
<versionRange>[1.2.1,)</versionRange>
+
<goals>
+
<goal>process</goal>
+
</goals>
+
</pluginExecutionFilter>
+ <action>
+
<ignore></ignore>
+
</action>
+
</pluginExecution>
+
<pluginExecution>
+
<pluginExecutionFilter>
+
<groupId>org.apache.maven.plugins</groupId>
+
<artifactId>maven-dependency-plugin</artifactId>
+
<versionRange>[2.8,)</versionRange>
+
<goals>
+
<goal>copy-dependencies</goal>
+
</goals>
+
</pluginExecutionFilter>
+ <action>
+
<ignore></ignore>
+
</action>
+
</pluginExecution>
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
</build>
<dependencies>
<dependency>
Added:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/assembly/server.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/assembly/server.xml?rev=1590407&view=auto
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/assembly/server.xml
(added)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/assembly/server.xml
Sun Apr 27 15:44:33 2014
@@ -0,0 +1,23 @@
+<?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.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0
http://maven.apache.org/xsd/assembly-1.1.0.xsd";>
+ <id>server</id>
+</assembly>
Modified: openmeetings/trunk/singlewebapp/openmeetings-webservice/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-webservice/pom.xml?rev=1590407&r1=1590406&r2=1590407&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-webservice/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-webservice/pom.xml Sun Apr 27
15:44:33 2014
@@ -25,7 +25,6 @@
<version>3.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.apache.openmeetings</groupId>
<artifactId>openmeetings-webservice</artifactId>
<packaging>jar</packaging>
<name>Openmeetings Webservices</name>
