Author: solomax
Date: Thu Aug 18 09:40:05 2016
New Revision: 1756750
URL: http://svn.apache.org/viewvc?rev=1756750&view=rev
Log:
no jira: project SCM is corrected
Modified:
openmeetings/application/branches/3.1.x/openmeetings-server/pom.xml
openmeetings/application/branches/3.1.x/openmeetings-server/src/site/xdoc/Internationalisation.xml
openmeetings/application/branches/3.1.x/openmeetings-server/src/site/xdoc/RestrictedAccess.xml
openmeetings/application/branches/3.1.x/openmeetings-server/src/site/xdoc/TimeZoneHandling.xml
openmeetings/application/branches/3.1.x/openmeetings-server/src/site/xdoc/WebsiteGuide.xml
openmeetings/application/branches/3.1.x/openmeetings-server/src/site/xdoc/themes-and-branding.xml
openmeetings/application/branches/3.2.x/openmeetings-server/pom.xml
openmeetings/application/branches/3.2.x/openmeetings-server/src/site/xdoc/Internationalisation.xml
openmeetings/application/branches/3.2.x/openmeetings-server/src/site/xdoc/RestrictedAccess.xml
openmeetings/application/branches/3.2.x/openmeetings-server/src/site/xdoc/TimeZoneHandling.xml
openmeetings/application/branches/3.2.x/openmeetings-server/src/site/xdoc/WebsiteGuide.xml
openmeetings/application/branches/3.2.x/openmeetings-server/src/site/xdoc/themes-and-branding.xml
openmeetings/application/trunk/openmeetings-server/pom.xml
openmeetings/application/trunk/openmeetings-server/src/site/xdoc/Internationalisation.xml
openmeetings/application/trunk/openmeetings-server/src/site/xdoc/RestrictedAccess.xml
openmeetings/application/trunk/openmeetings-server/src/site/xdoc/TimeZoneHandling.xml
openmeetings/application/trunk/openmeetings-server/src/site/xdoc/WebsiteGuide.xml
openmeetings/application/trunk/openmeetings-server/src/site/xdoc/themes-and-branding.xml
openmeetings/site/trunk/Internationalisation.html
openmeetings/site/trunk/RestrictedAccess.html
openmeetings/site/trunk/TimeZoneHandling.html
openmeetings/site/trunk/WebsiteGuide.html
openmeetings/site/trunk/source-repository.html
openmeetings/site/trunk/themes-and-branding.html
Modified: openmeetings/application/branches/3.1.x/openmeetings-server/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-server/pom.xml?rev=1756750&r1=1756749&r2=1756750&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-server/pom.xml
(original)
+++ openmeetings/application/branches/3.1.x/openmeetings-server/pom.xml Thu Aug
18 09:40:05 2016
@@ -44,9 +44,9 @@
</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>
+
<connection>scm:svn:https://svn.apache.org/repos/asf/openmeetings/application/branches/3.1.x</connection>
+
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/openmeetings/application/branches/3.1.x</developerConnection>
+
<url>https://svn.apache.org/repos/asf/openmeetings/application/branches/3.1.x</url>
<tag>HEAD</tag>
</scm>
<profiles>
Modified:
openmeetings/application/branches/3.1.x/openmeetings-server/src/site/xdoc/Internationalisation.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-server/src/site/xdoc/Internationalisation.xml?rev=1756750&r1=1756749&r2=1756750&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-server/src/site/xdoc/Internationalisation.xml
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-server/src/site/xdoc/Internationalisation.xml
Thu Aug 18 09:40:05 2016
@@ -24,8 +24,8 @@
<p>You can find all current language files here: </p>
<p>
<a
-
href="https://svn.apache.org/repos/asf/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/"
-
rel="nofollow">https://svn.apache.org/repos/asf/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/
+
href="https://svn.apache.org/repos/asf/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/"
+
rel="nofollow">https://svn.apache.org/repos/asf/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/
</a>
</p>
<p>Just take one file and translate it to your
language. </p>
Modified:
openmeetings/application/branches/3.1.x/openmeetings-server/src/site/xdoc/RestrictedAccess.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-server/src/site/xdoc/RestrictedAccess.xml?rev=1756750&r1=1756749&r2=1756750&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-server/src/site/xdoc/RestrictedAccess.xml
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-server/src/site/xdoc/RestrictedAccess.xml
Thu Aug 18 09:40:05 2016
@@ -32,8 +32,8 @@
<source>webapp.virtualHosts=*,localhost,
127.0.0.1</source>
Sample file:
<a
-
href="https://svn.apache.org/repos/asf/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/red5-web.properties"
-
rel="nofollow">https://svn.apache.org/repos/asf/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/red5-web.properties
+
href="https://svn.apache.org/repos/asf/openmeetings/application/trunk/openmeetings-web/src/main/webapp/WEB-INF/red5-web.properties"
+
rel="nofollow">https://svn.apache.org/repos/asf/openmeetings/application/trunk/openmeetings-web/src/main/webapp/WEB-INF/red5-web.properties
</a>
</section>
Modified:
openmeetings/application/branches/3.1.x/openmeetings-server/src/site/xdoc/TimeZoneHandling.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-server/src/site/xdoc/TimeZoneHandling.xml?rev=1756750&r1=1756749&r2=1756750&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-server/src/site/xdoc/TimeZoneHandling.xml
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-server/src/site/xdoc/TimeZoneHandling.xml
Thu Aug 18 09:40:05 2016
@@ -21,31 +21,9 @@
</properties>
<body>
-
<section name="Introduction">
<p>
- List of default Timezones:
- <a
-
href="https://svn.apache.org/repos/asf/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/timezones.xml"
-
rel="nofollow">https://svn.apache.org/repos/asf/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/timezones.xml
- </a>
- </p>
- <p>
- To add a new Time Zone you have to lookup its
represant in Java's
- Timezone registry. You can then add freely new
time zones to the XML
- file. The XML entries are imported into the
database into the table
- <strong>om_timezone</strong>
- during the installation of OpenMeetings. (Don't
forget to stop the
- server before you change anything in the
database).
- </p>
- <p>
- The Servers default timezone is stored in the
configuration table in
- the attribute
- <strong>default.timezone</strong>
- . The name in this value links to an attribute
in the table
- om_timezone in the column
- <strong>jname</strong>
- .
+ Time zones are being taken from JDK, so please
keep it up to date :)
</p>
<p>
You can set a Flag
@@ -56,33 +34,6 @@
version of OpenMeetings to make sure users see
the new feature and
update their settings.
</p>
-
-
-
- </section>
-
- <section name="How to lookup timezone's">
-
- <source>
-<![CDATA[
-String[] ids = TimeZone.getAvailableIDs();
-for (String id : ids) {
- TimeZone timeZone = TimeZone.getTimeZone(id);
- //TimeZone timeZone = timeRegistry.getTimeZone(id);
- Calendar cal = Calendar.getInstance();
- cal.setTimeZone(timeZone);
- // + cal.get(Calendar.DST_OFFSET)
- int offset = cal.get(Calendar.ZONE_OFFSET);
- int offsetInMinutes = offset/1000/60;
-
- System.out.println("name" + id + "name offset "+offsetInMinutes+"offset ");
-}
-]]>
- </source>
-
-
</section>
-
</body>
-
</document>
Modified:
openmeetings/application/branches/3.1.x/openmeetings-server/src/site/xdoc/WebsiteGuide.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-server/src/site/xdoc/WebsiteGuide.xml?rev=1756750&r1=1756749&r2=1756750&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-server/src/site/xdoc/WebsiteGuide.xml
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-server/src/site/xdoc/WebsiteGuide.xml
Thu Aug 18 09:40:05 2016
@@ -27,7 +27,7 @@
<div>
<ul>
<li>Sun JDK7</li>
- <li>Apache Maven (3.2.1 or
later)</li>
+ <li>Apache Maven (3.3.9 or
later)</li>
</ul>
</div>
</subsection>
@@ -36,7 +36,7 @@
<div>
<p>
The Apache OpenMeetings HTML
websites are generated from XML files.
- You edit the XML files, run the
MAVEN command <source><![CDATA[mvn install -Dunpacked=true]]></source> that
generates the HTML files
+ You edit the XML files, run the
MAVEN command <source><![CDATA[mvn install -P allModules,unpacked]]></source>
that generates the HTML files
and then you copy generated
HTML files into appropriate place and commit to SVN both: XML and HTML files.
</p>
<p>
@@ -56,7 +56,7 @@
<div>
To update the website you need
to checkout trunk:<br />
- <a
href="https://svn.apache.org/repos/asf/openmeetings/trunk/singlewebapp/">https://svn.apache.org/repos/asf/openmeetings/trunk/singlewebapp/</a>
<br/>
+ <a
href="https://svn.apache.org/repos/asf/openmeetings/application/trunk/">https://svn.apache.org/repos/asf/openmeetings/application/trunk/</a>
<br/>
edit the files in the folder
<tt>openmeetings-server/src/site</tt><br/>
then you run the command:
<source><![CDATA[mvn install
-Dunpacked=true]]></source>
Modified:
openmeetings/application/branches/3.1.x/openmeetings-server/src/site/xdoc/themes-and-branding.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-server/src/site/xdoc/themes-and-branding.xml?rev=1756750&r1=1756749&r2=1756750&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-server/src/site/xdoc/themes-and-branding.xml
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-server/src/site/xdoc/themes-and-branding.xml
Thu Aug 18 09:40:05 2016
@@ -38,15 +38,15 @@
<p>To modify default theme used by OM please open
following file in the SVN: </p>
<p>
<a
-
href="https://svn.apache.org/repos/asf/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/css/theme_om/jquery-ui-1.10.4.custom.css"
- target="_blank"
rel="nofollow">https://svn.apache.org/repos/asf/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/css/theme_om/jquery-ui-1.10.4.custom.css
+
href="https://svn.apache.org/repos/asf/openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/theme_om/jquery-ui.css"
+ target="_blank"
rel="nofollow">https://svn.apache.org/repos/asf/openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/theme_om/jquery-ui.css
</a>
</p>
<p>and follow to link following "To view and modify
this theme, visit" text in css comments</p>
<p>
Or if you already installed OpenMeetings on
your machine at:
<br />
-
<tt>/webapps/openmeetings/css/theme_om/jquery-ui-1.10.4.custom.css</tt>
+
<tt>/webapps/openmeetings/css/theme_om/jquery-ui.css</tt>
<br />
The file contains border, background and font
color definitions as
well as paths to icons that are loaded at
runtime.
Modified: openmeetings/application/branches/3.2.x/openmeetings-server/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-server/pom.xml?rev=1756750&r1=1756749&r2=1756750&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-server/pom.xml
(original)
+++ openmeetings/application/branches/3.2.x/openmeetings-server/pom.xml Thu Aug
18 09:40:05 2016
@@ -44,9 +44,9 @@
</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>
+
<connection>scm:svn:https://svn.apache.org/repos/asf/openmeetings/application/branches/3.2.x</connection>
+
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/openmeetings/application/branches/3.2.x</developerConnection>
+
<url>https://svn.apache.org/repos/asf/openmeetings/application/branches/3.2.x</url>
<tag>HEAD</tag>
</scm>
<profiles>
Modified:
openmeetings/application/branches/3.2.x/openmeetings-server/src/site/xdoc/Internationalisation.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-server/src/site/xdoc/Internationalisation.xml?rev=1756750&r1=1756749&r2=1756750&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-server/src/site/xdoc/Internationalisation.xml
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-server/src/site/xdoc/Internationalisation.xml
Thu Aug 18 09:40:05 2016
@@ -24,8 +24,8 @@
<p>You can find all current language files here: </p>
<p>
<a
-
href="https://svn.apache.org/repos/asf/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/"
-
rel="nofollow">https://svn.apache.org/repos/asf/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/
+
href="https://svn.apache.org/repos/asf/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/"
+
rel="nofollow">https://svn.apache.org/repos/asf/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/
</a>
</p>
<p>Just take one file and translate it to your
language. </p>
Modified:
openmeetings/application/branches/3.2.x/openmeetings-server/src/site/xdoc/RestrictedAccess.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-server/src/site/xdoc/RestrictedAccess.xml?rev=1756750&r1=1756749&r2=1756750&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-server/src/site/xdoc/RestrictedAccess.xml
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-server/src/site/xdoc/RestrictedAccess.xml
Thu Aug 18 09:40:05 2016
@@ -32,8 +32,8 @@
<source>webapp.virtualHosts=*,localhost,
127.0.0.1</source>
Sample file:
<a
-
href="https://svn.apache.org/repos/asf/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/red5-web.properties"
-
rel="nofollow">https://svn.apache.org/repos/asf/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/red5-web.properties
+
href="https://svn.apache.org/repos/asf/openmeetings/application/trunk/openmeetings-web/src/main/webapp/WEB-INF/red5-web.properties"
+
rel="nofollow">https://svn.apache.org/repos/asf/openmeetings/application/trunk/openmeetings-web/src/main/webapp/WEB-INF/red5-web.properties
</a>
</section>
Modified:
openmeetings/application/branches/3.2.x/openmeetings-server/src/site/xdoc/TimeZoneHandling.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-server/src/site/xdoc/TimeZoneHandling.xml?rev=1756750&r1=1756749&r2=1756750&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-server/src/site/xdoc/TimeZoneHandling.xml
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-server/src/site/xdoc/TimeZoneHandling.xml
Thu Aug 18 09:40:05 2016
@@ -21,31 +21,9 @@
</properties>
<body>
-
<section name="Introduction">
<p>
- List of default Timezones:
- <a
-
href="https://svn.apache.org/repos/asf/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/timezones.xml"
-
rel="nofollow">https://svn.apache.org/repos/asf/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/timezones.xml
- </a>
- </p>
- <p>
- To add a new Time Zone you have to lookup its
represant in Java's
- Timezone registry. You can then add freely new
time zones to the XML
- file. The XML entries are imported into the
database into the table
- <strong>om_timezone</strong>
- during the installation of OpenMeetings. (Don't
forget to stop the
- server before you change anything in the
database).
- </p>
- <p>
- The Servers default timezone is stored in the
configuration table in
- the attribute
- <strong>default.timezone</strong>
- . The name in this value links to an attribute
in the table
- om_timezone in the column
- <strong>jname</strong>
- .
+ Time zones are being taken from JDK, so please
keep it up to date :)
</p>
<p>
You can set a Flag
@@ -56,33 +34,6 @@
version of OpenMeetings to make sure users see
the new feature and
update their settings.
</p>
-
-
-
- </section>
-
- <section name="How to lookup timezone's">
-
- <source>
-<![CDATA[
-String[] ids = TimeZone.getAvailableIDs();
-for (String id : ids) {
- TimeZone timeZone = TimeZone.getTimeZone(id);
- //TimeZone timeZone = timeRegistry.getTimeZone(id);
- Calendar cal = Calendar.getInstance();
- cal.setTimeZone(timeZone);
- // + cal.get(Calendar.DST_OFFSET)
- int offset = cal.get(Calendar.ZONE_OFFSET);
- int offsetInMinutes = offset/1000/60;
-
- System.out.println("name" + id + "name offset "+offsetInMinutes+"offset ");
-}
-]]>
- </source>
-
-
</section>
-
</body>
-
</document>
Modified:
openmeetings/application/branches/3.2.x/openmeetings-server/src/site/xdoc/WebsiteGuide.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-server/src/site/xdoc/WebsiteGuide.xml?rev=1756750&r1=1756749&r2=1756750&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-server/src/site/xdoc/WebsiteGuide.xml
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-server/src/site/xdoc/WebsiteGuide.xml
Thu Aug 18 09:40:05 2016
@@ -27,7 +27,7 @@
<div>
<ul>
<li>Sun JDK7</li>
- <li>Apache Maven (3.2.1 or
later)</li>
+ <li>Apache Maven (3.3.9 or
later)</li>
</ul>
</div>
</subsection>
@@ -36,7 +36,7 @@
<div>
<p>
The Apache OpenMeetings HTML
websites are generated from XML files.
- You edit the XML files, run the
MAVEN command <source><![CDATA[mvn install -Dunpacked=true]]></source> that
generates the HTML files
+ You edit the XML files, run the
MAVEN command <source><![CDATA[mvn install -P allModules,unpacked]]></source>
that generates the HTML files
and then you copy generated
HTML files into appropriate place and commit to SVN both: XML and HTML files.
</p>
<p>
@@ -56,7 +56,7 @@
<div>
To update the website you need
to checkout trunk:<br />
- <a
href="https://svn.apache.org/repos/asf/openmeetings/trunk/singlewebapp/">https://svn.apache.org/repos/asf/openmeetings/trunk/singlewebapp/</a>
<br/>
+ <a
href="https://svn.apache.org/repos/asf/openmeetings/application/trunk/">https://svn.apache.org/repos/asf/openmeetings/application/trunk/</a>
<br/>
edit the files in the folder
<tt>openmeetings-server/src/site</tt><br/>
then you run the command:
<source><![CDATA[mvn install
-Dunpacked=true]]></source>
Modified:
openmeetings/application/branches/3.2.x/openmeetings-server/src/site/xdoc/themes-and-branding.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-server/src/site/xdoc/themes-and-branding.xml?rev=1756750&r1=1756749&r2=1756750&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-server/src/site/xdoc/themes-and-branding.xml
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-server/src/site/xdoc/themes-and-branding.xml
Thu Aug 18 09:40:05 2016
@@ -38,15 +38,15 @@
<p>To modify default theme used by OM please open
following file in the SVN: </p>
<p>
<a
-
href="https://svn.apache.org/repos/asf/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/css/theme_om/jquery-ui-1.10.4.custom.css"
- target="_blank"
rel="nofollow">https://svn.apache.org/repos/asf/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/css/theme_om/jquery-ui-1.10.4.custom.css
+
href="https://svn.apache.org/repos/asf/openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/theme_om/jquery-ui.css"
+ target="_blank"
rel="nofollow">https://svn.apache.org/repos/asf/openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/theme_om/jquery-ui.css
</a>
</p>
<p>and follow to link following "To view and modify
this theme, visit" text in css comments</p>
<p>
Or if you already installed OpenMeetings on
your machine at:
<br />
-
<tt>/webapps/openmeetings/css/theme_om/jquery-ui-1.10.4.custom.css</tt>
+
<tt>/webapps/openmeetings/css/theme_om/jquery-ui.css</tt>
<br />
The file contains border, background and font
color definitions as
well as paths to icons that are loaded at
runtime.
Modified: openmeetings/application/trunk/openmeetings-server/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-server/pom.xml?rev=1756750&r1=1756749&r2=1756750&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-server/pom.xml (original)
+++ openmeetings/application/trunk/openmeetings-server/pom.xml Thu Aug 18
09:40:05 2016
@@ -44,9 +44,9 @@
</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>
+
<connection>scm:svn:https://svn.apache.org/repos/asf/openmeetings/application/trunk</connection>
+
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/openmeetings/application/trunk</developerConnection>
+
<url>https://svn.apache.org/repos/asf/openmeetings/application/trunk</url>
<tag>HEAD</tag>
</scm>
<profiles>
Modified:
openmeetings/application/trunk/openmeetings-server/src/site/xdoc/Internationalisation.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-server/src/site/xdoc/Internationalisation.xml?rev=1756750&r1=1756749&r2=1756750&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-server/src/site/xdoc/Internationalisation.xml
(original)
+++
openmeetings/application/trunk/openmeetings-server/src/site/xdoc/Internationalisation.xml
Thu Aug 18 09:40:05 2016
@@ -24,8 +24,8 @@
<p>You can find all current language files here: </p>
<p>
<a
-
href="https://svn.apache.org/repos/asf/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/"
-
rel="nofollow">https://svn.apache.org/repos/asf/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/
+
href="https://svn.apache.org/repos/asf/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/"
+
rel="nofollow">https://svn.apache.org/repos/asf/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/
</a>
</p>
<p>Just take one file and translate it to your
language. </p>
Modified:
openmeetings/application/trunk/openmeetings-server/src/site/xdoc/RestrictedAccess.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-server/src/site/xdoc/RestrictedAccess.xml?rev=1756750&r1=1756749&r2=1756750&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-server/src/site/xdoc/RestrictedAccess.xml
(original)
+++
openmeetings/application/trunk/openmeetings-server/src/site/xdoc/RestrictedAccess.xml
Thu Aug 18 09:40:05 2016
@@ -32,8 +32,8 @@
<source>webapp.virtualHosts=*,localhost,
127.0.0.1</source>
Sample file:
<a
-
href="https://svn.apache.org/repos/asf/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/red5-web.properties"
-
rel="nofollow">https://svn.apache.org/repos/asf/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/red5-web.properties
+
href="https://svn.apache.org/repos/asf/openmeetings/application/trunk/openmeetings-web/src/main/webapp/WEB-INF/red5-web.properties"
+
rel="nofollow">https://svn.apache.org/repos/asf/openmeetings/application/trunk/openmeetings-web/src/main/webapp/WEB-INF/red5-web.properties
</a>
</section>
Modified:
openmeetings/application/trunk/openmeetings-server/src/site/xdoc/TimeZoneHandling.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-server/src/site/xdoc/TimeZoneHandling.xml?rev=1756750&r1=1756749&r2=1756750&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-server/src/site/xdoc/TimeZoneHandling.xml
(original)
+++
openmeetings/application/trunk/openmeetings-server/src/site/xdoc/TimeZoneHandling.xml
Thu Aug 18 09:40:05 2016
@@ -21,31 +21,9 @@
</properties>
<body>
-
<section name="Introduction">
<p>
- List of default Timezones:
- <a
-
href="https://svn.apache.org/repos/asf/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/timezones.xml"
-
rel="nofollow">https://svn.apache.org/repos/asf/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/timezones.xml
- </a>
- </p>
- <p>
- To add a new Time Zone you have to lookup its
represant in Java's
- Timezone registry. You can then add freely new
time zones to the XML
- file. The XML entries are imported into the
database into the table
- <strong>om_timezone</strong>
- during the installation of OpenMeetings. (Don't
forget to stop the
- server before you change anything in the
database).
- </p>
- <p>
- The Servers default timezone is stored in the
configuration table in
- the attribute
- <strong>default.timezone</strong>
- . The name in this value links to an attribute
in the table
- om_timezone in the column
- <strong>jname</strong>
- .
+ Time zones are being taken from JDK, so please
keep it up to date :)
</p>
<p>
You can set a Flag
@@ -56,33 +34,6 @@
version of OpenMeetings to make sure users see
the new feature and
update their settings.
</p>
-
-
-
- </section>
-
- <section name="How to lookup timezone's">
-
- <source>
-<![CDATA[
-String[] ids = TimeZone.getAvailableIDs();
-for (String id : ids) {
- TimeZone timeZone = TimeZone.getTimeZone(id);
- //TimeZone timeZone = timeRegistry.getTimeZone(id);
- Calendar cal = Calendar.getInstance();
- cal.setTimeZone(timeZone);
- // + cal.get(Calendar.DST_OFFSET)
- int offset = cal.get(Calendar.ZONE_OFFSET);
- int offsetInMinutes = offset/1000/60;
-
- System.out.println("name" + id + "name offset "+offsetInMinutes+"offset ");
-}
-]]>
- </source>
-
-
</section>
-
</body>
-
</document>
Modified:
openmeetings/application/trunk/openmeetings-server/src/site/xdoc/WebsiteGuide.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-server/src/site/xdoc/WebsiteGuide.xml?rev=1756750&r1=1756749&r2=1756750&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-server/src/site/xdoc/WebsiteGuide.xml
(original)
+++
openmeetings/application/trunk/openmeetings-server/src/site/xdoc/WebsiteGuide.xml
Thu Aug 18 09:40:05 2016
@@ -27,7 +27,7 @@
<div>
<ul>
<li>Sun JDK7</li>
- <li>Apache Maven (3.2.1 or
later)</li>
+ <li>Apache Maven (3.3.9 or
later)</li>
</ul>
</div>
</subsection>
@@ -36,7 +36,7 @@
<div>
<p>
The Apache OpenMeetings HTML
websites are generated from XML files.
- You edit the XML files, run the
MAVEN command <source><![CDATA[mvn install -Dunpacked=true]]></source> that
generates the HTML files
+ You edit the XML files, run the
MAVEN command <source><![CDATA[mvn install -P allModules,unpacked]]></source>
that generates the HTML files
and then you copy generated
HTML files into appropriate place and commit to SVN both: XML and HTML files.
</p>
<p>
@@ -56,7 +56,7 @@
<div>
To update the website you need
to checkout trunk:<br />
- <a
href="https://svn.apache.org/repos/asf/openmeetings/trunk/singlewebapp/">https://svn.apache.org/repos/asf/openmeetings/trunk/singlewebapp/</a>
<br/>
+ <a
href="https://svn.apache.org/repos/asf/openmeetings/application/trunk/">https://svn.apache.org/repos/asf/openmeetings/application/trunk/</a>
<br/>
edit the files in the folder
<tt>openmeetings-server/src/site</tt><br/>
then you run the command:
<source><![CDATA[mvn install
-Dunpacked=true]]></source>
Modified:
openmeetings/application/trunk/openmeetings-server/src/site/xdoc/themes-and-branding.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-server/src/site/xdoc/themes-and-branding.xml?rev=1756750&r1=1756749&r2=1756750&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-server/src/site/xdoc/themes-and-branding.xml
(original)
+++
openmeetings/application/trunk/openmeetings-server/src/site/xdoc/themes-and-branding.xml
Thu Aug 18 09:40:05 2016
@@ -38,15 +38,15 @@
<p>To modify default theme used by OM please open
following file in the SVN: </p>
<p>
<a
-
href="https://svn.apache.org/repos/asf/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/css/theme_om/jquery-ui-1.10.4.custom.css"
- target="_blank"
rel="nofollow">https://svn.apache.org/repos/asf/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/css/theme_om/jquery-ui-1.10.4.custom.css
+
href="https://svn.apache.org/repos/asf/openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/theme_om/jquery-ui.css"
+ target="_blank"
rel="nofollow">https://svn.apache.org/repos/asf/openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/theme_om/jquery-ui.css
</a>
</p>
<p>and follow to link following "To view and modify
this theme, visit" text in css comments</p>
<p>
Or if you already installed OpenMeetings on
your machine at:
<br />
-
<tt>/webapps/openmeetings/css/theme_om/jquery-ui-1.10.4.custom.css</tt>
+
<tt>/webapps/openmeetings/css/theme_om/jquery-ui.css</tt>
<br />
The file contains border, background and font
color definitions as
well as paths to icons that are loaded at
runtime.
Modified: openmeetings/site/trunk/Internationalisation.html
URL:
http://svn.apache.org/viewvc/openmeetings/site/trunk/Internationalisation.html?rev=1756750&r1=1756749&r2=1756750&view=diff
==============================================================================
--- openmeetings/site/trunk/Internationalisation.html (original)
+++ openmeetings/site/trunk/Internationalisation.html Thu Aug 18 09:40:05 2016
@@ -766,7 +766,7 @@
<p>You can find all current language files here: </p>
<p>
- <a class="externalLink"
href="https://svn.apache.org/repos/asf/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/"
rel="nofollow">https://svn.apache.org/repos/asf/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/
+ <a class="externalLink"
href="https://svn.apache.org/repos/asf/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/"
rel="nofollow">https://svn.apache.org/repos/asf/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/
</a>
</p>
Modified: openmeetings/site/trunk/RestrictedAccess.html
URL:
http://svn.apache.org/viewvc/openmeetings/site/trunk/RestrictedAccess.html?rev=1756750&r1=1756749&r2=1756750&view=diff
==============================================================================
--- openmeetings/site/trunk/RestrictedAccess.html (original)
+++ openmeetings/site/trunk/RestrictedAccess.html Thu Aug 18 09:40:05 2016
@@ -775,7 +775,7 @@
<div class="source"><pre class="prettyprint">webapp.virtualHosts=*,localhost,
127.0.0.1</pre></div>
Sample file:
- <a class="externalLink"
href="https://svn.apache.org/repos/asf/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/red5-web.properties"
rel="nofollow">https://svn.apache.org/repos/asf/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/red5-web.properties
+ <a class="externalLink"
href="https://svn.apache.org/repos/asf/openmeetings/application/trunk/openmeetings-web/src/main/webapp/WEB-INF/red5-web.properties"
rel="nofollow">https://svn.apache.org/repos/asf/openmeetings/application/trunk/openmeetings-web/src/main/webapp/WEB-INF/red5-web.properties
</a>
</div>
Modified: openmeetings/site/trunk/TimeZoneHandling.html
URL:
http://svn.apache.org/viewvc/openmeetings/site/trunk/TimeZoneHandling.html?rev=1756750&r1=1756749&r2=1756750&view=diff
==============================================================================
--- openmeetings/site/trunk/TimeZoneHandling.html (original)
+++ openmeetings/site/trunk/TimeZoneHandling.html Thu Aug 18 09:40:05 2016
@@ -760,33 +760,11 @@
-
<div class="section">
<h2><a name="Introduction"></a>Introduction</h2>
<p>
- List of default Timezones:
- <a class="externalLink"
href="https://svn.apache.org/repos/asf/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/timezones.xml"
rel="nofollow">https://svn.apache.org/repos/asf/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/timezones.xml
- </a>
- </p>
-
-<p>
- To add a new Time Zone you have to lookup its
represant in Java's
- Timezone registry. You can then add freely new
time zones to the XML
- file. The XML entries are imported into the
database into the table
- <b>om_timezone</b>
- during the installation of OpenMeetings. (Don't
forget to stop the
- server before you change anything in the
database).
- </p>
-
-<p>
- The Servers default timezone is stored in the
configuration table in
- the attribute
- <b>default.timezone</b>
- . The name in this value links to an attribute
in the table
- om_timezone in the column
- <b>jname</b>
- .
+ Time zones are being taken from JDK, so please
keep it up to date :)
</p>
<p>
@@ -798,39 +776,9 @@
version of OpenMeetings to make sure users see
the new feature and
update their settings.
</p>
-
-
-
- </div>
-
-
-<div class="section">
-<h2><a name="How_to_lookup_timezones"></a>How to lookup timezone's</h2>
-
-
-<div class="source"><pre class="prettyprint">
-
-String[] ids = TimeZone.getAvailableIDs();
-for (String id : ids) {
- TimeZone timeZone = TimeZone.getTimeZone(id);
- //TimeZone timeZone = timeRegistry.getTimeZone(id);
- Calendar cal = Calendar.getInstance();
- cal.setTimeZone(timeZone);
- // + cal.get(Calendar.DST_OFFSET)
- int offset = cal.get(Calendar.ZONE_OFFSET);
- int offsetInMinutes = offset/1000/60;
-
- System.out.println("name" + id + "name offset
"+offsetInMinutes+"offset ");
-}
-
- </pre></div>
-
-
</div>
-
-
</div>
</div>
</div>
Modified: openmeetings/site/trunk/WebsiteGuide.html
URL:
http://svn.apache.org/viewvc/openmeetings/site/trunk/WebsiteGuide.html?rev=1756750&r1=1756749&r2=1756750&view=diff
==============================================================================
--- openmeetings/site/trunk/WebsiteGuide.html (original)
+++ openmeetings/site/trunk/WebsiteGuide.html Thu Aug 18 09:40:05 2016
@@ -773,7 +773,7 @@
<li>Sun JDK7</li>
-<li>Apache Maven (3.2.1 or later)</li>
+<li>Apache Maven (3.3.9 or later)</li>
</ul>
</div>
</div>
@@ -787,7 +787,7 @@
<p>
The Apache OpenMeetings HTML
websites are generated from XML files.
You edit the XML files, run the
MAVEN command </p>
-<div class="source"><pre class="prettyprint">mvn install
-Dunpacked=true</pre></div> that generates the HTML files
+<div class="source"><pre class="prettyprint">mvn install -P
allModules,unpacked</pre></div> that generates the HTML files
and then you copy generated
HTML files into appropriate place and commit to SVN both: XML and HTML files.
@@ -813,7 +813,7 @@
<div>
To update the website you need
to checkout trunk:<br />
- <a class="externalLink"
href="https://svn.apache.org/repos/asf/openmeetings/trunk/singlewebapp/">https://svn.apache.org/repos/asf/openmeetings/trunk/singlewebapp/</a>
<br />
+ <a class="externalLink"
href="https://svn.apache.org/repos/asf/openmeetings/application/trunk/">https://svn.apache.org/repos/asf/openmeetings/application/trunk/</a>
<br />
edit the files in the folder
<tt>openmeetings-server/src/site</tt><br />
then you run the command:
Modified: openmeetings/site/trunk/source-repository.html
URL:
http://svn.apache.org/viewvc/openmeetings/site/trunk/source-repository.html?rev=1756750&r1=1756749&r2=1756750&view=diff
==============================================================================
--- openmeetings/site/trunk/source-repository.html (original)
+++ openmeetings/site/trunk/source-repository.html Thu Aug 18 09:40:05 2016
@@ -763,21 +763,21 @@
<div class="section">
<h2><a name="Web_Browser_Access"></a>Web Browser Access</h2><a
name="Web_Browser_Access"></a>
<p>The following is a link to a browsable version of the source repository:</p>
-<div class="source"><pre class="prettyprint"><a class="externalLink"
href="https://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp">https://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp</a></pre></div></div>
+<div class="source"><pre class="prettyprint"><a class="externalLink"
href="https://svn.apache.org/repos/asf/openmeetings/application/branches/3.1.x">https://svn.apache.org/repos/asf/openmeetings/application/branches/3.1.x/openmeetings-server</a></pre></div></div>
<div class="section">
<h2><a name="Anonymous_Access"></a>Anonymous Access</h2><a
name="Anonymous_Access"></a>
<p>The source can be checked out anonymously from Subversion with this
command:</p>
-<div class="source"><pre class="prettyprint">$ svn checkout
https://svn.apache.org/repos/asf/openmeetings/trunk/singlewebapp
openmeetings-server</pre></div></div>
+<div class="source"><pre class="prettyprint">$ svn checkout
https://svn.apache.org/repos/asf/openmeetings/application/branches/3.1.x
openmeetings</pre></div></div>
<div class="section">
<h2><a name="Developer_Access"></a>Developer Access</h2><a
name="Developer_Access"></a>
<p>Everyone can access the Subversion repository via HTTP, but committers must
checkout the Subversion repository via HTTPS.</p>
-<div class="source"><pre class="prettyprint">$ svn checkout
https://svn.apache.org/repos/asf/openmeetings/trunk/singlewebapp
openmeetings-server</pre></div>
+<div class="source"><pre class="prettyprint">$ svn checkout
https://svn.apache.org/repos/asf/openmeetings/application/branches/3.1.x
openmeetings</pre></div>
<p>To commit changes to the repository, execute the following command to
commit your changes (svn will prompt you for your password):</p>
<div class="source"><pre class="prettyprint">$ svn commit --username
your-username -m "A message"</pre></div></div>
<div class="section">
<h2><a name="Access_from_Behind_a_Firewall"></a>Access from Behind a
Firewall</h2><a name="Access_from_Behind_a_Firewall"></a>
<p>For those users who are stuck behind a corporate firewall which is blocking
HTTP access to the Subversion repository, you can try to access it via the
developer connection:</p>
-<div class="source"><pre class="prettyprint">$ svn checkout
https://svn.apache.org/repos/asf/openmeetings/trunk/singlewebapp
openmeetings-server</pre></div></div>
+<div class="source"><pre class="prettyprint">$ svn checkout
https://svn.apache.org/repos/asf/openmeetings/application/branches/3.1.x
openmeetings</pre></div></div>
<div class="section">
<h2><a name="Access_Through_a_Proxy"></a>Access Through a Proxy</h2><a
name="Access_Through_a_Proxy"></a>
<p>The Subversion client can go through a proxy, if you configure it to do so.
First, edit your "servers" configuration file to indicate which proxy
to use. The file's location depends on your operating system. On Linux or Unix
it is located in the directory "~/.subversion". On Windows it is in
"%APPDATA%\Subversion". (Try "echo %APPDATA%", note this is
a hidden directory.)</p>
Modified: openmeetings/site/trunk/themes-and-branding.html
URL:
http://svn.apache.org/viewvc/openmeetings/site/trunk/themes-and-branding.html?rev=1756750&r1=1756749&r2=1756750&view=diff
==============================================================================
--- openmeetings/site/trunk/themes-and-branding.html (original)
+++ openmeetings/site/trunk/themes-and-branding.html Thu Aug 18 09:40:05 2016
@@ -782,7 +782,7 @@
<p>To modify default theme used by OM please open following file in the SVN:
</p>
<p>
- <a class="externalLink"
href="https://svn.apache.org/repos/asf/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/css/theme_om/jquery-ui-1.10.4.custom.css"
target="_blank"
rel="nofollow">https://svn.apache.org/repos/asf/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/css/theme_om/jquery-ui-1.10.4.custom.css
+ <a class="externalLink"
href="https://svn.apache.org/repos/asf/openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/theme_om/jquery-ui.css"
target="_blank"
rel="nofollow">https://svn.apache.org/repos/asf/openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/theme_om/jquery-ui.css
</a>
</p>
@@ -791,7 +791,7 @@
<p>
Or if you already installed OpenMeetings on
your machine at:
<br />
-
<tt>/webapps/openmeetings/css/theme_om/jquery-ui-1.10.4.custom.css</tt>
+
<tt>/webapps/openmeetings/css/theme_om/jquery-ui.css</tt>
<br />
The file contains border, background and font
color definitions as
well as paths to icons that are loaded at
runtime.