hivemind-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From k...@apache.org
Subject svn commit: r327121 - in /jakarta/hivemind/branches/branch-1-1/library: ./ src/java/org/apache/hivemind/lib/groovy/ src/test/org/apache/hivemind/lib/groovy/
Date Fri, 21 Oct 2005 08:41:08 GMT
Author: knut
Date: Fri Oct 21 01:40:56 2005
New Revision: 327121

URL: http://svn.apache.org/viewcvs?rev=327121&view=rev
Log:
merge Groovy trunk changes into 1.1 branch

Modified:
    jakarta/hivemind/branches/branch-1-1/library/build.xml
    jakarta/hivemind/branches/branch-1-1/library/src/java/org/apache/hivemind/lib/groovy/HiveMindBuilder.java
    jakarta/hivemind/branches/branch-1-1/library/src/test/org/apache/hivemind/lib/groovy/TestHiveMindBuilder.java
    jakarta/hivemind/branches/branch-1-1/library/src/test/org/apache/hivemind/lib/groovy/calculator.groovy

Modified: jakarta/hivemind/branches/branch-1-1/library/build.xml
URL: http://svn.apache.org/viewcvs/jakarta/hivemind/branches/branch-1-1/library/build.xml?rev=327121&r1=327120&r2=327121&view=diff
==============================================================================
--- jakarta/hivemind/branches/branch-1-1/library/build.xml (original)
+++ jakarta/hivemind/branches/branch-1-1/library/build.xml Fri Oct 21 01:40:56 2005
@@ -38,7 +38,7 @@
 		<ibiblio-dependency artifact="spring-full" version="1.0.1" group="springframework"/>
 		<ibiblio-dependency artifact="commons-logging" version="1.0.3" group="commons-logging"/>
 		
-		<ibiblio-dependency artifact="groovy-all" version="1.0-beta-10" group="groovy"/>
+		<ibiblio-dependency artifact="groovy-all" version="1.0-jsr-03" group="groovy"/>
 
 		<ibiblio-dependency artifact="log4j" version="1.2.7" group="log4j" use="test"/>	
		
 		<ibiblio-dependency artifact="javassist" version="${javassist.version}" group="javassist"
use="test"/>

Modified: jakarta/hivemind/branches/branch-1-1/library/src/java/org/apache/hivemind/lib/groovy/HiveMindBuilder.java
URL: http://svn.apache.org/viewcvs/jakarta/hivemind/branches/branch-1-1/library/src/java/org/apache/hivemind/lib/groovy/HiveMindBuilder.java?rev=327121&r1=327120&r2=327121&view=diff
==============================================================================
--- jakarta/hivemind/branches/branch-1-1/library/src/java/org/apache/hivemind/lib/groovy/HiveMindBuilder.java
(original)
+++ jakarta/hivemind/branches/branch-1-1/library/src/java/org/apache/hivemind/lib/groovy/HiveMindBuilder.java
Fri Oct 21 01:40:56 2005
@@ -124,8 +124,11 @@
                 StackTraceElement[] trace = t.getStackTrace();
 
                 for (int i = 0; i < trace.length; i++)
-                    if (trace[i].getFileName().endsWith(".groovy"))
+                {
+                    String fileName = trace[i].getFileName();
+					if (fileName != null && fileName.endsWith(".groovy"))
                         return trace[i].getLineNumber();
+                }
             }
 
             return -1;

Modified: jakarta/hivemind/branches/branch-1-1/library/src/test/org/apache/hivemind/lib/groovy/TestHiveMindBuilder.java
URL: http://svn.apache.org/viewcvs/jakarta/hivemind/branches/branch-1-1/library/src/test/org/apache/hivemind/lib/groovy/TestHiveMindBuilder.java?rev=327121&r1=327120&r2=327121&view=diff
==============================================================================
--- jakarta/hivemind/branches/branch-1-1/library/src/test/org/apache/hivemind/lib/groovy/TestHiveMindBuilder.java
(original)
+++ jakarta/hivemind/branches/branch-1-1/library/src/test/org/apache/hivemind/lib/groovy/TestHiveMindBuilder.java
Fri Oct 21 01:40:56 2005
@@ -57,7 +57,10 @@
         runScript(script, mock);
     }
 
-    public void testLinePreciseErrorReporting() throws Exception
+    /*
+     * FIXME Test disabled until GROOVY-726 is resolved.
+     */
+    public void _testLinePreciseErrorReporting() throws Exception
     {
         Resource resource = getResource("missingModuleId.groovy");
 

Modified: jakarta/hivemind/branches/branch-1-1/library/src/test/org/apache/hivemind/lib/groovy/calculator.groovy
URL: http://svn.apache.org/viewcvs/jakarta/hivemind/branches/branch-1-1/library/src/test/org/apache/hivemind/lib/groovy/calculator.groovy?rev=327121&r1=327120&r2=327121&view=diff
==============================================================================
--- jakarta/hivemind/branches/branch-1-1/library/src/test/org/apache/hivemind/lib/groovy/calculator.groovy
(original)
+++ jakarta/hivemind/branches/branch-1-1/library/src/test/org/apache/hivemind/lib/groovy/calculator.groovy
Fri Oct 21 01:40:56 2005
@@ -21,12 +21,12 @@
 		'Multiplier':[examplesPkg + '.Multiplier', examplesImplPkg + '.MultiplerImpl'],
 		'Divider':[examplesPkg + '.Divider', examplesImplPkg + '.DividerImpl']
 	].entrySet().each { e |
-		processor.servicePoint(id:e.key, interface:e.value[0]) {
+		processor.servicePoint(id:e.key, 'interface':e.value[0]) {
 			createInstance(class:e.value[1])
 			interceptor(serviceId:'hivemind.LoggingInterceptor')
 		}
 	}
-	servicePoint(id:'Calculator', interface:examplesPkg + '.Calculator.class') {
+	servicePoint(id:'Calculator', 'interface':examplesPkg + '.Calculator.class') {
 		invokeFactory {
 			construct(class:examplesImplPkg + '.CalculatorImpl')
 		}



---------------------------------------------------------------------
To unsubscribe, e-mail: hivemind-cvs-unsubscribe@jakarta.apache.org
For additional commands, e-mail: hivemind-cvs-help@jakarta.apache.org


Mime
View raw message