gCubeSystem
/
common-events
16
0
Fork 0
Code Issues Pull Requests Releases 2 Wiki Activity

merged from trunk 

git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/branches/common/common-events/1.0@91837 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
fabio.simeoni 2014-02-18 13:26:45 +00:00
parent 41fe76137e
commit 81d835446a
6 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.classpath
View File

@ -22,12 +22,12 @@
<attribute name="maven.pomderived" value="true"/> <attribute name="maven.pomderived" value="true"/>
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"> <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes> <attributes>
<attribute name="maven.pomderived" value="true"/> <attribute name="maven.pomderived" value="true"/>
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
<attributes> <attributes>
<attribute name="maven.pomderived" value="true"/> <attribute name="maven.pomderived" value="true"/>
</attributes> </attributes>

14
.settings/org.eclipse.jdt.core.prefs
View File

@ -1,6 +1,12 @@
#Tue Jun 18 10:36:18 CEST 2013
eclipse.preferences.version=1 eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.compliance=1.6 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=1.7
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
org.eclipse.jdt.core.compiler.source=1.6 org.eclipse.jdt.core.compiler.source=1.7

5
distro/changelog.xml
View File

@ -1,5 +1,8 @@
<ReleaseNotes> <ReleaseNotes>
<Changeset component="${build.finalName}" date="2014-10-24"> <Changeset component="common-events-1.0.0" date="2013-10-24">
<Change>First Release</Change> <Change>First Release</Change>
</Changeset> </Changeset>
<Changeset component="${build.finalName}" date="2014-02-18">
<Change>Minor bug fixes</Change>
</Changeset>
</ReleaseNotes> </ReleaseNotes>

2
pom.xml
View File

@ -4,7 +4,7 @@
<groupId>org.gcube.core</groupId> <groupId>org.gcube.core</groupId>
<artifactId>common-events</artifactId> <artifactId>common-events</artifactId>
<version>1.0.0-SNAPSHOT</version> <version>1.0.1-SNAPSHOT</version>
<name>common-events</name> <name>common-events</name>

2
src/main/java/org/gcube/common/events/impl/DefaultHub.java
View File

@ -238,7 +238,7 @@ public class DefaultHub implements Hub {
Object watcher = new Object() { Object watcher = new Object() {
@Observes @SuppressWarnings("unused") @Observes
void onEvent() { void onEvent() {
log.trace("end of watch for event {}",eventType); log.trace("end of watch for event {}",eventType);
latch.countDown(); latch.countDown();

2
src/test/java/test/HubTest.java
View File

@ -492,7 +492,7 @@ public class HubTest {
Thread.sleep(10); Thread.sleep(10);
} }
assertEquals(10,count.get()); assertTrue(count.get()-10+" > 1",Math.abs(count.get()-10)<=1);
} }