Author: solomax
Date: Tue May 20 05:06:13 2014
New Revision: 1596112
URL: http://svn.apache.org/r1596112
Log:
[OPENMEETINGS-940] web services are added to the site
Added:
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/dto/
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/dto/RoomCountBean.java
- copied, changed from r1595891,
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomCountBean.java
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/dto/RoomReturn.java
- copied, changed from r1595891,
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomReturn.java
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/dto/RoomUser.java
- copied, changed from r1595891,
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomUser.java
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/dto/ServiceException.java
- copied, changed from r1595891,
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/ServiceException.java
Removed:
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomCountBean.java
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomReturn.java
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomUser.java
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/ServiceException.java
openmeetings/trunk/singlewebapp/src/doc/
openmeetings/trunk/singlewebapp/src/site/xdoc/ApiClassesTemplate.vm
openmeetings/trunk/singlewebapp/src/site/xdoc/ApiMethodsTemplate.vm
openmeetings/trunk/singlewebapp/src/site/xdoc/SoapRestAPI.xml
Modified:
openmeetings/trunk/singlewebapp/openmeetings-webservice/pom.xml
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/CalendarWebService.java
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/FileWebService.java
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/ServerWebService.java
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java
openmeetings/trunk/singlewebapp/pom.xml
openmeetings/trunk/singlewebapp/src/site/resources/css/openmeetings.css
openmeetings/trunk/singlewebapp/src/site/site.xml
Modified: openmeetings/trunk/singlewebapp/openmeetings-webservice/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-webservice/pom.xml?rev=1596112&r1=1596111&r2=1596112&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-webservice/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-webservice/pom.xml Tue May 20
05:06:13 2014
@@ -37,6 +37,29 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>javadoc</goal>
+ </goals>
+ <phase>site</phase>
+ <configuration>
+ <groups>
+ <group>
+
<title>Available WebServices</title>
+
<packages>org.apache.openmeetings.webservice</packages>
+ </group>
+ </groups>
+
<excludePackageNames>org.apache.openmeetings.webservice.cluster,org.apache.openmeetings.webservice.dto</excludePackageNames>
+
<reportOutputDirectory>${project.parent.build.directory}/site</reportOutputDirectory>
+
<destDir>webservices</destDir>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<configuration>
<skip>true</skip>
Modified:
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/CalendarWebService.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/CalendarWebService.java?rev=1596112&r1=1596111&r2=1596112&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/CalendarWebService.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/CalendarWebService.java
Tue May 20 05:06:13 2014
@@ -48,6 +48,7 @@ import org.apache.openmeetings.db.entity
import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.db.util.TimezoneUtil;
import org.apache.openmeetings.util.AuthLevelUtil;
+import org.apache.openmeetings.webservice.dto.ServiceException;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
Modified:
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/FileWebService.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/FileWebService.java?rev=1596112&r1=1596111&r2=1596112&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/FileWebService.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/FileWebService.java
Tue May 20 05:06:13 2014
@@ -49,6 +49,7 @@ import org.apache.openmeetings.util.OmFi
import org.apache.openmeetings.util.StoredFile;
import org.apache.openmeetings.util.process.ConverterProcessResultList;
import org.apache.openmeetings.util.process.FileImportError;
+import org.apache.openmeetings.webservice.dto.ServiceException;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
Modified:
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java?rev=1596112&r1=1596111&r2=1596112&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java
Tue May 20 05:06:13 2014
@@ -65,6 +65,10 @@ import org.apache.openmeetings.db.entity
import org.apache.openmeetings.db.util.TimezoneUtil;
import org.apache.openmeetings.util.AuthLevelUtil;
import org.apache.openmeetings.util.CalendarPatterns;
+import org.apache.openmeetings.webservice.dto.RoomCountBean;
+import org.apache.openmeetings.webservice.dto.RoomReturn;
+import org.apache.openmeetings.webservice.dto.RoomUser;
+import org.apache.openmeetings.webservice.dto.ServiceException;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.springframework.beans.BeanWrapper;
Modified:
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/ServerWebService.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/ServerWebService.java?rev=1596112&r1=1596111&r2=1596112&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/ServerWebService.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/ServerWebService.java
Tue May 20 05:06:13 2014
@@ -31,6 +31,7 @@ import org.apache.openmeetings.db.dao.se
import org.apache.openmeetings.db.dao.user.IUserManager;
import org.apache.openmeetings.db.entity.server.Server;
import org.apache.openmeetings.util.AuthLevelUtil;
+import org.apache.openmeetings.webservice.dto.ServiceException;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
Modified:
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java?rev=1596112&r1=1596111&r2=1596112&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java
Tue May 20 05:06:13 2014
@@ -47,6 +47,7 @@ import org.apache.openmeetings.db.entity
import org.apache.openmeetings.db.entity.server.Sessiondata;
import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.util.AuthLevelUtil;
+import org.apache.openmeetings.webservice.dto.ServiceException;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
Copied:
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/dto/RoomCountBean.java
(from r1595891,
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomCountBean.java)
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/dto/RoomCountBean.java?p2=openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/dto/RoomCountBean.java&p1=openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomCountBean.java&r1=1595891&r2=1596112&rev=1596112&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomCountBean.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/dto/RoomCountBean.java
Tue May 20 05:06:13 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.webservice;
+package org.apache.openmeetings.webservice.dto;
public class RoomCountBean {
private long roomId;
Copied:
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/dto/RoomReturn.java
(from r1595891,
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomReturn.java)
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/dto/RoomReturn.java?p2=openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/dto/RoomReturn.java&p1=openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomReturn.java&r1=1595891&r2=1596112&rev=1596112&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomReturn.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/dto/RoomReturn.java
Tue May 20 05:06:13 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.webservice;
+package org.apache.openmeetings.webservice.dto;
import java.util.Date;
Copied:
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/dto/RoomUser.java
(from r1595891,
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomUser.java)
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/dto/RoomUser.java?p2=openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/dto/RoomUser.java&p1=openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomUser.java&r1=1595891&r2=1596112&rev=1596112&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomUser.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/dto/RoomUser.java
Tue May 20 05:06:13 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.webservice;
+package org.apache.openmeetings.webservice.dto;
public class RoomUser {
Copied:
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/dto/ServiceException.java
(from r1595891,
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/ServiceException.java)
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/dto/ServiceException.java?p2=openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/dto/ServiceException.java&p1=openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/ServiceException.java&r1=1595891&r2=1596112&rev=1596112&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/ServiceException.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/dto/ServiceException.java
Tue May 20 05:06:13 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.webservice;
+package org.apache.openmeetings.webservice.dto;
import javax.xml.ws.WebFault;
Modified: openmeetings/trunk/singlewebapp/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/pom.xml?rev=1596112&r1=1596111&r2=1596112&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/pom.xml Tue May 20 05:06:13 2014
@@ -577,6 +577,11 @@
<artifactId>maven-jarsigner-plugin</artifactId>
<version>1.3.2</version>
</plugin>
+ <plugin>
+
<groupId>org.apache.maven.plugins</groupId>
+
<artifactId>maven-javadoc-plugin</artifactId>
+
<version>${maven.javadoc.version}</version>
+ </plugin>
</plugins>
</pluginManagement>
</build>
Modified:
openmeetings/trunk/singlewebapp/src/site/resources/css/openmeetings.css
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/site/resources/css/openmeetings.css?rev=1596112&r1=1596111&r2=1596112&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/site/resources/css/openmeetings.css
(original)
+++ openmeetings/trunk/singlewebapp/src/site/resources/css/openmeetings.css Tue
May 20 05:06:13 2014
@@ -51,4 +51,8 @@
float: none;
padding: 0;
padding-right: 10px;
+}
+iframe {
+ width: 100%;
+ min-height: 700px;
}
\ No newline at end of file
Modified: openmeetings/trunk/singlewebapp/src/site/site.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/site/site.xml?rev=1596112&r1=1596111&r2=1596112&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/site/site.xml (original)
+++ openmeetings/trunk/singlewebapp/src/site/site.xml Tue May 20 05:06:13 2014
@@ -65,7 +65,7 @@
<item name="Website Guide"
href="/WebsiteGuide.html" />
</item>
<item name="Integration" href="#integration">
- <item name="SOAP/REST API"
href="/SoapRestAPI.html" />
+ <item name="SOAP/REST API"
href="/webservices/index.html" target="_blank"/>
<item name="REST API Sample"
href="/RestAPISample.html" />
<item name="Ldap and ADS"
href="/LdapAndADS.html" />
<item name="OAuth2" href="/oauth2.html" />
