Revision: 4506
Author: solomax666
Date: Tue Nov 1 11:33:07 2011
Log: - Unit tests are able to be run under Eclipse. The following VM
parameter should be specified for the run/debug configuration for
successful
run: "-javaagent:${workspace_loc:ROOT}/lib/openjpa2/openjpa-2.1.0.jar"
(without quotes)
http://code.google.com/p/openmeetings/source/detail?r=4506
Deleted:
/trunk/singlewebapp/WebContent/WEB-INF/bin
/trunk/singlewebapp/WebContent/WEB-INF/classes
/trunk/singlewebapp/WebContent/WEB-INF/conf
/trunk/singlewebapp/WebContent/WEB-INF/lib
Modified:
/trunk/singlewebapp/.classpath
/trunk/singlewebapp/.project
/trunk/singlewebapp/.settings/org.eclipse.wst.common.component
/trunk/singlewebapp/src/test/org/openmeetings/test/AbstractOpenmeetingsSpringTest.java
/trunk/singlewebapp/src/test/org/openmeetings/test/error/TestErrorService.java
=======================================
--- /trunk/singlewebapp/.classpath Mon Oct 31 08:22:28 2011
+++ /trunk/singlewebapp/.classpath Tue Nov 1 11:33:07 2011
@@ -1,20 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src/userservice"/>
- <classpathentry kind="src" path="src/roomservice"/>
<classpathentry kind="src" path="src/app"/>
<classpathentry kind="src" path="src/client"/>
- <classpathentry kind="src" path="src/test"/>
<classpathentry kind="src" path="src/fileservice"/>
+ <classpathentry kind="src" path="src/roomservice"/>
<classpathentry kind="src" path="src/screenviewer"/>
- <classpathentry kind="src" path="src/templates"/>
<classpathentry kind="src" path="src/server"/>
+ <classpathentry kind="src" path="src/templates"/>
+ <classpathentry kind="src" path="src/test"/>
+ <classpathentry kind="src" path="src/userservice"/>
+ <classpathentry kind="src" path="WebContent/WEB-INF"/>
+ <classpathentry excluding="app/|client/|fileservice/|red5-screenshare/|
roomservice/|screenviewer/|server/|templates/|test/|userservice/"
including="META-INF/" kind="src" path="src"/>
<classpathentry kind="con"
path="org.eclipse.jst.j2ee.internal.web.container"/>
<classpathentry kind="con"
path="org.eclipse.jst.j2ee.internal.module.container"/>
<classpathentry kind="lib"
path="lib/spring/org.springframework.test-3.0.5.RELEASE.jar"/>
<classpathentry kind="lib" path="lib/velocity/velocity-1.6.2.jar"/>
<classpathentry kind="lib"
path="lib/velocity/velocity-tools-view-2.0.jar"/>
<classpathentry kind="lib"
path="red5-1.0.0-RC1/red5/webapps/openmeetings/screen/kunststoff.jar"/>
+ <classpathentry kind="lib" path="lib/spring/cglib-2.2.2.jar"/>
+ <classpathentry kind="lib" path="lib/database/derby.jar"/>
+ <classpathentry kind="lib" path="lib/database/derbyclient.jar"/>
+ <classpathentry kind="lib"
path="lib/database/mysql-connector-java-5.1.15-bin.jar"/>
<classpathentry kind="con"
path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
<classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="lib"
path="lib/spring/org.springframework.aop-3.0.5.RELEASE.jar"/>
=======================================
--- /trunk/singlewebapp/.project Tue Aug 30 13:17:16 2011
+++ /trunk/singlewebapp/.project Tue Nov 1 11:33:07 2011
@@ -41,7 +41,7 @@
</natures>
<filteredResources>
<filter>
- <id>1306674669997</id>
+ <id>1320166769162</id>
<name></name>
<type>26</type>
<matcher>
=======================================
--- /trunk/singlewebapp/.settings/org.eclipse.wst.common.component Tue Aug
30 13:17:16 2011
+++ /trunk/singlewebapp/.settings/org.eclipse.wst.common.component Tue Nov
1 11:33:07 2011
@@ -2,16 +2,18 @@
<project-modules id="moduleCoreId" project-version="1.5.0">
<wb-module deploy-name="ROOT">
<wb-resource deploy-path="/" source-path="/WebContent"/>
- <wb-resource deploy-path="/WEB-INF/classes"
source-path="/src/userservice"/>
- <wb-resource deploy-path="/WEB-INF/classes"
source-path="/src/roomservice"/>
+<wb-resource deploy-path="/WEB-INF/classes"
source-path="/red5-screenshare"/>
<wb-resource deploy-path="/WEB-INF/classes"
source-path="/src/app"/>
<wb-resource deploy-path="/WEB-INF/classes"
source-path="/src/client"/>
- <wb-resource deploy-path="/WEB-INF/classes"
source-path="/src/test"/>
<wb-resource deploy-path="/WEB-INF/classes"
source-path="/src/fileservice"/>
+ <wb-resource deploy-path="/WEB-INF/classes"
source-path="/src/roomservice"/>
<wb-resource deploy-path="/WEB-INF/classes"
source-path="/src/screenviewer"/>
- <wb-resource deploy-path="/WEB-INF/classes"
source-path="/src/templates"/>
-<wb-resource deploy-path="/WEB-INF/classes"
source-path="/red5-screenshare"/>
<wb-resource deploy-path="/WEB-INF/classes"
source-path="/src/server"/>
+ <wb-resource deploy-path="/WEB-INF/classes"
source-path="/src/templates"/>
+ <wb-resource deploy-path="/WEB-INF/classes"
source-path="/src/test"/>
+ <wb-resource deploy-path="/WEB-INF/classes"
source-path="/src/userservice"/>
+ <wb-resource deploy-path="/WEB-INF/classes"
source-path="/WebContent/WEB-INF"/>
+ <wb-resource deploy-path="/WEB-INF/classes" source-path="/src"/>
<property name="java-output-path"/>
<property name="context-root" value="/"/>
</wb-module>
=======================================
---
/trunk/singlewebapp/src/test/org/openmeetings/test/AbstractOpenmeetingsSpringTest.java
Fri Oct 21 11:33:37 2011
+++
/trunk/singlewebapp/src/test/org/openmeetings/test/AbstractOpenmeetingsSpringTest.java
Tue Nov 1 11:33:07 2011
@@ -274,6 +274,12 @@
long interview_Id = roommanagement.addRoomType("interview");
long custom_Id = roommanagement.addRoomType("custom");
+ log.debug(String.format("All room types were created successfully
[conference: %1$s; audience: %2$s; restricted: %3$s; interview: %4$s;
custom: %5$s]"
+ , conference_Id
+ , audience_Id
+ , restricted_Id
+ , interview_Id
+ , custom_Id));
roommanagement.addRoom(3, "public Interview Room", interview_Id,
"",
new Long(16), true, null, false, false, null,
false, null,
=======================================
---
/trunk/singlewebapp/src/test/org/openmeetings/test/error/TestErrorService.java
Thu Aug 18 09:06:58 2011
+++
/trunk/singlewebapp/src/test/org/openmeetings/test/error/TestErrorService.java
Tue Nov 1 11:33:07 2011
@@ -1,12 +1,13 @@
package org.openmeetings.test.error;
+import static junit.framework.Assert.assertNotNull;
+
import org.junit.Test;
import org.openmeetings.app.persistence.beans.lang.FieldLanguage;
import org.openmeetings.app.remote.ErrorService;
import org.openmeetings.app.remote.LanguageService;
import org.openmeetings.test.AbstractOpenmeetingsSpringTest;
import org.springframework.beans.factory.annotation.Autowired;
-import static junit.framework.Assert.assertNotNull;
public class TestErrorService extends AbstractOpenmeetingsSpringTest {
@Autowired
--
You received this message because you are subscribed to the Google Groups
"OpenMeetings developers" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/openmeetings-dev?hl=en.