Author: solomax Date: Sat May 3 15:46:48 2014 New Revision: 1592227 URL: http://svn.apache.org/r1592227 Log: [OPENMEETINGS-940] OM server is prepared all files are placed as usual
Modified:
openmeetings/trunk/singlewebapp/openmeetings-core/pom.xml
openmeetings/trunk/singlewebapp/openmeetings-web/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=1592227&r1=1592226&r2=1592227&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/pom.xml Sat May 3
15:46:48 2014
@@ -68,6 +68,12 @@
<groupId>org.apache.xmlgraphics</groupId>
<artifactId>batik-svg-dom</artifactId>
<version>${batik.version}</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>xml-apis-ext</artifactId>
+ <groupId>xml-apis</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.xmlgraphics</groupId>
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/pom.xml?rev=1592227&r1=1592226&r2=1592227&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/pom.xml Sat May 3
15:46:48 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>
+
<server.webapps>${project.build.directory}/server/webapps</server.webapps>
+ <server.lib>${project.build.directory}/server/lib</server.lib>
+
<server.webapps.om>${server.webapps}/openmeetings</server.webapps.om>
</properties>
<profiles>
<profile>
@@ -132,6 +135,7 @@
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
+ <id>move-openjpa-resources</id>
<phase>process-resources</phase>
<configuration>
<target>
@@ -217,6 +221,67 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+
<id>move-server-resources</id><!-- All this should be removed and implemented
somehow differently -->
+ <phase>verify</phase>
+ <configuration>
+ <target>
+ <delete
dir="${server.webapps}/installer"/>
+ <delete
dir="${server.webapps}/live"/>
+ <delete
dir="${server.webapps}/vod"/>
+ <mkdir
dir="${server.webapps.om}"/>
+ <unzip
src="${project.build.directory}/${project.build.finalName}.war"
dest="${server.webapps.om}"/>
+ <delete
dir="${server.webapps.om}/META-INF"/>
+ <mkdir
dir="${server.webapps.om}/screenshare"/>
+ <copy
todir="${server.webapps.om}/screenshare" overwrite="true">
+
<fileset dir="${project.basedir}/../openmeetings-screenshare/target/jnlp"/>
+ </copy>
+ <copy
todir="${server.webapps.om}/public" overwrite="true">
+
<fileset dir="${project.basedir}/../openmeetings-flash/target">
+
<include name="*.swf"/>
+
</fileset>
+ </copy>
+ <copy
todir="${project.build.directory}/server" overwrite="true">
+
<fileset dir="${project.basedir}/../WebContent/red5">
+
<include name="*.sh"/>
+
<include name="*.bat"/>
+
</fileset>
+ </copy>
+ <copy
todir="${server.webapps.om}/WEB-INF/classes" overwrite="true">
+
<fileset dir="${project.basedir}/src/main/java">
+
<include name="**/*.html"/>
+
<include name="**/*.js"/>
+
<include name="**/*.css"/>
+
<include name="**/*.xml"/>
+
</fileset>
+ </copy>
+ <copy
file="${project.basedir}/../WebContent/red5/index.html"
todir="${project.build.directory}/server/webapps/root" overwrite="true"/>
+ <chmod
dir="${project.build.directory}/server" perm="ugo+rx" includes="**/*.sh"/>
+ <move
todir="${server.lib}">
+
<fileset dir="${server.webapps.om}/WEB-INF/lib">
+
<include name="spring-*"/>
+
<include name="geronimo-jpa*"/>
+
<include name="commons-fileupload*"/>
+
</fileset>
+ </move>
+ <delete>
+
<fileset dir="${server.webapps.om}/WEB-INF/lib">
+
<include name="aopalliance*"/>
+
<include name="slf4j-*"/>
+
</fileset>
+ </delete>
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
<testResources>
<testResource>
@@ -348,6 +413,12 @@
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-extensions</artifactId>
<version>${wicket.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
Modified: openmeetings/trunk/singlewebapp/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/pom.xml?rev=1592227&r1=1592226&r2=1592227&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/pom.xml Sat May 3 15:46:48 2014
@@ -328,6 +328,10 @@
<artifactId>antlr</artifactId>
</exclusion>
<exclusion>
+ <groupId>aopalliance</groupId>
+
<artifactId>aopalliance</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>asm</groupId>
<artifactId>asm</artifactId>
</exclusion>
@@ -335,6 +339,10 @@
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
+ <exclusion>
+
<groupId>org.apache.geronimo.specs</groupId>
+
<artifactId>geronimo-servlet_3.0_spec</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
