hivemind-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ahue...@apache.org
Subject svn commit: r468383 - in /hivemind/branches/branch-2-0-annot: ./ annotations/ annotations/src/java/org/apache/hivemind/annotations/test/ annotations/src/test/org/apache/hivemind/annotations/ examples/ examples/src/test/org/apache/examples/panorama/star...
Date Fri, 27 Oct 2006 13:51:55 GMT
Author: ahuegen
Date: Fri Oct 27 06:51:53 2006
New Revision: 468383

URL: http://svn.apache.org/viewvc?view=rev&rev=468383
Log:
Fixed maven 2 build and text execution under maven 2

Added:
    hivemind/branches/branch-2-0-annot/annotations/src/test/org/apache/hivemind/annotations/AnnotationTestCase.java
      - copied, changed from r468326, hivemind/branches/branch-2-0-annot/annotations/src/java/org/apache/hivemind/annotations/test/AnnotationTestCase.java
    hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/parse/
      - copied from r468326, hivemind/branches/branch-2-0-annot/jmx/src/java/org/apache/hivemind/parse/
Removed:
    hivemind/branches/branch-2-0-annot/annotations/src/java/org/apache/hivemind/annotations/test/AnnotationTestCase.java
    hivemind/branches/branch-2-0-annot/jmx/src/java/org/apache/hivemind/parse/
    hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/parse/SchemaHolder.java
Modified:
    hivemind/branches/branch-2-0-annot/annotations/pom.xml
    hivemind/branches/branch-2-0-annot/annotations/src/test/org/apache/hivemind/annotations/SimpleAnnotatedModule.java
    hivemind/branches/branch-2-0-annot/annotations/src/test/org/apache/hivemind/annotations/TestAnnotatedModuleReader.java
    hivemind/branches/branch-2-0-annot/annotations/src/test/org/apache/hivemind/annotations/TestAnnotatedModules.java
    hivemind/branches/branch-2-0-annot/examples/pom.xml
    hivemind/branches/branch-2-0-annot/examples/src/test/org/apache/examples/panorama/startup/impl/TestTaskExecutor.java
    hivemind/branches/branch-2-0-annot/framework/pom.xml
    hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/impl/RegistryBuilder.java
    hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/impl/RegistryInfrastructureConstructor.java
    hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/impl/RegistryProviderAutoDetector.java
    hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/impl/ServicePointImpl.java
    hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/service/impl/AutowiringImpl.java
    hivemind/branches/branch-2-0-annot/jmx/pom.xml
    hivemind/branches/branch-2-0-annot/library/pom.xml
    hivemind/branches/branch-2-0-annot/pom.xml
    hivemind/branches/branch-2-0-annot/xml/pom.xml
    hivemind/branches/branch-2-0-annot/xml/src/descriptor/META-INF/MANIFEST.MF
    hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/impl/XmlRegistryProvider.java

Modified: hivemind/branches/branch-2-0-annot/annotations/pom.xml
URL: http://svn.apache.org/viewvc/hivemind/branches/branch-2-0-annot/annotations/pom.xml?view=diff&rev=468383&r1=468382&r2=468383
==============================================================================
--- hivemind/branches/branch-2-0-annot/annotations/pom.xml (original)
+++ hivemind/branches/branch-2-0-annot/annotations/pom.xml Fri Oct 27 06:51:53 2006
@@ -5,31 +5,27 @@
     <groupId>org.apache.hivemind</groupId>
     <artifactId>hivemind-annotations</artifactId>
     <packaging>jar</packaging>
-    <version>2.0.0_M1</version>
+    <version>${hivemindVersion}</version>
     <parent>
         <groupId>org.apache.hivemind</groupId>
         <artifactId>hivemind-project</artifactId>
-        <version>2.0.0_M1</version>
+        <version>${hivemindVersion}</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
-    <name>HiveMind Annotations Support</name>
+    <name>HiveMind Annotation Support</name>
     <inceptionYear>2006</inceptionYear>
     <dependencies>
         <dependency>
             <groupId>org.apache.hivemind</groupId>
             <artifactId>hivemind</artifactId>
