Author: lindner
Date: Sun Dec 26 09:43:59 2010
New Revision: 1052847
URL: http://svn.apache.org/viewvc?rev=1052847&view=rev
Log:
fix surefire plugin versioning, remove hack for misnamed support classes in
**/testing
Added:
shindig/trunk/java/common/src/test/java/org/apache/shindig/common/testing/ImmediateExecutorService.java
- copied, changed from r1052846,
shindig/trunk/java/common/src/test/java/org/apache/shindig/common/testing/TestExecutorService.java
Removed:
shindig/trunk/java/common/src/test/java/org/apache/shindig/common/testing/TestExecutorService.java
Modified:
shindig/trunk/java/common/pom.xml
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/DefaultGadgetSpecFactoryTest.java
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/DefaultMessageBundleFactoryTest.java
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/ConcurrentPreloaderServiceTest.java
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerTest.java
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/JsonRpcHandlerTest.java
shindig/trunk/pom.xml
Modified: shindig/trunk/java/common/pom.xml
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/common/pom.xml?rev=1052847&r1=1052846&r2=1052847&view=diff
==============================================================================
--- shindig/trunk/java/common/pom.xml (original)
+++ shindig/trunk/java/common/pom.xml Sun Dec 26 09:43:59 2010
@@ -60,23 +60,6 @@
</includes>
</resource>
</resources>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>org/apache/shindig/common/testing/*.java</exclude>
- </excludes>
- <systemProperties>
- <property>
- <name>java.awt.headless</name>
- <value>true</value>
- </property>
- </systemProperties>
- </configuration>
- </plugin>
- </plugins>
</build>
<profiles>
Copied:
shindig/trunk/java/common/src/test/java/org/apache/shindig/common/testing/ImmediateExecutorService.java
(from r1052846,
shindig/trunk/java/common/src/test/java/org/apache/shindig/common/testing/TestExecutorService.java)
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/testing/ImmediateExecutorService.java?p2=shindig/trunk/java/common/src/test/java/org/apache/shindig/common/testing/ImmediateExecutorService.java&p1=shindig/trunk/java/common/src/test/java/org/apache/shindig/common/testing/TestExecutorService.java&r1=1052846&r2=1052847&rev=1052847&view=diff
==============================================================================
---
shindig/trunk/java/common/src/test/java/org/apache/shindig/common/testing/TestExecutorService.java
(original)
+++
shindig/trunk/java/common/src/test/java/org/apache/shindig/common/testing/ImmediateExecutorService.java
Sun Dec 26 09:43:59 2010
@@ -25,7 +25,7 @@ import java.util.concurrent.TimeUnit;
/**
* ExecutorService used for testing. Executes all tasks immediately.
*/
-public class TestExecutorService extends AbstractExecutorService {
+public class ImmediateExecutorService extends AbstractExecutorService {
private boolean shutdown;
public void execute(Runnable command) {
@@ -52,4 +52,4 @@ public class TestExecutorService extends
shutdown();
return Collections.emptyList();
}
-}
\ No newline at end of file
+}
Modified:
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/DefaultGadgetSpecFactoryTest.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/DefaultGadgetSpecFactoryTest.java?rev=1052847&r1=1052846&r2=1052847&view=diff
==============================================================================
---
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/DefaultGadgetSpecFactoryTest.java
(original)
+++
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/DefaultGadgetSpecFactoryTest.java
Sun Dec 26 09:43:59 2010
@@ -25,7 +25,7 @@ import static org.junit.Assert.assertEqu
import org.apache.shindig.common.cache.CacheProvider;
import org.apache.shindig.common.cache.LruCacheProvider;
import org.apache.shindig.common.cache.SoftExpiringCache;
-import org.apache.shindig.common.testing.TestExecutorService;
+import org.apache.shindig.common.testing.ImmediateExecutorService;
import org.apache.shindig.common.uri.Uri;
import org.apache.shindig.config.ContainerConfig;
import org.apache.shindig.gadgets.http.HttpRequest;
@@ -265,7 +265,7 @@ public class DefaultGadgetSpecFactoryTes
CapturingPipeline capturingPipeline = new CapturingPipeline();
GadgetSpecFactory forcedCacheFactory = new DefaultGadgetSpecFactory(
- new TestExecutorService(), capturingPipeline, cacheProvider, 10000);
+ new ImmediateExecutorService(), capturingPipeline, cacheProvider,
10000);
forcedCacheFactory.getGadgetSpec(createContext(SPEC_URL, false));
@@ -334,7 +334,7 @@ public class DefaultGadgetSpecFactoryTes
specFactory.getGadgetSpec(createContext(SPEC_URL, false));
}
- private static class CountingExecutor extends TestExecutorService {
+ private static class CountingExecutor extends ImmediateExecutorService {
int runnableCount = 0;
@Override
Modified:
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/DefaultMessageBundleFactoryTest.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/DefaultMessageBundleFactoryTest.java?rev=1052847&r1=1052846&r2=1052847&view=diff
==============================================================================
---
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/DefaultMessageBundleFactoryTest.java
(original)
+++
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/DefaultMessageBundleFactoryTest.java
Sun Dec 26 09:43:59 2010
@@ -28,7 +28,7 @@ import static org.junit.Assert.assertNul
import org.apache.shindig.common.cache.Cache;
import org.apache.shindig.common.cache.CacheProvider;
import org.apache.shindig.common.cache.LruCacheProvider;
-import org.apache.shindig.common.testing.TestExecutorService;
+import org.apache.shindig.common.testing.ImmediateExecutorService;
import org.apache.shindig.common.uri.Uri;
import org.apache.shindig.common.util.TimeSource;
import org.apache.shindig.config.ContainerConfig;
@@ -136,7 +136,7 @@ public class DefaultMessageBundleFactory
private final Cache<String, MessageBundle> cache
= cacheProvider.createCache(DefaultMessageBundleFactory.CACHE_NAME);
private final DefaultMessageBundleFactory bundleFactory
- = new DefaultMessageBundleFactory(new TestExecutorService(), pipeline,
cacheProvider, MAX_AGE);
+ = new DefaultMessageBundleFactory(new ImmediateExecutorService(),
pipeline, cacheProvider, MAX_AGE);
private final GadgetSpec gadgetSpec;
private final GadgetSpec externalSpec;
@@ -330,7 +330,7 @@ public class DefaultMessageBundleFactory
CapturingFetcher capturingFetcher = new CapturingFetcher();
MessageBundleFactory factory = new DefaultMessageBundleFactory(
- new TestExecutorService(), capturingFetcher, cacheProvider, MAX_AGE);
+ new ImmediateExecutorService(), capturingFetcher, cacheProvider,
MAX_AGE);
factory.getBundle(gadgetSpec, LOCALE, false,
ContainerConfig.DEFAULT_CONTAINER);
Modified:
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/ConcurrentPreloaderServiceTest.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/ConcurrentPreloaderServiceTest.java?rev=1052847&r1=1052846&r2=1052847&view=diff
==============================================================================
---
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/ConcurrentPreloaderServiceTest.java
(original)
+++
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/ConcurrentPreloaderServiceTest.java
Sun Dec 26 09:43:59 2010
@@ -22,7 +22,7 @@ import static org.junit.Assert.assertNot
import static org.junit.Assert.assertSame;
import static org.junit.Assert.fail;
-import org.apache.shindig.common.testing.TestExecutorService;
+import org.apache.shindig.common.testing.ImmediateExecutorService;
import org.apache.shindig.gadgets.Gadget;
import org.junit.Test;
@@ -55,7 +55,7 @@ public class ConcurrentPreloaderServiceT
preloader.tasks.add(new TestPreloadCallable(
new DataPreload(PRELOAD_STRING_KEY, PRELOAD_STRING_VALUE)));
- PreloaderService service = new ConcurrentPreloaderService(new
TestExecutorService(),
+ PreloaderService service = new ConcurrentPreloaderService(new
ImmediateExecutorService(),
preloader);
Collection<PreloadedData> preloads = service.preload((Gadget) null);
@@ -86,7 +86,7 @@ public class ConcurrentPreloaderServiceT
preloader.tasks.add(new TestPreloadCallable(
new DataPreload(PRELOAD_MAP_KEY, PRELOAD_MAP_VALUE)));
- PreloaderService service = new ConcurrentPreloaderService(new
TestExecutorService(),
+ PreloaderService service = new ConcurrentPreloaderService(new
ImmediateExecutorService(),
preloader);
Collection<PreloadedData> preloads =
Modified:
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerTest.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerTest.java?rev=1052847&r1=1052846&r2=1052847&view=diff
==============================================================================
---
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerTest.java
(original)
+++
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerTest.java
Sun Dec 26 09:43:59 2010
@@ -31,7 +31,7 @@ import org.apache.shindig.auth.SecurityT
import org.apache.shindig.common.EasyMockTestCase;
import org.apache.shindig.common.JsonAssert;
import org.apache.shindig.common.testing.FakeGadgetToken;
-import org.apache.shindig.common.testing.TestExecutorService;
+import org.apache.shindig.common.testing.ImmediateExecutorService;
import org.apache.shindig.common.uri.Uri;
import org.apache.shindig.common.util.FakeTimeSource;
import org.apache.shindig.gadgets.RenderingContext;
@@ -107,7 +107,7 @@ public class GadgetsHandlerTest extends
urlGenerator, codec, proxyUriManager, jsUriManager, proxyHandler,
jsHandler,
SPEC_REFRESH_INTERVAL, beanFilter, cajaContentRewriter);
GadgetsHandler handler =
- new GadgetsHandler(new TestExecutorService(), service, beanFilter);
+ new GadgetsHandler(new ImmediateExecutorService(), service,
beanFilter);
registry = new DefaultHandlerRegistry(
injector, converter, new HandlerExecutionListener.NoOpHandler());
registry.addHandlers(ImmutableSet.<Object> of(handler));
Modified:
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/JsonRpcHandlerTest.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/JsonRpcHandlerTest.java?rev=1052847&r1=1052846&r2=1052847&view=diff
==============================================================================
---
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/JsonRpcHandlerTest.java
(original)
+++
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/JsonRpcHandlerTest.java
Sun Dec 26 09:43:59 2010
@@ -22,7 +22,7 @@ import static org.junit.Assert.assertEqu
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-import org.apache.shindig.common.testing.TestExecutorService;
+import org.apache.shindig.common.testing.ImmediateExecutorService;
import org.apache.shindig.gadgets.process.ProcessingException;
import org.apache.shindig.gadgets.spec.GadgetSpec;
@@ -40,7 +40,7 @@ public class JsonRpcHandlerTest {
private final FakeProcessor processor = new FakeProcessor();
private final FakeIframeUriManager urlGenerator = new FakeIframeUriManager();
private final JsonRpcHandler jsonRpcHandler
- = new JsonRpcHandler(new TestExecutorService(), processor, urlGenerator);
+ = new JsonRpcHandler(new ImmediateExecutorService(), processor,
urlGenerator);
private JSONObject createContext(String lang, String country)
throws JSONException {
Modified: shindig/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/shindig/trunk/pom.xml?rev=1052847&r1=1052846&r2=1052847&view=diff
==============================================================================
--- shindig/trunk/pom.xml (original)
+++ shindig/trunk/pom.xml Sun Dec 26 09:43:59 2010
@@ -783,16 +783,8 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.7</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
<version>2.7</version>
- <configuration>
- <parallel>both</parallel>
- </configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
@@ -1025,7 +1017,7 @@
<plugin>
<groupId>org.apache.maven.plugins </groupId>
<artifactId>maven-eclipse-plugin</artifactId>
- <version>2.5.1</version>
+ <version>2.8</version>
<configuration>
<addVersionToProjectName>true</addVersionToProjectName>
</configuration>
@@ -1098,7 +1090,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jxr-plugin</artifactId>
- <version>2.1</version>
+ <version>2.2</version>
<configuration>
<inputEncoding>${project.build.sourceEncoding}</inputEncoding>
</configuration>
@@ -1116,7 +1108,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <version>2.1.1</version>
+ <version>3.0.0-beta3</version>
<configuration>
<inputEncoding>${project.build.sourceEncoding}</inputEncoding>
<outputEncoding>${project.build.sourceEncoding}</outputEncoding>
@@ -1142,6 +1134,14 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.7</version>
+ <configuration>
+ <parallel>both</parallel>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>2.1.1</version>
</plugin>
@@ -1155,12 +1155,12 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
- <version>2.3</version>
+ <version>2.4</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
- <version>2.1</version>
+ <version>2.3.1</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
