You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2017/08/27 10:26:02 UTC

openmeetings git commit: no jira: site is updated to fix whimsy errors

Repository: openmeetings
Updated Branches:
  refs/heads/master 15b17b1da -> df5d58f87


no jira: site is updated to fix whimsy errors


Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/df5d58f8
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/df5d58f8
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/df5d58f8

Branch: refs/heads/master
Commit: df5d58f87c0bdd38aea859970490201ced9ae7c3
Parents: 15b17b1
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Sun Aug 27 17:25:48 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Sun Aug 27 17:25:48 2017 +0700

----------------------------------------------------------------------
 openmeetings-core/src/site/site.xml        | 7 +++----
 openmeetings-db/src/site/site.xml          | 7 +++----
 openmeetings-flash/src/site/site.xml       | 7 +++----
 openmeetings-install/src/site/site.xml     | 7 +++----
 openmeetings-screenshare/src/site/site.xml | 7 +++----
 openmeetings-server/src/site/site.xml      | 4 +++-
 openmeetings-service/src/site/site.xml     | 7 +++----
 openmeetings-util/src/site/site.xml        | 7 +++----
 openmeetings-web/src/site/site.xml         | 7 +++----
 openmeetings-webservice/src/site/site.xml  | 7 +++----
 pom.xml                                    | 2 +-
 src/site/site.xml                          | 5 ++++-
 12 files changed, 35 insertions(+), 39 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/openmeetings/blob/df5d58f8/openmeetings-core/src/site/site.xml
----------------------------------------------------------------------
diff --git a/openmeetings-core/src/site/site.xml b/openmeetings-core/src/site/site.xml
index 0d9f35c..18ac547 100644
--- a/openmeetings-core/src/site/site.xml
+++ b/openmeetings-core/src/site/site.xml
@@ -13,16 +13,15 @@
    limitations under the License.
  -->
 <project xmlns="http://maven.apache.org/DECORATION/1.7.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/DECORATION/1.7.0 http://maven.apache.org/xsd/decoration-1.7.0.xsd"
-  name="Apache OpenMeetings Project">
-
+		xsi:schemaLocation="http://maven.apache.org/DECORATION/1.7.0 http://maven.apache.org/xsd/decoration-1.7.0.xsd"
+		name="Apache OpenMeetings Project">
 	<body>
 		<menu ref="parent"/>
 		<menu name="Project">
 			<item name="About" href="/index.html" />
 			<item name="Info" href="/project-info.html" />
 			<item name="Summary" href="/project-summary.html" />
-			<item name="License" href="/license.html" />
+			<item name="License" href="http://www.apache.org/licenses/" />
 			<item name="Dependencies" href="/dependencies.html" />
 			<item name="Dependency Convergence" href="/dependency-convergence.html" />
 			<item name="RAT Report" href="/rat-report.html" />

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/df5d58f8/openmeetings-db/src/site/site.xml
----------------------------------------------------------------------
diff --git a/openmeetings-db/src/site/site.xml b/openmeetings-db/src/site/site.xml
index 0d9f35c..18ac547 100644
--- a/openmeetings-db/src/site/site.xml
+++ b/openmeetings-db/src/site/site.xml
@@ -13,16 +13,15 @@
    limitations under the License.
  -->
 <project xmlns="http://maven.apache.org/DECORATION/1.7.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/DECORATION/1.7.0 http://maven.apache.org/xsd/decoration-1.7.0.xsd"
-  name="Apache OpenMeetings Project">
-
+		xsi:schemaLocation="http://maven.apache.org/DECORATION/1.7.0 http://maven.apache.org/xsd/decoration-1.7.0.xsd"
+		name="Apache OpenMeetings Project">
 	<body>
 		<menu ref="parent"/>
 		<menu name="Project">
 			<item name="About" href="/index.html" />
 			<item name="Info" href="/project-info.html" />
 			<item name="Summary" href="/project-summary.html" />
