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/06/16 08:49:10 UTC
svn commit: r1602808 - in /openmeetings/trunk/singlewebapp: ./
openmeetings-core/ openmeetings-flash/
openmeetings-install/src/main/java/org/apache/openmeetings/installation/
openmeetings-server/ openmeetings-server/src/main/assembly/
openmeetings-serv...
Author: solomax
Date: Mon Jun 16 06:49:09 2014
New Revision: 1602808
URL: http://svn.apache.org/r1602808
Log:
[OPENMEETINGS-896] exit button is functional; code clean-up;
Modified:
openmeetings/trunk/singlewebapp/openmeetings-core/pom.xml
openmeetings/trunk/singlewebapp/openmeetings-flash/pom.xml
openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java
openmeetings/trunk/singlewebapp/openmeetings-server/pom.xml
openmeetings/trunk/singlewebapp/openmeetings-server/src/main/assembly/quick.xml
openmeetings/trunk/singlewebapp/openmeetings-server/src/main/assembly/root/index.html
openmeetings/trunk/singlewebapp/openmeetings-web/pom.xml
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.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=1602808&r1=1602807&r2=1602808&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/pom.xml Mon Jun 16 06:49:09 2014
@@ -41,6 +41,23 @@
<url>http://smslib.org/maven2/v3</url>
</repository>
</repositories>
+ <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>
+ <old-backups.dwnd.skip>true</old-backups.dwnd.skip>
+ <wicket.mode>DEVELOPMENT</wicket.mode>
+ </properties>
+ </profile>
+ </profiles>
<build>
<plugins>
<plugin>
Modified: openmeetings/trunk/singlewebapp/openmeetings-flash/pom.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-flash/pom.xml?rev=1602808&r1=1602807&r2=1602808&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-flash/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-flash/pom.xml Mon Jun 16 06:49:09 2014
@@ -47,6 +47,7 @@
<target>
<ant antfile="${basedir}/openlaszlo.xml" target="client.only"/>
</target>
+ <skip>${om.quick.build}</skip>
</configuration>
<goals>
<goal>run</goal>
Modified: openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java?rev=1602808&r1=1602807&r2=1602808&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java Mon Jun 16 06:49:09 2014
@@ -441,9 +441,6 @@ public class ImportInitvalues {
null,
"Default selection in ScreenSharing Quality:\n 0 - bigger frame rate, no resize\n 1 - no resize\n 2 - size == 1/2 of selected area\n 3 - size == 3/8 of selected area");
- configurationDao.add("default.dashboard.tab", "0", null,
- "Default selection in Dashboard tabs as tab-index-id");
-
configurationDao.add(CONFIG_DASHBOARD_SHOW_MYROOMS_KEY, "1", null, "Show My Rooms Tab");
configurationDao.add("dashboard.show.chat", "1", null, "Show Chat Tab");
Modified: openmeetings/trunk/singlewebapp/openmeetings-server/pom.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-server/pom.xml?rev=1602808&r1=1602807&r2=1602808&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-server/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-server/pom.xml Mon Jun 16 06:49:09 2014
@@ -35,6 +35,7 @@
<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>
+ <dist.om.dir>${dist.webapps}/openmeetings</dist.om.dir>
<om.webapp>webapps/openmeetings</om.webapp>
<root.webapp>webapps/root</root.webapp>
<assembly.finalName>${project.build.finalName}</assembly.finalName>
@@ -51,12 +52,55 @@
</property>
</activation>
<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>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-clean-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>quick-clean</id>
+ <phase>initialize</phase>
+ <goals>
+ <goal>clean</goal>
+ </goals>
+ <configuration>
+ <excludeDefaultDirectories>true</excludeDefaultDirectories>
+ <filesets>
+ <fileset>
+ <directory>${dist.om.dir}</directory>
+ <includes>
+ <include>css/**</include>
+ <include>js/**</include>
+ <include>images/**</include>
+ <include>WEB-INF/**</include>
+ </includes>
+ </fileset>
+ <fileset>
+ <directory>${dist.om.dir}/WEB-INF/lib</directory>
+ <includes>
+ <include>openmeetings-*.jar</include>
+ </includes>
+ </fileset>
+ <fileset>
+ <directory>${dist.om.dir}/WEB-INF/classes</directory>
+ <includes>
+ <include>**/*.html</include>
+ <include>**/*.js</include>
+ <include>**/*.css</include>
+ <include>**/*.xml</include>
+ </includes>
+ </fileset>
+ </filesets>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</profile>
<profile>
<id>Unpacked</id>
@@ -68,7 +112,6 @@
</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>
@@ -142,6 +185,7 @@
</parameters>
</transformationSet>
</transformationSets>
+ <skip>${om.quick.build}</skip>
</configuration>
</execution>
</executions>
@@ -150,7 +194,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<configuration>
- <skip>false</skip>
+ <skip>${om.quick.build}</skip>
</configuration>
<executions>
<execution>
Modified: 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=1602808&r1=1602807&r2=1602808&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-server/src/main/assembly/quick.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-server/src/main/assembly/quick.xml Mon Jun 16 06:49:09 2014
@@ -82,7 +82,7 @@
</includes>
</fileSet>
<fileSet>
- <directory>${project.parent.basedir}/openmeetings-web/target</directory>
+ <directory>${project.parent.basedir}/openmeetings-web/target/openmeetings-web-${project.version}/WEB-INF/lib</directory>
<outputDirectory>${om.webapp}/WEB-INF/lib</outputDirectory>
<includes>
<include>openmeetings-*.jar</include>
Modified: openmeetings/trunk/singlewebapp/openmeetings-server/src/main/assembly/root/index.html
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-server/src/main/assembly/root/index.html?rev=1602808&r1=1602807&r2=1602808&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-server/src/main/assembly/root/index.html (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-server/src/main/assembly/root/index.html Mon Jun 16 06:49:09 2014
@@ -15,9 +15,9 @@
<html>
<head>
<title>Your Page Title</title>
-<meta http-equiv="REFRESH" content="0;url=openmeetings/"></HEAD>
-<BODY>
+<meta http-equiv="REFRESH" content="0;url=openmeetings/">
+</head>
+<body>
Redirect to openmeetings/
-</BODY>
-</HTML>
-
+</body>
+</html>
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/pom.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/pom.xml?rev=1602808&r1=1602807&r2=1602808&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/pom.xml Mon Jun 16 06:49:09 2014
@@ -57,20 +57,6 @@
</dependency>
</dependencies>
</profile>
- <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>
- <old-backups.dwnd.skip>true</old-backups.dwnd.skip>
- </properties>
- </profile>
</profiles>
<build>
<plugins>
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java?rev=1602808&r1=1602807&r2=1602808&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java Mon Jun 16 06:49:09 2014
@@ -22,12 +22,17 @@ import static org.apache.openmeetings.ut
import static org.apache.openmeetings.web.app.Application.addUserToRoom;
import static org.apache.openmeetings.web.app.Application.getBean;
import static org.apache.openmeetings.web.app.Application.getRoomUsers;
+import static org.apache.openmeetings.web.util.OmUrlFragment.ROOMS_PUBLIC;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_REDIRECT_URL_FOR_EXTERNAL_KEY;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_APPLICATION_BASE_URL;
import java.util.ArrayList;
import java.util.List;
+import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
import org.apache.openmeetings.db.dao.user.UserDao;
import org.apache.openmeetings.db.entity.user.User;
+import org.apache.openmeetings.db.entity.user.User.Right;
import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.app.Client;
import org.apache.openmeetings.web.app.WebSession;
@@ -35,6 +40,7 @@ import org.apache.openmeetings.web.commo
import org.apache.openmeetings.web.common.menu.MenuItem;
import org.apache.openmeetings.web.common.menu.MenuPanel;
import org.apache.openmeetings.web.common.menu.RoomMenuItem;
+import org.apache.openmeetings.web.pages.MainPage;
import org.apache.wicket.ajax.AbstractDefaultAjaxBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.json.JSONArray;
@@ -49,8 +55,10 @@ import org.apache.wicket.markup.head.Pri
import org.apache.wicket.protocol.ws.IWebSocketSettings;
import org.apache.wicket.protocol.ws.api.registry.IWebSocketConnectionRegistry;
import org.apache.wicket.protocol.ws.api.registry.PageIdKey;
+import org.apache.wicket.request.flow.RedirectToUrlException;
import org.apache.wicket.request.resource.JavaScriptResourceReference;
import org.apache.wicket.request.resource.ResourceReference;
+import org.apache.wicket.util.string.Strings;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
@@ -157,7 +165,22 @@ public class RoomPanel extends BasePanel
private List<MenuItem> getMenu() {
//TODO hide/show
List<MenuItem> menu = new ArrayList<MenuItem>();
- menu.add(new RoomMenuItem(WebSession.getString(308), WebSession.getString(309), "room menu exit"));
+ menu.add(new RoomMenuItem(WebSession.getString(308), WebSession.getString(309), "room menu exit") {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public void onClick(MainPage page, AjaxRequestTarget target) {
+ if (WebSession.getRights().contains(Right.Dashboard)) {
+ page.updateContents(ROOMS_PUBLIC, target);
+ } else {
+ String url = getBean(ConfigurationDao.class).getConfValue(CONFIG_REDIRECT_URL_FOR_EXTERNAL_KEY, String.class, "");
+ if (Strings.isEmpty(url)) {
+ url = getBean(ConfigurationDao.class).getConfValue(CONFIG_APPLICATION_BASE_URL, String.class, "");
+ }
+ throw new RedirectToUrlException(url);
+ }
+ }
+ });
MenuItem files = new RoomMenuItem(WebSession.getString(245));
List<RoomMenuItem> fileItems = new ArrayList<RoomMenuItem>();
fileItems.add(new RoomMenuItem(WebSession.getString(15)));
Modified: openmeetings/trunk/singlewebapp/openmeetings-webservice/pom.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-webservice/pom.xml?rev=1602808&r1=1602807&r2=1602808&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-webservice/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-webservice/pom.xml Mon Jun 16 06:49:09 2014
@@ -39,11 +39,6 @@
<artifactId>maven-javadoc-plugin</artifactId>
<executions>
<execution>
- <goals>
- <goal>javadoc</goal>
- <goal>aggregate</goal>
- </goals>
- <phase>generate-resources</phase>
<configuration>
<groups>
<group>
@@ -52,7 +47,13 @@
</group>
</groups>
<excludePackageNames>org.apache.openmeetings.webservice.cluster,org.apache.openmeetings.webservice.dto</excludePackageNames>
+ <skip>${om.quick.build}</skip>
</configuration>
+ <goals>
+ <goal>javadoc</goal>
+ <goal>aggregate</goal>
+ </goals>
+ <phase>generate-resources</phase>
</execution>
</executions>
</plugin>
Modified: openmeetings/trunk/singlewebapp/pom.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/pom.xml?rev=1602808&r1=1602807&r2=1602808&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/pom.xml Mon Jun 16 06:49:09 2014
@@ -34,11 +34,13 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.build.timestamp.format>yyyy/MM/dd HH:mm</maven.build.timestamp.format>
<wicket.mode>DEPLOYMENT</wicket.mode>
+ <om.quick.build>false</om.quick.build>
<db>derby</db>
<spring.version>4.0.3.RELEASE</spring.version>
<junit.version>4.11</junit.version>
<maven.javadoc.version>2.9.1</maven.javadoc.version>
<maven.surefire.version>2.17</maven.surefire.version>
+ <maven-site.version>3.3</maven-site.version>
<wicket.version>6.15.0</wicket.version>
<red5-server.version>1.0.2-RELEASE</red5-server.version>
<batik.version>1.7</batik.version>
@@ -64,6 +66,20 @@
</modules>
<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>
+ <old-backups.dwnd.skip>true</old-backups.dwnd.skip>
+ <red5-server.dwnd.skip>true</red5-server.dwnd.skip>
+ <wicket.mode>DEVELOPMENT</wicket.mode>
+ </properties>
</profile>
</profiles>
<url>http://openmeetings.apache.org</url>
@@ -479,7 +495,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <version>3.3</version>
+ <version>${maven-site.version}</version>
<configuration>
<generatedSiteDirectory>${project.build.directory}/generated-site</generatedSiteDirectory>
</configuration>
@@ -591,6 +607,16 @@
<artifactId>xml-maven-plugin</artifactId>
<version>1.0</version>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>buildnumber-maven-plugin</artifactId>
+ <version>1.3</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-clean-plugin</artifactId>
+ <version>2.5</version>
+ </plugin>
</plugins>
</pluginManagement>
</build>