You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2014/04/29 20:01:55 UTC

svn commit: r1591036 - in /openmeetings/trunk/singlewebapp: openmeetings-util/pom.xml openmeetings-web/pom.xml

Author: solomax
Date: Tue Apr 29 18:01:54 2014
New Revision: 1591036

URL: http://svn.apache.org/r1591036
Log:
[OPENMEETINGS-940] Red5 server is downloaded

Modified:
    openmeetings/trunk/singlewebapp/openmeetings-util/pom.xml
    openmeetings/trunk/singlewebapp/openmeetings-web/pom.xml

Modified: openmeetings/trunk/singlewebapp/openmeetings-util/pom.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-util/pom.xml?rev=1591036&r1=1591035&r2=1591036&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-util/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-util/pom.xml Tue Apr 29 18:01:54 2014
@@ -58,6 +58,7 @@
 						<artifactId>antlr</artifactId>
 					</exclusion>
 				</exclusions>
+				<scope>compile</scope>
 			</dependency>
 		</dependencies>
 	</dependencyManagement>
@@ -110,12 +111,6 @@
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>servlet-api</artifactId>
-			<version>${servlet-api.version}</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
 			<groupId>org.apache.wicket</groupId>
 			<artifactId>wicket-util</artifactId>
 			<version>${wicket.version}</version>

Modified: openmeetings/trunk/singlewebapp/openmeetings-web/pom.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/pom.xml?rev=1591036&r1=1591035&r2=1591036&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/pom.xml Tue Apr 29 18:01:54 2014
@@ -185,6 +185,37 @@
 							<skip>${maven.test.skip}</skip>
 						</configuration>
 					</execution>
+					<execution>
+						<id>download-red5-server</id>
+						<phase>prepare-package</phase>
+						<goals>
+							<goal>download-single</goal>
+						</goals>
+						<configuration>
+							<url>https://github.com/Red5/red5-server/releases/download</url>
+							<fromFile>v${red5-server.version}/red5-server-${red5-server.version}-server.tar.gz</fromFile>
+							<toDir>${project.build.directory}</toDir>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>truezip-maven-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>unpack-red5-server</id>
+						<goals>
+							<goal>copy</goal>
+						</goals>
+						<phase>prepare-package</phase>
+						<configuration>
+							<fileset>
+								<directory>${project.build.directory}/red5-server-${red5-server.version}-server.tar.gz/red5-server-${red5-server.version}</directory>
+								<outputDirectory>${project.build.directory}/server</outputDirectory>
+							</fileset>
+						</configuration>
+					</execution>
 				</executions>
 			</plugin>
 		</plugins>