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/05/18 20:59:14 UTC
svn commit: r1595657 - in /openmeetings/trunk/singlewebapp: ./ WebContent/
openmeetings-core/src/main/java/org/apache/openmeetings/core/data/calendar/management/
openmeetings-flash/ openmeetings-server/ openmeetings-server/src/
openmeetings-server/src/...
Author: solomax
Date: Sun May 18 18:59:14 2014
New Revision: 1595657
URL: http://svn.apache.org/r1595657
Log:
[OPENMEETINGS-940] openmeetings-server subproject is added, assembly plugin is used to build assembly
Added:
openmeetings/trunk/singlewebapp/openmeetings-server/ (with props)
openmeetings/trunk/singlewebapp/openmeetings-server/pom.xml
openmeetings/trunk/singlewebapp/openmeetings-server/src/
openmeetings/trunk/singlewebapp/openmeetings-server/src/main/
openmeetings/trunk/singlewebapp/openmeetings-server/src/main/assembly/
openmeetings/trunk/singlewebapp/openmeetings-server/src/main/assembly/components/
openmeetings/trunk/singlewebapp/openmeetings-server/src/main/assembly/components/all.xml
openmeetings/trunk/singlewebapp/openmeetings-server/src/main/assembly/components/templates.xml
openmeetings/trunk/singlewebapp/openmeetings-server/src/main/assembly/jrebel/
- copied from r1595581, openmeetings/trunk/singlewebapp/WebContent/jrebel/
openmeetings/trunk/singlewebapp/openmeetings-server/src/main/assembly/quick.xml
openmeetings/trunk/singlewebapp/openmeetings-server/src/main/assembly/root/
openmeetings/trunk/singlewebapp/openmeetings-server/src/main/assembly/root/index.html
- copied unchanged from r1595581, openmeetings/trunk/singlewebapp/WebContent/red5/index.html
openmeetings/trunk/singlewebapp/openmeetings-server/src/main/assembly/scripts/
openmeetings/trunk/singlewebapp/openmeetings-server/src/main/assembly/scripts/admin.bat
- copied unchanged from r1595581, openmeetings/trunk/singlewebapp/WebContent/red5/admin.bat
openmeetings/trunk/singlewebapp/openmeetings-server/src/main/assembly/scripts/admin.sh
- copied unchanged from r1595581, openmeetings/trunk/singlewebapp/WebContent/red5/admin.sh
openmeetings/trunk/singlewebapp/openmeetings-server/src/main/assembly/scripts/network_test.sh
- copied unchanged from r1595581, openmeetings/trunk/singlewebapp/WebContent/red5/network_test.sh
openmeetings/trunk/singlewebapp/openmeetings-server/src/main/assembly/server.xml
openmeetings/trunk/singlewebapp/openmeetings-server/src/main/assembly/unpacked.xml
Removed:
openmeetings/trunk/singlewebapp/WebContent/
Modified:
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/calendar/management/AppointmentLogic.java
openmeetings/trunk/singlewebapp/openmeetings-flash/pom.xml
openmeetings/trunk/singlewebapp/openmeetings-web/pom.xml
openmeetings/trunk/singlewebapp/pom.xml
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/calendar/management/AppointmentLogic.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/calendar/management/AppointmentLogic.java?rev=1595657&r1=1595656&r2=1595657&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/calendar/management/AppointmentLogic.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/calendar/management/AppointmentLogic.java Sun May 18 18:59:14 2014
@@ -50,6 +50,7 @@ import org.apache.openmeetings.db.entity
import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.db.util.TimezoneUtil;
import org.apache.openmeetings.util.CalendarPatterns;
+import org.apache.openmeetings.util.InitializationContainer;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
@@ -183,6 +184,9 @@ public class AppointmentLogic {
// ----------------------------------------------------------------------------------------------
public void doScheduledMeetingReminder() throws Exception {
// log.debug("doScheduledMeetingReminder");
+ if (!InitializationContainer.initComplete) {
+ return;
+ }
String baseUrl = configurationDao.getConfValue(CONFIG_APPLICATION_BASE_URL, String.class, DEFAULT_BASE_URL);
if (baseUrl == null || baseUrl.length() < 1) {
Modified: openmeetings/trunk/singlewebapp/openmeetings-flash/pom.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-flash/pom.xml?rev=1595657&r1=1595656&r2=1595657&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-flash/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-flash/pom.xml Sun May 18 18:59:14 2014
@@ -25,7 +25,7 @@
<relativePath>..</relativePath>
</parent>
<artifactId>openmeetings-flash</artifactId>
- <packaging>pom</packaging><!-- FIXME -->
+ <packaging>jar</packaging><!-- FIXME -->
<name>Openmeetings Flash</name>
<description>TODO</description>
<properties>
Propchange: openmeetings/trunk/singlewebapp/openmeetings-server/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sun May 18 18:59:14 2014
@@ -0,0 +1,5 @@
+.classpath
+.project
+.settings
+target
+
Added: openmeetings/trunk/singlewebapp/openmeetings-server/pom.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-server/pom.xml?rev=1595657&view=auto
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-server/pom.xml (added)
+++ openmeetings/trunk/singlewebapp/openmeetings-server/pom.xml Sun May 18 18:59:14 2014
@@ -0,0 +1,195 @@
+<?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.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.openmeetings</groupId>
+ <artifactId>openmeetings-parent</artifactId>
+ <version>3.1.0-SNAPSHOT</version>
+ <relativePath>..</relativePath>
+ </parent>
+ <artifactId>openmeetings-server</artifactId>
+ <packaging>jar</packaging>
+ <name>Openmeetings Server</name>
+ <description>TODO</description>
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <server.dir>${project.build.directory}/red5-server</server.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>
+ </properties>
+ <profiles>
+ <profile>
+ <id>Quick</id>
+ <activation>
+ <property>
+ <name>quick</name>
+ <value>true</value>
+ </property>
+ </activation>
+ <properties>
+ <maven.test.skip>true</maven.test.skip>
+ <om.quick.build>true</om.quick.build>
+ <assembly.finalName>server</assembly.finalName>
+ <assembly.descriptor>quick</assembly.descriptor>
+ </properties>
+ </profile>
+ <profile>
+ <id>Unpacked</id>
+ <activation>
+ <property>
+ <name>unpacked</name>
+ <value>true</value>
+ </property>
+ </activation>
+ <properties>
+ <maven.test.skip>true</maven.test.skip>
+ <om.quick.build>false</om.quick.build>
+ <assembly.finalName>server</assembly.finalName>
+ <assembly.descriptor>unpacked</assembly.descriptor>
+ </properties>
+ </profile>
+ </profiles>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>wagon-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>download-red5-server</id>
+ <phase>process-resources</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.zip</fromFile>
+ <toDir>${project.build.directory}</toDir>
+ <skip>${om.quick.build}</skip>
+ </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>process-resources</phase>
+ <configuration>
+ <fileset>
+ <directory>${project.build.directory}/red5-server-${red5-server.version}-server.zip/red5-server-${red5-server.version}</directory>
+ <outputDirectory>${server.dir}</outputDirectory>
+ </fileset>
+ <skip>${om.quick.build}</skip>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptors>
+ <descriptor>${project.basedir}/src/main/assembly/${assembly.descriptor}.xml</descriptor>
+ </descriptors>
+ <finalName>${assembly.finalName}</finalName>
+ <appendAssemblyId>false</appendAssemblyId>
+ </configuration>
+ <executions>
+ <execution>
+ <id>make-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+ </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.codehaus.mojo</groupId>
+ <artifactId>wagon-maven-plugin</artifactId>
+ <versionRange>[1.0-beta-5,)</versionRange>
+ <goals>
+ <goal>download-single</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore></ignore>
+ </action>
+ </pluginExecution>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>truezip-maven-plugin</artifactId>
+ <versionRange>[1.2,)</versionRange>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore></ignore>
+ </action>
+ </pluginExecution>
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.openmeetings</groupId>
+ <artifactId>openmeetings-web</artifactId>
+ <version>${project.version}</version>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openmeetings</groupId>
+ <artifactId>openmeetings-screenshare</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openmeetings</groupId>
+ <artifactId>openmeetings-flash</artifactId>
+ </dependency>
+ </dependencies>
+</project>
Added: 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=1595657&view=auto
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-server/src/main/assembly/components/all.xml (added)
+++ openmeetings/trunk/singlewebapp/openmeetings-server/src/main/assembly/components/all.xml Sun May 18 18:59:14 2014
@@ -0,0 +1,102 @@
+<?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.
+-->
+<component
+ xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/component/1.1.2"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/component/1.1.2 http://maven.apache.org/xsd/component-1.1.2.xsd">
+ <fileSets>
+ <fileSet>
+ <directory>${server.dir}</directory>
+ <outputDirectory></outputDirectory>
+ <excludes>
+ <exclude>webapps/installer/**</exclude>
+ <exclude>webapps/live/**</exclude>
+ <exclude>webapps/vod/**</exclude>
+ <exclude>webapps/root/index.html</exclude>
+ <exclude>*.sh</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
+ <directory>${server.dir}</directory>
+ <outputDirectory></outputDirectory>
+ <fileMode>0755</fileMode>
+ <includes>
+ <include>*.sh</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>src/main/assembly/scripts</directory>
+ <outputDirectory></outputDirectory>
+ <fileMode>0755</fileMode>
+ </fileSet>
+ <fileSet>
+ <directory>src/main/assembly/root</directory>
+ <outputDirectory>${root.webapp}</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>${project.parent.basedir}/openmeetings-screenshare/target/jnlp</directory>
+ <outputDirectory>${om.webapp}/screenshare</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>${project.parent.basedir}/openmeetings-flash/target</directory>
+ <outputDirectory>${om.webapp}/public</outputDirectory>
+ <includes>
+ <include>*.swf</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>${project.parent.basedir}</directory>
+ <outputDirectory></outputDirectory>
+ <includes>
+ <include>CHANGELOG</include>
+ <include>LICENSE</include>
+ <include>NOTICE</include>
+ <include>README</include>
+ </includes>
+ </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>
+ <include>spring-*</include>
+ <include>geronimo-jpa*</include>
+ <include>commons-fileupload*</include>
+ </includes>
+ </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
Added: openmeetings/trunk/singlewebapp/openmeetings-server/src/main/assembly/components/templates.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-server/src/main/assembly/components/templates.xml?rev=1595657&view=auto
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-server/src/main/assembly/components/templates.xml (added)
+++ openmeetings/trunk/singlewebapp/openmeetings-server/src/main/assembly/components/templates.xml Sun May 18 18:59:14 2014
@@ -0,0 +1,34 @@
+<?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.
+-->
+<component
+ xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/component/1.1.2"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/component/1.1.2 http://maven.apache.org/xsd/component-1.1.2.xsd">
+ <fileSets>
+ <fileSet>
+ <directory>${project.parent.basedir}/openmeetings-web/src/main/java</directory>
+ <outputDirectory>${om.webapp}/WEB-INF/classes</outputDirectory>
+ <includes>
+ <include>**/*.html</include>
+ <include>**/*.js</include>
+ <include>**/*.css</include>
+ <include>**/*.xml</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+</component>
\ No newline at end of file
Added: openmeetings/trunk/singlewebapp/openmeetings-server/src/main/assembly/quick.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-server/src/main/assembly/quick.xml?rev=1595657&view=auto
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-server/src/main/assembly/quick.xml (added)
+++ openmeetings/trunk/singlewebapp/openmeetings-server/src/main/assembly/quick.xml Sun May 18 18:59:14 2014
@@ -0,0 +1,30 @@
+<?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.2"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+ <id>server</id>
+ <formats>
+ <format>dir</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <componentDescriptors>
+ <componentDescriptor>src/main/assembly/components/templates.xml</componentDescriptor>
+ </componentDescriptors>
+</assembly>
Added: 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=1595657&view=auto
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-server/src/main/assembly/server.xml (added)
+++ openmeetings/trunk/singlewebapp/openmeetings-server/src/main/assembly/server.xml Sun May 18 18:59:14 2014
@@ -0,0 +1,33 @@
+<?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.2"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+ <id>server</id>
+ <formats>
+ <format>tar.gz</format>
+ <format>zip</format>
+ <format>dir</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <componentDescriptors>
+ <componentDescriptor>src/main/assembly/components/all.xml</componentDescriptor>
+ <componentDescriptor>src/main/assembly/components/templates.xml</componentDescriptor>
+ </componentDescriptors>
+</assembly>
Added: openmeetings/trunk/singlewebapp/openmeetings-server/src/main/assembly/unpacked.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-server/src/main/assembly/unpacked.xml?rev=1595657&view=auto
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-server/src/main/assembly/unpacked.xml (added)
+++ openmeetings/trunk/singlewebapp/openmeetings-server/src/main/assembly/unpacked.xml Sun May 18 18:59:14 2014
@@ -0,0 +1,31 @@
+<?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.2"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+ <id>server</id>
+ <formats>
+ <format>dir</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <componentDescriptors>
+ <componentDescriptor>src/main/assembly/components/all.xml</componentDescriptor>
+ <componentDescriptor>src/main/assembly/components/templates.xml</componentDescriptor>
+ </componentDescriptors>
+</assembly>
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/pom.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/pom.xml?rev=1595657&r1=1595656&r2=1595657&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/pom.xml Sun May 18 18:59:14 2014
@@ -37,9 +37,6 @@
<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>
@@ -117,7 +114,6 @@
</goals>
<configuration>
<overwrite>true</overwrite>
- <!-- outputDirectory>${project.build.directory}/${project.build.finalName}/WEB-INF/classes</outputDirectory-->
<outputDirectory>${project.build.directory}/test-classes</outputDirectory>
<resources>
<resource>
@@ -129,8 +125,6 @@
<include>**/*.xml</include>
</includes>
</resource>
- </resources>
- <resources>
<resource>
<directory>${project.parent.basedir}/openmeetings-service/src/main/java</directory>
<includes>
@@ -165,109 +159,6 @@
tofile="${project.build.directory}/test-classes/META-INF/persistence.xml"
overwrite="true"/>
</target>
- <skip>${om.quick.build}</skip>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- <execution>
- <id>basic-move-server-resources</id><!-- All this should be removed and implemented somehow differently -->
- <phase>verify</phase>
- <configuration>
- <target>
- <delete dir="${server.webapps}/installer"/> <!-- maven-clean-plugin OR truezip::delete OR assembly::exclude-->
- <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"/>
- <copy todir="${project.build.directory}/server" overwrite="true">
- <fileset dir="${project.basedir}/../WebContent/red5">
- <include name="*.sh"/>
- <include name="*.bat"/>
- </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>
- <skip>${om.quick.build}</skip>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- <execution>
- <id>move-server-resources</id><!-- All this should be removed and implemented somehow differently -->
- <phase>verify</phase>
- <configuration>
- <target>
- <mkdir dir="${server.webapps.om}/screenshare"/>
- <copy todir="${server.webapps.om}/WEB-INF/lib" overwrite="true">
- <fileset dir="${project.basedir}/../openmeetings-core/target">
- <include name="openmeetings*.jar"/>
- </fileset>
- <fileset dir="${project.basedir}/../openmeetings-db/target">
- <include name="openmeetings*.jar"/>
- </fileset>
- <fileset dir="${project.basedir}/../openmeetings-install/target">
- <include name="openmeetings*.jar"/>
- </fileset>
- <fileset dir="${project.basedir}/../openmeetings-service/target">
- <include name="openmeetings*.jar"/>
- </fileset>
- <fileset dir="${project.basedir}/../openmeetings-util/target">
- <include name="openmeetings*.jar"/>
- </fileset>
- <fileset dir="${project.basedir}/../openmeetings-webservice/target">
- <include name="openmeetings*.jar"/>
- </fileset>
- <fileset dir="${project.build.directory}/${project.build.finalName}/WEB-INF/lib">
- <include name="openmeetings*.jar"/>
- </fileset>
- </copy>
- <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="${server.webapps.om}/WEB-INF" overwrite="true">
- <fileset dir="${project.build.directory}/${project.build.finalName}/WEB-INF">
- <include name="**/*.xml"/>
- </fileset>
- </copy>
- <copy todir="${server.webapps.om}/css" overwrite="true">
- <fileset dir="${project.basedir}/src/main/webapp/css">
- <include name="**/*.css"/>
- <include name="**/*.png"/>
- <include name="**/*.gif"/>
- </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>
- </target>
</configuration>
<goals>
<goal>run</goal>
@@ -294,70 +185,6 @@
<skip>${om.quick.build}</skip>
</configuration>
</plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>wagon-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>download-test-data</id>
- <phase>process-test-resources</phase>
- <goals>
- <goal>download</goal>
- </goals>
- <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>
- </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>
- <skip>${om.quick.build}</skip>
- </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>
- <skip>${om.quick.build}</skip>
- </configuration>
- </execution>
- <execution><!-- FIXME should be refactored -->
- <id>create-tgz-distribution</id>
- <goals>
- <goal>cp</goal>
- </goals>
- <phase>verify</phase>
- <configuration>
- <from>${project.build.directory}/server</from>
- <to>${project.build.directory}/openmeetings-${project.version}.tgz</to>
- <skip>${om.quick.build}</skip>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
<testResources>
<testResource>
@@ -389,32 +216,6 @@
</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>
@@ -458,16 +259,6 @@
<groupId>org.apache.openmeetings</groupId>
<artifactId>openmeetings-webservice</artifactId>
</dependency>
- <!--dependency>
- <groupId>org.apache.openmeetings</groupId>
- <artifactId>openmeetings-flash</artifactId>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.apache.openmeetings</groupId>
- <artifactId>openmeetings-screenshare</artifactId>
- <scope>provided</scope>
- </dependency-->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
Modified: openmeetings/trunk/singlewebapp/pom.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/pom.xml?rev=1595657&r1=1595656&r2=1595657&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/pom.xml Sun May 18 18:59:14 2014
@@ -53,6 +53,7 @@
<module>openmeetings-flash</module>
<module>openmeetings-install</module>
<module>openmeetings-screenshare</module>
+ <module>openmeetings-server</module>
<module>openmeetings-service</module>
<module>openmeetings-util</module>
<module>openmeetings-web</module>
@@ -175,6 +176,11 @@
</dependency>
<dependency>
<groupId>org.apache.openmeetings</groupId>
+ <artifactId>openmeetings-web</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openmeetings</groupId>
<artifactId>openmeetings-webservice</artifactId>
<version>${project.version}</version>
</dependency>
@@ -458,6 +464,11 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.4</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>2.8</version>
</plugin>