Author: solomax
Date: Tue Aug 9 04:31:38 2016
New Revision: 1755556
URL: http://svn.apache.org/viewvc?rev=1755556&view=rev
Log:
Release preparation: Icons were dropped from screen-sharing, documentation and
LICENSE update
Modified:
openmeetings/application/branches/3.1.x/LICENSE
openmeetings/application/branches/3.1.x/openmeetings-screenshare/pom.xml
openmeetings/application/branches/3.1.x/openmeetings-server/src/site/xdoc/JUnitTesting.xml
openmeetings/application/branches/3.2.x/LICENSE
openmeetings/application/branches/3.2.x/openmeetings-screenshare/pom.xml
openmeetings/application/branches/3.2.x/openmeetings-server/src/site/xdoc/JUnitTesting.xml
openmeetings/application/trunk/LICENSE
openmeetings/application/trunk/openmeetings-screenshare/pom.xml
openmeetings/application/trunk/openmeetings-server/src/site/xdoc/JUnitTesting.xml
Modified: openmeetings/application/branches/3.1.x/LICENSE
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/LICENSE?rev=1755556&r1=1755555&r2=1755556&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/LICENSE (original)
+++ openmeetings/application/branches/3.1.x/LICENSE Tue Aug 9 04:31:38 2016
@@ -252,6 +252,8 @@ webapps/openmeetings/WEB-INF/lib/openmee
webapps/openmeetings/WEB-INF/lib/openmeetings-web-*.jar
webapps/openmeetings/WEB-INF/lib/openmeetings-webservice-*.jar
+webapps/openmeetings/screenshare/icon.*
+webapps/openmeetings/screenshare/splashicon.*
======================================================================================================================
Further those components are either itself or derivate work from
Modified:
openmeetings/application/branches/3.1.x/openmeetings-screenshare/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-screenshare/pom.xml?rev=1755556&r1=1755555&r2=1755556&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-screenshare/pom.xml
(original)
+++ openmeetings/application/branches/3.1.x/openmeetings-screenshare/pom.xml
Tue Aug 9 04:31:38 2016
@@ -83,7 +83,25 @@
<filtering>true</filtering>
</resource>
</resources>
-
<skip>${skip.site.copy}</skip>
+ </configuration>
+ </execution>
+ <execution>
+ <id>copy-icons</id>
+
<phase>generate-resources</phase>
+ <goals>
+
<goal>copy-resources</goal>
+ </goals>
+ <configuration>
+
<outputDirectory>${jnlp.out.dir}</outputDirectory>
+ <resources>
+ <resource>
+
<directory>${project.basedir}/src/main/jnlp/resources</directory>
+
<includes>
+
<include>*.png</include>
+
</includes>
+
<filtering>false</filtering>
+ </resource>
+ </resources>
</configuration>
</execution>
</executions>
Modified:
openmeetings/application/branches/3.1.x/openmeetings-server/src/site/xdoc/JUnitTesting.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-server/src/site/xdoc/JUnitTesting.xml?rev=1755556&r1=1755555&r2=1755556&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-server/src/site/xdoc/JUnitTesting.xml
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-server/src/site/xdoc/JUnitTesting.xml
Tue Aug 9 04:31:38 2016
@@ -21,71 +21,55 @@
</properties>
<body>
-
<section name="Introduction">
-
<p>
Automatic tests are the significant part of
development process.
- Below is the instruction of how to run
Openmeetings
- <a href="http://junit.org";
rel="nofollow">JUnit</a>
- tests.
+ Below is the instruction of how to run
Openmeetings <a href="http://junit.org"; rel="nofollow">JUnit</a> tests.
</p>
</section>
-
<section name="Details">
-
-
<ol>
<li>running tests using command line: </li>
<li>
<ul>
<li>all tests:
- <source>ant
test</source>
+ <source>mvn
test</source>
</li>
<li>subset of tests by mask:
- <source>ant
-Dtestcases=TestError* test</source>
+ <source>mvn test
-Dtest=TestUserService</source>
</li>
</ul>
</li>
<li>running tests from Eclipse IDE: </li>
<li>
<ul>
- <li>
- <source><![CDATA[ant
-Ddb=<your_DB> prepare-eclipse]]></source>
- </li>
<li>Start Eclipse </li>
- <li>Load workspace with
Openmeetings project (or refresh existing
- project)
- </li>
+ <li>Load workspace with
Openmeetings project (or refresh existing project)</li>
<li>Select "Debug
Configurations..." </li>
</ul>
</li>
</ol>
<p>
<a class="fancybox-buttons"
href="images/DebugConfigurations.png">
- <img
src="images/DebugConfigurations.png" alt="" width="367"
- height="262" />
+ <img
src="images/DebugConfigurations.png" alt="" width="367" height="262" />
</a>
</p>
<ul>
- <li>Create New Junit configuration, give it a
name and select test
- class
- </li>
+ <li>Create New Junit configuration, give it a
name and select test class</li>
</ul>
<p>
<a class="fancybox-buttons"
href="images/NewConfiguration.png">
- <img src="images/NewConfiguration.png"
alt="" width="420"
- height="206" />
+ <img src="images/NewConfiguration.png"
alt="" width="420" height="206" />
</a>
</p>
<ul>
<li>Select Arguments tab </li>
<li>Add the following code to the VM section
-
<source>-javaagent:${workspace_loc:Openmeetings}/build/lib/om/openjpa-bundle-2.3.0.jar
-Dom.home=${workspace_loc:Openmeetings}/openmeetings-web/src/main/webapp/
-Dbackups.dir=${workspace_loc:Openmeetings}/build/lib/junit/backups</source>
+
<source>-javaagent:/home/solomax/.m2/repository/org/apache/openjpa/openjpa/2.4.1/openjpa-2.4.1.jar
-Dom.home=${workspace_loc:openmeetings-web}/src/main/webapp/
-Dbackups.dir=${workspace_loc:openmeetings-web}/test-data</source>
</li>
<li>To avoid temporary files being created in
OM root, modify
"Working Directory" as follows
-
<source>${workspace_loc:Openmeetings}/build/junit</source>
+
<source>${workspace_loc:openmeetings-web/target}</source>
</li>
</ul>
<p>
@@ -95,17 +79,7 @@
</p>
<ul>
<li>Select Debug </li>
-
- </ul>
- <ul>
- <li>Note: You need a file called
"persistence.xml" in src/META-INF
- if you run the JUnit test from inside
Eclipse. Normally "ant
- prepare-eclipse" should do that for
you. </li>
-
</ul>
-
</section>
-
</body>
-
</document>
Modified: openmeetings/application/branches/3.2.x/LICENSE
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/LICENSE?rev=1755556&r1=1755555&r2=1755556&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/LICENSE (original)
+++ openmeetings/application/branches/3.2.x/LICENSE Tue Aug 9 04:31:38 2016
@@ -252,6 +252,8 @@ webapps/openmeetings/WEB-INF/lib/openmee
webapps/openmeetings/WEB-INF/lib/openmeetings-web-*.jar
webapps/openmeetings/WEB-INF/lib/openmeetings-webservice-*.jar
+webapps/openmeetings/screenshare/icon.*
+webapps/openmeetings/screenshare/splashicon.*
======================================================================================================================
Further those components are either itself or derivate work from
Modified:
openmeetings/application/branches/3.2.x/openmeetings-screenshare/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-screenshare/pom.xml?rev=1755556&r1=1755555&r2=1755556&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-screenshare/pom.xml
(original)
+++ openmeetings/application/branches/3.2.x/openmeetings-screenshare/pom.xml
Tue Aug 9 04:31:38 2016
@@ -83,7 +83,25 @@
<filtering>true</filtering>
</resource>
</resources>
-
<skip>${skip.site.copy}</skip>
+ </configuration>
+ </execution>
+ <execution>
+ <id>copy-icons</id>
+
<phase>generate-resources</phase>
+ <goals>
+
<goal>copy-resources</goal>
+ </goals>
+ <configuration>
+
<outputDirectory>${jnlp.out.dir}</outputDirectory>
+ <resources>
+ <resource>
+
<directory>${project.basedir}/src/main/jnlp/resources</directory>
+
<includes>
+
<include>*.png</include>
+
</includes>
+
<filtering>false</filtering>
+ </resource>
+ </resources>
</configuration>
</execution>
</executions>
Modified:
openmeetings/application/branches/3.2.x/openmeetings-server/src/site/xdoc/JUnitTesting.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-server/src/site/xdoc/JUnitTesting.xml?rev=1755556&r1=1755555&r2=1755556&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-server/src/site/xdoc/JUnitTesting.xml
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-server/src/site/xdoc/JUnitTesting.xml
Tue Aug 9 04:31:38 2016
@@ -21,71 +21,55 @@
</properties>
<body>
-
<section name="Introduction">
-
<p>
Automatic tests are the significant part of
development process.
- Below is the instruction of how to run
Openmeetings
- <a href="http://junit.org";
rel="nofollow">JUnit</a>
- tests.
+ Below is the instruction of how to run
Openmeetings <a href="http://junit.org"; rel="nofollow">JUnit</a> tests.
</p>
</section>
-
<section name="Details">
-
-
<ol>
<li>running tests using command line: </li>
<li>
<ul>
<li>all tests:
- <source>ant
test</source>
+ <source>mvn
test</source>
</li>
<li>subset of tests by mask:
- <source>ant
-Dtestcases=TestError* test</source>
+ <source>mvn test
-Dtest=TestUserService</source>
</li>
</ul>
</li>
<li>running tests from Eclipse IDE: </li>
<li>
<ul>
- <li>
- <source><![CDATA[ant
-Ddb=<your_DB> prepare-eclipse]]></source>
- </li>
<li>Start Eclipse </li>
- <li>Load workspace with
Openmeetings project (or refresh existing
- project)
- </li>
+ <li>Load workspace with
Openmeetings project (or refresh existing project)</li>
<li>Select "Debug
Configurations..." </li>
</ul>
</li>
</ol>
<p>
<a class="fancybox-buttons"
href="images/DebugConfigurations.png">
- <img
src="images/DebugConfigurations.png" alt="" width="367"
- height="262" />
+ <img
src="images/DebugConfigurations.png" alt="" width="367" height="262" />
</a>
</p>
<ul>
- <li>Create New Junit configuration, give it a
name and select test
- class
- </li>
+ <li>Create New Junit configuration, give it a
name and select test class</li>
</ul>
<p>
<a class="fancybox-buttons"
href="images/NewConfiguration.png">
- <img src="images/NewConfiguration.png"
alt="" width="420"
- height="206" />
+ <img src="images/NewConfiguration.png"
alt="" width="420" height="206" />
</a>
</p>
<ul>
<li>Select Arguments tab </li>
<li>Add the following code to the VM section
-
<source>-javaagent:${workspace_loc:Openmeetings}/build/lib/om/openjpa-bundle-2.3.0.jar
-Dom.home=${workspace_loc:Openmeetings}/openmeetings-web/src/main/webapp/
-Dbackups.dir=${workspace_loc:Openmeetings}/build/lib/junit/backups</source>
+
<source>-javaagent:/home/solomax/.m2/repository/org/apache/openjpa/openjpa/2.4.1/openjpa-2.4.1.jar
-Dom.home=${workspace_loc:openmeetings-web}/src/main/webapp/
-Dbackups.dir=${workspace_loc:openmeetings-web}/test-data</source>
</li>
<li>To avoid temporary files being created in
OM root, modify
"Working Directory" as follows
-
<source>${workspace_loc:Openmeetings}/build/junit</source>
+
<source>${workspace_loc:openmeetings-web/target}</source>
</li>
</ul>
<p>
@@ -95,17 +79,7 @@
</p>
<ul>
<li>Select Debug </li>
-
- </ul>
- <ul>
- <li>Note: You need a file called
"persistence.xml" in src/META-INF
- if you run the JUnit test from inside
Eclipse. Normally "ant
- prepare-eclipse" should do that for
you. </li>
-
</ul>
-
</section>
-
</body>
-
</document>
Modified: openmeetings/application/trunk/LICENSE
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/LICENSE?rev=1755556&r1=1755555&r2=1755556&view=diff
==============================================================================
--- openmeetings/application/trunk/LICENSE (original)
+++ openmeetings/application/trunk/LICENSE Tue Aug 9 04:31:38 2016
@@ -252,6 +252,8 @@ webapps/openmeetings/WEB-INF/lib/openmee
webapps/openmeetings/WEB-INF/lib/openmeetings-web-*.jar
webapps/openmeetings/WEB-INF/lib/openmeetings-webservice-*.jar
+webapps/openmeetings/screenshare/icon.*
+webapps/openmeetings/screenshare/splashicon.*
======================================================================================================================
Further those components are either itself or derivate work from
Modified: openmeetings/application/trunk/openmeetings-screenshare/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-screenshare/pom.xml?rev=1755556&r1=1755555&r2=1755556&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-screenshare/pom.xml (original)
+++ openmeetings/application/trunk/openmeetings-screenshare/pom.xml Tue Aug 9
04:31:38 2016
@@ -83,7 +83,25 @@
<filtering>true</filtering>
</resource>
</resources>
-
<skip>${skip.site.copy}</skip>
+ </configuration>
+ </execution>
+ <execution>
+ <id>copy-icons</id>
+
<phase>generate-resources</phase>
+ <goals>
+
<goal>copy-resources</goal>
+ </goals>
+ <configuration>
+
<outputDirectory>${jnlp.out.dir}</outputDirectory>
+ <resources>
+ <resource>
+
<directory>${project.basedir}/src/main/jnlp/resources</directory>
+
<includes>
+
<include>*.png</include>
+
</includes>
+
<filtering>false</filtering>
+ </resource>
+ </resources>
</configuration>
</execution>
</executions>
Modified:
openmeetings/application/trunk/openmeetings-server/src/site/xdoc/JUnitTesting.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-server/src/site/xdoc/JUnitTesting.xml?rev=1755556&r1=1755555&r2=1755556&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-server/src/site/xdoc/JUnitTesting.xml
(original)
+++
openmeetings/application/trunk/openmeetings-server/src/site/xdoc/JUnitTesting.xml
Tue Aug 9 04:31:38 2016
@@ -21,71 +21,55 @@
</properties>
<body>
-
<section name="Introduction">
-
<p>
Automatic tests are the significant part of
development process.
- Below is the instruction of how to run
Openmeetings
- <a href="http://junit.org";
rel="nofollow">JUnit</a>
- tests.
+ Below is the instruction of how to run
Openmeetings <a href="http://junit.org"; rel="nofollow">JUnit</a> tests.
</p>
</section>
-
<section name="Details">
-
-
<ol>
<li>running tests using command line: </li>
<li>
<ul>
<li>all tests:
- <source>ant
test</source>
+ <source>mvn
test</source>
</li>
<li>subset of tests by mask:
- <source>ant
-Dtestcases=TestError* test</source>
+ <source>mvn test
-Dtest=TestUserService</source>
</li>
</ul>
</li>
<li>running tests from Eclipse IDE: </li>
<li>
<ul>
- <li>
- <source><![CDATA[ant
-Ddb=<your_DB> prepare-eclipse]]></source>
- </li>
<li>Start Eclipse </li>
- <li>Load workspace with
Openmeetings project (or refresh existing
- project)
- </li>
+ <li>Load workspace with
Openmeetings project (or refresh existing project)</li>
<li>Select "Debug
Configurations..." </li>
</ul>
</li>
</ol>
<p>
<a class="fancybox-buttons"
href="images/DebugConfigurations.png">
- <img
src="images/DebugConfigurations.png" alt="" width="367"
- height="262" />
+ <img
src="images/DebugConfigurations.png" alt="" width="367" height="262" />
</a>
</p>
<ul>
- <li>Create New Junit configuration, give it a
name and select test
- class
- </li>
+ <li>Create New Junit configuration, give it a
name and select test class</li>
</ul>
<p>
<a class="fancybox-buttons"
href="images/NewConfiguration.png">
- <img src="images/NewConfiguration.png"
alt="" width="420"
- height="206" />
+ <img src="images/NewConfiguration.png"
alt="" width="420" height="206" />
</a>
</p>
<ul>
<li>Select Arguments tab </li>
<li>Add the following code to the VM section
-
<source>-javaagent:${workspace_loc:Openmeetings}/build/lib/om/openjpa-bundle-2.3.0.jar
-Dom.home=${workspace_loc:Openmeetings}/openmeetings-web/src/main/webapp/
-Dbackups.dir=${workspace_loc:Openmeetings}/build/lib/junit/backups</source>
+
<source>-javaagent:/home/solomax/.m2/repository/org/apache/openjpa/openjpa/2.4.1/openjpa-2.4.1.jar
-Dom.home=${workspace_loc:openmeetings-web}/src/main/webapp/
-Dbackups.dir=${workspace_loc:openmeetings-web}/test-data</source>
</li>
<li>To avoid temporary files being created in
OM root, modify
"Working Directory" as follows
-
<source>${workspace_loc:Openmeetings}/build/junit</source>
+
<source>${workspace_loc:openmeetings-web/target}</source>
</li>
</ul>
<p>
@@ -95,17 +79,7 @@
</p>
<ul>
<li>Select Debug </li>
-
- </ul>
- <ul>
- <li>Note: You need a file called
"persistence.xml" in src/META-INF
- if you run the JUnit test from inside
Eclipse. Normally "ant
- prepare-eclipse" should do that for
you. </li>
-
</ul>
-
</section>
-
</body>
-
</document>