-            <version>2.0.0_M1</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.hivemind</groupId>
-            <artifactId>hivemind</artifactId>
-            <version>2.0.0_M1</version>
-            <type>test-jar</type>
+            <version>${hivemindVersion}</version>
         </dependency>
+        <!-- PROVIDED -->
         <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
         </dependency>
+        <!-- TEST -->
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
@@ -38,6 +34,13 @@
             <groupId>easymock</groupId>
             <artifactId>easymock</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.hivemind</groupId>
+            <artifactId>hivemind</artifactId>
+            <version>${hivemindVersion}</version>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
     <build>
         <pluginManagement>
@@ -45,29 +48,11 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-compiler-plugin</artifactId>
-                    <executions>
-                        <execution>
-                            <id>compile</id>
-                            <goals>
-                                <goal>compile</goal>
-                            </goals>
-                            <configuration>
-                                <source>1.5</source>
-                                <target>1.5</target>
-                                <optimize>true</optimize>
-                            </configuration>
-                        </execution>
-                        <execution>
-                            <id>test-compile</id>
-                            <goals>
-                                <goal>testCompile</goal>
-                            </goals>
-                            <configuration>
-                                <source>1.5</source>
-                                <target>1.5</target>
-                            </configuration>
-                        </execution>
-                    </executions>
+                    <configuration>
+                        <source>1.5</source>
+                        <target>1.5</target>
+                        <optimize>true</optimize>
+                    </configuration>
                 </plugin>
             </plugins>
         </pluginManagement>

Copied: hivemind/branches/branch-2-0-annot/annotations/src/test/org/apache/hivemind/annotations/AnnotationTestCase.java
(from r468326, hivemind/branches/branch-2-0-annot/annotations/src/java/org/apache/hivemind/annotations/test/AnnotationTestCase.java)
URL: http://svn.apache.org/viewvc/hivemind/branches/branch-2-0-annot/annotations/src/test/org/apache/hivemind/annotations/AnnotationTestCase.java?view=diff&rev=468383&p1=hivemind/branches/branch-2-0-annot/annotations/src/java/org/apache/hivemind/annotations/test/AnnotationTestCase.java&r1=468326&p2=hivemind/branches/branch-2-0-annot/annotations/src/test/org/apache/hivemind/annotations/AnnotationTestCase.java&r2=468383
==============================================================================
--- hivemind/branches/branch-2-0-annot/annotations/src/java/org/apache/hivemind/annotations/test/AnnotationTestCase.java
(original)
+++ hivemind/branches/branch-2-0-annot/annotations/src/test/org/apache/hivemind/annotations/AnnotationTestCase.java
Fri Oct 27 06:51:53 2006
@@ -1,4 +1,4 @@
-package org.apache.hivemind.annotations.test;
+package org.apache.hivemind.annotations;
 
 import org.apache.hivemind.Registry;
 import org.apache.hivemind.annotations.AnnotatedModuleReader;

Modified: hivemind/branches/branch-2-0-annot/annotations/src/test/org/apache/hivemind/annotations/SimpleAnnotatedModule.java
URL: http://svn.apache.org/viewvc/hivemind/branches/branch-2-0-annot/annotations/src/test/org/apache/hivemind/annotations/SimpleAnnotatedModule.java?view=diff&rev=468383&r1=468382&r2=468383
==============================================================================
--- hivemind/branches/branch-2-0-annot/annotations/src/test/org/apache/hivemind/annotations/SimpleAnnotatedModule.java
(original)
+++ hivemind/branches/branch-2-0-annot/annotations/src/test/org/apache/hivemind/annotations/SimpleAnnotatedModule.java
Fri Oct 27 06:51:53 2006
@@ -3,8 +3,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.aopalliance.intercept.MethodInterceptor;
-import org.aopalliance.intercept.MethodInvocation;
 import org.apache.hivemind.impl.ServiceModelContribution;
 
 public class SimpleAnnotatedModule