-			<item name="License" href="/license.html" />
+			<item name="License" href="http://www.apache.org/licenses/" />
 			<item name="Dependencies" href="/dependencies.html" />
 			<item name="Dependency Convergence" href="/dependency-convergence.html" />
 			<item name="RAT Report" href="/rat-report.html" />

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/df5d58f8/openmeetings-flash/src/site/site.xml
----------------------------------------------------------------------
diff --git a/openmeetings-flash/src/site/site.xml b/openmeetings-flash/src/site/site.xml
index dd3dc53..5268fea 100644
--- a/openmeetings-flash/src/site/site.xml
+++ b/openmeetings-flash/src/site/site.xml
@@ -13,16 +13,15 @@
    limitations under the License.
  -->
 <project xmlns="http://maven.apache.org/DECORATION/1.7.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/DECORATION/1.7.0 http://maven.apache.org/xsd/decoration-1.7.0.xsd"
-  name="Apache OpenMeetings Project">
-
+		xsi:schemaLocation="http://maven.apache.org/DECORATION/1.7.0 http://maven.apache.org/xsd/decoration-1.7.0.xsd"
+		name="Apache OpenMeetings Project">
 	<body>
 		<menu ref="parent"/>
 		<menu name="Project">
 			<item name="About" href="/index.html" />
 			<item name="Info" href="/project-info.html" />
 			<item name="Summary" href="/project-summary.html" />
-			<item name="License" href="/license.html" />
+			<item name="License" href="http://www.apache.org/licenses/" />
 			<item name="Dependencies" href="/dependencies.html" />
 			<item name="Dependency Convergence" href="/dependency-convergence.html" />
 			<item name="RAT Report" href="/rat-report.html" />

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/df5d58f8/openmeetings-install/src/site/site.xml
----------------------------------------------------------------------
diff --git a/openmeetings-install/src/site/site.xml b/openmeetings-install/src/site/site.xml
index dd3dc53..5268fea 100644
--- a/openmeetings-install/src/site/site.xml
+++ b/openmeetings-install/src/site/site.xml
@@ -13,16 +13,15 @@
    limitations under the License.
  -->
 <project xmlns="http://maven.apache.org/DECORATION/1.7.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/DECORATION/1.7.0 http://maven.apache.org/xsd/decoration-1.7.0.xsd"
-  name="Apache OpenMeetings Project">
-
+		xsi:schemaLocation="http://maven.apache.org/DECORATION/1.7.0 http://maven.apache.org/xsd/decoration-1.7.0.xsd"
+		name="Apache OpenMeetings Project">
 	<body>
 		<menu ref="parent"/>
 		<menu name="Project">
 			<item name="About" href="/index.html" />
 			<item name="Info" href="/project-info.html" />
 			<item name="Summary" href="/project-summary.html" />
-			<item name="License" href="/license.html" />
+			<item name="License" href="http://www.apache.org/licenses/" />
 			<item name="Dependencies" href="/dependencies.html" />
 			<item name="Dependency Convergence" href="/dependency-convergence.html" />
 			<item name="RAT Report" href="/rat-report.html" />

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/df5d58f8/openmeetings-screenshare/src/site/site.xml
----------------------------------------------------------------------
diff --git a/openmeetings-screenshare/src/site/site.xml b/openmeetings-screenshare/src/site/site.xml
index dd3dc53..5268fea 100644
--- a/openmeetings-screenshare/src/site/site.xml
+++ b/openmeetings-screenshare/src/site/site.xml
@@ -13,16 +13,15 @@
    limitations under the License.
  -->
 <project xmlns="http://maven.apache.org/DECORATION/1.7.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/DECORATION/1.7.0 http://maven.apache.org/xsd/decoration-1.7.0.xsd"
-  name="Apache OpenMeetings Project">
-
+		xsi:schemaLocation="http://maven.apache.org/DECORATION/1.7.0 http://maven.apache.org/xsd/decoration-1.7.0.xsd"
+		name="Apache OpenMeetings Project">
 	<body>
 		<menu ref="parent"/>
 		<menu name="Project">
 			<item name="About" href="/index.html" />
 			<item name="Info" href="/project-info.html" />
 			<item name="Summary" href="/project-summary.html" />
