Modified: openmeetings/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/rtmp/SimulateLoad.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/rtmp/SimulateLoad.java?rev=1712427&r1=1711723&r2=1712427&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/rtmp/SimulateLoad.java (original) +++ openmeetings/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/rtmp/SimulateLoad.java Tue Nov 3 22:25:34 2015 @@ -18,13 +18,13 @@ */ package org.apache.openmeetings.test.rtmp; +import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey; + +import org.red5.logging.Red5LoggerFactory; import org.slf4j.Logger; -import org.slf4j.LoggerFactory; public class SimulateLoad extends Thread { - - private static final Logger log = LoggerFactory - .getLogger(SimulateLoad.class); + private static final Logger log = Red5LoggerFactory.getLogger(SimulateLoad.class, webAppRootKey); private LoadTestRtmpClient loadTestRtmpClient; private boolean testRunning = true; @@ -53,7 +53,6 @@ public class SimulateLoad extends Thread System.err.println("started "); } catch (Exception er) { - er.printStackTrace(); log.error("Error", er); } } @@ -77,12 +76,12 @@ public class SimulateLoad extends Thread try { Thread.sleep(200); } catch (InterruptedException e) { - e.printStackTrace(); + log.error("Error", e); } } } catch (Exception e) { - e.printStackTrace(); + log.error("Error", e); } }
Modified: openmeetings/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/rtmp/SimulateLoadTest.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/rtmp/SimulateLoadTest.java?rev=1712427&r1=1711723&r2=1712427&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/rtmp/SimulateLoadTest.java (original) +++ openmeetings/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/rtmp/SimulateLoadTest.java Tue Nov 3 22:25:34 2015 @@ -18,13 +18,17 @@ */ package org.apache.openmeetings.test.rtmp; +import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey; + import java.util.ArrayList; import java.util.List; import org.junit.Test; +import org.red5.logging.Red5LoggerFactory; +import org.slf4j.Logger; public class SimulateLoadTest { - + private static final Logger log = Red5LoggerFactory.getLogger(SimulateLoadTest.class, webAppRootKey); private int numberOfClients = 25; private List<SimulateLoad> simulateLoadList = new ArrayList<SimulateLoad>(); @@ -57,14 +61,14 @@ public class SimulateLoadTest { Thread.sleep(100); } - System.err.println("Clients initialized"); + log.error("Clients initialized"); for (SimulateLoad simulateLoad : simulateLoadList) { simulateLoad.start(); Thread.sleep(50); } - System.err.println("Clients started"); + log.error("Clients started"); boolean running = true; while (running) { @@ -79,7 +83,7 @@ public class SimulateLoadTest { try { Thread.sleep(200); } catch (InterruptedException e) { - e.printStackTrace(); + log.error("Error", e); } } @@ -87,7 +91,7 @@ public class SimulateLoadTest { for (SimulateLoad simulateLoad : simulateLoadList) { overallTime += simulateLoad.getAverageTime(); - System.err.println("Number of calls: " + log.error("Number of calls: " + simulateLoad.getNumberOfCalls() + "overallTime: " + overallTime + " averageTime" + simulateLoad.getAverageTime()); @@ -96,10 +100,10 @@ public class SimulateLoadTest { double deltaAllClients = overallTime / Integer.valueOf(simulateLoadList.size()).doubleValue(); - System.err.println("Average time per call: " + deltaAllClients); + log.error("Average time per call: " + deltaAllClients); } catch (Exception err) { - err.printStackTrace(); + log.error("Error", err); } } Modified: openmeetings/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/user/TestMailSending.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/user/TestMailSending.java?rev=1712427&r1=1711723&r2=1712427&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/user/TestMailSending.java (original) +++ openmeetings/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/user/TestMailSending.java Tue Nov 3 22:25:34 2015 @@ -18,6 +18,7 @@ */ package org.apache.openmeetings.test.user; +import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey; import static org.junit.Assert.assertTrue; import java.io.IOException; @@ -35,6 +36,8 @@ import javax.mail.util.ByteArrayDataSour import org.apache.openmeetings.util.mail.SmtpAuthenticator; import org.junit.Test; +import org.red5.logging.Red5LoggerFactory; +import org.slf4j.Logger; import com.sun.mail.util.MailSSLSocketFactory; @@ -44,6 +47,7 @@ import com.sun.mail.util.MailSSLSocketFa * */ public class TestMailSending { + private static final Logger log = Red5LoggerFactory.getLogger(TestMailSending.class, webAppRootKey); //Example GMail email server data private String smtpServer = "smtp.gmail.com"; @@ -67,7 +71,7 @@ public class TestMailSending { Transport.send(getMimeMessage()); } catch (Exception err) { - err.printStackTrace(); + log.error("Error", err); } assertTrue(true); } Modified: openmeetings/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/xsd/GenerateConfigXsd.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/xsd/GenerateConfigXsd.java?rev=1712427&r1=1711723&r2=1712427&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/xsd/GenerateConfigXsd.java (original) +++ openmeetings/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/xsd/GenerateConfigXsd.java Tue Nov 3 22:25:34 2015 @@ -18,11 +18,17 @@ */ package org.apache.openmeetings.test.xsd; +import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey; + import java.io.File; +import org.red5.logging.Red5LoggerFactory; +import org.slf4j.Logger; + import com.thaiopensource.relaxng.translate.Driver; public class GenerateConfigXsd { + private static final Logger log = Red5LoggerFactory.getLogger(GenerateConfigXsd.class, webAppRootKey); public static void main(String... args) { new GenerateConfigXsd(); @@ -39,7 +45,7 @@ public class GenerateConfigXsd { Driver.main(args); } catch (Exception err) { - err.printStackTrace(); + log.error("Error", err); } } Modified: openmeetings/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/xsd/GenerateWebsiteXsd.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/xsd/GenerateWebsiteXsd.java?rev=1712427&r1=1711723&r2=1712427&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/xsd/GenerateWebsiteXsd.java (original) +++ openmeetings/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/xsd/GenerateWebsiteXsd.java Tue Nov 3 22:25:34 2015 @@ -18,15 +18,20 @@ */ package org.apache.openmeetings.test.xsd; +import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey; + import java.io.File; import java.io.FilenameFilter; import java.util.ArrayList; import java.util.List; +import org.red5.logging.Red5LoggerFactory; +import org.slf4j.Logger; + import com.thaiopensource.relaxng.translate.Driver; public class GenerateWebsiteXsd { - + private static final Logger log = Red5LoggerFactory.getLogger(GenerateWebsiteXsd.class, webAppRootKey); private static String WEBSITE_ROOT_DIR = "xdocs"; public static void main(String... args) { @@ -69,7 +74,7 @@ public class GenerateWebsiteXsd { Driver.main(allfilesPlusXSD.toArray(new String[0])); } catch (Exception err) { - err.printStackTrace(); + log.error("Error", err); } } Propchange: openmeetings/branches/3.1.x/openmeetings-db/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Tue Nov 3 22:25:34 2015 @@ -0,0 +1,5 @@ +target +.project +.classpath +.settings + Added: openmeetings/branches/3.1.x/openmeetings-db/pom.xml URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-db/pom.xml?rev=1712427&view=auto ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-db/pom.xml (added) +++ openmeetings/branches/3.1.x/openmeetings-db/pom.xml Tue Nov 3 22:25:34 2015 @@ -0,0 +1,169 @@ +<?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-db</artifactId> + <packaging>jar</packaging> + <name>Openmeetings DB</name> + <description>TODO</description> + <properties> + <openjpa.version>2.4.0</openjpa.version> + <asterisk-java.version>1.0.0</asterisk-java.version> + <commons-dbcp.version>2.1.1</commons-dbcp.version> + <commons-pool2.version>2.4.2</commons-pool2.version> + <derby.version>10.12.1.1</derby.version> + <postgresql.version>9.4-1203-jdbc41</postgresql.version> + <site.basedir>${project.parent.basedir}</site.basedir> + <skip.site.copy>false</skip.site.copy> + </properties> + <dependencies> + <dependency> + <groupId>org.apache.openmeetings</groupId> + <artifactId>openmeetings-util</artifactId> + </dependency> + <dependency> + <groupId>org.apache.wicket</groupId> + <artifactId>wicket-extensions</artifactId> + </dependency> + <dependency> + <groupId>org.apache.openjpa</groupId> + <artifactId>openjpa</artifactId> + <version>${openjpa.version}</version> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-tx</artifactId> + <version>${spring.version}</version> + </dependency> + <dependency> + <groupId>org.simpleframework</groupId> + <artifactId>simple-xml</artifactId> + </dependency> + <dependency> + <groupId>org.asteriskjava</groupId> + <artifactId>asterisk-java</artifactId> + <version>${asterisk-java.version}</version> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-dbcp2</artifactId> + <version>${commons-dbcp.version}</version> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-pool2</artifactId> + <version>${commons-pool2.version}</version> + </dependency> + <dependency> + <groupId>org.apache.derby</groupId> + <artifactId>derby</artifactId> + <version>${derby.version}</version> + </dependency> + <dependency> + <groupId>org.apache.derby</groupId> + <artifactId>derbyclient</artifactId> + <version>${derby.version}</version> + </dependency> + <dependency> + <groupId>org.postgresql</groupId> + <artifactId>postgresql</artifactId> + <version>${postgresql.version}</version> + </dependency> + </dependencies> + <repositories> + <repository> + <id>openmeetings-bintray</id> + <url>https://dl.bintray.com/openmeetings/maven</url> + </repository> + </repositories> + <build> + <plugins> + <plugin> + <groupId>org.apache.openjpa</groupId> + <artifactId>openjpa-maven-plugin</artifactId> + <version>${openjpa.version}</version> + <configuration> + <includes>**/entity/**/*.class</includes> + <addDefaultConstructor>true</addDefaultConstructor> + <enforcePropertyRestrictions>true</enforcePropertyRestrictions> + <persistenceXmlFile>${project.parent.basedir}/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/derby_persistence.xml</persistenceXmlFile> + </configuration> + <executions> + <execution> + <id>enhancer</id> + <phase>process-classes</phase> + <goals> + <goal>enhance</goal> + </goals> + </execution> + </executions> + <dependencies> + <dependency> + <groupId>org.apache.openjpa</groupId> + <artifactId>openjpa</artifactId> + <!-- set the version to be the same as the level in your runtime --> + <version>${openjpa.version}</version> + </dependency> + </dependencies> + </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.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> Added: openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/IApplication.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/IApplication.java?rev=1712427&view=auto ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/IApplication.java (added) +++ openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/IApplication.java Tue Nov 3 22:25:34 2015 @@ -0,0 +1,41 @@ +/* + * 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. + */ +package org.apache.openmeetings; + +import javax.servlet.ServletContext; + +import org.apache.openmeetings.db.entity.room.Invitation; +import org.apache.wicket.request.IExceptionMapper; +import org.apache.wicket.request.IRequestMapper; +import org.apache.wicket.request.mapper.parameter.PageParameters; +import org.apache.wicket.util.IProvider; + +public interface IApplication { + <T> T getOmBean(Class<T> clazz); + ServletContext getServletContext(); + IRequestMapper getRootRequestMapper(); + IProvider<IExceptionMapper> getExceptionMapperProvider(); + String getOmString(long id); + String getOmString(long id, long languageId); + String getOmString(String key, long languageId); + String getOmContactsLink(); + String getOmInvitationLink(String baseUrl, Invitation i); + String urlForActivatePage(PageParameters pp); + void invalidateClient(Long userId, String sessionId); +} Added: openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/IWebSession.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/IWebSession.java?rev=1712427&view=auto ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/IWebSession.java (added) +++ openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/IWebSession.java Tue Nov 3 22:25:34 2015 @@ -0,0 +1,24 @@ +/* + * 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. + */ +package org.apache.openmeetings; + +public interface IWebSession { + long getOmLanguage(); + void setLanguage(long languageId); +} Modified: openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentDao.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentDao.java?rev=1712427&r1=1711723&r2=1712427&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentDao.java (original) +++ openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentDao.java Tue Nov 3 22:25:34 2015 @@ -34,11 +34,12 @@ import javax.persistence.PersistenceCont import javax.persistence.TypedQuery; import org.apache.openmeetings.db.dao.basic.ConfigurationDao; -import org.apache.openmeetings.db.dao.calendar.IInvitationManager.MessageType; +import org.apache.openmeetings.db.dao.room.IInvitationManager; import org.apache.openmeetings.db.dao.room.RoomDao; import org.apache.openmeetings.db.dao.user.UserDao; import org.apache.openmeetings.db.entity.calendar.Appointment; import org.apache.openmeetings.db.entity.calendar.MeetingMember; +import org.apache.openmeetings.db.entity.room.Invitation.MessageType; import org.apache.openmeetings.db.entity.room.Room; import org.apache.openmeetings.db.util.TimezoneUtil; import org.red5.logging.Red5LoggerFactory; Modified: openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/LabelDao.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/LabelDao.java?rev=1712427&r1=1711723&r2=1712427&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/LabelDao.java (original) +++ openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/LabelDao.java Tue Nov 3 22:25:34 2015 @@ -19,6 +19,7 @@ package org.apache.openmeetings.db.dao.label; import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey; +import static org.apache.openmeetings.util.OpenmeetingsVariables.wicketApplicationName; import java.io.File; import java.io.InputStream; @@ -41,15 +42,17 @@ import javax.xml.parsers.SAXParserFactor import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.Predicate; +import org.apache.openmeetings.IApplication; +import org.apache.openmeetings.IWebSession; import org.apache.openmeetings.db.dao.IDataProviderDao; import org.apache.openmeetings.db.entity.label.StringLabel; import org.apache.openmeetings.util.OmFileHelper; import org.apache.openmeetings.util.XmlExport; -import org.apache.openmeetings.web.app.Application; -import org.apache.openmeetings.web.app.WebSession; +import org.apache.wicket.Application; import org.apache.wicket.ThreadContext; import org.apache.wicket.extensions.markup.html.repeater.util.SortParam; import org.apache.wicket.mock.MockWebResponse; +import org.apache.wicket.protocol.http.WebSession; import org.apache.wicket.protocol.http.mock.MockHttpServletRequest; import org.apache.wicket.protocol.http.mock.MockHttpSession; import org.apache.wicket.protocol.http.servlet.ServletWebRequest; @@ -84,7 +87,19 @@ public class LabelDao implements IDataPr public static final LinkedHashMap<Long, Locale> languages = new LinkedHashMap<Long, Locale>(); //TODO hide it and return unmodifiable map public static final ConcurrentHashMap<Locale, List<StringLabel>> labelCache = new ConcurrentHashMap<Locale, List<StringLabel>>(); public static final Set<String> keys = new HashSet<String>(); + private static Class<?> APP = null; + public List<Map<String, Object>> getStrings(Long language_id, int start, int count) { + List<Map<String, Object>> result = new ArrayList<Map<String, Object>>(); + for (int i = 0; i < count; ++i) { + Map<String, Object> map = new HashMap<>(); + map.put("id", start + i); + map.put("value", getString(start + i, language_id)); + result.add(map); + } + return result; + } + private static void storeLanguages() throws Exception { Document d = XmlExport.createDocument(); Element r = XmlExport.createRoot(d, "language"); @@ -104,24 +119,14 @@ public class LabelDao implements IDataPr labelCache.put(l, new ArrayList<StringLabel>()); } - public List<Map<String, Object>> getStrings(Long language_id, int start, int count) { - List<Map<String, Object>> result = new ArrayList<Map<String, Object>>(); - for (int i = 0; i < count; ++i) { - Map<String, Object> map = new HashMap<String, Object>(); - map.put("id", start + i); - map.put("value", getString(start + i, language_id)); - result.add(map); - } - return result; - } - - public String getString(long fieldValuesId, long langId) { - Application a = null; + public static IApplication getApp(long langId) { + IApplication a = null; if (Application.exists()) { - a = Application.get(); + a = (IApplication)Application.get(); } else { - a = (Application)Application.get(Application.getAppName()); - ThreadContext.setApplication(a); + Application app = Application.get(wicketApplicationName); + ThreadContext.setApplication(app); + a = (IApplication)Application.get(wicketApplicationName); } if (ThreadContext.getRequestCycle() == null) { ServletWebRequest req = new ServletWebRequest(new MockHttpServletRequest((Application)a, new MockHttpSession(a.getServletContext()), a.getServletContext()), ""); @@ -130,10 +135,18 @@ public class LabelDao implements IDataPr } if (ThreadContext.getSession() == null) { WebSession s = WebSession.get(); - s.setLanguage(langId); + ((IWebSession)s).setLanguage(langId); ThreadContext.setSession(s); } - return Application.getString(fieldValuesId, langId); + return a; + } + + public String getString(long fieldValuesId, long langId) { + return getApp(langId).getOmString(fieldValuesId, langId); + } + + public String getString(String key, long langId) { + return getApp(langId).getOmString(key, langId); } private static File getLangFile() { @@ -143,6 +156,7 @@ public class LabelDao implements IDataPr public static void initLanguageMap() { SAXReader reader = new SAXReader(); try { + APP = Class.forName("org.apache.openmeetings.web.app.Application"); //FIXME HACK to resolve package dependencies Document document = reader.read(getLangFile()); Element root = document.getRootElement(); languages.clear(); @@ -175,13 +189,13 @@ public class LabelDao implements IDataPr for (StringLabel sl : labels) { r.addElement(ENTRY_ELEMENT).addAttribute(KEY_ATTR, sl.getKey()).addCDATA(sl.getValue()); } - URL u = Application.class.getResource(getLabelFileName(l)); + URL u = APP.getResource(getLabelFileName(l)); XmlExport.toXml(new File(u.toURI()), d); } public static void upload(Locale l, InputStream is) throws Exception { List<StringLabel> labels = getLabels(l, is); - URL u = Application.class.getResource(getLabelFileName(Locale.ENGLISH)); //get the URL of existing resource + URL u = APP.getResource(getLabelFileName(Locale.ENGLISH)); //get the URL of existing resource File el = new File(u.toURI()); File f = new File(el.getParentFile(), getLabelFileName(l)); if (!f.exists()) { @@ -195,7 +209,7 @@ public class LabelDao implements IDataPr List<StringLabel> labels = new ArrayList<StringLabel>(); InputStream is = null; try { - is = Application.class.getResourceAsStream(getLabelFileName(l)); + is = APP.getResourceAsStream(getLabelFileName(l)); labels = getLabels(l, is); } catch (Exception e) { log.error("Error reading resources document", e); @@ -380,7 +394,7 @@ public class LabelDao implements IDataPr } labelCache.remove(l); try { - URL u = Application.class.getResource(getLabelFileName(l)); + URL u = APP.getResource(getLabelFileName(l)); if (u != null) { File f = new File(u.toURI()); if (f.exists()) { Added: openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/IInvitationManager.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/IInvitationManager.java?rev=1712427&view=auto ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/IInvitationManager.java (added) +++ openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/IInvitationManager.java Tue Nov 3 22:25:34 2015 @@ -0,0 +1,53 @@ +/* + * 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. + */ +package org.apache.openmeetings.db.dao.room; + +import java.util.Date; + +import org.apache.openmeetings.db.entity.calendar.Appointment; +import org.apache.openmeetings.db.entity.calendar.MeetingMember; +import org.apache.openmeetings.db.entity.room.Invitation; +import org.apache.openmeetings.db.entity.room.Invitation.MessageType; +import org.apache.openmeetings.db.entity.room.Invitation.Valid; +import org.apache.openmeetings.db.entity.room.Room; +import org.apache.openmeetings.db.entity.user.User; + +public interface IInvitationManager { + void processInvitation(Appointment a, MeetingMember member, MessageType type); + + void processInvitation(Appointment a, MeetingMember mm, MessageType type, boolean sendMail); + + Invitation getInvitation(Invitation _invitation, User inveetee, Room room + , boolean isPasswordProtected, String invitationpass, Valid valid, + User createdBy, Long languageId, Date gmtTimeStart, Date gmtTimeEnd + , Appointment appointment); + + Invitation getInvitation(User inveetee, Room room + , boolean isPasswordProtected, String invitationpass, Valid valid, + User createdBy, Long languageId, Date gmtTimeStart, Date gmtTimeEnd + , Appointment appointment); + + void sendInvitionLink(Invitation i, MessageType type, String subject, String message, boolean ical) throws Exception ; + + Object checkInvitationPass(String hashCode, String pass); + + Object getInvitationByHashCode(String hashCode, boolean hidePass); + + boolean sendInvitationReminderSMS(String phone, String subject, long languageId); +} Modified: openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/IUserManager.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/IUserManager.java?rev=1712427&r1=1711723&r2=1712427&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/IUserManager.java (original) +++ openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/IUserManager.java Tue Nov 3 22:25:34 2015 @@ -30,6 +30,7 @@ import java.util.TimeZone; import org.apache.openmeetings.db.entity.user.State; import org.apache.openmeetings.db.entity.user.User; import org.apache.openmeetings.db.entity.user.User.Right; +import org.apache.openmeetings.db.entity.user.Userdata; //FIXME HACK to bypass cross project compilation public interface IUserManager { @@ -51,4 +52,13 @@ public interface IUserManager { Long getLanguage(Locale loc); State getCountry(Locale loc); User loginOAuth(Map<String, String> params, long serverId) throws IOException, NoSuchAlgorithmException; + + /** TODO FIXME seems to be unused **/ + Boolean kickUserByStreamId(String SID, Long roomId); + + Boolean kickUserByPublicSID(String SID, String publicSID); + + Long logout(String SID, long userId); + + List<Userdata> getUserdataDashBoard(Long userId); } Modified: openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java?rev=1712427&r1=1711723&r2=1712427&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java (original) +++ openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java Tue Nov 3 22:25:34 2015 @@ -51,7 +51,7 @@ import org.apache.openmeetings.db.entity import org.apache.openmeetings.db.entity.user.User.Type; import org.apache.openmeetings.db.util.TimezoneUtil; import org.apache.openmeetings.db.util.UserHelper; -import org.apache.openmeetings.util.AuthLevelUtil; +import org.apache.openmeetings.db.util.AuthLevelUtil; import org.apache.openmeetings.util.DaoHelper; import org.apache.openmeetings.util.OmException; import org.apache.openmeetings.util.crypt.ManageCryptStyle; Modified: openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Invitation.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Invitation.java?rev=1712427&r1=1711723&r2=1712427&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Invitation.java (original) +++ openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Invitation.java Tue Nov 3 22:25:34 2015 @@ -51,6 +51,12 @@ import org.apache.openmeetings.db.entity public class Invitation implements Serializable { private static final long serialVersionUID = 1153321347974705506L; + public enum MessageType { + Create + , Update + , Cancel + } + public enum Valid { OneTime , Period Copied: openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/AuthLevelUtil.java (from r1711723, openmeetings/branches/3.1.x/src/util/java/org/apache/openmeetings/util/AuthLevelUtil.java) URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/AuthLevelUtil.java?p2=openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/AuthLevelUtil.java&p1=openmeetings/branches/3.1.x/src/util/java/org/apache/openmeetings/util/AuthLevelUtil.java&r1=1711723&r2=1712427&rev=1712427&view=diff ============================================================================== --- openmeetings/branches/3.1.x/src/util/java/org/apache/openmeetings/util/AuthLevelUtil.java (original) +++ openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/AuthLevelUtil.java Tue Nov 3 22:25:34 2015 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.openmeetings.util; +package org.apache.openmeetings.db.util; import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey; Copied: openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/FormatHelper.java (from r1711723, openmeetings/branches/3.1.x/src/web/java/org/apache/openmeetings/web/util/FormatHelper.java) URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/FormatHelper.java?p2=openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/FormatHelper.java&p1=openmeetings/branches/3.1.x/src/web/java/org/apache/openmeetings/web/util/FormatHelper.java&r1=1711723&r2=1712427&rev=1712427&view=diff ============================================================================== --- openmeetings/branches/3.1.x/src/web/java/org/apache/openmeetings/web/util/FormatHelper.java (original) +++ openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/FormatHelper.java Tue Nov 3 22:25:34 2015 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.openmeetings.web.util; +package org.apache.openmeetings.db.util; import static org.apache.commons.lang3.StringEscapeUtils.escapeHtml4; Added: openmeetings/branches/3.1.x/openmeetings-db/src/site/site.xml URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-db/src/site/site.xml?rev=1712427&view=auto ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-db/src/site/site.xml (added) +++ openmeetings/branches/3.1.x/openmeetings-db/src/site/site.xml Tue Nov 3 22:25:34 2015 @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed 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/DECORATION/1.6.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/DECORATION/1.6.0 http://maven.apache.org/xsd/decoration-1.6.0.xsd"; + name="Apache OpenMeetings Project"> + + <body> + <menu ref="parent"/> + <menu name="Project"> + <item name="About" href="/index.html" /> + <item name="Info" href="/project-info.html" /> + <item name="Summary" href="/project-summary.html" /> + <item name="License" href="/license.html" /> + <item name="Dependencies" href="/dependencies.html" /> + <item name="Dependency Convergence" href="/dependency-convergence.html" /> + <item name="RAT Report" href="/rat-report.html" /> + <item name="JavaDoc" href="/apidocs/index.html" target="_blank" /> + </menu> + </body> +</project> Propchange: openmeetings/branches/3.1.x/openmeetings-flash/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Tue Nov 3 22:25:34 2015 @@ -0,0 +1,5 @@ +target +.project +.classpath +.settings + Added: openmeetings/branches/3.1.x/openmeetings-flash/openlaszlo.xml URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/openlaszlo.xml?rev=1712427&view=auto ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-flash/openlaszlo.xml (added) +++ openmeetings/branches/3.1.x/openmeetings-flash/openlaszlo.xml Tue Nov 3 22:25:34 2015 @@ -0,0 +1,133 @@ +<?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. + --> +<!DOCTYPE project> +<project name="openmeetings" basedir="./" default="client.only" + xmlns="antlib:org.apache.tools.ant" + xmlns:rat="antlib:org.apache.rat.anttasks" + xmlns:ivy="antlib:org.apache.ivy.ant" + xmlns:artifact="antlib:org.apache.maven.artifact.ant" + > + <property name="laszlo46.home" value="${basedir}/openlaszlo46" /> + <!-- LPS Properties --> + <property name="out.dir.swf" value="${dist.webapps.dir}/public" /> + <property name="flex.src.dir" value="${webcontent.base.dir}/flex" /> + <property name="laszlo.as3.src.dir" value="${webcontent.base.dir}/swf10" /> + <path id="laszlo46.lib"> + <fileset dir="${laszlo46.home}/WEB-INF/lib" includes="*.jar" /> + </path> + + <target name="client.only" depends="compile.flex, compile.laszlo.networktesting" unless="client-already-built"> + <property name="client-already-built" value="true"/> + </target> + + <target name="client.debug.only" depends="compile.flex.debug,compile.laszlo.networktesting.debug" /> + + <target name="-compile.flash" description="compile flash application"> + <!-- commented for now + <echo message="flash.src.dir == '${flash.src.dir}'" /> + <echo message="classpathref == '${flash.classpath.ref}'" /> + <echo message="laszlo.home == '${flash.lps.home}'" /> + <echo message="flash.debug == '${flash.debug}'" /> + <echo message="laszlo.proxied == '${laszlo.proxied}'" /> + <echo message="flash.runtime == '${flash.runtime}'" /> + <echo message="out.dir.swf == '${out.dir.swf}'" /> + <echo message="flash.main.file == '${flash.main.file}'" /> + <echo message="flash.out.file == '${flash.out.file}'" /> + --> + <java classname="org.openlaszlo.compiler.Main" fork="true" newenvironment="true" failonerror="true" dir="${flash.src.dir}" classpathref="${flash.classpath.ref}"> + <jvmarg value="-DLPS_HOME=${flash.lps.home}" /> + <jvmarg value="-Dlzdebug=false" /> + <jvmarg value="-Dlzproxied=${laszlo.proxied}" /> + <jvmarg value="-Xms512M" /> + <jvmarg value="-Xmx512M" /> + <arg line="--runtime=${flash.runtime} ${flash.debug} --dir "${out.dir.swf}" --onerror warn ${flash.main.file} -o ${flash.out.file}" /> + </java> + </target> + + <target name="compile.laszlo.networktesting" depends="compile.laszlo.networktesting.debug"> + <antcall target="-compile.flash" inheritAll="true" inheritRefs="true"> + <param name="flash.classpath.ref" value="laszlo46.lib" /> + <param name="flash.src.dir" value="${laszlo.as3.src.dir}/networkTesting" /> + <param name="flash.lps.home" value="${laszlo46.home}" /> + <param name="flash.runtime" value="swf10" /> + <param name="flash.main.file" value="networktesting.lzx" /> + <param name="flash.out.file" value="networktesting.swf10.swf" /> + <param name="flash.debug" value="" /> + </antcall> + </target> + + <target name="compile.laszlo.networktesting.debug" depends="-retrieve-openlaszlo46"> + <antcall target="-compile.flash" inheritAll="true" inheritRefs="true"> + <param name="flash.classpath.ref" value="laszlo46.lib" /> + <param name="flash.src.dir" value="${laszlo.as3.src.dir}/networkTesting" /> + <param name="flash.lps.home" value="${laszlo46.home}" /> + <param name="flash.runtime" value="swf10" /> + <param name="flash.main.file" value="networktesting.lzx" /> + <param name="flash.out.file" value="networktestingdebug.swf10.swf" /> + <param name="flash.debug" value="--debug" /> + </antcall> + </target> + + <condition property="isWindows"> + <os family="windows" /> + </condition> + + <condition property="isUnix"> + <os family="unix" /> + </condition> + + <target name="if_windows" if="isWindows"> + <property name="mxmlc_bin" value="mxmlc.exe" /> + </target> + + <target name="if_unix" if="isUnix"> + <property name="mxmlc_bin" value="mxmlc" /> + </target> + + <target name="-compile.flex" description="compile flash application" depends="if_windows, if_unix"> + <exec dir="${flex.src.dir}" executable="${laszlo46.home}/WEB-INF/flexsdk/4.6.0/bin/${mxmlc_bin}"> + <arg value="main.mxml"/> + <arg line="-output ${out.dir.swf}/main.swf"/> + <env key="PLAYERGLOBAL_HOME" value="${laszlo46.home}/WEB-INF/flexsdk/4.6.0/frameworks/libs/player"/> + </exec> + </target> + + <target name="compile.flex" depends="compile.flex.debug"> + <antcall target="-compile.flex" inheritAll="true" inheritRefs="true"/> + </target> + + <target name="compile.flex.debug" depends="-retrieve-openlaszlo46"> + <!--antcall target="-compile.flex" inheritAll="true" inheritRefs="true"/--> + </target> + + <target name="-availability-check" description="Check which libraries need to be retrieved"> + <available file="${laszlo46.home}/WEB-INF/lib" type="dir" property="laszlo46.installed" /> + </target> + <target name="-retrieve-openlaszlo46" unless="laszlo46.installed" description="Retrieves the libraries if needed" depends="-availability-check"> + <mkdir dir="${openlaszlo}"/> + <get src="https://dl.bintray.com/openmeetings/maven/org/openlaszlo/openlaszlo/4.9.5/openlaszlo-4.9.5.tgz"; + dest="${openlaszlo}" usetimestamp="true"/> + <untar src="${openlaszlo}/openlaszlo-4.9.5.tgz" dest="${openlaszlo}" compression="gzip" /> + <chmod dir="${laszlo46.home}/WEB-INF/flexsdk" perm="755" includes="**/mxmlc*" /> + <delete> + <fileset dir="${openlaszlo}" includes="openlaszlo*.tgz"/> + </delete> + </target> +</project> Added: openmeetings/branches/3.1.x/openmeetings-flash/pom.xml URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/pom.xml?rev=1712427&view=auto ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-flash/pom.xml (added) +++ openmeetings/branches/3.1.x/openmeetings-flash/pom.xml Tue Nov 3 22:25:34 2015 @@ -0,0 +1,109 @@ +<?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-flash</artifactId> + <!-- packaging>swf</packaging--> + <packaging>jar</packaging> + <name>Openmeetings Flash</name> + <description>TODO</description> + <properties> + <openlaszlo>${project.basedir}/openlaszlo</openlaszlo> + <laszlo46.home>${openlaszlo}/openlaszlo46</laszlo46.home> + <out.dir.swf>${project.build.directory}</out.dir.swf> + <webcontent.base.dir>${project.basedir}/src/main</webcontent.base.dir> + <site.basedir>${project.parent.basedir}</site.basedir> + <skip.site.copy>false</skip.site.copy> + </properties> + <build> + <!-- sourceDirectory>src/main/flex</sourceDirectory--> + + <plugins> + <plugin> + <groupId>org.apache.rat</groupId> + <artifactId>apache-rat-plugin</artifactId> + <configuration> + <excludes> + <exclude>openlaszlo/**</exclude> + </excludes> + </configuration> + </plugin> + <!-- plugin> + <groupId>net.flexmojos.oss</groupId> + <artifactId>flexmojos-maven-plugin</artifactId> + <version>7.1.0-SNAPSHOT</version> + <extensions>true</extensions> + <configuration> + <sourceFile>main.mxml</sourceFile> + </configuration> + <dependencies> + <dependency> + <groupId>net.flexmojos.oss</groupId> + <artifactId>flexmojos-threadlocaltoolkit-wrapper</artifactId> + <version>7.1.0-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.apache.flex</groupId> + <artifactId>compiler</artifactId> + <version>4.12.1.20140427</version> + <type>pom</type> + </dependency> + </dependencies> + </plugin--> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <phase>package</phase> + <configuration> + <exportAntProperties>true</exportAntProperties> + <target> + <ant antfile="${basedir}/openlaszlo.xml" target="client.only"/> + </target> + <skip>${om.quick.build}</skip> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + <!-- dependencies> + <dependency> + <groupId>org.apache.flex</groupId> + <artifactId>framework</artifactId> + <version>4.12.1.20140427</version> + <type>pom</type> + </dependency> + <dependency> + <groupId>com.adobe.flash.framework</groupId> + <artifactId>playerglobal</artifactId> + <version>11.9</version> + <type>swc</type> + </dependency> + </dependencies--> +</project> Added: openmeetings/branches/3.1.x/openmeetings-flash/src/site/site.xml URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/site/site.xml?rev=1712427&view=auto ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-flash/src/site/site.xml (added) +++ openmeetings/branches/3.1.x/openmeetings-flash/src/site/site.xml Tue Nov 3 22:25:34 2015 @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed 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/DECORATION/1.6.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/DECORATION/1.6.0 http://maven.apache.org/xsd/decoration-1.6.0.xsd"; + name="Apache OpenMeetings Project"> + + <body> + <menu ref="parent"/> + <menu name="Project"> + <item name="About" href="/index.html" /> + <item name="Info" href="/project-info.html" /> + <item name="Summary" href="/project-summary.html" /> + <item name="License" href="/license.html" /> + <item name="Dependencies" href="/dependencies.html" /> + <item name="Dependency Convergence" href="/dependency-convergence.html" /> + <item name="RAT Report" href="/rat-report.html" /> + <item name="JavaDoc" href="/apidocs/index.html" target="_blank" /> + </menu> + </body> +</project> Propchange: openmeetings/branches/3.1.x/openmeetings-install/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Tue Nov 3 22:25:34 2015 @@ -0,0 +1,5 @@ +target +.project +.classpath +.settings + Added: openmeetings/branches/3.1.x/openmeetings-install/pom.xml URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-install/pom.xml?rev=1712427&view=auto ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-install/pom.xml (added) +++ openmeetings/branches/3.1.x/openmeetings-install/pom.xml Tue Nov 3 22:25:34 2015 @@ -0,0 +1,56 @@ +<?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-install</artifactId> + <packaging>jar</packaging> + <name>Openmeetings Install</name> + <description>TODO</description> + <properties> + <commons-cli.version>1.3.1</commons-cli.version> + <site.basedir>${project.parent.basedir}</site.basedir> + <skip.site.copy>false</skip.site.copy> + </properties> + <dependencies> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-core</artifactId> + </dependency> + <dependency> + <groupId>org.apache.openmeetings</groupId> + <artifactId>openmeetings-util</artifactId> + </dependency> + <dependency> + <groupId>org.apache.openmeetings</groupId> + <artifactId>openmeetings-db</artifactId> + </dependency> + <dependency> + <groupId>commons-cli</groupId> + <artifactId>commons-cli</artifactId> + <version>${commons-cli.version}</version> + </dependency> + </dependencies> +</project> Modified: openmeetings/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupExport.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupExport.java?rev=1712427&r1=1711723&r2=1712427&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupExport.java (original) +++ openmeetings/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupExport.java Tue Nov 3 22:25:34 2015 @@ -73,7 +73,7 @@ import org.apache.openmeetings.db.entity import org.apache.openmeetings.db.entity.user.State; import org.apache.openmeetings.db.entity.user.User; import org.apache.openmeetings.db.entity.user.User.Right; -import org.apache.openmeetings.util.AuthLevelUtil; +import org.apache.openmeetings.db.util.AuthLevelUtil; import org.apache.openmeetings.util.CalendarPatterns; import org.apache.openmeetings.util.OmFileHelper; import org.red5.logging.Red5LoggerFactory; Modified: openmeetings/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Admin.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Admin.java?rev=1712427&r1=1711723&r2=1712427&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Admin.java (original) +++ openmeetings/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Admin.java Tue Nov 3 22:25:34 2015 @@ -63,6 +63,7 @@ import org.apache.openmeetings.installat import org.apache.openmeetings.installation.InstallationConfig; import org.apache.openmeetings.installation.InstallationDocumentHandler; import org.apache.openmeetings.util.CalendarPatterns; +import org.apache.openmeetings.util.ConnectionProperties; import org.apache.openmeetings.util.ImportHelper; import org.apache.openmeetings.util.OMContextListener; import org.apache.openmeetings.util.OmFileHelper; Modified: openmeetings/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/cli/ConnectionPropertiesPatcher.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/cli/ConnectionPropertiesPatcher.java?rev=1712427&r1=1711723&r2=1712427&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/cli/ConnectionPropertiesPatcher.java (original) +++ openmeetings/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/cli/ConnectionPropertiesPatcher.java Tue Nov 3 22:25:34 2015 @@ -33,7 +33,8 @@ import javax.xml.xpath.XPathFactory; import org.apache.commons.lang3.StringEscapeUtils; import org.apache.commons.lang3.StringUtils; -import org.apache.openmeetings.cli.ConnectionProperties.DbType; +import org.apache.openmeetings.util.ConnectionProperties.DbType; +import org.apache.openmeetings.util.ConnectionProperties; import org.apache.openmeetings.util.OmFileHelper; import org.w3c.dom.Attr; import org.w3c.dom.Document; Propchange: openmeetings/branches/3.1.x/openmeetings-screenshare/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Tue Nov 3 22:25:34 2015 @@ -0,0 +1,5 @@ +target +.project +.classpath +.settings + Added: openmeetings/branches/3.1.x/openmeetings-screenshare/pom.xml URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-screenshare/pom.xml?rev=1712427&view=auto ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-screenshare/pom.xml (added) +++ openmeetings/branches/3.1.x/openmeetings-screenshare/pom.xml Tue Nov 3 22:25:34 2015 @@ -0,0 +1,380 @@ +<?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-screenshare</artifactId> + <packaging>jar</packaging> + <name>Openmeetings Screen Sharing applet</name> + <description>A File to grab a screen and send it to a Server</description> + <properties> + <keystore.location>${project.build.directory}/screensharing_sign.keystore</keystore.location> + <key.password>secret</key.password> + <keystore.password>secret</keystore.password> + <keystore.type>jks</keystore.type> + <key.alias>screen</key.alias> + <site.basedir>${project.parent.basedir}</site.basedir> + <skip.site.copy>false</skip.site.copy> + </properties> + <dependencies> + <dependency> + <groupId>org.red5</groupId> + <artifactId>red5-client</artifactId> + </dependency> + <dependency> + <groupId>org.apache.mina</groupId> + <artifactId>mina-core</artifactId> + <version>2.0.8</version> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-core</artifactId> + </dependency> + </dependencies> + <build> + <plugins> + <!-- plugin> FIXME review after http://jira.codehaus.org/browse/MWEBSTART-266 is fixed + <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>$protocol</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>$publicSid</token> + <value>*</value> + </replacement> + <replacement> + <token>$labels</token> + <value>*</value> + </replacement> + <replacement> + <token>$defaultQuality</token> + <value>*</value> + </replacement> + <replacement> + <token>$defaultFps</token> + <value>*</value> + </replacement> + <replacement> + <token>$showFps</token> + <value>*</value> + </replacement> + <replacement> + <token>$allowRemote</token> + <value>*</value> + </replacement> + <replacement> + <token>$allowRecording</token> + <value>*</value> + </replacement> + <replacement> + <token>$allowPublishing</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> + <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.codehaus.mojo</groupId> + <artifactId>webstart-maven-plugin</artifactId> + <executions> + <!-- execution> FIXME review after http://jira.codehaus.org/browse/MWEBSTART-266 is fixed + <id>generate-jnlp-template-for-signing</id> + <phase>process-resources</phase> + <goals> + <goal>jnlp</goal> + </goals> + <configuration> + <excludeTransitive>false</excludeTransitive> + <dependencies> + <includes> + <include>commons-codec:commons-codec</include> + <include>commons-beanutils:commons-beanutils</include> + <include>commons-collections:commons-collections</include> + <include>org.apache.commons:commons-lang3</include> + <include>org.apache.httpcomponents:httpclient</include> + <include>org.apache.httpcomponents:httpcore</include> + <include>org.bouncycastle:bcprov-jdk15on</include> + <include>net.sf.ehcache:ehcache-core</include> + <include>org.slf4j:slf4j-api</include> + <include>org.slf4j:jcl-over-slf4j</include> + <include>ch.qos.logback:logback-core</include> + <include>ch.qos.logback:logback-classic</include> + <include>org.apache.mina:mina-core</include> + <include>org.red5:red5-io</include> + <include>org.red5:red5-server-common</include> + <include>org.red5:red5-client</include> + <include>org.springframework:spring-context</include> + <include>org.springframework:spring-core</include> + <include>org.springframework:spring-beans</include> + <include>org.quartz-scheduler:quartz</include> + </includes> + </dependencies> + <jnlp> + <inputTemplateResourcePath>${project.build.directory}</inputTemplateResourcePath> + <inputTemplate>APPLICATION_TEMPLATE.jnlp</inputTemplate> + <outputFile>APPLICATION_TEMPLATE.jnlp</outputFile> + <mainClass>org.apache.openmeetings.screen.webstart.CoreScreenShare</mainClass> + </jnlp> + <makeArchive>false</makeArchive> + </configuration> + </execution--> + <execution> + <id>generate-jnlp-and-sign-libs</id> + <phase>package</phase> + <goals> + <goal>jnlp</goal> + </goals> + <configuration> + <excludeTransitive>false</excludeTransitive> + <dependencies> + <includes> + <include>commons-codec:commons-codec</include> + <include>commons-beanutils:commons-beanutils</include> + <include>commons-collections:commons-collections</include> + <include>org.apache.commons:commons-lang3</include> + <include>org.apache.httpcomponents:httpclient</include> + <include>org.apache.httpcomponents:httpcore</include> + <include>org.bouncycastle:bcprov-jdk15on</include> + <include>net.sf.ehcache:ehcache-core</include> + <include>org.slf4j:slf4j-api</include> + <include>org.slf4j:jcl-over-slf4j</include> + <include>ch.qos.logback:logback-core</include> + <include>ch.qos.logback:logback-classic</include> + <include>org.apache.mina:mina-core</include> + <include>org.red5:red5-io</include> + <include>org.red5:red5-server-common</include> + <include>org.red5:red5-client</include> + <include>org.springframework:spring-context</include> + <include>org.springframework:spring-core</include> + <include>org.springframework:spring-beans</include> + <include>org.quartz-scheduler:quartz</include> + </includes> + </dependencies> + + <jnlp> + <inputTemplateResourcePath>${project.basedir}/src/main/jnlp/templates</inputTemplateResourcePath> + <inputTemplate>template.jnlp</inputTemplate> + <outputFile>APPLICATION.jnlp</outputFile> + <mainClass>org.apache.openmeetings.screen.webstart.CoreScreenShare</mainClass> + </jnlp> + + <sign> + <keystore>${keystore.location}</keystore> + <keypass>${key.password}</keypass> + <storepass>${keystore.password}</storepass> + <storetype>${keystore.type}</storetype> + <alias>${key.alias}</alias> + + <validity>365</validity> + <dnameCn>Sebastian Wagner</dnameCn> + <dnameOu>technology</dnameOu> + <dnameO>openmeetings.apache.org</dnameO> + <!-- dnameL>Location</dnameL> + <dnameSt>State</dnameSt--> + <dnameC>DE</dnameC> + + <keystoreConfig> + <delete>false</delete> + <gen>true</gen> + </keystoreConfig> + <verify>false</verify> <!-- due to self signed certificate --> + </sign> + <unsign>true</unsign> + <outputJarVersions>false</outputJarVersions> + <makeArchive>false</makeArchive> + <verbose>true</verbose> + </configuration> + </execution> + </executions> + </plugin> + <!-- plugin> FIXME review after http://jira.codehaus.org/browse/MWEBSTART-266 is fixed + <groupId>org.codehaus.mojo</groupId> + <artifactId>truezip-maven-plugin</artifactId> + <executions> + <execution> + <id>move-jnlp-template</id> + <goals> + <goal>move</goal> + </goals> + <phase>verify</phase> + <configuration> + <from>${project.build.directory}/jnlp/APPLICATION_TEMPLATE.jnlp</from> + <to>${project.build.directory}/jnlp/${project.build.finalName}.jar/JNLP-INF/APPLICATION_TEMPLATE.jnlp</to> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jarsigner-plugin</artifactId> + <executions> + <execution> + <id>sign</id> + <phase>verify</phase> + <goals> + <goal>sign</goal> + </goals> + </execution> + </executions> + <configuration> + <archiveDirectory>${project.build.directory}/jnlp</archiveDirectory> + <includes> + <include>${project.build.finalName}.jar</include> + </includes> + <keystore>${keystore.location}</keystore> + <keypass>${key.password}</keypass> + <storepass>${keystore.password}</storepass> + <storetype>${keystore.type}</storetype> + <alias>${key.alias}</alias> + <removeExistingSignatures>true</removeExistingSignatures> + <verbose>true</verbose> + </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> + Copied: openmeetings/branches/3.1.x/openmeetings-screenshare/src/main/jnlp/templates/template.jnlp (from r1711723, openmeetings/branches/3.1.x/src/screenshare.vm) URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-screenshare/src/main/jnlp/templates/template.jnlp?p2=openmeetings/branches/3.1.x/openmeetings-screenshare/src/main/jnlp/templates/template.jnlp&p1=openmeetings/branches/3.1.x/src/screenshare.vm&r1=1711723&r2=1712427&rev=1712427&view=diff ============================================================================== --- openmeetings/branches/3.1.x/src/screenshare.vm (original) +++ openmeetings/branches/3.1.x/openmeetings-screenshare/src/main/jnlp/templates/template.jnlp Tue Nov 3 22:25:34 2015 @@ -17,15 +17,15 @@ specific language governing permissions and limitations under the License. --> -<jnlp spec='1.0+' codebase='$codebase'> - <information> - <title>Screen Sharing Application</title> - <vendor>$APP_NAME</vendor> - <homepage>http://openmeetings.apache.org/</homepage> +<jnlp spec="1.0+" codebase="$codebase"> + <information> + <title>$informationTitle</title> + <vendor>$applicationName</vendor> + <homepage>$informationHomepage</homepage> <icon href="icon.jpg" /> <icon kind="splash" href="splashicon.jpg" /> - <description>ScreenViewer Client Application</description> - <description kind="short">A File to grab a screen and send it to a Server</description> + <description>$informationTitle</description> + <description kind="short">$informationDescription</description> <offline-allowed/> </information> <security> @@ -35,7 +35,7 @@ <j2se version='1.7+'/> $dependencies </resources> - <application-desc main-class='org.apache.openmeetings.screen.webstart.CoreScreenShare'> + <application-desc main-class='$mainClass'> <argument>$protocol</argument> <argument>$host</argument> <argument>$port</argument> Added: openmeetings/branches/3.1.x/openmeetings-screenshare/src/site/site.xml URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-screenshare/src/site/site.xml?rev=1712427&view=auto ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-screenshare/src/site/site.xml (added) +++ openmeetings/branches/3.1.x/openmeetings-screenshare/src/site/site.xml Tue Nov 3 22:25:34 2015 @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed 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/DECORATION/1.6.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/DECORATION/1.6.0 http://maven.apache.org/xsd/decoration-1.6.0.xsd"; + name="Apache OpenMeetings Project"> + + <body> + <menu ref="parent"/> + <menu name="Project"> + <item name="About" href="/index.html" /> + <item name="Info" href="/project-info.html" /> + <item name="Summary" href="/project-summary.html" /> + <item name="License" href="/license.html" /> + <item name="Dependencies" href="/dependencies.html" /> + <item name="Dependency Convergence" href="/dependency-convergence.html" /> + <item name="RAT Report" href="/rat-report.html" /> + <item name="JavaDoc" href="/apidocs/index.html" target="_blank" /> + </menu> + </body> +</project> Propchange: openmeetings/branches/3.1.x/openmeetings-server/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Tue Nov 3 22:25:34 2015 @@ -0,0 +1,5 @@ +target +.project +.classpath +.settings + Added: openmeetings/branches/3.1.x/openmeetings-server/pom.xml URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-server/pom.xml?rev=1712427&view=auto ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-server/pom.xml (added) +++ openmeetings/branches/3.1.x/openmeetings-server/pom.xml Tue Nov 3 22:25:34 2015 @@ -0,0 +1,319 @@ +<?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> + <server.dir>${project.build.directory}/red5-server</server.dir> + <languages.dir>../openmeetings-web/src/main/java/org/apache/openmeetings/web/app</languages.dir> + <assembly.finalName>${project.build.finalName}</assembly.finalName> + <assembly.descriptor>server</assembly.descriptor> + <dist.dir>${project.build.directory}/${assembly.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> + <red5-server-file.dir>red5-server</red5-server-file.dir> + </properties> + <url>http://openmeetings.apache.org</url> + <scm> + <connection>scm:svn:https://svn.apache.org/repos/asf/openmeetings/trunk/singlewebapp</connection> + <developerConnection>scm:svn:https://svn.apache.org/repos/asf/openmeetings/trunk/singlewebapp</developerConnection> + <url>https://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp</url> + <tag>HEAD</tag> + </scm> + <profiles> + <profile> + <id>Quick</id> + <activation> + <property> + <name>quick</name> + <value>true</value> + </property> + </activation> + <properties> + <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/lib/openmeetings*</include> + <include>WEB-INF/classes/META-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> + <activation> + <property> + <name>unpacked</name> + <value>true</value> + </property> + </activation> + <properties> + <maven.test.skip>true</maven.test.skip> + <assembly.finalName>server</assembly.finalName> + <assembly.descriptor>unpacked</assembly.descriptor> + </properties> + </profile> + <profile> + <id>prepare-red5-server</id> + <activation> + <file> + <missing>red5-server/red5-server-1.0.7-SNAPSHOT-server.zip</missing> <!-- TODO should be in-sync with global property --> + </file> + </activation> + <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>${red5-server-file.dir}</toDir> + <skip>${red5-server.dwnd.skip}</skip> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> + <build> + <plugins> + <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>${red5-server-file.dir}/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.codehaus.mojo</groupId> + <artifactId>xml-maven-plugin</artifactId> + <executions> + <execution> + <id>generate-errors-doc</id> + <phase>generate-sources</phase> + <goals> + <goal>transform</goal> + </goals> + <configuration> + <transformationSets> + <transformationSet> + <dir>${languages.dir}</dir> + <includes> + <include>errorvalues.xml</include> + </includes> + <stylesheet>src/site/stylesheets/errortable.xsl</stylesheet> + <outputDir>${basedir}/src/site/xdoc</outputDir> + <parameters> + <parameter> + <name>languagesDir</name> + <value>${project.baseUri}/${languages.dir}</value> + </parameter> + </parameters> + </transformationSet> + </transformationSets> + <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> + <tarLongFileMode>gnu</tarLongFileMode> + </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> + <pluginExecution> + <pluginExecutionFilter> + <groupId>org.codehaus.mojo</groupId> + <artifactId>xml-maven-plugin</artifactId> + <versionRange>[1.0,)</versionRange> + <goals> + <goal>transform</goal> + </goals> + </pluginExecutionFilter> + <action> + <ignore></ignore> + </action> + </pluginExecution> + <pluginExecution> + <pluginExecutionFilter> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-site-plugin</artifactId> + <versionRange>[3.3,)</versionRange> + <goals> + <goal>site</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>