@@ -60,18 +58,18 @@
         _registry = registry;
     }
     
-    // @methodInterceptor(name="loggingInterceptor")
-    public Object interceptIt(MethodInvocation invocation) throws Throwable
-    {
-        return invocation.proceed();
-    }
-
-    // @interceptorFactory(name="", services="hivemind.*", methods="*" );
-    public MethodInterceptor createInterceptor()
-    {
-        return null;
-    }
-    
+//    // @methodInterceptor(name="loggingInterceptor")
+//    public Object interceptIt(MethodInvocation invocation) throws Throwable
+//    {
+//        return invocation.proceed();
+//    }
+//
+//    // @interceptorFactory(name="", services="hivemind.*", methods="*" );
+//    public MethodInterceptor createInterceptor()
+//    {
+//        return null;
+//    }
+//    
 //    public Runnable getService1(List interceptors)
 //    {
 //        Runnable result = null;

Modified: hivemind/branches/branch-2-0-annot/annotations/src/test/org/apache/hivemind/annotations/TestAnnotatedModuleReader.java
URL: http://svn.apache.org/viewvc/hivemind/branches/branch-2-0-annot/annotations/src/test/org/apache/hivemind/annotations/TestAnnotatedModuleReader.java?view=diff&rev=468383&r1=468382&r2=468383
==============================================================================
--- hivemind/branches/branch-2-0-annot/annotations/src/test/org/apache/hivemind/annotations/TestAnnotatedModuleReader.java
(original)
+++ hivemind/branches/branch-2-0-annot/annotations/src/test/org/apache/hivemind/annotations/TestAnnotatedModuleReader.java
Fri Oct 27 06:51:53 2006
@@ -1,7 +1,6 @@
 package org.apache.hivemind.annotations;
 
 import org.apache.hivemind.Registry;
-import org.apache.hivemind.annotations.test.AnnotationTestCase;
 import org.apache.hivemind.definition.RegistryDefinition;
 
 public class TestAnnotatedModuleReader extends AnnotationTestCase

Modified: hivemind/branches/branch-2-0-annot/annotations/src/test/org/apache/hivemind/annotations/TestAnnotatedModules.java
URL: http://svn.apache.org/viewvc/hivemind/branches/branch-2-0-annot/annotations/src/test/org/apache/hivemind/annotations/TestAnnotatedModules.java?view=diff&rev=468383&r1=468382&r2=468383
==============================================================================
--- hivemind/branches/branch-2-0-annot/annotations/src/test/org/apache/hivemind/annotations/TestAnnotatedModules.java
(original)
+++ hivemind/branches/branch-2-0-annot/annotations/src/test/org/apache/hivemind/annotations/TestAnnotatedModules.java
Fri Oct 27 06:51:53 2006
@@ -3,7 +3,6 @@
 import hivemind.test.services.ServiceAutowireTarget;
 
 import org.apache.hivemind.Registry;