-			<item name="License" href="/license.html" />
+			<item name="License" href="http://www.apache.org/licenses/" />
 			<item name="Dependencies" href="/dependencies.html" />
 			<item name="Dependency Convergence" href="/dependency-convergence.html" />
 			<item name="RAT Report" href="/rat-report.html" />

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/df5d58f8/openmeetings-server/src/site/site.xml
----------------------------------------------------------------------
diff --git a/openmeetings-server/src/site/site.xml b/openmeetings-server/src/site/site.xml
index be0875d..4cf92e8 100644
--- a/openmeetings-server/src/site/site.xml
+++ b/openmeetings-server/src/site/site.xml
@@ -18,8 +18,10 @@
 	<body>
 		<menu name="General">
 			<item name="Home" href="/index.html"/>
-			<item name="License" href="/license.html"/>
+			<item name="License" href="http://www.apache.org/licenses/"/>
 			<item name="ASF" href="http://www.apache.org/"/>
+			<item name="Sponsorship" href="https://www.apache.org/foundation/sponsorship" />
+			<item name="Thanks" href="https://www.apache.org/foundation/thanks" />
 			<item name="Call For Logo" href="/CallForLogo.html"/>
 			<item name="News archive" href="/NewsArchive.html"/>
 			<item name="Security" href="/security.html"/>

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/df5d58f8/openmeetings-service/src/site/site.xml
----------------------------------------------------------------------
diff --git a/openmeetings-service/src/site/site.xml b/openmeetings-service/src/site/site.xml
index 0d9f35c..18ac547 100644
--- a/openmeetings-service/src/site/site.xml
+++ b/openmeetings-service/src/site/site.xml
@@ -13,16 +13,15 @@
    limitations under the License.
  -->
 <project xmlns="http://maven.apache.org/DECORATION/1.7.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/DECORATION/1.7.0 http://maven.apache.org/xsd/decoration-1.7.0.xsd"
-  name="Apache OpenMeetings Project">
-
+		xsi:schemaLocation="http://maven.apache.org/DECORATION/1.7.0 http://maven.apache.org/xsd/decoration-1.7.0.xsd"
+		name="Apache OpenMeetings Project">
 	<body>
 		<menu ref="parent"/>
 		<menu name="Project">
 			<item name="About" href="/index.html" />
 			<item name="Info" href="/project-info.html" />
 			<item name="Summary" href="/project-summary.html" />
-			<item name="License" href="/license.html" />
+			<item name="License" href="http://www.apache.org/licenses/" />
 			<item name="Dependencies" href="/dependencies.html" />
 			<item name="Dependency Convergence" href="/dependency-convergence.html" />
 			<item name="RAT Report" href="/rat-report.html" />

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/df5d58f8/openmeetings-util/src/site/site.xml
----------------------------------------------------------------------
diff --git a/openmeetings-util/src/site/site.xml b/openmeetings-util/src/site/site.xml
index 0d9f35c..18ac547 100644
--- a/openmeetings-util/src/site/site.xml
+++ b/openmeetings-util/src/site/site.xml
@@ -13,16 +13,15 @@
    limitations under the License.
  -->
 <project xmlns="http://maven.apache.org/DECORATION/1.7.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/DECORATION/1.7.0 http://maven.apache.org/xsd/decoration-1.7.0.xsd"
-  name="Apache OpenMeetings Project">
-
+		xsi:schemaLocation="http://maven.apache.org/DECORATION/1.7.0 http://maven.apache.org/xsd/decoration-1.7.0.xsd"
+		name="Apache OpenMeetings Project">
 	<body>
 		<menu ref="parent"/>
 		<menu name="Project">
 			<item name="About" href="/index.html" />
 			<item name="Info" href="/project-info.html" />
 			<item name="Summary" href="/project-summary.html" />
-			<item name="License" href="/license.html" />
+			<item name="License" href="http://www.apache.org/licenses/" />
 			<item name="Dependencies" href="/dependencies.html" />
 			<item name="Dependency Convergence" href="/dependency-convergence.html" />
 			<item name="RAT Report" href="/rat-report.html" />

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/df5d58f8/openmeetings-web/src/site/site.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/site/site.xml b/openmeetings-web/src/site/site.xml
index dd3dc53..5268fea 100644
--- a/openmeetings-web/src/site/site.xml
+++ b/openmeetings-web/src/site/site.xml
@@ -13,16 +13,15 @@
    limitations under the License.
  -->
 <project xmlns="http://maven.apache.org/DECORATION/1.7.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/DECORATION/1.7.0 http://maven.apache.org/xsd/decoration-1.7.0.xsd"
