You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2013/09/02 11:50:47 UTC
svn commit: r1519377 - in /openmeetings/trunk/singlewebapp: .classpath
.settings/org.eclipse.wst.common.component docs/JUnitTesting.html
xdocs/JUnitTesting.xml
Author: solomax
Date: Mon Sep 2 09:50:47 2013
New Revision: 1519377
URL: http://svn.apache.org/r1519377
Log:
[OPENMEETINGS-772] junit tests are fixed after refactoring
Modified:
openmeetings/trunk/singlewebapp/.classpath
openmeetings/trunk/singlewebapp/.settings/org.eclipse.wst.common.component
openmeetings/trunk/singlewebapp/docs/JUnitTesting.html
openmeetings/trunk/singlewebapp/xdocs/JUnitTesting.xml
Modified: openmeetings/trunk/singlewebapp/.classpath
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/.classpath?rev=1519377&r1=1519376&r2=1519377&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/.classpath (original)
+++ openmeetings/trunk/singlewebapp/.classpath Mon Sep 2 09:50:47 2013
@@ -1,20 +1,28 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Licensed 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.
- -->
+ 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.
+
+-->
<classpath>
<classpathentry kind="src" path="src/main/java"/>
<classpathentry kind="src" path="src/test/java"/>
+ <classpathentry excluding="classes/|conf/|services/|classes/" kind="src" path="src/main/webapp/WEB-INF"/>
+ <classpathentry kind="src" path="src/main/webapp/WEB-INF/classes"/>
<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/.settings/org.eclipse.wst.common.component
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/.settings/org.eclipse.wst.common.component?rev=1519377&r1=1519376&r2=1519377&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/.settings/org.eclipse.wst.common.component (original)
+++ openmeetings/trunk/singlewebapp/.settings/org.eclipse.wst.common.component Mon Sep 2 09:50:47 2013
@@ -1,17 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Licensed 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.
- -->
+ 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.
+
+-->
<project-modules id="moduleCoreId" project-version="1.5.0">
<wb-module deploy-name="ROOT">
<wb-resource deploy-path="/" source-path="/WebContent"/>
@@ -22,6 +28,8 @@
<wb-resource deploy-path="/WEB-INF/classes" source-path="/WebContent/openmeetings/WEB-INF/classes"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/test/java"/>
+ <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/webapp/WEB-INF"/>
+ <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/webapp/WEB-INF/classes"/>
<property name="java-output-path"/>
<property name="context-root" value="/"/>
</wb-module>
Modified: openmeetings/trunk/singlewebapp/docs/JUnitTesting.html
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/docs/JUnitTesting.html?rev=1519377&r1=1519376&r2=1519377&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/docs/JUnitTesting.html (original)
+++ openmeetings/trunk/singlewebapp/docs/JUnitTesting.html Mon Sep 2 09:50:47 2013
@@ -727,7 +727,7 @@ limitations under the License.
<li>Add the following code to the VM section
<div class="xmlcode">
-javaagent:${workspace_loc:Openmeetings}/build/lib/om/openjpa-bundle-2.2.2.jar
- -Dwebapps.root=${workspace_loc:Openmeetings}/dist/red5/webapps/openmeetings
+ -Dom.home=${workspace_loc:Openmeetings}/src/main/webapp
</div>
</li>
<li>To avoid temporary files being created in OM root, modify
Modified: openmeetings/trunk/singlewebapp/xdocs/JUnitTesting.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/xdocs/JUnitTesting.xml?rev=1519377&r1=1519376&r2=1519377&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/xdocs/JUnitTesting.xml (original)
+++ openmeetings/trunk/singlewebapp/xdocs/JUnitTesting.xml Mon Sep 2 09:50:47 2013
@@ -90,7 +90,7 @@
<li>Add the following code to the VM section
<div class="xmlcode">
-javaagent:${workspace_loc:Openmeetings}/build/lib/om/openjpa-bundle-2.2.2.jar
- -Dwebapps.root=${workspace_loc:Openmeetings}/dist/red5/webapps/openmeetings
+ -Dom.home=${workspace_loc:Openmeetings}/src/main/webapp
</div>
</li>
<li>To avoid temporary files being created in OM root, modify