Permalink
Browse files

Misc fix for new version of eclipse

  • Loading branch information...
spearway
spearway committed Aug 24, 2011
1 parent 4e61000 commit 8487a5f195163a99836ee83128b7194ff7e9edac
@@ -1,9 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" output="target/classes" path="src/main/java"/>
<classpathentry kind="src" path="src/sample/java"/>
<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
@@ -11,13 +11,13 @@
</arguments>
</buildCommand>
<buildCommand>
<name>org.maven.ide.eclipse.maven2Builder</name>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.maven.ide.eclipse.maven2Nature</nature>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>
@@ -0,0 +1,6 @@
#Wed Aug 24 18:27:30 CEST 2011
eclipse.preferences.version=1
encoding//src/main/java=UTF-8
encoding//src/main/resources=UTF-8
encoding//src/test/java=UTF-8
encoding//src/test/resources=UTF-8
@@ -1,4 +1,4 @@
#Thu Jul 22 18:10:50 PDT 2010
#Wed Aug 24 18:27:28 CEST 2011
activeProfiles=
eclipse.preferences.version=1
fullBuildGoals=process-test-resources
34 pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>org.sonatype.oss</groupId>
<artifactId>oss-parent</artifactId>
<version>4</version>
<version>7</version>
<!-- https://docs.sonatype.org/display/Repository/Sonatype+OSS+Maven+Repository+Usage+Guide -->
<!-- http://www.sonatype.com/people/2010/01/how-to-generate-pgp-signatures-with-maven/ -->
<!-- mvn release:clean -->
@@ -261,7 +261,7 @@ Many thanks to Stuart Cheshire for help and moral support.</description>
<executions>
<execution>
<id>bundle-manifest</id>
<phase>process-classes</phase>
<phase>process-classes</phase>
<goals>
<goal>manifest</goal>
</goals>
@@ -316,7 +316,6 @@ Many thanks to Stuart Cheshire for help and moral support.</description>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>2.0</version>
<configuration>
<tagBase>https://jmdns.svn.sourceforge.net/svnroot/jmdns/tags/</tagBase>
</configuration>
@@ -331,6 +330,35 @@ Many thanks to Stuart Cheshire for help and moral support.</description>
<!-- mvn nexus:staging-promote -->
</plugin>
</plugins>
<pluginManagement>
<plugins>
<!--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.1.0,)</versionRange>
<goals>
<goal>manifest</goal>
</goals>
</pluginExecutionFilter>
<action>
<ignore></ignore>
</action>
</pluginExecution>
</pluginExecutions>
</lifecycleMappingMetadata>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>
<reporting>
<outputDirectory>target/site</outputDirectory>
@@ -60,12 +60,12 @@ public void teardown() {
@Test
public void testWaitAndSignal() throws InterruptedException {
WaitingThread thread = new WaitingThread(_semaphore, 0);
WaitingThread thread = new WaitingThread(_semaphore, Long.MAX_VALUE);
thread.start();
Thread.sleep(2);
Thread.sleep(1);
assertFalse("The thread should be waiting.", thread.hasFinished());
_semaphore.signalEvent();
Thread.sleep(2);
Thread.sleep(1);
assertTrue("The thread should have finished.", thread.hasFinished());
}

0 comments on commit 8487a5f

Please sign in to comment.