Author: solomax
Date: Tue Apr 22 03:53:38 2014
New Revision: 1589016
URL: http://svn.apache.org/r1589016
Log:
[OPENMEETINGS-940] maven build partially fixed
Added:
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ISlaveHTTPConnectionManager.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/
openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestAppointmentAddAppointment.java
- copied, changed from r1588870,
openmeetings/trunk/singlewebapp/openmeetings-core/src/test/java/org/apache/openmeetings/test/calendar/TestAppointmentAddAppointment.java
openmeetings/trunk/singlewebapp/openmeetings-webservice/
- copied from r1589015, openmeetings/trunk/singlewebapp/openmeetings-axis/
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/core/
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/core/cluster/
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/CalendarWebService.java
- copied, changed from r1588870,
openmeetings/trunk/singlewebapp/openmeetings-axis/src/main/java/org/apache/openmeetings/axis/services/CalendarWebService.java
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/FileWebService.java
- copied, changed from r1588870,
openmeetings/trunk/singlewebapp/openmeetings-axis/src/main/java/org/apache/openmeetings/axis/services/FileWebService.java
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/JabberWebService.java
- copied, changed from r1588870,
openmeetings/trunk/singlewebapp/openmeetings-axis/src/main/java/org/apache/openmeetings/axis/services/JabberWebService.java
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomCountBean.java
- copied, changed from r1588870,
openmeetings/trunk/singlewebapp/openmeetings-axis/src/main/java/org/apache/openmeetings/axis/services/RoomCountBean.java
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomReturn.java
- copied, changed from r1588870,
openmeetings/trunk/singlewebapp/openmeetings-axis/src/main/java/org/apache/openmeetings/axis/services/RoomReturn.java
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomUser.java
- copied, changed from r1588870,
openmeetings/trunk/singlewebapp/openmeetings-axis/src/main/java/org/apache/openmeetings/axis/services/RoomUser.java
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java
- copied, changed from r1588870,
openmeetings/trunk/singlewebapp/openmeetings-axis/src/main/java/org/apache/openmeetings/axis/services/RoomWebService.java
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/ServerWebService.java
- copied, changed from r1588870,
openmeetings/trunk/singlewebapp/openmeetings-axis/src/main/java/org/apache/openmeetings/axis/services/ServerWebService.java
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/ServiceException.java
- copied, changed from r1588870,
openmeetings/trunk/singlewebapp/openmeetings-axis/src/main/java/org/apache/openmeetings/axis/services/ServiceException.java
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java
- copied, changed from r1588870,
openmeetings/trunk/singlewebapp/openmeetings-axis/src/main/java/org/apache/openmeetings/axis/services/UserWebService.java
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/cluster/
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/cluster/RestClient.java
- copied, changed from r1588870,
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/cluster/sync/RestClient.java
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/cluster/SlaveHTTPConnectionManager.java
- copied, changed from r1588870,
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/cluster/SlaveHTTPConnectionManager.java
Removed:
openmeetings/trunk/singlewebapp/openmeetings-axis/
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/cluster/
openmeetings/trunk/singlewebapp/openmeetings-core/src/test/java/org/apache/openmeetings/test/calendar/TestAppointmentAddAppointment.java
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/axis/
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/resources/
Modified:
openmeetings/trunk/singlewebapp/.classpath
openmeetings/trunk/singlewebapp/build.xml
openmeetings/trunk/singlewebapp/docs/RoomService.html
openmeetings/trunk/singlewebapp/openmeetings-core/pom.xml
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/UserService.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/openmeetings-applicationContext.xml
openmeetings/trunk/singlewebapp/openmeetings-webservice/pom.xml
openmeetings/trunk/singlewebapp/pom.xml
Modified: openmeetings/trunk/singlewebapp/.classpath
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/.classpath?rev=1589016&r1=1589015&r2=1589016&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/.classpath (original)
+++ openmeetings/trunk/singlewebapp/.classpath Tue Apr 22 03:53:38 2014
@@ -19,18 +19,18 @@
-->
<classpath>
- <classpathentry kind="src" path="openmeetings-axis/src/main/java"/>
- <classpathentry kind="src" path="openmeetings-db/src/main/java"/>
<classpathentry kind="src" path="src/doc/java"/>
- <classpathentry kind="src" path="openmeetings-install/src/main/java"/>
<classpathentry kind="src" path="openmeetings-core/src/main/java"/>
<classpathentry kind="src" path="openmeetings-core/src/test/java"/>
+ <classpathentry kind="src" path="openmeetings-db/src/main/java"/>
+ <classpathentry kind="src" path="openmeetings-install/src/main/java"/>
<classpathentry kind="src"
path="openmeetings-screenshare/src/main/java"/>
+ <classpathentry kind="src" path="openmeetings-service/src/main/java"/>
<classpathentry kind="src" path="openmeetings-util/src/main/java"/>
<classpathentry kind="src" path="openmeetings-web/src/main/java"/>
<classpathentry kind="src"
path="openmeetings-web/src/main/webapp/WEB-INF/classes"/>
<classpathentry kind="src" path="openmeetings-web/src/test/java"/>
- <classpathentry kind="src" path="openmeetings-service/src/main/java"/>
+ <classpathentry kind="src"
path="openmeetings-webservice/src/main/java"/>
<classpathentry exported="true" kind="con"
path="org.eclipse.jst.j2ee.internal.module.container"/>
<classpathentry kind="con"
path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4">
<attributes>
Modified: openmeetings/trunk/singlewebapp/build.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/build.xml?rev=1589016&r1=1589015&r2=1589016&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/build.xml (original)
+++ openmeetings/trunk/singlewebapp/build.xml Tue Apr 22 03:53:38 2014
@@ -42,7 +42,6 @@
<property name="webcontent.base.dir" value="${basedir}/WebContent" />
<property name="screenshare.resources.dir"
value="${basedir}/openmeetings-screenshare/src/main/resources" />
- <property name="axis.resources.dir"
value="${basedir}/openmeetings-axis/src/main/resources" />
<property name="webapp.dir"
value="${basedir}/openmeetings-web/src/main/webapp" />
<property name="junit.lib.dir" value="${project.lib.dir}/junit" />
@@ -329,7 +328,7 @@
<exclude name="META-INF/*.xml" />
<exclude name="org/apache/openmeetings/util/**"
/>
<exclude name="org/apache/openmeetings/test/**"
/>
- <exclude name="org/apache/openmeetings/axis/**"
/>
+ <exclude
name="org/apache/openmeetings/webservice/**" />
<exclude name="org/apache/openmeetings/db/**" />
<exclude name="org/apache/openmeetings/cli/**"
/>
<exclude
name="org/apache/openmeetings/backup/**" />
@@ -416,9 +415,9 @@
</jar>
<!-- Build WebServices -->
- <jar
destfile="${dist.webapps.dir}/WEB-INF/lib/${project.distname}-axis-${jar.suffix}.jar">
+ <jar
destfile="${dist.webapps.dir}/WEB-INF/lib/${project.distname}-webservice-${jar.suffix}.jar">
<fileset dir="${main.out.dir}">
- <include name="**/apache/openmeetings/axis/**"
/>
+ <include
name="**/apache/openmeetings/webservice/**" />
<include name="META-INF/LICENSE" />
<include name="META-INF/NOTICE" />
</fileset>
@@ -461,7 +460,7 @@
<format property="TODAY_YEAR" pattern="yyyy"
locale="en" />
</tstamp>
<javadoc packagenames="org.apache.openmeetings.core.remote.*"
-
sourcepath="${basedir}/openmeetings-axis/src/main/java:${basedir}/openmeetings-db/src/main/java:${src.base.dir}/doc/java:${basedir}/openmeetings-install/src/main/java:${basedir}/openmeetings-core/src/main/java:${basedir}/openmeetings-screenshare/src/main/java:${basedir}/openmeetings-util/src/main/java:${basedir}/openmeetings-web/src/main/java:${basedir}/openmeetings-service/src/main/java"
+
sourcepath="${basedir}/openmeetings-webservice/src/main/java:${basedir}/openmeetings-db/src/main/java:${src.base.dir}/doc/java:${basedir}/openmeetings-install/src/main/java:${basedir}/openmeetings-core/src/main/java:${basedir}/openmeetings-screenshare/src/main/java:${basedir}/openmeetings-util/src/main/java:${basedir}/openmeetings-web/src/main/java:${basedir}/openmeetings-service/src/main/java"
excludepackagenames="org.apache.openmeetings.test.*"
defaultexcludes="yes"
destdir="build/api"
@@ -679,7 +678,7 @@
<echo message="Compile main to ${main.out.dir}" />
<javac debug="on" debuglevel="lines,vars,source"
destdir="${main.out.dir}" includeantruntime="false"
source="1.6" target="1.6">
- <src path="${basedir}/openmeetings-axis/src/main/java"
/>
+ <src
path="${basedir}/openmeetings-webservice/src/main/java" />
<src path="${basedir}/openmeetings-db/src/main/java" />
<src path="${src.base.dir}/doc/java" />
<src
path="${basedir}/openmeetings-install/src/main/java" />
@@ -700,7 +699,6 @@
<exclude name="**/*.java" />
</fileset>
</copy>
- <copy file="${axis.resources.dir}/services.xml"
tofile="${main.out.dir}/META-INF/services.xml" overwrite="true" />
<copy file="LICENSE" tofile="${main.out.dir}/META-INF/LICENSE"
overwrite="true" />
<copy file="NOTICE" tofile="${main.out.dir}/META-INF/NOTICE"
overwrite="true" />
</target>
@@ -846,7 +844,7 @@
<target name="build.only.webservice.doc" depends="anakia">
<javadoc classpathref="build.webservice.classpath"
useexternalfile="true" destdir="${basedir}/docs">
- <fileset
dir="${basedir}/openmeetings-axis/src/main/java/org/apache/openmeetings/axis/services">
+ <fileset
dir="${basedir}/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice">
<include name="*WebService.java" />
<exclude name="BaseWebService.java" />
</fileset>
Modified: openmeetings/trunk/singlewebapp/docs/RoomService.html
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/docs/RoomService.html?rev=1589016&r1=1589015&r2=1589016&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/docs/RoomService.html (original)
+++ openmeetings/trunk/singlewebapp/docs/RoomService.html Tue Apr 22 03:53:38
2014
@@ -694,7 +694,7 @@
Returns current users for rooms ids
</p>
<p>
- Return Type:
java.util.List<org.apache.openmeetings.axis.services.RoomCountBean>
+ Return Type:
java.util.List<org.apache.openmeetings.webservice.RoomCountBean>
</p>
<p>Params:</p>
@@ -798,7 +798,7 @@
Returns a object of type RoomReturn
</p>
<p>
- Return Type: org.apache.openmeetings.axis.services.RoomReturn
+ Return Type: org.apache.openmeetings.webservice.RoomReturn
</p>
<p>Params:</p>
@@ -4245,7 +4245,7 @@
conference room
</p>
<p>
- Return Type:
java.util.List<org.apache.openmeetings.axis.services.RoomReturn>
+ Return Type:
java.util.List<org.apache.openmeetings.webservice.RoomReturn>
</p>
<p>Params:</p>
@@ -4330,7 +4330,7 @@
conference room with option to search for special external room types
</p>
<p>
- Return Type:
java.util.List<org.apache.openmeetings.axis.services.RoomReturn>
+ Return Type:
java.util.List<org.apache.openmeetings.webservice.RoomReturn>
</p>
<p>Params:</p>
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/pom.xml?rev=1589016&r1=1589015&r2=1589016&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/pom.xml Tue Apr 22
03:53:38 2014
@@ -32,8 +32,6 @@
<description>TODO</description>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <axis2.version>1.7.0-SNAPSHOT</axis2.version>
- <axiom.version>1.2.14</axiom.version>
<velocity.version>1.7</velocity.version>
<batik.version>1.7</batik.version>
<smslib.version>3.5.4</smslib.version>
@@ -45,27 +43,6 @@
<url>http://smslib.org/maven2/v3</url>
</repository>
</repositories>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <version>2.2</version>
- <executions>
- <execution>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- <!-- configuration>
- <excludes>
- <exclude>**/*.class</exclude>
- </excludes>
- </configuration-->
- </plugin>
- </plugins>
- </build>
<dependencies>
<dependency>
<groupId>org.apache.openmeetings</groupId>
@@ -78,16 +55,6 @@
<version>${openmeetings.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2</artifactId>
- <version>${axis2.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.ws.commons.axiom</groupId>
- <artifactId>axiom-impl</artifactId>
- <version>${axiom.version}</version>
- </dependency>
- <dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity</artifactId>
<version>${velocity.version}</version>
Added:
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ISlaveHTTPConnectionManager.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ISlaveHTTPConnectionManager.java?rev=1589016&view=auto
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ISlaveHTTPConnectionManager.java
(added)
+++
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ISlaveHTTPConnectionManager.java
Tue Apr 22 03:53:38 2014
@@ -0,0 +1,25 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License") + you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.openmeetings.core.remote;
+
+import org.apache.openmeetings.db.entity.server.Server;
+
+public interface ISlaveHTTPConnectionManager {
+ void kickSlaveUser(Server server, String publicSID) throws Exception;
+}
Modified:
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/UserService.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/UserService.java?rev=1589016&r1=1589015&r2=1589016&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/UserService.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/UserService.java
Tue Apr 22 03:53:38 2014
@@ -22,7 +22,6 @@ import java.util.Date;
import java.util.HashMap;
import java.util.List;
-import org.apache.openmeetings.core.cluster.SlaveHTTPConnectionManager;
import org.apache.openmeetings.core.data.basic.FieldManager;
import org.apache.openmeetings.core.data.conference.RoomManager;
import org.apache.openmeetings.core.data.user.OrganisationManager;
@@ -111,7 +110,7 @@ public class UserService implements IUse
@Autowired
private ServerDao serverDao;
@Autowired
- private SlaveHTTPConnectionManager slaveHTTPConnectionManager;
+ private ISlaveHTTPConnectionManager slaveHTTPConnectionManager;
@Autowired
private FieldLanguagesValuesDao fieldLanguagesValuesDao;
@Autowired
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/openmeetings-applicationContext.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/openmeetings-applicationContext.xml?rev=1589016&r1=1589015&r2=1589016&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/openmeetings-applicationContext.xml
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/openmeetings-applicationContext.xml
Tue Apr 22 03:53:38 2014
@@ -98,7 +98,7 @@
<bean id="openmeetings.FlvInterviewReConverterTask"
class="org.apache.openmeetings.core.data.flvrecord.converter.FlvInterviewReConverterTask"
/>
<bean id="openmeetings.FlvInterviewConverter"
class="org.apache.openmeetings.core.converter.FlvInterviewConverter" />
<bean id="openmeetings.FlvRecorderConverter"
class="org.apache.openmeetings.core.converter.FlvRecorderConverter" />
- <bean id="openmeetings.SlaveHTTPConnectionManager"
class="org.apache.openmeetings.core.cluster.SlaveHTTPConnectionManager" />
+ <bean id="openmeetings.SlaveHTTPConnectionManager"
class="org.apache.openmeetings.webservice.cluster.SlaveHTTPConnectionManager" />
<bean id="openmeetings.SessionClearJob"
class="org.apache.openmeetings.core.quartz.scheduler.SessionClearJob" />
<bean id="sessionClearJob"
class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean">
@@ -310,12 +310,12 @@
</bean>
<!-- Axis2 Service Proxy's -->
- <bean id="userWebService"
class="org.apache.openmeetings.axis.services.UserWebService" />
- <bean id="roomWebService"
class="org.apache.openmeetings.axis.services.RoomWebService" />
- <bean id="fileWebService"
class="org.apache.openmeetings.axis.services.FileWebService" />
- <bean id="calendarWebService"
class="org.apache.openmeetings.axis.services.CalendarWebService" />
- <bean id="jabberWebService"
class="org.apache.openmeetings.axis.services.JabberWebService" />
- <bean id="serverWebService"
class="org.apache.openmeetings.axis.services.ServerWebService" />
+ <bean id="userWebService"
class="org.apache.openmeetings.webservice.UserWebService" />
+ <bean id="roomWebService"
class="org.apache.openmeetings.webservice.RoomWebService" />
+ <bean id="fileWebService"
class="org.apache.openmeetings.webservice.FileWebService" />
+ <bean id="calendarWebService"
class="org.apache.openmeetings.webservice.CalendarWebService" />
+ <bean id="jabberWebService"
class="org.apache.openmeetings.webservice.JabberWebService" />
+ <bean id="serverWebService"
class="org.apache.openmeetings.webservice.ServerWebService" />
<bean id="jsonProvider"
class="org.apache.cxf.jaxrs.provider.json.JSONProvider">
<!-- (writeXsiType=false) -->
Copied:
openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestAppointmentAddAppointment.java
(from r1588870,
openmeetings/trunk/singlewebapp/openmeetings-core/src/test/java/org/apache/openmeetings/test/calendar/TestAppointmentAddAppointment.java)
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestAppointmentAddAppointment.java?p2=openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestAppointmentAddAppointment.java&p1=openmeetings/trunk/singlewebapp/openmeetings-core/src/test/java/org/apache/openmeetings/test/calendar/TestAppointmentAddAppointment.java&r1=1588870&r2=1589016&rev=1589016&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-core/src/test/java/org/apache/openmeetings/test/calendar/TestAppointmentAddAppointment.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestAppointmentAddAppointment.java
Tue Apr 22 03:53:38 2014
@@ -26,12 +26,12 @@ import java.util.Calendar;
import org.apache.openmeetings.core.data.calendar.management.AppointmentLogic;
import org.apache.openmeetings.db.dao.calendar.AppointmentDao;
import org.apache.openmeetings.db.entity.calendar.Appointment;
-import org.apache.openmeetings.test.AbstractJUnitDefaults;
+import org.apache.openmeetings.test.AbstractWicketTester;
import org.junit.Test;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
-public class TestAppointmentAddAppointment extends AbstractJUnitDefaults {
+public class TestAppointmentAddAppointment extends AbstractWicketTester {
private static final Logger log =
Red5LoggerFactory.getLogger(TestAppointmentAddAppointment.class, webAppRootKey);
@Autowired
Modified: openmeetings/trunk/singlewebapp/openmeetings-webservice/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-webservice/pom.xml?rev=1589016&r1=1589015&r2=1589016&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-webservice/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-webservice/pom.xml Tue Apr 22
03:53:38 2014
@@ -26,12 +26,13 @@
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.apache.openmeetings</groupId>
- <artifactId>openmeetings-axis</artifactId>
+ <artifactId>openmeetings-webservice</artifactId>
<packaging>jar</packaging>
- <name>Openmeetings Axis</name>
+ <name>Openmeetings Webservices</name>
<description>TODO</description>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <cxf.version>2.7.11</cxf.version>
</properties>
<dependencies>
<dependency>
@@ -50,9 +51,14 @@
<version>${openmeetings.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.openmeetings</groupId>
- <artifactId>openmeetings-web</artifactId>
- <version>${openmeetings.version}</version>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-frontend-jaxrs</artifactId>
+ <version>${cxf.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-frontend-jaxws</artifactId>
+ <version>${cxf.version}</version>
</dependency>
</dependencies>
</project>
Copied:
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/CalendarWebService.java
(from r1588870,
openmeetings/trunk/singlewebapp/openmeetings-axis/src/main/java/org/apache/openmeetings/axis/services/CalendarWebService.java)
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/CalendarWebService.java?p2=openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/CalendarWebService.java&p1=openmeetings/trunk/singlewebapp/openmeetings-axis/src/main/java/org/apache/openmeetings/axis/services/CalendarWebService.java&r1=1588870&r2=1589016&rev=1589016&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-axis/src/main/java/org/apache/openmeetings/axis/services/CalendarWebService.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/CalendarWebService.java
Tue Apr 22 03:53:38 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.axis.services;
+package org.apache.openmeetings.webservice;
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
Copied:
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/FileWebService.java
(from r1588870,
openmeetings/trunk/singlewebapp/openmeetings-axis/src/main/java/org/apache/openmeetings/axis/services/FileWebService.java)
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/FileWebService.java?p2=openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/FileWebService.java&p1=openmeetings/trunk/singlewebapp/openmeetings-axis/src/main/java/org/apache/openmeetings/axis/services/FileWebService.java&r1=1588870&r2=1589016&rev=1589016&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-axis/src/main/java/org/apache/openmeetings/axis/services/FileWebService.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/FileWebService.java
Tue Apr 22 03:53:38 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.axis.services;
+package org.apache.openmeetings.webservice;
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
Copied:
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/JabberWebService.java
(from r1588870,
openmeetings/trunk/singlewebapp/openmeetings-axis/src/main/java/org/apache/openmeetings/axis/services/JabberWebService.java)
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/JabberWebService.java?p2=openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/JabberWebService.java&p1=openmeetings/trunk/singlewebapp/openmeetings-axis/src/main/java/org/apache/openmeetings/axis/services/JabberWebService.java&r1=1588870&r2=1589016&rev=1589016&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-axis/src/main/java/org/apache/openmeetings/axis/services/JabberWebService.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/JabberWebService.java
Tue Apr 22 03:53:38 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.axis.services;
+package org.apache.openmeetings.webservice;
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
Copied:
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomCountBean.java
(from r1588870,
openmeetings/trunk/singlewebapp/openmeetings-axis/src/main/java/org/apache/openmeetings/axis/services/RoomCountBean.java)
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomCountBean.java?p2=openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomCountBean.java&p1=openmeetings/trunk/singlewebapp/openmeetings-axis/src/main/java/org/apache/openmeetings/axis/services/RoomCountBean.java&r1=1588870&r2=1589016&rev=1589016&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-axis/src/main/java/org/apache/openmeetings/axis/services/RoomCountBean.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomCountBean.java
Tue Apr 22 03:53:38 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.axis.services;
+package org.apache.openmeetings.webservice;
public class RoomCountBean {
private long roomId;
Copied:
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomReturn.java
(from r1588870,
openmeetings/trunk/singlewebapp/openmeetings-axis/src/main/java/org/apache/openmeetings/axis/services/RoomReturn.java)
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomReturn.java?p2=openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomReturn.java&p1=openmeetings/trunk/singlewebapp/openmeetings-axis/src/main/java/org/apache/openmeetings/axis/services/RoomReturn.java&r1=1588870&r2=1589016&rev=1589016&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-axis/src/main/java/org/apache/openmeetings/axis/services/RoomReturn.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomReturn.java
Tue Apr 22 03:53:38 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.axis.services;
+package org.apache.openmeetings.webservice;
import java.util.Date;
Copied:
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomUser.java
(from r1588870,
openmeetings/trunk/singlewebapp/openmeetings-axis/src/main/java/org/apache/openmeetings/axis/services/RoomUser.java)
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomUser.java?p2=openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomUser.java&p1=openmeetings/trunk/singlewebapp/openmeetings-axis/src/main/java/org/apache/openmeetings/axis/services/RoomUser.java&r1=1588870&r2=1589016&rev=1589016&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-axis/src/main/java/org/apache/openmeetings/axis/services/RoomUser.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomUser.java
Tue Apr 22 03:53:38 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.axis.services;
+package org.apache.openmeetings.webservice;
public class RoomUser {
Copied:
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java
(from r1588870,
openmeetings/trunk/singlewebapp/openmeetings-axis/src/main/java/org/apache/openmeetings/axis/services/RoomWebService.java)
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java?p2=openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java&p1=openmeetings/trunk/singlewebapp/openmeetings-axis/src/main/java/org/apache/openmeetings/axis/services/RoomWebService.java&r1=1588870&r2=1589016&rev=1589016&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-axis/src/main/java/org/apache/openmeetings/axis/services/RoomWebService.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java
Tue Apr 22 03:53:38 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.axis.services;
+package org.apache.openmeetings.webservice;
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
Copied:
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/ServerWebService.java
(from r1588870,
openmeetings/trunk/singlewebapp/openmeetings-axis/src/main/java/org/apache/openmeetings/axis/services/ServerWebService.java)
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/ServerWebService.java?p2=openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/ServerWebService.java&p1=openmeetings/trunk/singlewebapp/openmeetings-axis/src/main/java/org/apache/openmeetings/axis/services/ServerWebService.java&r1=1588870&r2=1589016&rev=1589016&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-axis/src/main/java/org/apache/openmeetings/axis/services/ServerWebService.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/ServerWebService.java
Tue Apr 22 03:53:38 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.axis.services;
+package org.apache.openmeetings.webservice;
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
Copied:
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/ServiceException.java
(from r1588870,
openmeetings/trunk/singlewebapp/openmeetings-axis/src/main/java/org/apache/openmeetings/axis/services/ServiceException.java)
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/ServiceException.java?p2=openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/ServiceException.java&p1=openmeetings/trunk/singlewebapp/openmeetings-axis/src/main/java/org/apache/openmeetings/axis/services/ServiceException.java&r1=1588870&r2=1589016&rev=1589016&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-axis/src/main/java/org/apache/openmeetings/axis/services/ServiceException.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/ServiceException.java
Tue Apr 22 03:53:38 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.axis.services;
+package org.apache.openmeetings.webservice;
import javax.xml.ws.WebFault;
Copied:
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java
(from r1588870,
openmeetings/trunk/singlewebapp/openmeetings-axis/src/main/java/org/apache/openmeetings/axis/services/UserWebService.java)
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java?p2=openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java&p1=openmeetings/trunk/singlewebapp/openmeetings-axis/src/main/java/org/apache/openmeetings/axis/services/UserWebService.java&r1=1588870&r2=1589016&rev=1589016&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-axis/src/main/java/org/apache/openmeetings/axis/services/UserWebService.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java
Tue Apr 22 03:53:38 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.axis.services;
+package org.apache.openmeetings.webservice;
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
Copied:
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/cluster/RestClient.java
(from r1588870,
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/cluster/sync/RestClient.java)
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/cluster/RestClient.java?p2=openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/cluster/RestClient.java&p1=openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/cluster/sync/RestClient.java&r1=1588870&r2=1589016&rev=1589016&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/cluster/sync/RestClient.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/cluster/RestClient.java
Tue Apr 22 03:53:38 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.core.cluster.sync;
+package org.apache.openmeetings.webservice.cluster;
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
@@ -25,8 +25,8 @@ import java.net.URL;
import javax.xml.namespace.QName;
import javax.xml.ws.Service;
-import org.apache.openmeetings.axis.services.UserWebService;
import org.apache.openmeetings.db.entity.server.Server;
+import org.apache.openmeetings.webservice.UserWebService;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
Copied:
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/cluster/SlaveHTTPConnectionManager.java
(from r1588870,
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/cluster/SlaveHTTPConnectionManager.java)
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/cluster/SlaveHTTPConnectionManager.java?p2=openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/cluster/SlaveHTTPConnectionManager.java&p1=openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/cluster/SlaveHTTPConnectionManager.java&r1=1588870&r2=1589016&rev=1589016&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/cluster/SlaveHTTPConnectionManager.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/cluster/SlaveHTTPConnectionManager.java
Tue Apr 22 03:53:38 2014
@@ -16,14 +16,15 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.core.cluster;
+package org.apache.openmeetings.webservice.cluster;
+
+import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
import java.util.HashMap;
import java.util.Map;
-import org.apache.openmeetings.core.cluster.sync.RestClient;
+import org.apache.openmeetings.core.remote.ISlaveHTTPConnectionManager;
import org.apache.openmeetings.db.entity.server.Server;
-import org.apache.openmeetings.util.OpenmeetingsVariables;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
@@ -36,10 +37,8 @@ import org.slf4j.Logger;
* @author sebawagner
*
*/
-public class SlaveHTTPConnectionManager {
-
- private static Logger log = Red5LoggerFactory.getLogger(
- SlaveHTTPConnectionManager.class,
OpenmeetingsVariables.webAppRootKey);
+public class SlaveHTTPConnectionManager implements ISlaveHTTPConnectionManager
{
+ private static Logger log =
Red5LoggerFactory.getLogger(SlaveHTTPConnectionManager.class, webAppRootKey);
/**
* We store the list of RestClients in the memory, so that we can simply
Modified: openmeetings/trunk/singlewebapp/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/pom.xml?rev=1589016&r1=1589015&r2=1589016&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/pom.xml Tue Apr 22 03:53:38 2014
@@ -39,16 +39,18 @@
<jaudiotagger.version>2.0.4-SNAPSHOT</jaudiotagger.version>
<spring.version>4.0.0.RELEASE</spring.version>
<junit.version>4.11</junit.version>
+ <maven.javadoc.version>2.9.1</maven.javadoc.version>
+ <maven.surefire.version>2.12.2</maven.surefire.version>
</properties>
<modules>
- <module>openmeetings-util</module>
+ <module>openmeetings-core</module>
<module>openmeetings-db</module>
- <module>openmeetings-screenshare</module>
<module>openmeetings-install</module>
- <module>openmeetings-web</module>
- <module>openmeetings-core</module>
- <module>openmeetings-axis</module>
+ <module>openmeetings-screenshare</module>
<module>openmeetings-service</module>
+ <module>openmeetings-util</module>
+ <module>openmeetings-web</module>
+ <module>openmeetings-webservice</module>
</modules>
<profiles>
<profile>
@@ -171,41 +173,200 @@
<directory>${basedir}/target</directory>
<plugins>
<plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.2</version>
- <configuration>
- <compilerVersion>1.6</compilerVersion>
- <fork>true</fork>
- <source>1.6</source>
- <target>1.6</target>
- </configuration>
+ <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>
- <version>2.3.7</version>
- <extensions>true</extensions>
+ <inherited>true</inherited>
</plugin>
+ </plugins>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <inherited>true</inherited>
+
<groupId>org.apache.maven.plugins</groupId>
+
<artifactId>maven-compiler-plugin</artifactId>
+ <version>2.5.1</version>
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
+ <optimize>true</optimize>
+ <debug>true</debug>
+ </configuration>
+ </plugin>
+ <plugin>
+
<groupId>org.apache.maven.plugins</groupId>
+
<artifactId>maven-eclipse-plugin</artifactId>
+ <version>2.9</version>
+ <configuration>
+
<downloadSources>true</downloadSources>
+ </configuration>
+ </plugin>
+ <plugin>
+
<groupId>org.apache.maven.plugins</groupId>
+
<artifactId>maven-gpg-plugin</artifactId>
+ <version>1.4</version>
+ <executions>
+ <execution>
+ <id>sign-artifacts</id>
+ <phase>install</phase>
+ <goals>
+
<goal>sign</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+
<groupId>org.apache.maven.plugins</groupId>
+
<artifactId>maven-war-plugin</artifactId>
+ <version>2.2</version>
+ <configuration>
+
<warName>${project.artifactId}</warName>
+ </configuration>
+ </plugin>
+ <plugin>
+
<groupId>org.apache.maven.plugins</groupId>
+
<artifactId>maven-jar-plugin</artifactId>
+ <version>2.4</version>
+ <configuration>
+
<useDefaultManifestFile>true</useDefaultManifestFile>
+ <archive>
+ <manifest>
+
<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+ </manifest>
+ <manifestEntries>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ </plugin>
+ <plugin>
+
<groupId>org.apache.maven.plugins</groupId>
+
<artifactId>maven-site-plugin</artifactId>
+ <version>3.3</version>
+ </plugin>
+ <plugin>
+
<groupId>org.apache.maven.plugins</groupId>
+
<artifactId>maven-surefire-plugin</artifactId>
+
<version>${maven.surefire.version}</version>
+ <configuration>
+ <includes>
+
<include>**/Test*.java</include>
+ </includes>
+ </configuration>
+ <dependencies>
+ <dependency>
+ <!-- force 4.7 runner
to enable excludedGroups on Categories (& parallel) -->
+
<groupId>org.apache.maven.surefire</groupId>
+
<artifactId>surefire-junit47</artifactId>
+
<version>${maven.surefire.version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ <plugin>
+
<groupId>org.apache.maven.plugins</groupId>
+
<artifactId>maven-surefire-report-plugin</artifactId>
+
<version>${maven.surefire.version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+
<artifactId>maven-bundle-plugin</artifactId>
+ <version>2.3.7</version>
+ <extensions>true</extensions>
+ </plugin>
+
+ <!--This plugin's configuration is used to
store Eclipse m2e settings only. It has no influence on the Maven build
itself.-->
+ <plugin>
+ <groupId>org.eclipse.m2e</groupId>
+
<artifactId>lifecycle-mapping</artifactId>
+ <version>1.0.0</version>
+ <configuration>
+ <lifecycleMappingMetadata>
+ <pluginExecutions>
+
<pluginExecution>
+
<pluginExecutionFilter>
+
<groupId>org.apache.felix</groupId>
+
<artifactId>maven-bundle-plugin</artifactId>
+
<versionRange>[2.3.7,)</versionRange>
+
<goals>
+
<goal>manifest</goal>
+
</goals>
+
</pluginExecutionFilter>
+ <action>
+
<ignore />
+
</action>
+
</pluginExecution>
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+ <reporting>
+ <plugins>
<plugin>
- <artifactId>maven-dependency-plugin</artifactId>
+ <groupId>org.apache.maven.plugins</groupId>
+
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>2.6</version>
- <executions>
- <execution>
- <id>copy-dependencies</id>
- <phase>package</phase>
- <goals>
-
<goal>copy-dependencies</goal>
- </goals>
- <configuration>
-
<outputDirectory>${project.build.directory}/lib</outputDirectory>
-
<overWriteReleases>false</overWriteReleases>
-
<overWriteSnapshots>false</overWriteSnapshots>
-
<overWriteIfNewer>true</overWriteIfNewer>
-
<excludeTransitive>true</excludeTransitive>
- </configuration>
- </execution>
- </executions>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>index</report>
+ <report>help</report>
+
<report>project-team</report>
+ <report>modules</report>
+ <report>plugins</report>
+ <report>cim</report>
+
<report>issue-tracking</report>
+ <report>scm</report>
+ <report>license</report>
+
<report>plugin-management</report>
+
<report>distribution-management</report>
+ <report>summary</report>
+
<report>mailing-list</report>
+
<report>issue-tracking</report>
+ <!--
+
<report>dependencies</report>
+ -->
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+
<artifactId>maven-surefire-report-plugin</artifactId>
+ <reportSets>
+ <reportSet>
+ <reports>
+
<report>report-only</report>
+ </reports>
+ </reportSet>
+ </reportSets>
</plugin>
</plugins>
- </build>
+ </reporting>
</project>
