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=1714149&r1=1714148&r2=1714149&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 Fri Nov 13 01:24:41 2015 @@ -51,7 +51,7 @@ import org.apache.openmeetings.db.dao.se import org.apache.openmeetings.db.dao.server.OAuth2Dao; import org.apache.openmeetings.db.dao.server.ServerDao; import org.apache.openmeetings.db.dao.server.SessiondataDao; -import org.apache.openmeetings.db.dao.user.OrganisationDao; +import org.apache.openmeetings.db.dao.user.GroupDao; import org.apache.openmeetings.db.dao.user.PrivateMessageFolderDao; import org.apache.openmeetings.db.dao.user.PrivateMessageDao; import org.apache.openmeetings.db.dao.user.UserContactDao; @@ -64,7 +64,7 @@ import org.apache.openmeetings.db.entity import org.apache.openmeetings.db.entity.room.Room; import org.apache.openmeetings.db.entity.room.RoomPoll; import org.apache.openmeetings.db.entity.server.LdapConfig; -import org.apache.openmeetings.db.entity.user.Organisation; +import org.apache.openmeetings.db.entity.user.Group; import org.apache.openmeetings.db.entity.user.PrivateMessage; import org.apache.openmeetings.db.entity.user.State; import org.apache.openmeetings.db.entity.user.User; @@ -130,7 +130,7 @@ public class BackupExport { @Autowired private ServerDao serverDao; @Autowired - private OrganisationDao organisationDao; + private GroupDao groupDao; @Autowired private RoomDao roomDao; @Autowired @@ -146,8 +146,7 @@ public class BackupExport { /* * ##################### Backup Groups */ - writeList(simpleSerializer, backup_dir, "organizations.xml", - "organisations", organisationDao.get(0, Integer.MAX_VALUE)); + writeList(simpleSerializer, backup_dir, "organizations.xml", "organisations", groupDao.get(0, Integer.MAX_VALUE)); progressHolder.setProgress(5); /* * ##################### Backup Users @@ -178,7 +177,7 @@ public class BackupExport { Strategy strategy = new RegistryStrategy(registry); Serializer serializer = new Persister(strategy); - registry.bind(Organisation.class, OrganisationConverter.class); + registry.bind(Group.class, GroupConverter.class); registry.bind(Room.class, RoomConverter.class); writeList(serializer, backup_dir, "rooms_organisation.xml", "room_organisations", roomGroupDao.get()); @@ -344,7 +343,7 @@ public class BackupExport { * ##################### Config */ { - List<Configuration> list = configurationDao.getConfigurations(0, Integer.MAX_VALUE, "c.configuration_id", true); + List<Configuration> list = configurationDao.getConfigurations(0, Integer.MAX_VALUE, "c.id", true); Registry registry = new Registry(); registry.bind(State.class, StateConverter.class); registry.bind(User.class, UserConverter.class); @@ -352,7 +351,7 @@ public class BackupExport { Serializer serializer = new Persister(strategy); if (list != null && list.size() > 0) { - registry.bind(list.get(0).getStarttime().getClass(), DateConverter.class); + registry.bind(list.get(0).getInserted().getClass(), DateConverter.class); } writeList(serializer, backup_dir, "configs.xml", "configs", list); @@ -454,7 +453,7 @@ public class BackupExport { Strategy strategy = new RegistryStrategy(registry); Serializer serializer = new Persister(strategy); - registry.bind(Organisation.class, OrganisationConverter.class); + registry.bind(Group.class, GroupConverter.class); registry.bind(State.class, StateConverter.class); registry.bind(Salutation.class, SalutationConverter.class); if (list != null && list.size() > 0) {
Modified: openmeetings/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java (original) +++ openmeetings/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java Fri Nov 13 01:24:41 2015 @@ -67,7 +67,7 @@ import org.apache.openmeetings.db.dao.ro import org.apache.openmeetings.db.dao.server.LdapConfigDao; import org.apache.openmeetings.db.dao.server.OAuth2Dao; import org.apache.openmeetings.db.dao.server.ServerDao; -import org.apache.openmeetings.db.dao.user.OrganisationDao; +import org.apache.openmeetings.db.dao.user.GroupDao; import org.apache.openmeetings.db.dao.user.PrivateMessageDao; import org.apache.openmeetings.db.dao.user.PrivateMessageFolderDao; import org.apache.openmeetings.db.dao.user.StateDao; @@ -90,7 +90,7 @@ import org.apache.openmeetings.db.entity import org.apache.openmeetings.db.entity.server.OAuthServer; import org.apache.openmeetings.db.entity.server.Server; import org.apache.openmeetings.db.entity.user.Address; -import org.apache.openmeetings.db.entity.user.Organisation; +import org.apache.openmeetings.db.entity.user.Group; import org.apache.openmeetings.db.entity.user.PrivateMessage; import org.apache.openmeetings.db.entity.user.PrivateMessageFolder; import org.apache.openmeetings.db.entity.user.State; @@ -127,8 +127,6 @@ public class BackupImport { @Autowired private StateDao statemanagement; @Autowired - private OrganisationDao orgDao; - @Autowired private RoomDao roomDao; @Autowired private UserDao userDao; @@ -159,10 +157,12 @@ public class BackupImport { @Autowired private OAuth2Dao auth2Dao; @Autowired + private GroupDao groupDao; + @Autowired private RoomGroupDao roomGroupDao; private final Map<Long, Long> usersMap = new HashMap<Long, Long>(); - private final Map<Long, Long> organisationsMap = new HashMap<Long, Long>(); + private final Map<Long, Long> groupMap = new HashMap<Long, Long>(); private final Map<Long, Long> appointmentsMap = new HashMap<Long, Long>(); private final Map<Long, Long> roomsMap = new HashMap<Long, Long>(); private final Map<Long, Long> messageFoldersMap = new HashMap<Long, Long>(); @@ -179,7 +179,7 @@ public class BackupImport { working_dir.mkdir(); } usersMap.clear(); - organisationsMap.clear(); + groupMap.clear(); appointmentsMap.clear(); roomsMap.clear(); messageFoldersMap.clear(); @@ -230,22 +230,22 @@ public class BackupImport { List<Configuration> list = readList(serializer, f, "configs.xml", "configs", Configuration.class, true); for (Configuration c : list) { - if (c.getConf_key() == null || c.isDeleted()) { + if (c.getKey() == null || c.isDeleted()) { continue; } - Configuration cfg = configurationDao.forceGet(c.getConf_key()); + Configuration cfg = configurationDao.forceGet(c.getKey()); if (cfg != null && !cfg.isDeleted()) { - log.warn("Non deleted configuration with same key is found! old value: {}, new value: {}", cfg.getConf_value(), c.getConf_value()); + log.warn("Non deleted configuration with same key is found! old value: {}, new value: {}", cfg.getValue(), c.getValue()); } c.setId(cfg == null ? null : cfg.getId()); if (c.getUser() != null && c.getUser().getId() == null) { c.setUser(null); } - if (CONFIG_CRYPT_KEY.equals(c.getConf_key())) { + if (CONFIG_CRYPT_KEY.equals(c.getKey())) { try { - Class.forName(c.getConf_value()); + Class.forName(c.getValue()); } catch (ClassNotFoundException e) { - c.setConf_value(MD5Implementation.class.getCanonicalName()); + c.setValue(MD5Implementation.class.getCanonicalName()); } } configurationDao.update(c, null); @@ -258,12 +258,12 @@ public class BackupImport { */ Serializer simpleSerializer = new Persister(); { - List<Organisation> list = readList(simpleSerializer, f, "organizations.xml", "organisations", Organisation.class); - for (Organisation o : list) { + List<Group> list = readList(simpleSerializer, f, "organizations.xml", "organisations", Group.class); + for (Group o : list) { long oldId = o.getId(); o.setId(null); - o = orgDao.update(o, null); - organisationsMap.put(oldId, o.getId()); + o = groupDao.update(o, null); + groupMap.put(oldId, o.getId()); } } @@ -350,12 +350,12 @@ public class BackupImport { Strategy strategy = new RegistryStrategy(registry); Serializer serializer = new Persister(strategy); - registry.bind(Organisation.class, new OrganisationConverter(orgDao, organisationsMap)); + registry.bind(Group.class, new GroupConverter(groupDao, groupMap)); registry.bind(Room.class, new RoomConverter(roomDao, roomsMap)); List<RoomGroup> list = readList(serializer, f, "rooms_organisation.xml", "room_organisations", RoomGroup.class); for (RoomGroup ro : list) { - if (!ro.isDeleted() && ro.getRoom() != null && ro.getRoom().getId() != null && ro.getOrganisation() != null && ro.getOrganisation().getId() != null) { + if (!ro.isDeleted() && ro.getRoom() != null && ro.getRoom().getId() != null && ro.getGroup() != null && ro.getGroup().getId() != null) { // We need to reset this as openJPA reject to store them otherwise ro.setId(null); roomGroupDao.update(ro, null); @@ -903,7 +903,7 @@ public class BackupImport { Strategy strategy = new RegistryStrategy(registry); Serializer ser = new Persister(strategy); - registry.bind(Organisation.class, new OrganisationConverter(orgDao, organisationsMap)); + registry.bind(Group.class, new GroupConverter(groupDao, groupMap)); registry.bind(State.class, new StateConverter(statemanagement)); registry.bind(Salutation.class, SalutationConverter.class); registry.bind(Date.class, DateConverter.class); @@ -1087,8 +1087,8 @@ public class BackupImport { } break; case ORGANISATIONS: - if (organisationsMap.containsKey(oldId)) { - newId = organisationsMap.get(oldId); + if (groupMap.containsKey(oldId)) { + newId = groupMap.get(oldId); } break; case APPOINTMENTS: Copied: openmeetings/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/backup/GroupConverter.java (from r1714102, openmeetings/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/backup/OrganisationConverter.java) URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/backup/GroupConverter.java?p2=openmeetings/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/backup/GroupConverter.java&p1=openmeetings/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/backup/OrganisationConverter.java&r1=1714102&r2=1714149&rev=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/backup/OrganisationConverter.java (original) +++ openmeetings/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/backup/GroupConverter.java Fri Nov 13 01:24:41 2015 @@ -20,33 +20,33 @@ package org.apache.openmeetings.backup; import java.util.Map; -import org.apache.openmeetings.db.dao.user.OrganisationDao; -import org.apache.openmeetings.db.entity.user.Organisation; +import org.apache.openmeetings.db.dao.user.GroupDao; +import org.apache.openmeetings.db.entity.user.Group; import org.simpleframework.xml.stream.InputNode; import org.simpleframework.xml.stream.OutputNode; -public class OrganisationConverter extends OmConverter<Organisation> { - private OrganisationDao orgDao; +public class GroupConverter extends OmConverter<Group> { + private GroupDao groupDao; private Map<Long, Long> idMap; - public OrganisationConverter() { + public GroupConverter() { //default constructor is for export } - public OrganisationConverter(OrganisationDao orgDao, Map<Long, Long> idMap) { - this.orgDao = orgDao; + public GroupConverter(GroupDao groupDao, Map<Long, Long> idMap) { + this.groupDao = groupDao; this.idMap = idMap; } - public Organisation read(InputNode node) throws Exception { + public Group read(InputNode node) throws Exception { long oldId = getLong(node); long newId = idMap.containsKey(oldId) ? idMap.get(oldId) : oldId; - Organisation o = orgDao.get(newId); - return o == null ? new Organisation() : o; + Group o = groupDao.get(newId); + return o == null ? new Group() : o; } - public void write(OutputNode node, Organisation value) throws Exception { + public void write(OutputNode node, Group value) throws Exception { node.setData(true); node.setValue(value == null ? "0" : "" + value.getId()); } Modified: openmeetings/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/cli/OmHelpFormatter.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/cli/OmHelpFormatter.java?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/cli/OmHelpFormatter.java (original) +++ openmeetings/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/cli/OmHelpFormatter.java Fri Nov 13 01:24:41 2015 @@ -25,6 +25,8 @@ import java.util.Collections; import java.util.Comparator; import java.util.LinkedHashMap; import java.util.List; +import java.util.Map; +import java.util.Map.Entry; import org.apache.commons.cli.HelpFormatter; import org.apache.commons.cli.Option; @@ -112,9 +114,9 @@ public class OmHelpFormatter extends Hel map.get(g).add(o); } } - for (String _key : map.keySet()) { - final String key = _key; - List<OmOption> options = map.get(key); + for (Map.Entry<String, List<OmOption>> me : map.entrySet()) { + final String key = me.getKey(); + List<OmOption> options = me.getValue(); Collections.sort(options, new Comparator<OmOption>(){ public int compare(OmOption o1, OmOption o2) { boolean o1opt = !o1.isOptional(key); @@ -150,11 +152,11 @@ public class OmHelpFormatter extends Hel char[] delimiter = new char[width - 2]; Arrays.fill(delimiter, '-'); - for (String key : optList.keySet()) { - if (GENERAL_OPTION_GROUP.equals(key)) { + for (Entry<String, List<OmOption>> me : optList.entrySet()) { + if (GENERAL_OPTION_GROUP.equals(me.getKey())) { sb.append("General options:").append(getNewLine()); } - for (OmOption option : optList.get(key)) { + for (OmOption option : me.getValue()) { StringBuilder optBuf = new StringBuilder(option.getHelpPrefix()); if (optBuf.length() < maxPrefixLength) { @@ -165,7 +167,7 @@ public class OmHelpFormatter extends Hel int nextLineTabStop = maxPrefixLength + descPad; - if (option.isOptional(key)) { + if (option.isOptional(me.getKey())) { optBuf.append(optional); } if (option.getDescription() != null) { Modified: openmeetings/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java (original) +++ openmeetings/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java Fri Nov 13 01:24:41 2015 @@ -59,7 +59,7 @@ import org.apache.openmeetings.db.dao.ba import org.apache.openmeetings.db.dao.room.RoomDao; import org.apache.openmeetings.db.dao.room.SipDao; import org.apache.openmeetings.db.dao.server.OAuth2Dao; -import org.apache.openmeetings.db.dao.user.OrganisationDao; +import org.apache.openmeetings.db.dao.user.GroupDao; import org.apache.openmeetings.db.dao.user.StateDao; import org.apache.openmeetings.db.dao.user.UserDao; import org.apache.openmeetings.db.entity.basic.ErrorValue; @@ -68,8 +68,8 @@ import org.apache.openmeetings.db.entity import org.apache.openmeetings.db.entity.room.RoomGroup; import org.apache.openmeetings.db.entity.server.OAuthServer; import org.apache.openmeetings.db.entity.server.OAuthServer.RequestMethod; -import org.apache.openmeetings.db.entity.user.Organisation; -import org.apache.openmeetings.db.entity.user.Organisation_Users; +import org.apache.openmeetings.db.entity.user.Group; +import org.apache.openmeetings.db.entity.user.GroupUser; import org.apache.openmeetings.db.entity.user.User; import org.apache.openmeetings.db.entity.user.User.Right; import org.apache.openmeetings.util.OmFileHelper; @@ -98,7 +98,7 @@ public class ImportInitvalues { @Autowired private OAuth2Dao oauthDao; @Autowired - private OrganisationDao groupDao; + private GroupDao groupDao; @Autowired private RoomDao roomDao; @@ -187,7 +187,7 @@ public class ImportInitvalues { 1455L); navimanagement.addMainStructure("adminModuleOrg", null, 16, 127, true, - false, 3, "Administration of Organizations", 6, false, 1456L); + false, 3, "Administration of Groups", 6, false, 1456L); navimanagement.addMainStructure("adminModuleRoom", null, 17, 186, true, false, 3, "Administration of Rooms", 6, false, 1457L); @@ -262,7 +262,7 @@ public class ImportInitvalues { cfgDao.add(CONFIG_FRONTEND_REGISTER_KEY, cfg.allowFrontendRegister, null, "Is user register available on login screen"); cfgDao.add(CONFIG_SOAP_REGISTER_KEY, "1", null, "Is user register available via SOAP/REST"); cfgDao.add(CONFIG_OAUTH_REGISTER_KEY, "1", null, "Is user register available via OAuth"); - // this group_id is the Organisation of users who register through the frontend or SOAP + // this group_id is the Group of users who register through the frontend or SOAP cfgDao.add(CONFIG_DEFAULT_GROUP_ID, "1", null, ""); cfgDao.add("smtp_server", cfg.smtpServer, null, @@ -455,7 +455,7 @@ public class ImportInitvalues { if (groupId != null) { RoomGroup ro = new RoomGroup(); ro.setRoom(r); - ro.setOrganisation(groupDao.get(groupId)); + ro.setGroup(groupDao.get(groupId)); ro.setInserted(new Date()); } r = roomDao.update(r, null); @@ -483,13 +483,13 @@ public class ImportInitvalues { } } - public void loadInitUserAndOrganisation(InstallationConfig cfg) throws Exception { + public void loadInitUserAndGroup(InstallationConfig cfg) throws Exception { // Add default group - Organisation org = new Organisation(); + Group org = new Group(); org.setName(cfg.group); org.setInsertedby(1L); org.setDeleted(false); - org.setStarttime(new Date()); + org.setInserted(new Date()); org = groupDao.update(org, null); User u = userDao.getNewUserInstance(null); @@ -500,7 +500,7 @@ public class ImportInitvalues { u.setFirstname("firstname"); u.setLastname("lastname"); u.getAddress().setEmail(cfg.email); - u.getOrganisation_users().add(new Organisation_Users(org)); + u.getGroupUsers().add(new GroupUser(org)); u = userDao.update(u, cfg.password, -1); @@ -624,7 +624,7 @@ public class ImportInitvalues { return; } loadSystem(cfg, force); - loadInitUserAndOrganisation(cfg); + loadInitUserAndGroup(cfg); progress = 94; loadDefaultRooms("1".equals(cfg.createDefaultRooms)); Modified: openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/ApacheDerbyConfig.xml URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/ApacheDerbyConfig.xml?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/ApacheDerbyConfig.xml (original) +++ openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/ApacheDerbyConfig.xml Fri Nov 13 01:24:41 2015 @@ -12,7 +12,9 @@ See the License for the specific language governing permissions and limitations under the License. --> -<document xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:noNamespaceSchemaLocation="website.xsd"> +<document xmlns="http://maven.apache.org/XDOC/2.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd";> <properties> <title>Apache Derby Configuration</title> Modified: openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/BitrixPlugin.xml URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/BitrixPlugin.xml?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/BitrixPlugin.xml (original) +++ openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/BitrixPlugin.xml Fri Nov 13 01:24:41 2015 @@ -12,12 +12,12 @@ See the License for the specific language governing permissions and limitations under the License. --> -<document xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:noNamespaceSchemaLocation="website.xsd"> +<document xmlns="http://maven.apache.org/XDOC/2.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd";> <properties> <title>Bitrix Plugin</title> - <author email="[email protected]"> - OpenMeetings Team - </author> + <author email="[email protected]">OpenMeetings Team</author> </properties> <body> <section name="OpenMeetings Plugin for Bitrix"> Modified: openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/BuildInstructions.xml URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/BuildInstructions.xml?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/BuildInstructions.xml (original) +++ openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/BuildInstructions.xml Fri Nov 13 01:24:41 2015 @@ -12,7 +12,9 @@ See the License for the specific language governing permissions and limitations under the License. --> -<document xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:noNamespaceSchemaLocation="website.xsd"> +<document xmlns="http://maven.apache.org/XDOC/2.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd";> <properties> <title>Build instructions</title> @@ -22,312 +24,74 @@ </properties> <body> - <section name="Nightly Builds"> - <p> You can find Nightly Builds of the software at: - <a href="https://builds.apache.org/view/M-R/view/OpenMeetings/"; - rel="nofollow" target="_BLANK"> + <a href="https://builds.apache.org/view/M-R/view/OpenMeetings/"; rel="nofollow" target="_blank"> https://builds.apache.org/view/M-R/view/OpenMeetings/ </a> </p> - </section> <section name="How to Build a Distribution"> - <div> <p>To build a binary release of OpenMeetings you need: </p> <ul> - <li>Sun JDK6</li> - <li>Apache ANT (minimum) 1.8.3</li> + <li>Oracle JDK7</li> + <li>Apache Maven (minimum) 3.2.1</li> <li> SVN Command line client (Subversion 1.7 required!) - <a href="http://subversion.apache.org/packages.html"; target="_BLANK" - rel="nofollow">http://subversion.apache.org/packages.html</a> + <a href="http://subversion.apache.org/packages.html"; target="_blank" rel="nofollow">http://subversion.apache.org/packages.html</a> </li> </ul> </div> <p>Get the source: </p> - <div class="xmlcode"> - svn checkout - https://svn.apache.org/repos/asf/openmeetings/trunk/singlewebapp/ - </div> + <source><![CDATA[svn checkout https://svn.apache.org/repos/asf/openmeetings/trunk/singlewebapp/]]></source> <p>Run the command: </p> - <div class="xmlcode"> - ant - </div> - <p>There is no need to compile the client additionally! The ant task - does it all! You will find a directory dist that contains - OpenMeetings and a red5-server. - </p> - <p>To compile the client you can also use ant: </p> - <div class="xmlcode"> - ant - <span style="margin-left: 200px;"># compiles a complete package into the folder dist - </span> - <br /> - ant compile.laszlo.main - <span style="margin-left: 70px;"># compiles the client into main.as3.swf10.swf and - main.swf8.swf</span> - <br /> - ant compile.laszlo.main.debug - <span style="margin-left: 30px;"># compiles the debug-client into - maindebug.as3.swf10.swf and maindebug.swf8.swf - </span> - <br /> - ant -Ddb=<name of DB> - <span style="margin-left: 50px;"># will copy <name of DB>_persistense.xml to - persistense.xml - </span> - <br /> - <span style="margin-left: 230px;">#(for ex. ant -Ddb=mysql will set mysql as default - DB) - </span> - </div> - <p>To compile just the openmeetings JAR file: </p> - <div class="xmlcode"> - ant jar.only - </div> - <p> - To run Junit tests using ANT see - <a href="JUnitTesting.html">JUnitTesting</a> - </p> + <source><![CDATA[mvn clean install ]]></source> </section> <section name="Run, Develop, Test"> - <p> - To develop or build OpenMeetings you checkout the source as Eclipse - project. You need the Subclipse or Subversive Plugin for Eclipse. If - you just need to change 3 lines of code then your probably better - switch to - <a href="#How_to_build_a_distribution" rel="nofollow">How to build a - distribution - </a> - . + To develop Openmeetings you need to import maven project into Eclipse + <img src="images/eclipse-import-maven-project.png" alt="Import OM into Eclipse" width="526" height="394" /> </p> - - <subsection name="Step1 - Get required Software"> - - <p>To develop OpenMeetings you need at least: </p> - <ul> - <li>Eclipse in a up to date copy and Sun JDK6 </li> - <li>Apache ANT (minimum) 1.8.3</li> - <li> - Subclipse 1.8 (Subversion 1.7 required!) - <a href="http://subclipse.tigris.org/"; target="_BLANK" rel="nofollow">http://subclipse.tigris.org/ - </a> - </li> - <li> - SVN Command line client (Subversion 1.7 required!) - <a href="http://subversion.apache.org/packages.html"; target="_BLANK" - rel="nofollow">http://subversion.apache.org/packages.html</a> - </li> - <li>Spring IDE for Eclipse (installable via Help > Eclipse - Marketplace) - </li> - <li> - Apache IvyDE™ For Eclipse (installable via Help > Install - New Software) - URL: http://www.apache.org/dist/ant/ivyde/updatesite - detailed steps can be found here: - <a href="http://ant.apache.org/ivy/ivyde/download.cgi"; target="_BLANK" - rel="nofollow">http://ant.apache.org/ivy/ivyde/download.cgi</a> - </li> - <li>MySQL (or Postgres, or other Databases supported by openJPA) - are optionally but handy to have them - </li> - </ul> - - </subsection> - - <subsection name="Step2 - Download the Source"> - - <p>Advanced Users: Check out the Code from the Repository as a - Java - project into Eclipse. - </p> - <p> - URL: - <a - href="https://svn.apache.org/repos/asf/openmeetings/trunk/singlewebapp/";> - https://svn.apache.org/repos/asf/openmeetings/trunk/singlewebapp/ - </a> - </p> - <p>To download the required JARs for building and developing - OpenMeetings you need to run the ANT comand: - </p> - <div class="xmlcode"> - ant -Ddb=<your_DB> prepare-eclipse - </div> - <p>After the ANT command you need to press F5 and rebuild the - project from inside Eclipse - </p> - <p>Step-By-Step: </p> - <p>1) Start Eclipse </p> - <p> - 2) Change Perspective to SVN Repository Exploring: - <br /> - <br /> - <a class="fancybox-buttons" href="images/checkout_1.png"> - <img src="images/checkout_1.png" alt="" width="400" height="289" /> - </a> - - </p> - <p> - 3) Select SVN Repository Exploring and click ok. - <br /> - <br /> - <a class="fancybox-buttons" href="images/checkout_2.png"> - <img src="images/checkout_2.png" alt="" width="304" height="417" /> - </a> - </p> - <p> - 4) A new Dialog in Eclipse opens - <strong>SVN Repositories</strong> - <br /> - <br /> - <a class="fancybox-buttons" href="images/checkout_3.png"> - <img src="images/checkout_3.png" alt="" width="460" height="102" /> - </a> - </p> - <p> - 5) Click on the icon with the plus in the top right corner in the - SVN Repository Dialog - <br /> - <br /> - <a class="fancybox-buttons" href="images/checkout_4.png"> - <img src="images/checkout_4.png" alt="" width="57" height="38" /> - </a> - </p> - <p> - 6) Add the URL - <a - href="https://svn.apache.org/repos/asf/openmeetings/trunk/singlewebapp/"; - rel="nofollow">https://svn.apache.org/repos/asf/openmeetings/trunk/singlewebapp/ - </a> - and click Finish - <br /> - <br /> - <a class="fancybox-buttons" href="images/checkout_5.png"> - <img src="images/checkout_5.png" alt="" width="455" height="272" /> - </a> - </p> - <p> - 7) After download is complete you see a new Source Repository in - the Repository Explorer. Right click on it and choose - <strong>checkout</strong> - <br /> - <br /> - <a class="fancybox-buttons" href="images/checkout_6.png"> - <img src="images/checkout_6.png" alt="" width="340" height="135" /> - </a> - </p> - <p> - 8) In the Dialog the opens now just click next - <br /> - <br /> - <a class="fancybox-buttons" href="images/checkout_7.png"> - <img src="images/checkout_7.png" alt="" width="390" height="338" /> - </a> - </p> - <p> - 9) In the next Dialog just click Finish, Eclipse will then download - the sources - <br /> - <br /> - <a class="fancybox-buttons" href="images/checkout_8.png"> - <img src="images/checkout_8.png" alt="" width="390" height="338" /> - </a> - </p> - <p> - 10) After the download is complete you will see a new Project in - the Package Explorer Dialog of Eclipse - <br /> - <br /> - <a class="fancybox-buttons" href="images/checkout_9.png"> - <img src="images/checkout_9.png" alt="" width="310" height="297" /> - </a> - </p> - <div> - 11) Please run - <div class="xmlcode"> - ant prepare-eclipse - </div> - to download all necessary jar files, and perform source - <tt>Refresh</tt> - to resolve all compilation issues. - </div> - </subsection> - - <subsection name="Step3 - Deploy and Run"> - - <p> - see the first chapter about the ANT tasks to compile the code. You - will find a directory called - <strong>dist</strong> - which contains a regular openmeetings including red5. You can then - use the usual process like described at - <a href="installation.html">installation</a> - to run the code then. - </p> - </subsection> - - </section> - - <section name="Links"> - - <ul> - <li> - Getting Started with OpenLaszlo, checkout - <a - href="http://www.openlaszlo.org/lps4.2/laszlo-explorer/index.jsp?lzr=swf8"; - target="_BLANK" rel="nofollow">Laszlo-in-10-Minutes</a> - and the - <a href="http://www.openlaszlo.org/lps4.2/docs/"; target="_BLANK" - rel="nofollow">Application - Developer's Guide - </a> - or try the - <a href="http://www.openlaszlo.org/getstarted"; target="_BLANK" - rel="nofollow">ScreenCast</a> - </li> - <li> - <a href="http://openmeetings.apache.org/svn.html";> - browse SVN source - </a> - </li> - </ul> - </section> - <section name="Tipps and Gotchas"> - - <p>When you want to develop only client side there are handy ANT - tasks so that you only rebuild the SWFs, same for the Java side. - </p> - <p> - It - also takes much less time if you do use MySQL as database then - rebuilding the software and waiting for Apache Derby to set up the - database everytime you did rebuild. - </p> + <section name="Tips and Gotchas"> + <p>To compile only client you can run following command: </p> + <source> +<![CDATA[ +mvn install -pl openmeetings-flash # compiles a complete package into the folder openmeetings-flash/target +]]> + </source> + <p>In case you would like to develop Openmeetings you need to run <i>"unpacked"</i> build: </p> + <source> +<![CDATA[ +mvn clean install -Dunpacked=true -Dmaven.test.skip=true -Dold-backups.dwnd.skip=true -Ddb=mysql -Dwicket.mode=DEVELOPMENT +]]> + </source> + <p>After modifications are made you can run <i>"quick"</i> build: </p> + <source> +<![CDATA[ +mvn install -pl openmeetings-web -pl openmeetings-server -Dquick=true -Ddb=mysql -Dwicket.mode=DEVELOPMENT +]]> + </source> + <p>Any number of projects can be specified during build: </p> + <source> +<![CDATA[ +mvn install -pl openmeetings-util -pl openmeetings-db -pl openmeetings-core -pl openmeetings-install -pl openmeetings-service -pl openmeetings-web -pl openmeetings-server -pl openmeetings-webservice -Dquick=true -Ddb=mysql -Dwicket.mode=DEVELOPMENT +]]> + </source> <p> <b>Working behind a proxy:</b> - If you are sitting behind a proxy you should add some proxy settings - before starting the build process. - <br /> - For Apache Ivy see: - <a href="http://ant.apache.org/ivy/faq.html"; target="_BLANK" rel="nofollow">http://ant.apache.org/ivy/faq.html - </a> + If you are sitting behind a proxy you should add some proxy settings before starting the build process. <br /> For SVN Command Line Client (From CollabNet 1.7) see: <a href="https://ctf6latest.collab.net/internal-help/index.jsp?topic=/teamforge610/faq/client_proxy_settings.html"; - target="_BLANK" rel="nofollow">https://ctf6latest.collab.net/internal-help/index.jsp?topic=/teamforge610/faq/client_proxy_settings.html + target="_blank" rel="nofollow">https://ctf6latest.collab.net/internal-help/index.jsp?topic=/teamforge610/faq/client_proxy_settings.html </a> </p> Modified: openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/CalendarAndTimezone.xml URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/CalendarAndTimezone.xml?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/CalendarAndTimezone.xml (original) +++ openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/CalendarAndTimezone.xml Fri Nov 13 01:24:41 2015 @@ -12,7 +12,9 @@ See the License for the specific language governing permissions and limitations under the License. --> -<document xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:noNamespaceSchemaLocation="website.xsd"> +<document xmlns="http://maven.apache.org/XDOC/2.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd";> <properties> <title>Changing the Calendar and Timezone default</title> @@ -49,22 +51,17 @@ name="Changing first day in week for calendar from Sunday to Monday"> <p>in the public/config.xml change the key: </p> - <div class="xmlcode"> - <!-- - <br /> - First day in the Week used by the Calendar - <br /> - 0 means Sunday - <br /> - 1 means Monday - <br /> - this is the way how the Celendar inits a week - <br /> - --> - <br /> - <firstdayinweek>0</firstdayinweek> - <br /> - </div> + <source> +<![CDATA[ +<!-- +First day in the Week used by the Calendar +0 means Sunday +1 means Monday +this is the way how the Celendar inits a week +--> +<firstdayinweek>0</firstdayinweek> +]]> + </source> </section> <section Modified: openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/Clustering.xml URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/Clustering.xml?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/Clustering.xml (original) +++ openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/Clustering.xml Fri Nov 13 01:24:41 2015 @@ -12,12 +12,12 @@ See the License for the specific language governing permissions and limitations under the License. --> -<document xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:noNamespaceSchemaLocation="website.xsd"> +<document xmlns="http://maven.apache.org/XDOC/2.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd";> <properties> <title>Clustering</title> - <author email="[email protected]"> - OpenMeetings Team - </author> + <author email="[email protected]">OpenMeetings Team</author> </properties> <body> @@ -31,7 +31,7 @@ <ul> <li> Multiple OM servers should be set up as described in - <a href="installation.html" target="_BLANK"> + <a href="installation.html" target="_blank"> <b>Installation</b> </a> </li> @@ -43,53 +43,53 @@ </ul> </section> <section name="Database"> - All servers should be configured to use the same database. It can be on the server or on the one node - of the cluster. + <p>All servers should be configured to use the same database. It can be on the server or on the one node + of the cluster.</p> <ul> <li>Add users who can connect to the database remotely</li> <li>Update <tt>/opt/red5/webapps/openmeetings/WEB-INF/classes/META-INF/persistence.xml</tt> set correct server address, login and password. Also add the following section: - <div class="xmlcode"><property name="openjpa.RemoteCommitProvider" value="tcp(Addresses=10.1.1.1;10.1.1.2)" /></div> + <source><![CDATA[<property name="openjpa.RemoteCommitProvider" value="tcp(Addresses=10.1.1.1;10.1.1.2)" />]]></source> Instead of the 10.1.1.1 and 10.1.1.2 set semicolon separated IPs of all nodes of the cluster. </li> </ul> </section> <section name="File systems"> - If files and recordings using the same physical folders the files and recordings will be available for - each node. You can do this using Samba or NFS, for example. For using NFS do the following: + <p>If files and recordings using the same physical folders the files and recordings will be available for + each node. You can do this using Samba or NFS, for example. For using NFS do the following:</p> <ul> <li>Install NFS to the data server. In the file <tt>/etc/exports</tt> add the following lines: - <div class="xmlcode"> - /opt/red5/webapps/openmeetings/upload 10.1.1.2(rw,sync,no_subtree_check,no_root_squash)<br/> - /opt/red5/webapps/openmeetings/streams 10.1.1.2(rw,sync,no_subtree_check,no_root_squash) - </div> + <source> +/opt/red5/webapps/openmeetings/upload 10.1.1.2(rw,sync,no_subtree_check,no_root_squash) +/opt/red5/webapps/openmeetings/streams 10.1.1.2(rw,sync,no_subtree_check,no_root_squash) + </source> Here 10.1.1.2 - is node ip for NFS remote access. Add these lines for all nodes except node with folders. </li> <li> Install NFS common tools to other nodes. In the file <tt>/etc/fstab</tt> do the following: - <div class="xmlcode"> - 10.1.1.1:/opt/red5/webapps/openmeetings/upload/<br/> - /opt/red5/webapps/openmeetings/upload nfs timeo=50,hard,intr<br/> - 10.1.1.1:/opt/red5/webapps/openmeetings/streams/<br/> - /opt/red5/webapps/openmeetings/streams nfs timeo=50,hard,intr - </div> + <source> +10.1.1.1:/opt/red5/webapps/openmeetings/upload/ +/opt/red5/webapps/openmeetings/upload nfs timeo=50,hard,intr +10.1.1.1:/opt/red5/webapps/openmeetings/streams/ +/opt/red5/webapps/openmeetings/streams nfs timeo=50,hard,intr + </source> Here 10.1.1.1 â data server ip. And run the command: - <div class="xmlcode"> - mount -a - </div> + <source>mount -a</source> </li> </ul> </section> <section name="OM nodes configuration"> - In the file <tt>/opt/red5/webapps/openmeetings/WEB-INF/openmeetings-applicationContext.xml</tt>: + <p>In the file <tt>/opt/red5/webapps/openmeetings/WEB-INF/classes/openmeetings-applicationContext.xml</tt>:</p> <ul> <li> For each node uncomment line: - <div class="xmlcode"> - <!-- Need to be uncommented and set to the real ID if in cluster mode--><br/> - <property name="serverId" value="1" /> - </div> + <source> +<![CDATA[ +<!-- Need to be uncommented and set to the real ID if in cluster mode--> +<property name="serverId" value="1" /> +]]> + </source> and input the unique value for each node. </li> <li> @@ -100,21 +100,21 @@ </ul> </section> <section name="Configuring cluster in Administration"> - Run red5 on each node. Login to the system as admin. + <p>Run red5 on each node. Login to the system as admin.</p> <ul> <li>Go to the <tt>Administration -> Users</tt> and create Webservice user (only access via SOAP).</li> <li> Go to the <tt>Administration -> Servers</tt> and add all cluster nodes with the following settings: - <div class="xmlcode"> - Server Name = node name;<br/> - Active = check the checkbox. If the checkbox is checked it means node is active and you can use this node;<br/> - Server Address = node ip;<br/> - HTTP Port = 5080 - port for http part of Openmeetings;<br/> - User (SOAP Access) = login of Webservice user from the previous step;<br/> - Password = password of Webservise user;<br/> - Webapp path = openmeetings - path where OM installed on this node, it would be better if this path will be the same for all nodes;<br/> - Protocol = http. - </div> + <source> +Server Name = node name; +Active = check the checkbox. If the checkbox is checked it means node is active and you can use this node; +Server Address = node ip; +HTTP Port = 5080 - port for http part of Openmeetings; +User (SOAP Access) = login of Webservice user from the previous step; +Password = password of Webservise user; +Webapp path = openmeetings - path where OM installed on this node, it would be better if this path will be the same for all nodes; +Protocol = http. + </source> </li> </ul> <img src="images/cluster1.png" alt="" width="650" height="461" /> @@ -136,4 +136,4 @@ <img src="images/cluster2.png" alt="" width="650" height="369" /> </section> </body> -</document> \ No newline at end of file +</document> Modified: openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/CommandLineAdmin.xml URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/CommandLineAdmin.xml?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/CommandLineAdmin.xml (original) +++ openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/CommandLineAdmin.xml Fri Nov 13 01:24:41 2015 @@ -12,12 +12,12 @@ See the License for the specific language governing permissions and limitations under the License. --> -<document xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:noNamespaceSchemaLocation="website.xsd"> +<document xmlns="http://maven.apache.org/XDOC/2.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd";> <properties> <title>Command line admin</title> - <author email="[email protected]"> - OpenMeetings Team - </author> + <author email="[email protected]">OpenMeetings Team</author> </properties> <body> <section name="Usage"> @@ -31,63 +31,58 @@ </ul> <p>Some example commands:</p> <p>MySQL (requires to place the MySQL JDBC driver into webapps/openmeetings/WEB-INF/lib before running the command):</p> - <div> - <div class="xmlcode"> -./admin.sh -i -v -tz Europe/Berlin -email [email protected] -group webbase -user admin --smtp-server localhost --db-type mysql --db-name openmeetings_db --email-auth-user [email protected] --password 123qweasd --system-email-address [email protected] --db-user root --db-host localhost --email-auth-pass 123qweasd<br/> - </div> - </div> + <source>./admin.sh -i -v -tz Europe/Berlin -email [email protected] -group webbase -user admin --smtp-server localhost \ + --db-type mysql --db-name openmeetings_db --email-auth-user [email protected] --password 123qweasd \ + --system-email-address [email protected] --db-user root --db-host localhost --email-auth-pass 123qweasd + </source> <p>Derby (Not recommended for production environment):</p> - <div> - <div class="xmlcode"> -./admin.sh -i -v -tz Europe/Berlin -email [email protected] -group webbase -user admin --smtp-server localhost --email-auth-user [email protected] --password 123qweasd --system-email-address [email protected] --email-auth-pass 123qweasd<br/> - </div> - </div> + <source>./admin.sh -i -v -tz Europe/Berlin -email [email protected] -group webbase -user admin --smtp-server localhost \ + --email-auth-user [email protected] --password 123qweasd --system-email-address [email protected] --email-auth-pass 123qweasd + </source> </section> <section name="Command reference"> - <div> - <div class="xmlcode"> - -v,--verbose verbose error messages<br/> ---------------------------------------------------------------------------------------------------<br/> - -h,--help prints this message<br/> ---------------------------------------------------------------------------------------------------<br/> - -b,--backup Backups OM<br/> -<span style="margin-left: 50px;">-file <arg> (optional) file used for backup/restore/install</span><br/> -<span style="margin-left: 100px;">--exclude-files (optional) should backup exclude files [default: include]</span><br/> ---------------------------------------------------------------------------------------------------<br/> - -r,--restore Restores OM<br/> -<span style="margin-left: 50px;">-file <arg> file used for backup/restore/install</span><br/> ---------------------------------------------------------------------------------------------------<br/> - -l,--languages Reimport All language files into DB<br/> -<span style="margin-left: 50px;">-lang,--language <arg> (optional) Single language to be imported (id or name)</span><br/> ---------------------------------------------------------------------------------------------------<br/> - -i,--install Fill DB table, and make OM usable<br/> -<span style="margin-left: 50px;">-user <arg> Login name of the default user, minimum 4 characters (mutually exclusive with 'file')</span><br/> -<span style="margin-left: 50px;">-group <arg> The name of the default user group (mutually exclusive with 'file')</span><br/> -<span style="margin-left: 50px;">-email <arg> Email of the default user (mutually exclusive with 'file')</span><br/> -<span style="margin-left: 50px;">-tz <arg> Default server time zone, and time zone for the selected user (mutually exclusive with 'file') file used for backup/restore/install</span><br/> -<span style="margin-left: 100px;">--email-auth-pass <arg> (optional) Email auth password (anonymous connection will be used if not set)</span><br/> -<span style="margin-left: 100px;">--db-host <arg> (optional) DNS name or IP address of database</span><br/> -<span style="margin-left: 100px;">--drop (optional) Drop database before installation</span><br/> -<span style="margin-left: 100px;">--db-user <arg> (optional) User with write access to the DB specified</span><br/> -<span style="margin-left: 100px;">--system-email-address <arg> (optional) System e-mail address [default: [email protected]]</span><br/> -<span style="margin-left: 100px;">--password <arg> (optional) Password of the default user, minimum 4 characters (will be prompted if not set)</span><br/> -<span style="margin-left: 100px;">--email-use-tls (optional) Is secure e-mail connection [default: no]</span><br/> -<span style="margin-left: 100px;">--email-auth-user <arg> (optional) Email auth username (anonymous connection will be used if not set)</span><br/> -<span style="margin-left: 100px;">--db-port <arg> (optional) Database port</span><br/> -<span style="margin-left: 100px;">--smtp-port <arg> (optional) SMTP server for outgoing e-mails [default: 25]</span><br/> -<span style="margin-left: 100px;">--db-name <arg> (optional) The name of Openmeetings database</span><br/> -<span style="margin-left: 100px;">--disable-frontend-register (optional) Do not allow front end register [allowed by default]</span><br/> -<span style="margin-left: 100px;">--db-type <arg> (optional) The type of the DB to be used</span><br/> -<span style="margin-left: 100px;">--skip-default-rooms (optional) Do not create default rooms [created by default]</span><br/> -<span style="margin-left: 100px;">--force (optional) Install without checking the existence of old data in the database.</span><br/> -<span style="margin-left: 100px;">--smtp-server <arg> (optional) SMTP server for outgoing e-mails [default: localhost]</span><br/> -<span style="margin-left: 100px;">--db-pass <arg> (optional) Password of the user with write access to the DB specified</span><br/> ---------------------------------------------------------------------------------------------------<br/> - -f,--files File operations - statictics/cleanup<br/> -<span style="margin-left: 100px;">--cleanup (optional) Should intermediate files be clean up</span><br/> ---------------------------------------------------------------------------------------------------<br/> - </div> - </div> +<source><![CDATA[ +-v,--verbose verbose error messages +-------------------------------------------------------------------------------------------------- +-h,--help prints this message +-------------------------------------------------------------------------------------------------- +-b,--backup Backups OM + -file <arg> (optional) file used for backup/restore/install + --exclude-files (optional) should backup exclude files [default: include] +-------------------------------------------------------------------------------------------------- +-r,--restore Restores OM + -file <arg> file used for backup/restore/install +-------------------------------------------------------------------------------------------------- +-l,--languages Reimport All language files into DB + -lang,--language <arg> (optional) Single language to be imported (id or name) +-------------------------------------------------------------------------------------------------- +-i,--install Fill DB table, and make OM usable + -user <arg> Login name of the default user, minimum 4 characters (mutually exclusive with 'file') + -group <arg> The name of the default user group (mutually exclusive with 'file') + -email <arg> Email of the default user (mutually exclusive with 'file') + -tz <arg> Default server time zone, and time zone for the selected user (mutually exclusive with 'file') file used for backup/restore/install + --email-auth-pass <arg> (optional) Email auth password (anonymous connection will be used if not set) + --db-host <arg> (optional) DNS name or IP address of database + --drop (optional) Drop database before installation + --db-user <arg> (optional) User with write access to the DB specified + --system-email-address <arg> (optional) System e-mail address [default: [email protected]] + --password <arg> (optional) Password of the default user, minimum 4 characters (will be prompted if not set) + --email-use-tls (optional) Is secure e-mail connection [default: no] + --email-auth-user <arg> (optional) Email auth username (anonymous connection will be used if not set) + --db-port <arg> (optional) Database port + --smtp-port <arg> (optional) SMTP server for outgoing e-mails [default: 25] + --db-name <arg> (optional) The name of Openmeetings database + --disable-frontend-register (optional) Do not allow front end register [allowed by default] + --db-type <arg> (optional) The type of the DB to be used + --skip-default-rooms (optional) Do not create default rooms [created by default] + --force (optional) Install without checking the existence of old data in the database. + --smtp-server <arg> (optional) SMTP server for outgoing e-mails [default: localhost] + --db-pass <arg> (optional) Password of the user with write access to the DB specified +-------------------------------------------------------------------------------------------------- +-f,--files File operations - statictics/cleanup + --cleanup (optional) Should intermediate files be clean up +-------------------------------------------------------------------------------------------------- +]]></source> </section> </body> </document> Modified: openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/ConferenceRoomLayoutOptions.xml URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/ConferenceRoomLayoutOptions.xml?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/ConferenceRoomLayoutOptions.xml (original) +++ openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/ConferenceRoomLayoutOptions.xml Fri Nov 13 01:24:41 2015 @@ -12,7 +12,9 @@ See the License for the specific language governing permissions and limitations under the License. --> -<document xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:noNamespaceSchemaLocation="website.xsd"> +<document xmlns="http://maven.apache.org/XDOC/2.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd";> <properties> <title>Layout options for a conference room in OpenMeetings</title> Modified: openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/ConfluencePlugin.xml URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/ConfluencePlugin.xml?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/ConfluencePlugin.xml (original) +++ openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/ConfluencePlugin.xml Fri Nov 13 01:24:41 2015 @@ -12,7 +12,8 @@ See the License for the specific language governing permissions and limitations under the License. --> -<document xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:noNamespaceSchemaLocation="website.xsd"> +<document xmlns="http://maven.apache.org/XDOC/2.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd";> <properties> <title>Confluence Plugin</title> @@ -24,36 +25,32 @@ <body> <section name="Confluence Plugin for OpenMeetings"> - <p> + <p> Current Development Snapshots for testing can be downloaded from: - <a href="https://svn.apache.org/repos/asf/openmeetings/branches/confluence-plugin/target/openmeetingsconfluence-1.0-SNAPSHOT.jar";>here</a> + <a + href="https://svn.apache.org/repos/asf/openmeetings/branches/confluence-plugin/target/openmeetingsconfluence-1.0-SNAPSHOT.jar";>here</a> . - </p> + </p> </section> - + <section name="Features"> <p>The plugin contains the following features: </p> <ul> <li>Create videoconference rooms through Confluence: </li> <li> <ol> - <li>Integrated with Confluence content </li> + <li>Integrated with Confluence content </li> <li>Configurable room type </li> </ol> </li> </ul> - </section> - - <section name="Demo video"> - <p>The demo video of Confluence plugin show you the plugin in action </p> - <object style="height: 390px; width: 640px"> - <param name="movie" value="http://www.youtube.com/v/YFKlXggtld0?version=3&feature=player_detailpage"/> - <param name="allowFullScreen" value="true"/> - <param name="allowScriptAccess" value="always"/> - <embed src="http://www.youtube.com/v/YFKlXggtld0?version=3&feature=player_detailpage"; type="application/x-shockwave-flash" allowfullscreen="true" allowScriptAccess="always" width="640" height="360"/> - </object> + </section> + + <section name="Demo video"> + <p>The demo video of Confluence plugin show you the plugin in action </p> + <iframe width="640" height="390" src="http://www.youtube.com/embed/YFKlXggtld0"; frameborder="0" allowfullscreen=""></iframe> </section> </body> -</document> \ No newline at end of file +</document> Modified: openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/CustomCryptMechanism.xml URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/CustomCryptMechanism.xml?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/CustomCryptMechanism.xml (original) +++ openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/CustomCryptMechanism.xml Fri Nov 13 01:24:41 2015 @@ -12,10 +12,12 @@ See the License for the specific language governing permissions and limitations under the License. --> -<document xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:noNamespaceSchemaLocation="website.xsd"> +<document xmlns="http://maven.apache.org/XDOC/2.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd";> <properties> <title>Howto create a Custom Crypt styles</title> - <author email="[email protected]"> + <author email="[email protected]"> OpenMeetings Team </author> </properties> @@ -28,10 +30,10 @@ </p> <ul> - <li>org.xmlcrm.utils.crypt.MD5Implementation - this uses common MD5 + <li>org.apache.openmeetings.util.crypt.MD5Implementation - this uses common MD5 Crypt like PHP does, this is the default one (results in something like: fe01ce2a7fbac8fafaed7c982a04e229)</li> - <li>org.xmlcrm.utils.crypt.MD5CryptImplementation - does use + <li>org.apache.openmeetings.util.crypt.MD5CryptImplementation - does use BSD-Style of encryption using a salt (results in something like: $1$GMsj7F2I$5S3r9CeukXGXNwf6b4sph1)</li> </ul> @@ -45,41 +47,39 @@ <section name="Configuration of Custom Crypt-Style"> <p> To add your own crypt style you need to write a class which - implements the interface: org.xmlcrm.utils.cryptCryptString - <br /> - and extends the Adapter: org.xmlcrm.utils.CryptStringAdapter + implements the interface: org.apache.openmeetings.util.crypt.ICryptString <br /> Example of an Implementation: </p> - <div class="xmlcode"> - package org.xmlcrm.utils.crypt; - - import java.security.NoSuchAlgorithmException; - - public class MD5Implementation extends CryptStringAdapter implements CryptString { - - @Override - public String createPassPhrase(String userGivenPass) { - String passPhrase = null; - try { - passPhrase = MD5.do_checksum(userGivenPass); - } catch (NoSuchAlgorithmException e) { - e.printStackTrace(); - } - return passPhrase; - } - - @Override - public Boolean verifyPassword(String passGiven, String passwdFromDb) { - return (passwdFromDb.equals(createPassPhrase(passGiven))); - } - - } - </div> + <source> +<![CDATA[ +package org.apache.openmeetings.util.crypt; + +import java.security.NoSuchAlgorithmException; + +public class MD5Implementation implements ICryptString { + @Override + public String createPassPhrase(String userGivenPass) { + String passPhrase = null; + try { + passPhrase = MD5.do_checksum(userGivenPass); + } catch (NoSuchAlgorithmException e) { + e.printStackTrace(); + } + return passPhrase; + } + + @Override + public Boolean verifyPassword(String passGiven, String passwdFromDb) { + return (passwdFromDb.equals(createPassPhrase(passGiven))); + } +} +]]> + </source> <p>To add your own Encryption-Class you need to add your class to the OpenMeetings-Webapp (make it available to the webapp-classpath) and use your custom-class-name instead of - org.xmlcrm.utils.crypt.MD5Implementation during the Installation or + org.apache.openmeetings.util.crypt.MD5Implementation during the Installation or at runtime by editing the config-key crypt_ClassName</p> </section> <section name="Configuration of Custom Crypt-Style"> Modified: openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/CustomRoomTypeHowTo.xml URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/CustomRoomTypeHowTo.xml?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/CustomRoomTypeHowTo.xml (original) +++ openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/CustomRoomTypeHowTo.xml Fri Nov 13 01:24:41 2015 @@ -12,7 +12,9 @@ See the License for the specific language governing permissions and limitations under the License. --> -<document xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:noNamespaceSchemaLocation="website.xsd"> +<document xmlns="http://maven.apache.org/XDOC/2.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd";> <properties> <title>Howto create a custom room type in OpenMeetings</title> Modified: openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/Dashboard.xml URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/Dashboard.xml?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/Dashboard.xml (original) +++ openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/Dashboard.xml Fri Nov 13 01:24:41 2015 @@ -12,7 +12,9 @@ See the License for the specific language governing permissions and limitations under the License. --> -<document xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:noNamespaceSchemaLocation="website.xsd"> +<document xmlns="http://maven.apache.org/XDOC/2.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd";> <properties> <title>Changing Dashboard</title> @@ -31,41 +33,34 @@ <p></p> <table> <tr> - <th style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> Config-key </th> - <th style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> Values </th> - <th style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> Meaning </th> + <th> Config-key </th> + <th> Values </th> + <th> Meaning </th> </tr> <tr> - <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> default.dashboard.tab </td> - <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> 0,1,2 </td> - <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> Which tab should be shown by default, counting - starts with 0 - </td> + <td> dashboard.show.myrooms </td> + <td> 0 or 1 </td> + <td> If the MyRooms tab should be visible or not </td> </tr> <tr> - <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> dashboard.show.myrooms </td> - <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> 0 or 1 </td> - <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> If the MyRooms tab should be visible or not </td> + <td> dashboard.show.chat </td> + <td> 0 or 1 </td> + <td> If the Chat tab should be visible or not </td> </tr> <tr> - <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> dashboard.show.chat </td> - <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> 0 or 1 </td> - <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> If the Chat tab should be visible or not </td> + <td> dashboard.show.rssfeed </td> + <td> 0 or 1 </td> + <td> If the RSS-Feed tab should be visible or not </td> </tr> <tr> - <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> dashboard.show.rssfeed </td> - <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> 0 or 1 </td> - <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> If the RSS-Feed tab should be visible or not </td> + <td> rss_feed1 </td> + <td> http-URL </td> + <td> ATOM-Feed URL for the dashboard RSS Tab </td> </tr> <tr> - <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> rss_feed1 </td> - <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> http-URL </td> - <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> ATOM-Feed URL for the dashboard RSS Tab </td> - </tr> - <tr> - <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> rss_feed2 </td> - <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> http-URL </td> - <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> ATOM-Feed URL for the dashboard RSS Tab </td> + <td> rss_feed2 </td> + <td> http-URL </td> + <td> ATOM-Feed URL for the dashboard RSS Tab </td> </tr> </table> <p></p> Modified: openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/DrupalPlugin.xml URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/DrupalPlugin.xml?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/DrupalPlugin.xml (original) +++ openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/DrupalPlugin.xml Fri Nov 13 01:24:41 2015 @@ -12,7 +12,9 @@ See the License for the specific language governing permissions and limitations under the License. --> -<document xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:noNamespaceSchemaLocation="website.xsd"> +<document xmlns="http://maven.apache.org/XDOC/2.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd";> <properties> <title>Drupal Plugin</title> @@ -26,10 +28,7 @@ <section name="Drupal Plugin for OpenMeetings"> <p> Plugin for Drupal currently is not open source. - Please contact <a href="commercial-support.html" target="_BLANK" rel="nofollow">Commercial Support</a> to get it. - <br/> - A demo version+video of the Drupal plugin is available at - <a href="http://drupal.openmeetings.de/"; target="_BLANK" rel="nofollow">drupal.openmeetings.de</a>. + Please contact <a href="commercial-support.html" target="_blank" rel="nofollow">Commercial Support</a> to get it. </p> </section> @@ -38,7 +37,7 @@ You simply download the ZIP or TAR package and unzip it to Drupal "mod" directory. <br/> For a detailed description on how to install plugins in Drupal please review their - <a href="http://drupal.org/documentation/install/modules-themes"; target="_BLANK" rel="nofollow">handbook</a>. + <a href="http://drupal.org/documentation/install/modules-themes"; target="_blank" rel="nofollow">handbook</a>. <br /> Then you visit the module interface of Drupal, where you will find the new module. You should switch it to "enabled" to get the "Configure" and "Permissions" buttons. @@ -69,6 +68,11 @@ </a> </section> + <section name="Demo video"> + <p>The demo video of Drupal plugin show you the plugin in action </p> + <iframe width="640" height="390" src="http://www.youtube.com/embed/LmMIKFCLRV4"; frameborder="0" allowfullscreen=""></iframe> + <iframe width="640" height="390" src="http://www.youtube.com/embed/k5PF3vdVUn0"; frameborder="0" allowfullscreen=""></iframe> + </section> </body> </document> \ No newline at end of file Modified: openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/EditTemplates.xml URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/EditTemplates.xml?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/EditTemplates.xml (original) +++ openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/EditTemplates.xml Fri Nov 13 01:24:41 2015 @@ -12,7 +12,9 @@ See the License for the specific language governing permissions and limitations under the License. --> -<document xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:noNamespaceSchemaLocation="website.xsd"> +<document xmlns="http://maven.apache.org/XDOC/2.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd";> <properties> <title>Edit Templates</title> @@ -35,10 +37,8 @@ To lookup the labelids in the GUI you can simply run OpenMeetings client with the debug enabled. That way every text-string has the labelid in brackets additionally in the textfield. To start the - client in debug mode just add the param ?swf=maindebug.swf8.swf to - the URL. Example: - <a href="http://localhost:5080/openmeetings/?swf=maindebug.swf8.swf"; - rel="nofollow">http://localhost:5080/openmeetings/?swf=maindebug.swf8.swf</a> + client in debug mode please check "Tips and Tricks" section of + <a href="installation.html" rel="nofollow">Installation guide</a> </p> </section> Modified: openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/FFMPEGVersionSwitch.xml URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/FFMPEGVersionSwitch.xml?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/FFMPEGVersionSwitch.xml (original) +++ openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/FFMPEGVersionSwitch.xml Fri Nov 13 01:24:41 2015 @@ -12,7 +12,9 @@ See the License for the specific language governing permissions and limitations under the License. --> -<document xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:noNamespaceSchemaLocation="website.xsd"> +<document xmlns="http://maven.apache.org/XDOC/2.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd";> <properties> <title>Howto switch between different versions of FFMPEG </title>