-  name="Apache OpenMeetings Project">
-
+		xsi:schemaLocation="http://maven.apache.org/DECORATION/1.7.0 http://maven.apache.org/xsd/decoration-1.7.0.xsd"
+		name="Apache OpenMeetings Project">
 	<body>
 		<menu ref="parent"/>
 		<menu name="Project">
 			<item name="About" href="/index.html" />
 			<item name="Info" href="/project-info.html" />
 			<item name="Summary" href="/project-summary.html" />
-			<item name="License" href="/license.html" />
+			<item name="License" href="http://www.apache.org/licenses/" />
 			<item name="Dependencies" href="/dependencies.html" />
 			<item name="Dependency Convergence" href="/dependency-convergence.html" />
 			<item name="RAT Report" href="/rat-report.html" />

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/df5d58f8/openmeetings-webservice/src/site/site.xml
----------------------------------------------------------------------
diff --git a/openmeetings-webservice/src/site/site.xml b/openmeetings-webservice/src/site/site.xml
index 0d9f35c..18ac547 100644
--- a/openmeetings-webservice/src/site/site.xml
+++ b/openmeetings-webservice/src/site/site.xml
@@ -13,16 +13,15 @@
    limitations under the License.
  -->
 <project xmlns="http://maven.apache.org/DECORATION/1.7.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/DECORATION/1.7.0 http://maven.apache.org/xsd/decoration-1.7.0.xsd"
-  name="Apache OpenMeetings Project">
-
+		xsi:schemaLocation="http://maven.apache.org/DECORATION/1.7.0 http://maven.apache.org/xsd/decoration-1.7.0.xsd"
+		name="Apache OpenMeetings Project">
 	<body>
 		<menu ref="parent"/>
 		<menu name="Project">
 			<item name="About" href="/index.html" />
 			<item name="Info" href="/project-info.html" />
 			<item name="Summary" href="/project-summary.html" />
-			<item name="License" href="/license.html" />
+			<item name="License" href="http://www.apache.org/licenses/" />
 			<item name="Dependencies" href="/dependencies.html" />
 			<item name="Dependency Convergence" href="/dependency-convergence.html" />
 			<item name="RAT Report" href="/rat-report.html" />

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/df5d58f8/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 7a429c0..8311671 100644
--- a/pom.xml
+++ b/pom.xml
@@ -281,7 +281,7 @@
 	<licenses>
 		<license>
 			<name>The Apache Software License, Version 2.0</name>
-			<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+			<url>http://www.apache.org/licenses/LICENSE-2.0</url>
 			<distribution>repo</distribution>
 		</license>
 	</licenses>

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/df5d58f8/src/site/site.xml
----------------------------------------------------------------------
diff --git a/src/site/site.xml b/src/site/site.xml
index 5727f48..83557ee 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -45,6 +45,10 @@
 			<item name="Wiki" href="https://cwiki.apache.org/confluence/display/OPENMEETINGS"/>
 		</links>
 		<menu ref="modules" inherit="top"/>
+		<footer>
+			<p>Apache OpenMeetings, OpenMeetings, Apache, the Apache feather, and the Apache OpenMeetings project logo</p>
+			<p>are trademarks of the Apache Software Foundation.</p>
+		</footer>
 	</body>
 
 	<poweredBy></poweredBy>
@@ -56,7 +60,6 @@
 					<span class="color-highlight">Apache</span> OpenMeetings
 				]]></name>
 			</brand>
-			<!--absoluteResourceURL>http://localhost:5080/openmeetings/docs</absoluteResourceURL--><!-- DEVELOPMENT -->
 			<absoluteResourceURL>http://openmeetings.apache.org</absoluteResourceURL>
 			<protocolRelativeURLs>true</protocolRelativeURLs>
 			<localResources>true</localResources>