Author: solomax
Date: Sat Nov 16 14:51:28 2013
New Revision: 1542517
URL: http://svn.apache.org/r1542517
Log:
[OPENMEETINGS-835] persistence file for postgresql is renamed
Added:
openmeetings/branches/2.x/src/META-INF/postgresql_persistence.xml
- copied unchanged from r1541082,
openmeetings/branches/2.x/src/META-INF/postgres_persistence.xml
openmeetings/trunk/singlewebapp/src/main/webapp/WEB-INF/classes/META-INF/postgresql_persistence.xml
- copied unchanged from r1541076,
openmeetings/trunk/singlewebapp/src/main/webapp/WEB-INF/classes/META-INF/postgres_persistence.xml
Removed:
openmeetings/branches/2.x/src/META-INF/postgres_persistence.xml
openmeetings/trunk/singlewebapp/src/main/webapp/WEB-INF/classes/META-INF/postgres_persistence.xml
Modified:
openmeetings/branches/2.x/build.xml
openmeetings/branches/2.x/docs/PostgresConfig.html
openmeetings/branches/2.x/xdocs/PostgresConfig.xml
openmeetings/trunk/singlewebapp/build.xml
openmeetings/trunk/singlewebapp/docs/PostgresConfig.html
openmeetings/trunk/singlewebapp/xdocs/PostgresConfig.xml
Modified: openmeetings/branches/2.x/build.xml
URL:
http://svn.apache.org/viewvc/openmeetings/branches/2.x/build.xml?rev=1542517&r1=1542516&r2=1542517&view=diff
==============================================================================
--- openmeetings/branches/2.x/build.xml (original)
+++ openmeetings/branches/2.x/build.xml Sat Nov 16 14:51:28 2013
@@ -1130,7 +1130,7 @@
<!-- empty -->
</target>
- <target name="-retrieve-postgres" unless="postgres.installed"
description="Retrieves the libraries if needed" depends="-availability-check">
+ <target name="-retrieve-postgresql" unless="postgresql.installed"
description="Retrieves the libraries if needed" depends="-availability-check">
<!-- retrieved automatically, added for compatibility -->
</target>
Modified: openmeetings/branches/2.x/docs/PostgresConfig.html
URL:
http://svn.apache.org/viewvc/openmeetings/branches/2.x/docs/PostgresConfig.html?rev=1542517&r1=1542516&r2=1542517&view=diff
==============================================================================
--- openmeetings/branches/2.x/docs/PostgresConfig.html (original)
+++ openmeetings/branches/2.x/docs/PostgresConfig.html Sat Nov 16 14:51:28 2013
@@ -36,7 +36,7 @@ limitations under the License.
- <title>Apache OpenMeetings - Postgres Configuration</title>
+ <title>Apache OpenMeetings - PostgreSQL Configuration</title>
<link rel="stylesheet" type="text/css" href="css/openmeetings.css">
<link rel="stylesheet" type="text/css" href="css/jquery-ui.css">
<link rel="stylesheet" type="text/css"
href="css/coin-slider-styles.css">
@@ -648,7 +648,7 @@ limitations under the License.
<table
border="0" cellspacing="0" cellpadding="0" cellspacing="0" width="100%">
<tr><td ><!-- bgcolor="#EEEEEE" -->
<font color="#000000" face="verdana,arial,helvetica,sanserif">
- <a name="Postgres Configuration"><strong>Postgres
Configuration</strong></a>
+ <a name="PostgreSQL Configuration"><strong>PostgreSQL
Configuration</strong></a>
</font>
<hr style="width:100%; color:#999999; background-color:#999999;
height:1px; border:0px;"/>
</td></tr>
@@ -666,9 +666,9 @@ limitations under the License.
<li>Make sure that you have set utf8 as
default/server-character-set
</li>
<li>
- make sure Postgres is listening
on TCP/IP connections!
+ make sure PostgreSQL is
listening on TCP/IP connections!
<br />
- To verify if Postgres
connection is working: OpenMeetings will
+ To verify if PostgreSQL
connection is working: OpenMeetings will
automatically create all tables
in the database and all tables
should have utf8 as
encoding/collation!
</li>
@@ -698,7 +698,7 @@ limitations under the License.
<li>
Rename:
<br />
-
$red5/webapps/openmeetings/WEB-INF/classes/META-INF/postgres_persistence.xml
+
$red5/webapps/openmeetings/WEB-INF/classes/META-INF/postgresql_persistence.xml
<br />
to
<br />
@@ -723,17 +723,15 @@ limitations under the License.
<table border="0"
cellspacing="0" cellpadding="0" width="100%">
<tr><td bgcolor="#EFEFEF">
<font color="#000000" face="arial,helvetica,sanserif">
- <a name="Postgres Sample Configuration"><strong>Postgres Sample
Configuration</strong></a>
+ <a name="PostgreSQL Sample Configuration"><strong>PostgreSQL Sample
Configuration</strong></a>
</font>
</td></tr>
<tr><td>
<blockquote>
<p>
- There is a sample configuration for
Postgres that ships with
- every
- release in:
- <br />
-
/webapps/openmeetings/WEB-INF/classes/META-INF/postgres_persistence.xml
+ There is a sample configuration for
PostgreSQL that ships with
+ every release in:<br />
+
/webapps/openmeetings/WEB-INF/classes/META-INF/postgresql_persistence.xml
</p>
</blockquote>
</td></tr>
Modified: openmeetings/branches/2.x/xdocs/PostgresConfig.xml
URL:
http://svn.apache.org/viewvc/openmeetings/branches/2.x/xdocs/PostgresConfig.xml?rev=1542517&r1=1542516&r2=1542517&view=diff
==============================================================================
--- openmeetings/branches/2.x/xdocs/PostgresConfig.xml (original)
+++ openmeetings/branches/2.x/xdocs/PostgresConfig.xml Sat Nov 16 14:51:28 2013
@@ -15,23 +15,23 @@
<document>
<properties>
- <title>Postgres Configuration</title>
+ <title>PostgreSQL Configuration</title>
<author email="[email protected]">
Apache OpenMeetings Documentation Team
</author>
</properties>
<body>
- <section name="Postgres Configuration">
+ <section name="PostgreSQL Configuration">
<subsection name="Before you start">
<ul>
<li>Make sure that you have set utf8 as
default/server-character-set
</li>
<li>
- make sure Postgres is listening
on TCP/IP connections!
+ make sure PostgreSQL is
listening on TCP/IP connections!
<br />
- To verify if Postgres
connection is working: OpenMeetings will
+ To verify if PostgreSQL
connection is working: OpenMeetings will
automatically create all tables
in the database and all tables
should have utf8 as
encoding/collation!
</li>
@@ -52,7 +52,7 @@
<li>
Rename:
<br />
-
$red5/webapps/openmeetings/WEB-INF/classes/META-INF/postgres_persistence.xml
+
$red5/webapps/openmeetings/WEB-INF/classes/META-INF/postgresql_persistence.xml
<br />
to
<br />
@@ -72,13 +72,11 @@
</ul>
</subsection>
- <subsection name="Postgres Sample Configuration">
+ <subsection name="PostgreSQL Sample Configuration">
<p>
- There is a sample configuration for
Postgres that ships with
- every
- release in:
- <br />
-
/webapps/openmeetings/WEB-INF/classes/META-INF/postgres_persistence.xml
+ There is a sample configuration for
PostgreSQL that ships with
+ every release in:<br />
+
/webapps/openmeetings/WEB-INF/classes/META-INF/postgresql_persistence.xml
</p>
</subsection>
Modified: openmeetings/trunk/singlewebapp/build.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/build.xml?rev=1542517&r1=1542516&r2=1542517&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/build.xml (original)
+++ openmeetings/trunk/singlewebapp/build.xml Sat Nov 16 14:51:28 2013
@@ -1310,7 +1310,7 @@
<!-- empty -->
</target>
- <target name="-retrieve-postgres" unless="postgres.installed"
description="Retrieves the libraries if needed" depends="-availability-check">
+ <target name="-retrieve-postgresql" unless="postgresql.installed"
description="Retrieves the libraries if needed" depends="-availability-check">
<!-- retrieved automatically, added for compatibility -->
</target>
Modified: openmeetings/trunk/singlewebapp/docs/PostgresConfig.html
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/docs/PostgresConfig.html?rev=1542517&r1=1542516&r2=1542517&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/docs/PostgresConfig.html (original)
+++ openmeetings/trunk/singlewebapp/docs/PostgresConfig.html Sat Nov 16
14:51:28 2013
@@ -36,7 +36,7 @@ limitations under the License.
- <title>Apache OpenMeetings - Postgres Configuration</title>
+ <title>Apache OpenMeetings - PostgreSQL Configuration</title>
<link rel="stylesheet" type="text/css" href="css/openmeetings.css">
<link rel="stylesheet" type="text/css" href="css/jquery-ui.css">
<link rel="stylesheet" type="text/css"
href="css/coin-slider-styles.css">
@@ -656,7 +656,7 @@ limitations under the License.
<table
border="0" cellspacing="0" cellpadding="0" cellspacing="0" width="100%">
<tr><td ><!-- bgcolor="#EEEEEE" -->
<font color="#000000" face="verdana,arial,helvetica,sanserif">
- <a name="Postgres Configuration"><strong>Postgres
Configuration</strong></a>
+ <a name="PostgreSQL Configuration"><strong>PostgreSQL
Configuration</strong></a>
</font>
<hr style="width:100%; color:#999999; background-color:#999999;
height:1px; border:0px;"/>
</td></tr>
@@ -674,9 +674,9 @@ limitations under the License.
<li>Make sure that you have set utf8 as
default/server-character-set
</li>
<li>
- make sure Postgres is listening
on TCP/IP connections!
+ make sure PostgreSQL is
listening on TCP/IP connections!
<br />
- To verify if Postgres
connection is working: OpenMeetings will
+ To verify if PostgreSQL
connection is working: OpenMeetings will
automatically create all tables
in the database and all tables
should have utf8 as
encoding/collation!
</li>
@@ -706,7 +706,7 @@ limitations under the License.
<li>
Rename:
<br />
-
$red5/webapps/openmeetings/WEB-INF/classes/META-INF/postgres_persistence.xml
+
$red5/webapps/openmeetings/WEB-INF/classes/META-INF/postgresql_persistence.xml
<br />
to
<br />
@@ -731,17 +731,17 @@ limitations under the License.
<table border="0"
cellspacing="0" cellpadding="0" width="100%">
<tr><td bgcolor="#EFEFEF">
<font color="#000000" face="arial,helvetica,sanserif">
- <a name="Postgres Sample Configuration"><strong>Postgres Sample
Configuration</strong></a>
+ <a name="PostgreSQL Sample Configuration"><strong>PostgreSQL Sample
Configuration</strong></a>
</font>
</td></tr>
<tr><td>
<blockquote>
<p>
- There is a sample configuration for
Postgres that ships with
+ There is a sample configuration for
PostgreSQL that ships with
every
release in:
<br />
-
/webapps/openmeetings/WEB-INF/classes/META-INF/postgres_persistence.xml
+
/webapps/openmeetings/WEB-INF/classes/META-INF/postgresql_persistence.xml
</p>
</blockquote>
</td></tr>
Modified: openmeetings/trunk/singlewebapp/xdocs/PostgresConfig.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/xdocs/PostgresConfig.xml?rev=1542517&r1=1542516&r2=1542517&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/xdocs/PostgresConfig.xml (original)
+++ openmeetings/trunk/singlewebapp/xdocs/PostgresConfig.xml Sat Nov 16
14:51:28 2013
@@ -15,23 +15,23 @@
<document xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:noNamespaceSchemaLocation="website.xsd">
<properties>
- <title>Postgres Configuration</title>
+ <title>PostgreSQL Configuration</title>
<author email="[email protected]">
Apache OpenMeetings Documentation Team
</author>
</properties>
<body>
- <section name="Postgres Configuration">
+ <section name="PostgreSQL Configuration">
<subsection name="Before you start">
<ul>
<li>Make sure that you have set utf8 as
default/server-character-set
</li>
<li>
- make sure Postgres is listening
on TCP/IP connections!
+ make sure PostgreSQL is
listening on TCP/IP connections!
<br />
- To verify if Postgres
connection is working: OpenMeetings will
+ To verify if PostgreSQL
connection is working: OpenMeetings will
automatically create all tables
in the database and all tables
should have utf8 as
encoding/collation!
</li>
@@ -52,7 +52,7 @@
<li>
Rename:
<br />
-
$red5/webapps/openmeetings/WEB-INF/classes/META-INF/postgres_persistence.xml
+
$red5/webapps/openmeetings/WEB-INF/classes/META-INF/postgresql_persistence.xml
<br />
to
<br />
@@ -72,13 +72,13 @@
</ul>
</subsection>
- <subsection name="Postgres Sample Configuration">
+ <subsection name="PostgreSQL Sample Configuration">
<p>
- There is a sample configuration for
Postgres that ships with
+ There is a sample configuration for
PostgreSQL that ships with
every
release in:
<br />
-
/webapps/openmeetings/WEB-INF/classes/META-INF/postgres_persistence.xml
+
/webapps/openmeetings/WEB-INF/classes/META-INF/postgresql_persistence.xml
</p>
</subsection>
