Author: solomax
Date: Wed May 21 07:20:24 2014
New Revision: 1596495
URL: http://svn.apache.org/r1596495
Log:
[OPENMEETINGS-940] build is fixed, warnings are removed
Modified:
openmeetings/trunk/singlewebapp/openmeetings-db/pom.xml
openmeetings/trunk/singlewebapp/openmeetings-service/pom.xml
openmeetings/trunk/singlewebapp/openmeetings-util/pom.xml
openmeetings/trunk/singlewebapp/openmeetings-web/pom.xml
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/js/history.js
openmeetings/trunk/singlewebapp/openmeetings-webservice/pom.xml
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/cluster/RestClient.java
openmeetings/trunk/singlewebapp/pom.xml
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/pom.xml?rev=1596495&r1=1596494&r2=1596495&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/pom.xml Wed May 21 07:20:24
2014
@@ -32,7 +32,6 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<openjpa.version>2.3.0</openjpa.version>
- <simple-xml.version>2.7.1</simple-xml.version>
<asterisk-java.version>1.0.0.CI-SNAPSHOT</asterisk-java.version>
<commons-dbcp.version>1.4</commons-dbcp.version>
<derby.version>10.10.1.1</derby.version>
@@ -42,7 +41,6 @@
<dependency>
<groupId>org.apache.openmeetings</groupId>
<artifactId>openmeetings-util</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.openjpa</groupId>
@@ -57,7 +55,6 @@
<dependency>
<groupId>org.simpleframework</groupId>
<artifactId>simple-xml</artifactId>
- <version>${simple-xml.version}</version>
</dependency>
<dependency>
<groupId>org.asteriskjava</groupId>
@@ -128,6 +125,18 @@
</dependency>
</dependencies>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>javadoc</goal>
+ </goals>
+ <phase>site</phase>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
<pluginManagement>
<plugins>
Modified: openmeetings/trunk/singlewebapp/openmeetings-service/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-service/pom.xml?rev=1596495&r1=1596494&r2=1596495&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-service/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-service/pom.xml Wed May 21
07:20:24 2014
@@ -47,7 +47,6 @@
<dependency>
<groupId>org.apache.openmeetings</groupId>
<artifactId>openmeetings-core</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
Modified: openmeetings/trunk/singlewebapp/openmeetings-util/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-util/pom.xml?rev=1596495&r1=1596494&r2=1596495&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-util/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-util/pom.xml Wed May 21
07:20:24 2014
@@ -39,11 +39,8 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
</plugin>
</plugins>
</build>
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/pom.xml?rev=1596495&r1=1596494&r2=1596495&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/pom.xml Wed May 21
07:20:24 2014
@@ -32,7 +32,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<wicket-dashboard.version>0.10</wicket-dashboard.version>
- <select2.version>2.2.2</select2.version>
+ <select2.version>2.2.3</select2.version>
<dnd.version>0.6.0</dnd.version>
<commons-io.version>2.4</commons-io.version>
<commons-fileupload.version>1.3</commons-fileupload.version>
@@ -192,6 +192,25 @@
<skip>${om.quick.build}</skip>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>wagon-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>download-test-data</id>
+
<phase>process-test-resources</phase>
+ <goals>
+ <goal>download</goal>
+ </goals>
+ <configuration>
+
<url>https://openmeetings.googlecode.com/svn/repository</url>
+
<includes>backup_*.zip</includes>
+
<toDir>${project.build.directory}/old-backups</toDir>
+
<skip>${maven.test.skip}</skip>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
<testResources>
<testResource>
@@ -234,6 +253,19 @@
<ignore></ignore>
</action>
</pluginExecution>
+
<pluginExecution>
+
<pluginExecutionFilter>
+
<groupId>org.codehaus.mojo</groupId>
+
<artifactId>wagon-maven-plugin</artifactId>
+
<versionRange>[1.0-beta-5,)</versionRange>
+
<goals>
+
<goal>download</goal>
+
</goals>
+
</pluginExecutionFilter>
+ <action>
+
<ignore></ignore>
+
</action>
+
</pluginExecution>
</pluginExecutions>
</lifecycleMappingMetadata>
</configuration>
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/js/history.js
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/js/history.js?rev=1596495&r1=1596494&r2=1596495&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/js/history.js
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/js/history.js
Wed May 21 07:20:24 2014
@@ -680,7 +680,7 @@ function goForwardOrBackInHistory(step)
if(/webkit/i.test(u)){
st(function(){
var dr=document.readyState;
- if(dr=="loaded"||dr=="complete"){i()}
+ if(dr=="loaded"||dr=="complete"){i();}
else{st(arguments.callee,10);}},10);
} else if((/mozilla/i.test(u)&&!/(compati)/.test(u)) ||
(/opera/i.test(u))){
document.addEventListener("DOMContentLoaded",i,false);
Modified: openmeetings/trunk/singlewebapp/openmeetings-webservice/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-webservice/pom.xml?rev=1596495&r1=1596494&r2=1596495&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-webservice/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-webservice/pom.xml Wed May 21
07:20:24 2014
@@ -31,7 +31,6 @@
<description>TODO</description>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <jettison.version>1.3.5</jettison.version>
</properties>
<build>
<plugins>
@@ -51,9 +50,9 @@
<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>
+
<reportOutputDirectory>../target/site</reportOutputDirectory>
<destDir>webservices</destDir>
+
<excludePackageNames>org.apache.openmeetings.webservice.cluster,org.apache.openmeetings.webservice.dto</excludePackageNames>
</configuration>
</execution>
</executions>
@@ -94,12 +93,11 @@
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
- <artifactId>cxf-bundle</artifactId>
+ <artifactId>cxf-rt-rs-extension-providers</artifactId>
</dependency>
<dependency>
<groupId>org.codehaus.jettison</groupId>
<artifactId>jettison</artifactId>
- <version>${jettison.version}</version>
</dependency>
</dependencies>
</project>
Modified:
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/cluster/RestClient.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/cluster/RestClient.java?rev=1596495&r1=1596494&r2=1596495&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/cluster/RestClient.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/cluster/RestClient.java
Wed May 21 07:20:24 2014
@@ -58,19 +58,10 @@ public class RestClient {
private String publicSID;
-// private static String nameSpaceForSlaveDto =
"http://room.conference.openmeetings.apache.org/xsd";;
-
- private static String NAMESPACE_PREFIX =
"http://services.axis.openmeetings.apache.org";;
-
private String getUserServiceWsdl() {
return protocol + "://" + host + ":" + port + "/" + webapp
+ "/services/UserService?wsdl";
}
-//
-// private String getRoomServiceEndPoint() {
-// return protocol + "://" + host + ":" + port + "/" + webapp
-// + "/services/RoomService";
-// }
/**
* The observerInstance will be notified whenever a ping was completed
@@ -222,40 +213,4 @@ public class RestClient {
log.error("[kickUser failed]", err);
}
}
-
- /**
- * Get and cast the element's text (if there is any)
- *
- * @param resultElement
- * @param elementName
- * @param typeObject
- * @return
- */
-// private <T> T getElementTextByName(OMElement resultElement, String
elementName, Class<T> typeObject) {
-// try {
-// OMElement userIdElement = resultElement
-// .getFirstChildWithName(new
QName(nameSpaceForSlaveDto, elementName));
-// if (userIdElement != null && userIdElement.getText() !=
null
-// && userIdElement.getText().length() >
0) {
-//
-// String defaultValue = userIdElement.getText();
-//
-// // Either this can be directly assigned or try
to find a constructor
-// // that handles it
-// if
(typeObject.isAssignableFrom(defaultValue.getClass())) {
-// return typeObject.cast(defaultValue);
-// }
-// Constructor<T> c =
typeObject.getConstructor(defaultValue
-// .getClass());
-// return c.newInstance(defaultValue);
-//
-// }
-// } catch (Exception err) {
-// //Catch any class cast exception, but log only
-// log.error("[getElementTextByName]", err);
-// }
-// return null;
-// }
-
-
}
Modified: openmeetings/trunk/singlewebapp/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/pom.xml?rev=1596495&r1=1596494&r2=1596495&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/pom.xml Wed May 21 07:20:24 2014
@@ -43,9 +43,11 @@
<batik.version>1.7</batik.version>
<commons-transaction.version>1.2</commons-transaction.version>
<ical4j.version>1.0.5.2</ical4j.version>
- <cxf.version>2.7.11</cxf.version>
+ <cxf.version>3.0.0</cxf.version>
<selenium.version>2.41.0</selenium.version>
<red5-client.version>1.0.2-RC2</red5-client.version>
+ <simple-xml.version>2.7.1</simple-xml.version>
+ <jettison.version>1.3.5</jettison.version>
</properties>
<modules>
<module>openmeetings-core</module>
@@ -322,44 +324,44 @@
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
- <artifactId>cxf-bundle</artifactId>
+
<artifactId>cxf-rt-rs-extension-providers</artifactId>
<version>${cxf.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.seleniumhq.selenium</groupId>
+ <artifactId>selenium-java</artifactId>
+ <version>${selenium.version}</version>
+ <scope>test</scope>
<exclusions>
<exclusion>
-
<groupId>org.springframework</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- <exclusion>
- <groupId>antlr</groupId>
- <artifactId>antlr</artifactId>
- </exclusion>
- <exclusion>
- <groupId>aopalliance</groupId>
-
<artifactId>aopalliance</artifactId>
- </exclusion>
- <exclusion>
- <groupId>asm</groupId>
- <artifactId>asm</artifactId>
- </exclusion>
- <exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.simpleframework</groupId>
+ <artifactId>simple-xml</artifactId>
+ <version>${simple-xml.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>stax</groupId>
+
<artifactId>stax-api</artifactId>
+ </exclusion>
<exclusion>
-
<groupId>org.apache.geronimo.specs</groupId>
-
<artifactId>geronimo-servlet_3.0_spec</artifactId>
+ <groupId>xpp3</groupId>
+ <artifactId>xpp3</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
- <groupId>org.seleniumhq.selenium</groupId>
- <artifactId>selenium-java</artifactId>
- <version>${selenium.version}</version>
- <scope>test</scope>
+ <groupId>org.codehaus.jettison</groupId>
+ <artifactId>jettison</artifactId>
+ <version>${jettison.version}</version>
<exclusions>
<exclusion>
-
<groupId>commons-logging</groupId>
-
<artifactId>commons-logging</artifactId>
+ <groupId>stax</groupId>
+
<artifactId>stax-api</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -394,37 +396,11 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-eclipse-plugin</artifactId>
- <inherited>true</inherited>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <inherited>true</inherited>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <inherited>true</inherited>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
-
<artifactId>maven-surefire-report-plugin</artifactId>
- <inherited>true</inherited>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <inherited>true</inherited>
- </plugin>
- <plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <inherited>true</inherited>
</plugin>
</plugins>
- <pluginManagement>
+ <pluginManagement>
<plugins>
<plugin>
<inherited>true</inherited>
@@ -606,3 +582,4 @@
</plugins>
</reporting>
</project>
+
