Revert "Need to take a break..."
This reverts commits for new develop, applied in wrong branch. ASF doesn't allow 'git push --force'...
diff --git a/libraries/lang-groovy/src/test/groovy/org/apache/zest/library/groovy/HelloSpeakerMixin.groovy b/libraries/lang-groovy/src/test/groovy/org/apache/zest/library/groovy/HelloSpeakerMixin.groovy
index b360211..1e85ecb 100644
--- a/libraries/lang-groovy/src/test/groovy/org/apache/zest/library/groovy/HelloSpeakerMixin.groovy
+++ b/libraries/lang-groovy/src/test/groovy/org/apache/zest/library/groovy/HelloSpeakerMixin.groovy
@@ -18,7 +18,7 @@
package org.apache.zest.library.groovy;
// START SNIPPET: direct
-public class HelloSpeakerMixin implements HelloSpeaker {
+public class HelloSpeakerMixin implements org.apache.zest.library.groovy.support.HelloSpeaker {
public String sayHello( String name ) {
"Hello $name!"
}
diff --git a/libraries/lang-groovy/src/test/groovy/org/apache/zest/library/groovy/HelloSpeakerTest.java b/libraries/lang-groovy/src/test/groovy/org/apache/zest/library/groovy/HelloSpeakerTest.java
index ac36ec7..e12cae7 100644
--- a/libraries/lang-groovy/src/test/groovy/org/apache/zest/library/groovy/HelloSpeakerTest.java
+++ b/libraries/lang-groovy/src/test/groovy/org/apache/zest/library/groovy/HelloSpeakerTest.java
@@ -29,13 +29,13 @@
public void assemble( ModuleAssembly module )
throws AssemblyException
{
- module.transients( HelloSpeaker.class ).withMixins( GroovyMixin.class );
+ module.transients( org.apache.zest.library.groovy.support.HelloSpeaker.class ).withMixins( GroovyMixin.class );
}
@Test
public void testHello()
{
- HelloSpeaker speaker = module.newTransient( HelloSpeaker.class );
+ org.apache.zest.library.groovy.support.HelloSpeaker speaker = module.newTransient( org.apache.zest.library.groovy.support.HelloSpeaker.class );
Assert.assertEquals( "Hello World!", speaker.sayHello( "World" ) );
}
@@ -50,10 +50,10 @@
public void assemble( ModuleAssembly assembly )
throws AssemblyException
{
- assembly.transients( HelloSpeaker.class ).withMixins( GroovyMixin.class );
+ assembly.transients( org.apache.zest.library.groovy.support.HelloSpeaker.class ).withMixins( GroovyMixin.class );
}
};
- HelloSpeaker speaker = assembler.module().newTransient( HelloSpeaker.class );
+ org.apache.zest.library.groovy.support.HelloSpeaker speaker = assembler.module().newTransient( org.apache.zest.library.groovy.support.HelloSpeaker.class );
Assert.assertEquals( "Hello World!", speaker.sayHello( "World" ) );
// END SNIPPET: script
}
@@ -69,10 +69,10 @@
public void assemble( ModuleAssembly module )
throws AssemblyException
{
- module.transients( HelloSpeaker.class ).withMixins( HelloSpeakerMixin.class );
+ module.transients( org.apache.zest.library.groovy.support.HelloSpeaker.class ).withMixins( HelloSpeakerMixin.class );
}
};
- HelloSpeaker speaker = assembler.module().newTransient( HelloSpeaker.class );
+ org.apache.zest.library.groovy.support.HelloSpeaker speaker = assembler.module().newTransient( org.apache.zest.library.groovy.support.HelloSpeaker.class );
Assert.assertEquals( "Hello World!", speaker.sayHello( "World" ) );
// END SNIPPET: direct
}