-import org.apache.hivemind.annotations.test.AnnotationTestCase;
 
 public class TestAnnotatedModules extends AnnotationTestCase
 {

Modified: hivemind/branches/branch-2-0-annot/examples/pom.xml
URL: http://svn.apache.org/viewvc/hivemind/branches/branch-2-0-annot/examples/pom.xml?view=diff&rev=468383&r1=468382&r2=468383
==============================================================================
--- hivemind/branches/branch-2-0-annot/examples/pom.xml (original)
+++ hivemind/branches/branch-2-0-annot/examples/pom.xml Fri Oct 27 06:51:53 2006
@@ -5,11 +5,11 @@
     <groupId>org.apache.hivemind</groupId>
     <artifactId>hivemind-examples</artifactId>
     <packaging>jar</packaging>
-    <version>2.0.0_M1</version>
+    <version>${hivemindVersion}</version>
     <parent>
         <groupId>org.apache.hivemind</groupId>
         <artifactId>hivemind-project</artifactId>
-        <version>2.0.0_M1</version>
+        <version>${hivemindVersion}</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <name>HiveMind Examples</name>
@@ -18,15 +18,22 @@
         <dependency>
             <groupId>org.apache.hivemind</groupId>
             <artifactId>hivemind</artifactId>
-            <version>2.0.0_M1</version>
+            <version>${hivemindVersion}</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.hivemind</groupId>
+            <artifactId>hivemind-xml</artifactId>
+            <version>${hivemindVersion}</version>
+        </dependency>
+        <!-- PROVIDED -->
+        <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+        </dependency>
+        <!-- TEST -->
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
         </dependency>
         <dependency>
             <groupId>easymock</groupId>

Modified: hivemind/branches/branch-2-0-annot/examples/src/test/org/apache/examples/panorama/startup/impl/TestTaskExecutor.java
URL: http://svn.apache.org/viewvc/hivemind/branches/branch-2-0-annot/examples/src/test/org/apache/examples/panorama/startup/impl/TestTaskExecutor.java?view=diff&rev=468383&r1=468382&r2=468383
==============================================================================
--- hivemind/branches/branch-2-0-annot/examples/src/test/org/apache/examples/panorama/startup/impl/TestTaskExecutor.java
(original)
+++ hivemind/branches/branch-2-0-annot/examples/src/test/org/apache/examples/panorama/startup/impl/TestTaskExecutor.java
Fri Oct 27 06:51:53 2006
@@ -14,10 +14,12 @@
 
 package org.apache.examples.panorama.startup.impl;
 
+import java.io.File;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Locale;
+import java.util.Properties;
 
 import org.apache.commons.logging.Log;
 import org.apache.examples.panorama.startup.Executable;
@@ -71,10 +73,13 @@
 
     public Messages getMessages()
     {
-        String projectRoot = System.getProperty("PROJECT_ROOT", ".");
-        String path = projectRoot + "/examples/src/descriptor/META-INF/panorama.startup.xml";
+        // Some magic to make this test run in eclipse and maven which use different root
dirs
+        File module = new File("./examples/src/descriptor/META-INF/panorama.startup.xml");
+        if (!module.exists()) {
+            module = new File("./src/descriptor/META-INF/panorama.startup.xml");
+        }
 
-        Resource r = new FileResource(path);
+        Resource r = new FileResource(module.getAbsolutePath());
         MessageFinder mf = new MessageFinderImpl(r);
         ThreadLocale tl = new ThreadLocaleImpl(Locale.getDefault());
 

Modified: hivemind/branches/branch-2-0-annot/framework/pom.xml
URL: http://svn.apache.org/viewvc/hivemind/branches/branch-2-0-annot/framework/pom.xml?view=diff&rev=468383&r1=468382&r2=468383
==============================================================================
--- hivemind/branches/branch-2-0-annot/framework/pom.xml (original)
+++ hivemind/branches/branch-2-0-annot/framework/pom.xml Fri Oct 27 06:51:53 2006
@@ -5,11 +5,11 @@
     <groupId>org.apache.hivemind</groupId>
     <artifactId>hivemind</artifactId>
     <packaging>jar</packaging>
-    <version>2.0.0_M1</version>
+    <version>${hivemindVersion}</version>
     <parent>
         <groupId>org.apache.hivemind</groupId>
         <artifactId>hivemind-project</artifactId>
-        <version>2.0.0_M1</version>
+        <version>${hivemindVersion}</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <name>HiveMind core framework</name>
@@ -35,22 +35,22 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>servlet-api</artifactId>
-            <scope>provided</scope>
+            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>easymock</groupId>
             <artifactId>easymock</artifactId>
-            <scope>provided</scope>
+            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>easymock</groupId>
             <artifactId>easymockclassextension</artifactId>
-            <scope>provided</scope>
+            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <scope>provided</scope>
+            <scope>compile</scope>
         </dependency>
         <!-- TEST -->
         <dependency>

Modified: hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/impl/RegistryBuilder.java
URL: http://svn.apache.org/viewvc/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/impl/RegistryBuilder.java?view=diff&rev=468383&r1=468382&r2=468383
==============================================================================
--- hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/impl/RegistryBuilder.java
(original)
+++ hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/impl/RegistryBuilder.java
Fri Oct 27 06:51:53 2006
@@ -222,6 +222,10 @@
                 expected), configurationPoint.getLocation(), null);
     }
 
