Copied: openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureAppointment.java (from r1589015, openmeetings/trunk/singlewebapp/openmeetings-core/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureAppointment.java) URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureAppointment.java?p2=openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureAppointment.java&p1=openmeetings/trunk/singlewebapp/openmeetings-core/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureAppointment.java&r1=1589015&r2=1590080&rev=1590080&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/openmeetings-core/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureAppointment.java (original) +++ openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureAppointment.java Fri Apr 25 16:41:23 2014 @@ -18,7 +18,7 @@ */ package org.apache.openmeetings.test.calendar; - +import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey; import java.text.SimpleDateFormat; import java.util.Calendar; @@ -26,18 +26,16 @@ import java.util.Date; import java.util.Iterator; import java.util.List; -import org.apache.log4j.Logger; import org.apache.openmeetings.db.dao.calendar.AppointmentDao; import org.apache.openmeetings.db.entity.calendar.Appointment; import org.apache.openmeetings.test.AbstractJUnitDefaults; import org.junit.Test; +import org.red5.logging.Red5LoggerFactory; +import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; - - public class TestDatabaseStructureAppointment extends AbstractJUnitDefaults { - - private static final Logger log = Logger.getLogger(TestDatabaseStructureAppointment.class); + private static final Logger log = Red5LoggerFactory.getLogger(TestDatabaseStructureAppointment.class, webAppRootKey); @Autowired private AppointmentDao appointmentDao;
Copied: openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureAppointmentReminderTyp.java (from r1589015, openmeetings/trunk/singlewebapp/openmeetings-core/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureAppointmentReminderTyp.java) URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureAppointmentReminderTyp.java?p2=openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureAppointmentReminderTyp.java&p1=openmeetings/trunk/singlewebapp/openmeetings-core/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureAppointmentReminderTyp.java&r1=1589015&r2=1590080&rev=1590080&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/openmeetings-core/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureAppointmentReminderTyp.java (original) +++ openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureAppointmentReminderTyp.java Fri Apr 25 16:41:23 2014 @@ -18,22 +18,21 @@ */ package org.apache.openmeetings.test.calendar; -//import groovy.sql.Sql; +import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey; import java.util.Calendar; import java.util.List; -import org.apache.log4j.Logger; import org.apache.openmeetings.db.dao.calendar.AppointmentReminderTypDao; import org.apache.openmeetings.db.entity.calendar.AppointmentReminderTyps; import org.apache.openmeetings.test.AbstractJUnitDefaults; import org.junit.Test; +import org.red5.logging.Red5LoggerFactory; +import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; public class TestDatabaseStructureAppointmentReminderTyp extends AbstractJUnitDefaults { - - private static final Logger log = Logger - .getLogger(TestDatabaseStructureAppointmentReminderTyp.class); + private static final Logger log = Red5LoggerFactory.getLogger(TestDatabaseStructureAppointmentReminderTyp.class, webAppRootKey); @Autowired private AppointmentReminderTypDao appointmentReminderTypDaoImpl; Copied: openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureCategory.java (from r1589015, openmeetings/trunk/singlewebapp/openmeetings-core/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureCategory.java) URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureCategory.java?p2=openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureCategory.java&p1=openmeetings/trunk/singlewebapp/openmeetings-core/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureCategory.java&r1=1589015&r2=1590080&rev=1590080&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/openmeetings-core/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureCategory.java (original) +++ openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureCategory.java Fri Apr 25 16:41:23 2014 @@ -18,23 +18,24 @@ */ package org.apache.openmeetings.test.calendar; +import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey; + import java.util.List; -import org.apache.log4j.Logger; import org.apache.openmeetings.db.dao.calendar.AppointmentCategoryDao; import org.apache.openmeetings.db.entity.calendar.AppointmentCategory; import org.apache.openmeetings.test.AbstractJUnitDefaults; import org.junit.Test; +import org.red5.logging.Red5LoggerFactory; +import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; public class TestDatabaseStructureCategory extends AbstractJUnitDefaults { + private static final Logger log = Red5LoggerFactory.getLogger(TestDatabaseStructureCategory.class, webAppRootKey); @Autowired private AppointmentCategoryDao appointmentCategoryDaoImpl; - private static final Logger log = Logger - .getLogger(TestDatabaseStructureCategory.class); - @Test public void testAddingGroup() { Copied: openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureGetAppointmentByRange.java (from r1589015, openmeetings/trunk/singlewebapp/openmeetings-core/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureGetAppointmentByRange.java) URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureGetAppointmentByRange.java?p2=openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureGetAppointmentByRange.java&p1=openmeetings/trunk/singlewebapp/openmeetings-core/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureGetAppointmentByRange.java&r1=1589015&r2=1590080&rev=1590080&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/openmeetings-core/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureGetAppointmentByRange.java (original) +++ openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureGetAppointmentByRange.java Fri Apr 25 16:41:23 2014 @@ -18,22 +18,25 @@ */ package org.apache.openmeetings.test.calendar; +import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey; import static org.junit.Assert.assertEquals; import java.util.ArrayList; import java.util.Calendar; import java.util.Random; -import org.apache.log4j.Logger; import org.apache.openmeetings.db.dao.calendar.AppointmentDao; import org.apache.openmeetings.db.entity.calendar.Appointment; import org.apache.openmeetings.db.entity.calendar.MeetingMember; import org.apache.openmeetings.test.AbstractJUnitDefaults; import org.junit.Test; +import org.red5.logging.Red5LoggerFactory; +import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; public class TestDatabaseStructureGetAppointmentByRange extends AbstractJUnitDefaults { - private static final Logger log = Logger.getLogger(TestDatabaseStructureGetAppointmentByRange.class); + private static final Logger log = Red5LoggerFactory.getLogger(TestDatabaseStructureGetAppointmentByRange.class, webAppRootKey); + @Autowired private AppointmentDao appointmentDao; Copied: openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureGetUserStart.java (from r1589015, openmeetings/trunk/singlewebapp/openmeetings-core/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureGetUserStart.java) URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureGetUserStart.java?p2=openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureGetUserStart.java&p1=openmeetings/trunk/singlewebapp/openmeetings-core/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureGetUserStart.java&r1=1589015&r2=1590080&rev=1590080&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/openmeetings-core/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureGetUserStart.java (original) +++ openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureGetUserStart.java Fri Apr 25 16:41:23 2014 @@ -18,14 +18,18 @@ */ package org.apache.openmeetings.test.calendar; -import org.apache.log4j.Logger; +import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey; + import org.apache.openmeetings.db.dao.user.UserDao; import org.apache.openmeetings.test.AbstractJUnitDefaults; import org.junit.Test; +import org.red5.logging.Red5LoggerFactory; +import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; public class TestDatabaseStructureGetUserStart extends AbstractJUnitDefaults { - private static final Logger log = Logger.getLogger(TestDatabaseStructureGetUserStart.class); + private static final Logger log = Red5LoggerFactory.getLogger(TestDatabaseStructureGetUserStart.class, webAppRootKey); + @Autowired private UserDao usersDao; Copied: openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureUsersSearch.java (from r1589015, openmeetings/trunk/singlewebapp/openmeetings-core/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureUsersSearch.java) URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureUsersSearch.java?p2=openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureUsersSearch.java&p1=openmeetings/trunk/singlewebapp/openmeetings-core/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureUsersSearch.java&r1=1589015&r2=1590080&rev=1590080&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/openmeetings-core/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureUsersSearch.java (original) +++ openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureUsersSearch.java Fri Apr 25 16:41:23 2014 @@ -18,27 +18,27 @@ */ package org.apache.openmeetings.test.calendar; +import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey; + import java.util.List; -import org.apache.log4j.Logger; import org.apache.openmeetings.db.dao.user.UserDao; import org.apache.openmeetings.db.entity.user.User; import org.apache.openmeetings.test.AbstractJUnitDefaults; import org.junit.Test; +import org.red5.logging.Red5LoggerFactory; +import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; - public class TestDatabaseStructureUsersSearch extends AbstractJUnitDefaults { - @Autowired - private UserDao userDao; + private static final Logger log = Red5LoggerFactory.getLogger(TestDatabaseStructureUsersSearch.class, webAppRootKey); - private static final Logger log = Logger.getLogger(TestDatabaseStructureUsersSearch.class); + @Autowired + private UserDao userDao; @Test public void testAddingGroup(){ - try { - List<User> users = userDao.get("first", 0, 10, "orderby", 1); log.debug("[result]" + users.size()); log.debug("[records]"+ users); @@ -50,18 +50,7 @@ public class TestDatabaseStructureUsersS //GroupMemberDaoImpl.getInstance().deleteGroupMember(2L); //GroupMemberDaoImpl.getInstance().updateGroupMember(1L, "Eugen", "Schwert", Calendar.getInstance().getTime(), "1", "2", "interpol155", 1L, 1L); } catch (Exception err) { - log.error("[testAddingGroup]",err); - } - - - - - } - - - } - Copied: openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestGetAppointment.java (from r1589015, openmeetings/trunk/singlewebapp/openmeetings-core/src/test/java/org/apache/openmeetings/test/calendar/TestGetAppointment.java) URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestGetAppointment.java?p2=openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestGetAppointment.java&p1=openmeetings/trunk/singlewebapp/openmeetings-core/src/test/java/org/apache/openmeetings/test/calendar/TestGetAppointment.java&r1=1589015&r2=1590080&rev=1590080&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/openmeetings-core/src/test/java/org/apache/openmeetings/test/calendar/TestGetAppointment.java (original) +++ openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestGetAppointment.java Fri Apr 25 16:41:23 2014 @@ -18,20 +18,22 @@ */ package org.apache.openmeetings.test.calendar; +import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import java.util.Calendar; -import org.apache.log4j.Logger; import org.apache.openmeetings.db.dao.calendar.AppointmentDao; import org.apache.openmeetings.db.entity.calendar.Appointment; import org.apache.openmeetings.test.AbstractJUnitDefaults; import org.junit.Test; +import org.red5.logging.Red5LoggerFactory; +import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; public class TestGetAppointment extends AbstractJUnitDefaults { - private static final Logger log = Logger.getLogger(TestGetAppointment.class); + private static final Logger log = Red5LoggerFactory.getLogger(TestGetAppointment.class, webAppRootKey); @Autowired private AppointmentDao appointmentDao; Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/domain/TestAddGroup.java URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/domain/TestAddGroup.java?rev=1590080&r1=1589015&r2=1590080&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/domain/TestAddGroup.java (original) +++ openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/domain/TestAddGroup.java Fri Apr 25 16:41:23 2014 @@ -18,23 +18,25 @@ */ package org.apache.openmeetings.test.domain; -import org.apache.log4j.Logger; +import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey; + import org.apache.openmeetings.core.data.user.OrganisationManager; import org.apache.openmeetings.db.dao.user.UserDao; import org.apache.openmeetings.db.entity.user.User; import org.apache.openmeetings.test.AbstractJUnitDefaults; import org.junit.Test; +import org.red5.logging.Red5LoggerFactory; +import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; public class TestAddGroup extends AbstractJUnitDefaults { + private static final Logger log = Red5LoggerFactory.getLogger(TestAddGroup.class, webAppRootKey); @Autowired private OrganisationManager organisationManager; @Autowired private UserDao usersDao; - private static final Logger log = Logger.getLogger(TestAddGroup.class); - @Test public void testAddingGroup() { Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/domain/TestUserGroupAggregation.java URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/domain/TestUserGroupAggregation.java?rev=1590080&r1=1589015&r2=1590080&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/domain/TestUserGroupAggregation.java (original) +++ openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/domain/TestUserGroupAggregation.java Fri Apr 25 16:41:23 2014 @@ -18,25 +18,25 @@ */ package org.apache.openmeetings.test.domain; +import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey; import static org.junit.Assert.assertTrue; import java.util.List; -import org.apache.log4j.Logger; import org.apache.openmeetings.core.data.user.OrganisationManager; import org.apache.openmeetings.db.entity.user.Organisation; import org.apache.openmeetings.test.AbstractJUnitDefaults; import org.junit.Test; +import org.red5.logging.Red5LoggerFactory; +import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; public class TestUserGroupAggregation extends AbstractJUnitDefaults { + private static final Logger log = Red5LoggerFactory.getLogger(TestUserGroupAggregation.class, webAppRootKey); @Autowired private OrganisationManager organisationManager; - private static final Logger log = Logger - .getLogger(TestUserGroupAggregation.class); - @Test public void testitNow() { Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/library/TestFileParser.java URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/library/TestFileParser.java?rev=1590080&r1=1589015&r2=1590080&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/library/TestFileParser.java (original) +++ openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/library/TestFileParser.java Fri Apr 25 16:41:23 2014 @@ -18,16 +18,18 @@ */ package org.apache.openmeetings.test.library; -import org.apache.log4j.Logger; +import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey; + import org.apache.openmeetings.core.documents.LibraryWmlLoader; import org.apache.openmeetings.test.AbstractJUnitDefaults; import org.junit.Test; +import org.red5.logging.Red5LoggerFactory; +import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; - public class TestFileParser extends AbstractJUnitDefaults { - - private static final Logger log = Logger.getLogger(TestFileParser.class); + private static final Logger log = Red5LoggerFactory.getLogger(TestFileParser.class, webAppRootKey); + @Autowired private LibraryWmlLoader libraryWmlLoader; Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/selenium/AbstractTestDefaults.java URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/selenium/AbstractTestDefaults.java?rev=1590080&r1=1590079&r2=1590080&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/selenium/AbstractTestDefaults.java (original) +++ openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/selenium/AbstractTestDefaults.java Fri Apr 25 16:41:23 2014 @@ -24,6 +24,7 @@ import org.apache.openmeetings.db.dao.la import org.apache.openmeetings.test.AbstractSpringTest; import org.junit.After; import org.junit.Before; +import org.junit.experimental.categories.Category; import org.openqa.selenium.Keys; import org.openqa.selenium.WebDriver; import org.openqa.selenium.WebElement; @@ -31,6 +32,7 @@ import org.openqa.selenium.firefox.Firef import org.openqa.selenium.firefox.FirefoxProfile; import org.springframework.beans.factory.annotation.Autowired; +@Category(SeleniumTests.class) public abstract class AbstractTestDefaults extends AbstractSpringTest { @Autowired Added: openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/selenium/SeleniumTests.java URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/selenium/SeleniumTests.java?rev=1590080&view=auto ============================================================================== --- openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/selenium/SeleniumTests.java (added) +++ openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/selenium/SeleniumTests.java Fri Apr 25 16:41:23 2014 @@ -0,0 +1,23 @@ +/* + * 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.test.selenium; + +public @interface SeleniumTests { + +} Modified: openmeetings/trunk/singlewebapp/openmeetings-webservice/pom.xml URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-webservice/pom.xml?rev=1590080&r1=1590079&r2=1590080&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/openmeetings-webservice/pom.xml (original) +++ openmeetings/trunk/singlewebapp/openmeetings-webservice/pom.xml Fri Apr 25 16:41:23 2014 @@ -33,6 +33,7 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <cxf.version>2.7.11</cxf.version> + <jettison.version>1.3.5</jettison.version> </properties> <dependencies> <dependency> @@ -51,14 +52,77 @@ <version>${openmeetings.version}</version> </dependency> <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-core</artifactId> + <version>${spring.version}</version> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-frontend-jaxrs</artifactId> <version>${cxf.version}</version> + <exclusions> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>*</artifactId> + </exclusion> + <exclusion> + <groupId>javax.servlet</groupId> + <artifactId>*</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-frontend-jaxws</artifactId> <version>${cxf.version}</version> + <exclusions> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>*</artifactId> + </exclusion> + <exclusion> + <groupId>javax.servlet</groupId> + <artifactId>*</artifactId> + </exclusion> + <exclusion> + <groupId>asm</groupId> + <artifactId>asm</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-bundle</artifactId> + <version>${cxf.version}</version> + <exclusions> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>*</artifactId> + </exclusion> + <exclusion> + <groupId>antlr</groupId> + <artifactId>antlr</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.codehaus.jettison</groupId> + <artifactId>jettison</artifactId> + <version>${jettison.version}</version> </dependency> </dependencies> </project> Modified: openmeetings/trunk/singlewebapp/pom.xml URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/pom.xml?rev=1590080&r1=1590079&r2=1590080&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/pom.xml (original) +++ openmeetings/trunk/singlewebapp/pom.xml Fri Apr 25 16:41:23 2014 @@ -32,6 +32,8 @@ <description>TODO</description> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <wicket.mode>DEPLOYMENT</wicket.mode> + <db>derby</db> <openmeetings.version>3.1.0-SNAPSHOT</openmeetings.version> <spring.version>4.0.3.RELEASE</spring.version> <junit.version>4.11</junit.version> @@ -122,7 +124,17 @@ <id>Red5</id> <url>http://red5.googlecode.com/svn/repository</url> </repository> + <repository> + <id>flex-mojos-repository</id> + <url>http://repository.sonatype.org/content/groups/flexgroup</url> + </repository> </repositories> + <pluginRepositories> + <pluginRepository> + <id>flex-mojos-plugin-repository</id> + <url>http://repository.sonatype.org/content/groups/flexgroup</url> + </pluginRepository> + </pluginRepositories> <dependencies> <dependency> <groupId>junit</groupId> @@ -135,6 +147,12 @@ <artifactId>spring-core</artifactId> <version>${spring.version}</version> <scope>test</scope> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.springframework</groupId>