+    /**
+     * Automatically loads hivemind modules on the classpath which are 
+     * provided by {@link RegistryProvider}s which are defined in Manifest-Files. 
+     */
     public void autoDetectModules()
     {
         RegistryProviderAutoDetector detector = new RegistryProviderAutoDetector(new DefaultClassResolver());

Modified: hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/impl/RegistryInfrastructureConstructor.java
URL: http://svn.apache.org/viewvc/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/impl/RegistryInfrastructureConstructor.java?view=diff&rev=468383&r1=468382&r2=468383
==============================================================================
--- hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/impl/RegistryInfrastructureConstructor.java
(original)
+++ hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/impl/RegistryInfrastructureConstructor.java
Fri Oct 27 06:51:53 2006
@@ -198,7 +198,8 @@
         ServiceImplementationDefinition impl = sd.getDefaultImplementation();
 
         if (impl == null) {
-            throw new ApplicationRuntimeException(ImplMessages.servicePointDefinitionWithoutImplementation(sd));
+            // This is possible if a module defines the service interface only and no implementation
+            // is contributed. It's handled in ServicePointImpl
         } else {
             if (_log.isDebugEnabled())
                 _log.debug("Adding implementation to service extension point " + point.getExtensionPointId());

Modified: hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/impl/RegistryProviderAutoDetector.java
URL: http://svn.apache.org/viewvc/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/impl/RegistryProviderAutoDetector.java?view=diff&rev=468383&r1=468382&r2=468383
==============================================================================
--- hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/impl/RegistryProviderAutoDetector.java
(original)
+++ hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/impl/RegistryProviderAutoDetector.java
Fri Oct 27 06:51:53 2006
@@ -88,6 +88,9 @@
         if (attributes != null) {
             String providerClassName = attributes.getValue(PROVIDER_ATTRIBUTE_NAME);
             if (providerClassName != null) {
+                if (LOG.isDebugEnabled()) {
+                    LOG.debug("Found provider '" + providerClassName + "' defined in manifest
file '" + url.toString() + "'");
+                }
                 loadProvider(resolver, providerClassName);
             }
         }

Modified: hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/impl/ServicePointImpl.java
URL: http://svn.apache.org/viewvc/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/impl/ServicePointImpl.java?view=diff&rev=468383&r1=468382&r2=468383
==============================================================================
--- hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/impl/ServicePointImpl.java
(original)
+++ hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/impl/ServicePointImpl.java
Fri Oct 27 06:51:53 2006
@@ -289,6 +289,8 @@
 
     public ServiceImplementationDefinition getImplementationDefinition()
     {
+        if (getServicePointDefinition().getDefaultImplementation() == null)
+            throw new ApplicationRuntimeException(ImplMessages.servicePointDefinitionWithoutImplementation(getServicePointDefinition()));
         return getServicePointDefinition().getDefaultImplementation();
     }
     

Modified: hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/service/impl/AutowiringImpl.java
URL: http://svn.apache.org/viewvc/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/service/impl/AutowiringImpl.java?view=diff&rev=468383&r1=468382&r2=468383
==============================================================================
--- hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/service/impl/AutowiringImpl.java
(original)
+++ hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/service/impl/AutowiringImpl.java
Fri Oct 27 06:51:53 2006
@@ -156,9 +156,10 @@
         if (propertyType.isPrimitive() || SKIPPED_PROPERTY_TYPES.contains(propertyType))
{
             return false;
         } else {
-            Object value = PropertyUtils.read(target, propertyName);
             // Don't wire if value is already assigned
-            return value == null;
+            if (PropertyUtils.isReadable(target, propertyName))
+                return PropertyUtils.read(target, propertyName) == null;
+            else return true;
         }
     }
 

Modified: hivemind/branches/branch-2-0-annot/jmx/pom.xml
URL: http://svn.apache.org/viewvc/hivemind/branches/branch-2-0-annot/jmx/pom.xml?view=diff&rev=468383&r1=468382&r2=468383
==============================================================================
--- hivemind/branches/branch-2-0-annot/jmx/pom.xml (original)
+++ hivemind/branches/branch-2-0-annot/jmx/pom.xml Fri Oct 27 06:51:53 2006
@@ -5,11 +5,11 @@
     <groupId>org.apache.hivemind</groupId>
     <artifactId>hivemind-jmx</artifactId>
     <packaging>jar</packaging>
-    <version>2.0.0_M1</version>
+    <version>${hivemindVersion}</version>
     <parent>
         <groupId>org.apache.hivemind</groupId>
         <artifactId>hivemind-project</artifactId>
-        <version>2.0.0_M1</version>
+        <version>${hivemindVersion}</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <name>HiveMind JMX Support</name>
@@ -22,23 +22,14 @@
         <dependency>
             <groupId>org.apache.hivemind</groupId>
             <artifactId>hivemind</artifactId>
-            <version>2.0.0_M1</version>
+            <version>${hivemindVersion}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.hivemind</groupId>
             <artifactId>hivemind-xml</artifactId>
-            <version>2.0.0_M1</version>
+            <version>${hivemindVersion}</version>
         </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>easymock</groupId>
-            <artifactId>easymock</artifactId>
-        </dependency>
-        <!-- Here, again, we're using a scope of provided to mean
-            "optional at runtime" -->
+        <!-- PROVIDED -->
         <dependency>
             <groupId>mx4j</groupId>
             <artifactId>mx4j</artifactId>
@@ -57,6 +48,29 @@
             <version>2.1.1</version>
             <scope>provided</scope>
         </dependency>
+        <!-- TEST -->
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>easymock</groupId>
+            <artifactId>easymock</artifactId>
+        </dependency>        
+        <dependency>
+            <groupId>org.apache.hivemind</groupId>
+            <artifactId>hivemind</artifactId>
+            <version>${hivemindVersion}</version>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.hivemind</groupId>
+            <artifactId>hivemind-xml</artifactId>
+            <version>${hivemindVersion}</version>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
     <scm>
         <connection>svn:http://svn.apache.org/repos/asf/jakarta/hivemind/trunk/jmx</connection>

Modified: hivemind/branches/branch-2-0-annot/library/pom.xml
URL: http://svn.apache.org/viewvc/hivemind/branches/branch-2-0-annot/library/pom.xml?view=diff&rev=468383&r1=468382&r2=468383
==============================================================================
--- hivemind/branches/branch-2-0-annot/library/pom.xml (original)
+++ hivemind/branches/branch-2-0-annot/library/pom.xml Fri Oct 27 06:51:53 2006
@@ -4,11 +4,11 @@
     <groupId>org.apache.hivemind</groupId>
     <artifactId>hivemind-lib</artifactId>
     <packaging>jar</packaging>
-    <version>2.0.0_M1</version>
+    <version>${hivemindVersion}</version>
     <parent>
         <groupId>org.apache.hivemind</groupId>
         <artifactId>hivemind-project</artifactId>
-        <version>2.0.0_M1</version>
+        <version>${hivemindVersion}</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <name>HiveMind standard library</name>
@@ -17,39 +17,17 @@
         <dependency>
             <groupId>org.apache.hivemind</groupId>
             <artifactId>hivemind</artifactId>
-            <version>2.0.0_M1</version>
+            <version>${hivemindVersion}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.hivemind</groupId>
             <artifactId>hivemind-xml</artifactId>
-            <version>2.0.0_M1</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.hivemind</groupId>
-            <artifactId>hivemind</artifactId>
-            <version>2.0.0_M1</version>
-            <type>test-jar</type> 
-        </dependency>
-        <dependency>
-            <groupId>org.apache.hivemind</groupId>
-            <artifactId>hivemind-xml</artifactId>
-            <version>2.0.0_M1</version>
-            <type>test-jar</type> 
-        </dependency>
-        <!-- Here, again, we're using a scope of provided to mean
-             "optional at runtime" -->
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>easymock</groupId>
-            <artifactId>easymock</artifactId>           
+            <version>${hivemindVersion}</version>
         </dependency>
+        <!-- PROVIDED -->
         <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
-            <version>1.2.8</version>
         </dependency>
         <dependency>
             <groupId>groovy</groupId>
@@ -74,6 +52,29 @@
             <artifactId>aopalliance</artifactId>
             <version>1.0</version>
             <scope>provided</scope>
+        </dependency>
+        <!-- TEST -->
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>easymock</groupId>
+            <artifactId>easymock</artifactId>           
+        </dependency>
+        <dependency>
+            <groupId>org.apache.hivemind</groupId>
+            <artifactId>hivemind</artifactId>
+            <version>${hivemindVersion}</version>
+            <type>test-jar</type> 
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.hivemind</groupId>
+            <artifactId>hivemind-xml</artifactId>
+            <version>${hivemindVersion}</version>
+            <type>test-jar</type> 
+            <scope>test</scope>
         </dependency>
     </dependencies>
     <scm>

Modified: hivemind/branches/branch-2-0-annot/pom.xml
URL: http://svn.apache.org/viewvc/hivemind/branches/branch-2-0-annot/pom.xml?view=diff&rev=468383&r1=468382&r2=468383
==============================================================================
--- hivemind/branches/branch-2-0-annot/pom.xml (original)
+++ hivemind/branches/branch-2-0-annot/pom.xml Fri Oct 27 06:51:53 2006
@@ -2,10 +2,15 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
+
+	<properties>
+    	<hivemindVersion>2.0.0_M1</hivemindVersion>
+	</properties>
+
     <groupId>org.apache.hivemind</groupId>
     <artifactId>hivemind-project</artifactId>
     <packaging>pom</packaging>
-    <version>2.0.0_M1</version>
+    <version>${hivemindVersion}</version>
     <name>HiveMind Project</name>
     <inceptionYear>2003</inceptionYear>
     <modules>
@@ -102,7 +107,7 @@
             <dependency>
                 <groupId>org.apache.hivemind</groupId>
                 <artifactId>hivemind</artifactId>
-                <version>2.0.0_M1</version>
+                <version>${hivemindVersion}</version>
             </dependency>
         </dependencies>
     </dependencyManagement>
@@ -174,7 +179,7 @@
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-plugin</artifactId>
                     <configuration>
-                    		<testFailureIgnore>true</testFailureIgnore>
+                    		<testFailureIgnore>false</testFailureIgnore>
                         <includes>
                             <include>**/Test*.java</include>
                         </includes>

Modified: hivemind/branches/branch-2-0-annot/xml/pom.xml
URL: http://svn.apache.org/viewvc/hivemind/branches/branch-2-0-annot/xml/pom.xml?view=diff&rev=468383&r1=468382&r2=468383
==============================================================================
--- hivemind/branches/branch-2-0-annot/xml/pom.xml (original)
+++ hivemind/branches/branch-2-0-annot/xml/pom.xml Fri Oct 27 06:51:53 2006
@@ -5,11 +5,11 @@
     <groupId>org.apache.hivemind</groupId>
     <artifactId>hivemind-xml</artifactId>
     <packaging>jar</packaging>
-    <version>2.0.0_M1</version>
+    <version>${hivemindVersion}</version>
     <parent>
         <groupId>org.apache.hivemind</groupId>
         <artifactId>hivemind-project</artifactId>
-        <version>2.0.0_M1</version>
+        <version>${hivemindVersion}</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <name>HiveMind XML Support</name>
@@ -18,27 +18,14 @@
         <dependency>
             <groupId>org.apache.hivemind</groupId>
             <artifactId>hivemind</artifactId>
-            <version>2.0.0_M1</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.hivemind</groupId>
-            <artifactId>hivemind</artifactId>
-            <version>2.0.0_M1</version>
-            <type>test-jar</type>
+            <version>${hivemindVersion}</version>
         </dependency>
+        <!-- PROVIDED -->
         <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
         </dependency>
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>easymock</groupId>
-            <artifactId>easymock</artifactId>
-        </dependency>
-        <dependency>
             <groupId>xerces</groupId>
             <artifactId>xercesImpl</artifactId>
             <scope>provided</scope>
@@ -46,6 +33,12 @@
         <dependency>
             <groupId>xml-apis</groupId>
             <artifactId>xml-apis</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>servlet-api</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>ant</groupId>
@@ -53,17 +46,32 @@
             <version>1.6.3</version>
             <scope>provided</scope>
         </dependency>
+        <!-- TEST -->
         <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <scope>provided</scope>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>easymock</groupId>
+            <artifactId>easymock</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>easymock</groupId>
+            <artifactId>easymockclassextension</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.hivemind</groupId>
+            <artifactId>hivemind</artifactId>
+            <version>${hivemindVersion}</version>
+            <type>test-jar</type>
+            <scope>test</scope>
         </dependency>
     </dependencies>
-	  <build>
-	    <plugins>
-	     <plugin>
-	       <groupId>org.apache.maven.plugins</groupId>
-	       <artifactId>maven-jar-plugin</artifactId>
+	<build>
+	  <plugins>
+      	<plugin>
+           <groupId>org.apache.maven.plugins</groupId>
+           <artifactId>maven-jar-plugin</artifactId>
 	       <executions>
 	         <execution>
 	           <goals>
@@ -72,7 +80,12 @@
 	           </goals>
 	         </execution>
 	       </executions>
-	     </plugin>
-	    </plugins>
+           <configuration>
+             <archive>
+               <manifestFile>src/descriptor/META-INF/MANIFEST.MF</manifestFile>
+             </archive>
+           </configuration>
+        </plugin>
+      </plugins>
   	</build>
 </project>

Modified: hivemind/branches/branch-2-0-annot/xml/src/descriptor/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/hivemind/branches/branch-2-0-annot/xml/src/descriptor/META-INF/MANIFEST.MF?view=diff&rev=468383&r1=468382&r2=468383
==============================================================================
--- hivemind/branches/branch-2-0-annot/xml/src/descriptor/META-INF/MANIFEST.MF (original)
+++ hivemind/branches/branch-2-0-annot/xml/src/descriptor/META-INF/MANIFEST.MF Fri Oct 27
06:51:53 2006
@@ -1,5 +1,2 @@
 hivemind-provider: org.apache.hivemind.impl.XmlRegistryProvider
 
-
-Name: hivemind
-hivemind-provider: org.apache.hivemind.impl.XmlRegistryProvider
\ No newline at end of file

Modified: hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/impl/XmlRegistryProvider.java
URL: http://svn.apache.org/viewvc/hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/impl/XmlRegistryProvider.java?view=diff&rev=468383&r1=468382&r2=468383
==============================================================================
--- hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/impl/XmlRegistryProvider.java
(original)
+++ hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/impl/XmlRegistryProvider.java
Fri Oct 27 06:51:53 2006
@@ -37,7 +37,7 @@
         XmlModuleReader xmlModuleReader = new XmlModuleReader(registryDefinition, _classResolver,
                 errorHandler);
         if (LOG.isDebugEnabled())
-            LOG.debug("Processing modules visible to " + _classResolver);
+            LOG.debug("Processing xml modules visible to " + _classResolver);
 
         xmlModuleReader.readClassPathModules(_resourcePath);
     }



Mime
View raw message