hivemind-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jcar...@apache.org
Subject svn commit: r657103 - in /hivemind/hivemind1/trunk: ./ examples/ framework/ framework/src/java/org/apache/hivemind/test/ framework/src/test/org/apache/hivemind/test/ jmx/ library/
Date Fri, 16 May 2008 15:23:03 GMT
Author: jcarman
Date: Fri May 16 08:23:02 2008
New Revision: 657103

URL: http://svn.apache.org/viewvc?rev=657103&view=rev
Log:
Fixing maven2 pom.xml files and moving HiveMindTestCase to src/test

Added:
    hivemind/hivemind1/trunk/framework/src/test/org/apache/hivemind/test/AbstractArgumentMatcher.java
  (contents, props changed)
      - copied, changed from r657068, hivemind/hivemind1/trunk/framework/src/java/org/apache/hivemind/test/AbstractArgumentMatcher.java
    hivemind/hivemind1/trunk/framework/src/test/org/apache/hivemind/test/AggregateArgumentsMatcher.java
  (contents, props changed)
      - copied, changed from r657068, hivemind/hivemind1/trunk/framework/src/java/org/apache/hivemind/test/AggregateArgumentsMatcher.java
    hivemind/hivemind1/trunk/framework/src/test/org/apache/hivemind/test/ArgumentMatcher.java
  (contents, props changed)
      - copied, changed from r657068, hivemind/hivemind1/trunk/framework/src/java/org/apache/hivemind/test/ArgumentMatcher.java
    hivemind/hivemind1/trunk/framework/src/test/org/apache/hivemind/test/ArrayMatcher.java
  (contents, props changed)
      - copied, changed from r657068, hivemind/hivemind1/trunk/framework/src/java/org/apache/hivemind/test/ArrayMatcher.java
    hivemind/hivemind1/trunk/framework/src/test/org/apache/hivemind/test/EqualsMatcher.java
  (contents, props changed)
      - copied, changed from r657068, hivemind/hivemind1/trunk/framework/src/java/org/apache/hivemind/test/EqualsMatcher.java
    hivemind/hivemind1/trunk/framework/src/test/org/apache/hivemind/test/HiveMindTestCase.java
  (contents, props changed)
      - copied, changed from r657068, hivemind/hivemind1/trunk/framework/src/java/org/apache/hivemind/test/HiveMindTestCase.java
    hivemind/hivemind1/trunk/framework/src/test/org/apache/hivemind/test/RegexpMatcher.java
  (contents, props changed)
      - copied, changed from r657068, hivemind/hivemind1/trunk/framework/src/java/org/apache/hivemind/test/RegexpMatcher.java
    hivemind/hivemind1/trunk/framework/src/test/org/apache/hivemind/test/StoreAppender.java
  (contents, props changed)
      - copied, changed from r657068, hivemind/hivemind1/trunk/framework/src/java/org/apache/hivemind/test/StoreAppender.java
    hivemind/hivemind1/trunk/framework/src/test/org/apache/hivemind/test/TypeMatcher.java
  (contents, props changed)
      - copied, changed from r657068, hivemind/hivemind1/trunk/framework/src/java/org/apache/hivemind/test/TypeMatcher.java
Removed:
    hivemind/hivemind1/trunk/framework/src/java/org/apache/hivemind/test/AbstractArgumentMatcher.java
    hivemind/hivemind1/trunk/framework/src/java/org/apache/hivemind/test/AggregateArgumentsMatcher.java
    hivemind/hivemind1/trunk/framework/src/java/org/apache/hivemind/test/ArgumentMatcher.java
    hivemind/hivemind1/trunk/framework/src/java/org/apache/hivemind/test/ArrayMatcher.java
    hivemind/hivemind1/trunk/framework/src/java/org/apache/hivemind/test/EqualsMatcher.java
    hivemind/hivemind1/trunk/framework/src/java/org/apache/hivemind/test/HiveMindTestCase.java
    hivemind/hivemind1/trunk/framework/src/java/org/apache/hivemind/test/RegexpMatcher.java
    hivemind/hivemind1/trunk/framework/src/java/org/apache/hivemind/test/StoreAppender.java
    hivemind/hivemind1/trunk/framework/src/java/org/apache/hivemind/test/TypeMatcher.java
Modified:
    hivemind/hivemind1/trunk/examples/pom.xml
    hivemind/hivemind1/trunk/framework/pom.xml
    hivemind/hivemind1/trunk/jmx/pom.xml
    hivemind/hivemind1/trunk/library/pom.xml
    hivemind/hivemind1/trunk/pom.xml

Modified: hivemind/hivemind1/trunk/examples/pom.xml
URL: http://svn.apache.org/viewvc/hivemind/hivemind1/trunk/examples/pom.xml?rev=657103&r1=657102&r2=657103&view=diff
==============================================================================
--- hivemind/hivemind1/trunk/examples/pom.xml (original)
+++ hivemind/hivemind1/trunk/examples/pom.xml Fri May 16 08:23:02 2008
@@ -2,38 +2,46 @@
     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>
-    <groupId>org.apache.hivemind</groupId>
-    <artifactId>hivemind-examples</artifactId>
-    <packaging>jar</packaging>
-    <version>1.2.1</version>
     <parent>
-        <groupId>org.apache.hivemind</groupId>
-        <artifactId>hivemind-project</artifactId>
-        <version>1.2.1</version>
-        <relativePath>../pom.xml</relativePath>
+      <groupId>org.apache.hivemind</groupId>
+      <artifactId>hivemind-parent</artifactId>
+      <version>1.2-SNAPSHOT</version>
     </parent>
+    	
+    <artifactId>hivemind-examples</artifactId>
+    <packaging>jar</packaging>
+    
     <name>HiveMind Examples</name>
     <inceptionYear>2003</inceptionYear>
     <dependencies>
         <dependency>
             <groupId>org.apache.hivemind</groupId>
             <artifactId>hivemind</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.hivemind</groupId>
+            <artifactId>hivemind</artifactId>
+            <version>${project.version}</version>
+            <classifier>tests</classifier>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
+            <version>3.8.1</version>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
+            <version>1.2.8</version>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>easymock</groupId>
             <artifactId>easymock</artifactId>
+            <version>1.1</version>
+            <scope>test</scope>
         </dependency>
     </dependencies>
-    <scm>
-        <connection>svn:http://svn.apache.org/repos/asf/jakarta/hivemind/trunk/examples</connection>
-        <url>http://svn.apache.org/viewvc/jakarta/hivemind/trunk/examples</url>
-    </scm>
 </project>

Modified: hivemind/hivemind1/trunk/framework/pom.xml
URL: http://svn.apache.org/viewvc/hivemind/hivemind1/trunk/framework/pom.xml?rev=657103&r1=657102&r2=657103&view=diff
==============================================================================
--- hivemind/hivemind1/trunk/framework/pom.xml (original)
+++ hivemind/hivemind1/trunk/framework/pom.xml Fri May 16 08:23:02 2008
@@ -1,88 +1,91 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
-    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">
+         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>
-    <groupId>org.apache.hivemind</groupId>
-    <artifactId>hivemind</artifactId>
-    <packaging>jar</packaging>
-    <version>1.2.1</version>
     <parent>
         <groupId>org.apache.hivemind</groupId>
-        <artifactId>hivemind-project</artifactId>
-        <version>1.2.1</version>
-        <relativePath>../pom.xml</relativePath>
+        <artifactId>hivemind-parent</artifactId>
+        <version>1.2-SNAPSHOT</version>
     </parent>
-    <name>HiveMind core framework</name>
-    <inceptionYear>2003</inceptionYear>
+
+    <artifactId>hivemind</artifactId>
+    <packaging>jar</packaging>
+
+    <name>HiveMind Core Framework</name>
     <dependencies>
         <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>jboss</groupId>
-            <artifactId>javassist</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>oro</groupId>
-            <artifactId>oro</artifactId>
-        </dependency>
-        <!-- PROVIDED -->
-        <dependency>
             <groupId>ant</groupId>
             <artifactId>ant</artifactId>
             <version>1.6.3</version>
-            <scope>provided</scope>
+            <optional>true</optional>
         </dependency>
         <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
+            <groupId>xerces</groupId>
+            <artifactId>xercesImpl</artifactId>
+            <version>2.6.2</version>
+            <optional>true</optional>
         </dependency>
         <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <scope>provided</scope>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>3.8.1</version>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>easymock</groupId>
             <artifactId>easymock</artifactId>
-            <scope>provided</scope>
+            <version>1.1</version>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>easymock</groupId>
             <artifactId>easymockclassextension</artifactId>
-            <scope>provided</scope>
+            <version>1.1</version>
+            <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>xerces</groupId>
-            <artifactId>xercesImpl</artifactId>
-            <scope>provided</scope>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+            <version>1.2.8</version>
+            <scope>test</scope>
         </dependency>
+
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>provided</scope>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+            <version>1.0.3</version>
         </dependency>
-        <!-- TEST -->
         <dependency>
-            <groupId>cglib</groupId>
-            <artifactId>cglib-full</artifactId>
+            <groupId>jboss</groupId>
+            <artifactId>javassist</artifactId>
+            <version>3.0</version>
         </dependency>
         <dependency>
-            <groupId>xml-apis</groupId>
-            <artifactId>xml-apis</artifactId>
+            <groupId>oro</groupId>
+            <artifactId>oro</artifactId>
+            <version>2.0.8</version>
+        </dependency>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>servlet-api</artifactId>
+            <version>2.3</version>
+            <scope>provided</scope>
         </dependency>
+
     </dependencies>
-    <reporting>
+    <build>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-project-info-reports-plugin</artifactId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>test-jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
             </plugin>
         </plugins>
-    </reporting>
-    <scm>
-        <connection>svn:http://svn.apache.org/repos/asf/jakarta/hivemind/trunk/framework</connection>
-        <url>http://svn.apache.org/viewvc/jakarta/hivemind/trunk/framework</url>
-    </scm>
-</project>
+    </build>
+</project>

Copied: hivemind/hivemind1/trunk/framework/src/test/org/apache/hivemind/test/AbstractArgumentMatcher.java
(from r657068, hivemind/hivemind1/trunk/framework/src/java/org/apache/hivemind/test/AbstractArgumentMatcher.java)
URL: http://svn.apache.org/viewvc/hivemind/hivemind1/trunk/framework/src/test/org/apache/hivemind/test/AbstractArgumentMatcher.java?p2=hivemind/hivemind1/trunk/framework/src/test/org/apache/hivemind/test/AbstractArgumentMatcher.java&p1=hivemind/hivemind1/trunk/framework/src/java/org/apache/hivemind/test/AbstractArgumentMatcher.java&r1=657068&r2=657103&rev=657103&view=diff
==============================================================================
    (empty)

Propchange: hivemind/hivemind1/trunk/framework/src/test/org/apache/hivemind/test/AbstractArgumentMatcher.java
------------------------------------------------------------------------------
    cvs2svn:cvs-rev = 1.2

Propchange: hivemind/hivemind1/trunk/framework/src/test/org/apache/hivemind/test/AbstractArgumentMatcher.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: hivemind/hivemind1/trunk/framework/src/test/org/apache/hivemind/test/AbstractArgumentMatcher.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Copied: hivemind/hivemind1/trunk/framework/src/test/org/apache/hivemind/test/AggregateArgumentsMatcher.java
(from r657068, hivemind/hivemind1/trunk/framework/src/java/org/apache/hivemind/test/AggregateArgumentsMatcher.java)
URL: http://svn.apache.org/viewvc/hivemind/hivemind1/trunk/framework/src/test/org/apache/hivemind/test/AggregateArgumentsMatcher.java?p2=hivemind/hivemind1/trunk/framework/src/test/org/apache/hivemind/test/AggregateArgumentsMatcher.java&p1=hivemind/hivemind1/trunk/framework/src/java/org/apache/hivemind/test/AggregateArgumentsMatcher.java&r1=657068&r2=657103&rev=657103&view=diff
==============================================================================
    (empty)

Propchange: hivemind/hivemind1/trunk/framework/src/test/org/apache/hivemind/test/AggregateArgumentsMatcher.java
------------------------------------------------------------------------------
    cvs2svn:cvs-rev = 1.4

Propchange: hivemind/hivemind1/trunk/framework/src/test/org/apache/hivemind/test/AggregateArgumentsMatcher.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: hivemind/hivemind1/trunk/framework/src/test/org/apache/hivemind/test/AggregateArgumentsMatcher.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Copied: hivemind/hivemind1/trunk/framework/src/test/org/apache/hivemind/test/ArgumentMatcher.java
(from r657068, hivemind/hivemind1/trunk/framework/src/java/org/apache/hivemind/test/ArgumentMatcher.java)
URL: http://svn.apache.org/viewvc/hivemind/hivemind1/trunk/framework/src/test/org/apache/hivemind/test/ArgumentMatcher.java?p2=hivemind/hivemind1/trunk/framework/src/test/org/apache/hivemind/test/ArgumentMatcher.java&p1=hivemind/hivemind1/trunk/framework/src/java/org/apache/hivemind/test/ArgumentMatcher.java&r1=657068&r2=657103&rev=657103&view=diff
==============================================================================
    (empty)

Propchange: hivemind/hivemind1/trunk/framework/src/test/org/apache/hivemind/test/ArgumentMatcher.java
------------------------------------------------------------------------------
    cvs2svn:cvs-rev = 1.4

Propchange: hivemind/hivemind1/trunk/framework/src/test/org/apache/hivemind/test/ArgumentMatcher.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: hivemind/hivemind1/trunk/framework/src/test/org/apache/hivemind/test/ArgumentMatcher.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Copied: hivemind/hivemind1/trunk/framework/src/test/org/apache/hivemind/test/ArrayMatcher.java
(from r657068, hivemind/hivemind1/trunk/framework/src/java/org/apache/hivemind/test/ArrayMatcher.java)
URL: http://svn.apache.org/viewvc/hivemind/hivemind1/trunk/framework/src/test/org/apache/hivemind/test/ArrayMatcher.java?p2=hivemind/hivemind1/trunk/framework/src/test/org/apache/hivemind/test/ArrayMatcher.java&p1=hivemind/hivemind1/trunk/framework/src/java/org/apache/hivemind/test/ArrayMatcher.java&r1=657068&r2=657103&rev=657103&view=diff
==============================================================================
    (empty)

Propchange: hivemind/hivemind1/trunk/framework/src/test/org/apache/hivemind/test/ArrayMatcher.java
------------------------------------------------------------------------------
    cvs2svn:cvs-rev = 1.4

Propchange: hivemind/hivemind1/trunk/framework/src/test/org/apache/hivemind/test/ArrayMatcher.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: hivemind/hivemind1/trunk/framework/src/test/org/apache/hivemind/test/ArrayMatcher.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Copied: hivemind/hivemind1/trunk/framework/src/test/org/apache/hivemind/test/EqualsMatcher.java
(from r657068, hivemind/hivemind1/trunk/framework/src/java/org/apache/hivemind/test/EqualsMatcher.java)
URL: http://svn.apache.org/viewvc/hivemind/hivemind1/trunk/framework/src/test/org/apache/hivemind/test/EqualsMatcher.java?p2=hivemind/hivemind1/trunk/framework/src/test/org/apache/hivemind/test/EqualsMatcher.java&p1=hivemind/hivemind1/trunk/framework/src/java/org/apache/hivemind/test/EqualsMatcher.java&r1=657068&r2=657103&rev=657103&view=diff
==============================================================================
    (empty)

Propchange: hivemind/hivemind1/trunk/framework/src/test/org/apache/hivemind/test/EqualsMatcher.java
------------------------------------------------------------------------------
    cvs2svn:cvs-rev = 1.3

Propchange: hivemind/hivemind1/trunk/framework/src/test/org/apache/hivemind/test/EqualsMatcher.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: hivemind/hivemind1/trunk/framework/src/test/org/apache/hivemind/test/EqualsMatcher.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Copied: hivemind/hivemind1/trunk/framework/src/test/org/apache/hivemind/test/HiveMindTestCase.java
(from r657068, hivemind/hivemind1/trunk/framework/src/java/org/apache/hivemind/test/HiveMindTestCase.java)
URL: http://svn.apache.org/viewvc/hivemind/hivemind1/trunk/framework/src/test/org/apache/hivemind/test/HiveMindTestCase.java?p2=hivemind/hivemind1/trunk/framework/src/test/org/apache/hivemind/test/HiveMindTestCase.java&p1=hivemind/hivemind1/trunk/framework/src/java/org/apache/hivemind/test/HiveMindTestCase.java&r1=657068&r2=657103&rev=657103&view=diff
==============================================================================
    (empty)

Propchange: hivemind/hivemind1/trunk/framework/src/test/org/apache/hivemind/test/HiveMindTestCase.java
------------------------------------------------------------------------------
    cvs2svn:cvs-rev = 1.26

Propchange: hivemind/hivemind1/trunk/framework/src/test/org/apache/hivemind/test/HiveMindTestCase.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: hivemind/hivemind1/trunk/framework/src/test/org/apache/hivemind/test/HiveMindTestCase.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Copied: hivemind/hivemind1/trunk/framework/src/test/org/apache/hivemind/test/RegexpMatcher.java
(from r657068, hivemind/hivemind1/trunk/framework/src/java/org/apache/hivemind/test/RegexpMatcher.java)
URL: http://svn.apache.org/viewvc/hivemind/hivemind1/trunk/framework/src/test/org/apache/hivemind/test/RegexpMatcher.java?p2=hivemind/hivemind1/trunk/framework/src/test/org/apache/hivemind/test/RegexpMatcher.java&p1=hivemind/hivemind1/trunk/framework/src/java/org/apache/hivemind/test/RegexpMatcher.java&r1=657068&r2=657103&rev=657103&view=diff
==============================================================================
    (empty)

Propchange: hivemind/hivemind1/trunk/framework/src/test/org/apache/hivemind/test/RegexpMatcher.java
------------------------------------------------------------------------------
    cvs2svn:cvs-rev = 1.5

Propchange: hivemind/hivemind1/trunk/framework/src/test/org/apache/hivemind/test/RegexpMatcher.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: hivemind/hivemind1/trunk/framework/src/test/org/apache/hivemind/test/RegexpMatcher.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Copied: hivemind/hivemind1/trunk/framework/src/test/org/apache/hivemind/test/StoreAppender.java
(from r657068, hivemind/hivemind1/trunk/framework/src/java/org/apache/hivemind/test/StoreAppender.java)
URL: http://svn.apache.org/viewvc/hivemind/hivemind1/trunk/framework/src/test/org/apache/hivemind/test/StoreAppender.java?p2=hivemind/hivemind1/trunk/framework/src/test/org/apache/hivemind/test/StoreAppender.java&p1=hivemind/hivemind1/trunk/framework/src/java/org/apache/hivemind/test/StoreAppender.java&r1=657068&r2=657103&rev=657103&view=diff
==============================================================================
--- hivemind/hivemind1/trunk/framework/src/java/org/apache/hivemind/test/StoreAppender.java
(original)
+++ hivemind/hivemind1/trunk/framework/src/test/org/apache/hivemind/test/StoreAppender.java
Fri May 16 08:23:02 2008
@@ -21,7 +21,7 @@
 import org.apache.log4j.spi.LoggingEvent;
 
 /**
- * Used to test logging provided by the {@link org.apache.hivemind.impl.LoggingInterceptorFactory}.
+ * Used to test logging provided by the {@link org.apache.hivemind.service.impl.LoggingInterceptorFactory}.
  *
  * @author Howard Lewis Ship
  */

Propchange: hivemind/hivemind1/trunk/framework/src/test/org/apache/hivemind/test/StoreAppender.java
------------------------------------------------------------------------------
    cvs2svn:cvs-rev = 1.3

Propchange: hivemind/hivemind1/trunk/framework/src/test/org/apache/hivemind/test/StoreAppender.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: hivemind/hivemind1/trunk/framework/src/test/org/apache/hivemind/test/StoreAppender.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Copied: hivemind/hivemind1/trunk/framework/src/test/org/apache/hivemind/test/TypeMatcher.java
(from r657068, hivemind/hivemind1/trunk/framework/src/java/org/apache/hivemind/test/TypeMatcher.java)
URL: http://svn.apache.org/viewvc/hivemind/hivemind1/trunk/framework/src/test/org/apache/hivemind/test/TypeMatcher.java?p2=hivemind/hivemind1/trunk/framework/src/test/org/apache/hivemind/test/TypeMatcher.java&p1=hivemind/hivemind1/trunk/framework/src/java/org/apache/hivemind/test/TypeMatcher.java&r1=657068&r2=657103&rev=657103&view=diff
==============================================================================
    (empty)

Propchange: hivemind/hivemind1/trunk/framework/src/test/org/apache/hivemind/test/TypeMatcher.java
------------------------------------------------------------------------------
    cvs2svn:cvs-rev = 1.4

Propchange: hivemind/hivemind1/trunk/framework/src/test/org/apache/hivemind/test/TypeMatcher.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: hivemind/hivemind1/trunk/framework/src/test/org/apache/hivemind/test/TypeMatcher.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Modified: hivemind/hivemind1/trunk/jmx/pom.xml
URL: http://svn.apache.org/viewvc/hivemind/hivemind1/trunk/jmx/pom.xml?rev=657103&r1=657102&r2=657103&view=diff
==============================================================================
--- hivemind/hivemind1/trunk/jmx/pom.xml (original)
+++ hivemind/hivemind1/trunk/jmx/pom.xml Fri May 16 08:23:02 2008
@@ -2,58 +2,58 @@
     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>
-    <groupId>org.apache.hivemind</groupId>
-    <artifactId>hivemind-jmx</artifactId>
-    <packaging>jar</packaging>
-    <version>1.2.1</version>
     <parent>
-        <groupId>org.apache.hivemind</groupId>
-        <artifactId>hivemind-project</artifactId>
-        <version>1.2.1</version>
-        <relativePath>../pom.xml</relativePath>
+      <groupId>org.apache.hivemind</groupId>
+      <artifactId>hivemind-parent</artifactId>
+      <version>1.2-SNAPSHOT</version>
     </parent>
+    <artifactId>hivemind-jmx</artifactId>
+    <packaging>jar</packaging>
     <name>HiveMind JMX Support</name>
     <inceptionYear>2004</inceptionYear>
     <dependencies>
         <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
+            <groupId>org.apache.hivemind</groupId>
+            <artifactId>hivemind</artifactId>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.hivemind</groupId>
             <artifactId>hivemind</artifactId>
+            <version>${project.version}</version>
+            <classifier>tests</classifier>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
+            <version>3.8.1</version>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>easymock</groupId>
             <artifactId>easymock</artifactId>
+            <version>1.1</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+            <version>1.2.8</version>
         </dependency>
-        <!-- Here, again, we're using a scope of provided to mean
-            "optional at runtime" -->
         <dependency>
             <groupId>mx4j</groupId>
             <artifactId>mx4j</artifactId>
             <version>2.1.1</version>
-            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>mx4j</groupId>
             <artifactId>mx4j-tools</artifactId>
             <version>2.1.1</version>
-            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>mx4j</groupId>
             <artifactId>mx4j-remote</artifactId>
             <version>2.1.1</version>
-            <scope>provided</scope>
         </dependency>
     </dependencies>
-    <scm>
-        <connection>svn:http://svn.apache.org/repos/asf/jakarta/hivemind/trunk/jmx</connection>
-        <url>http://svn.apache.org/viewvc/jakarta/hivemind/trunk/jmx</url>
-    </scm>
 </project>

Modified: hivemind/hivemind1/trunk/library/pom.xml
URL: http://svn.apache.org/viewvc/hivemind/hivemind1/trunk/library/pom.xml?rev=657103&r1=657102&r2=657103&view=diff
==============================================================================
--- hivemind/hivemind1/trunk/library/pom.xml (original)
+++ hivemind/hivemind1/trunk/library/pom.xml Fri May 16 08:23:02 2008
@@ -1,65 +1,65 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" 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>
-    <groupId>org.apache.hivemind</groupId>
-    <artifactId>hivemind-lib</artifactId>
-    <packaging>jar</packaging>
-    <version>1.2.1</version>
     <parent>
-        <groupId>org.apache.hivemind</groupId>
-        <artifactId>hivemind-project</artifactId>
-        <version>1.2.1</version>
-        <relativePath>../pom.xml</relativePath>
+      <groupId>org.apache.hivemind</groupId>
+      <artifactId>hivemind-parent</artifactId>
+      <version>1.2-SNAPSHOT</version>
     </parent>
-    <name>HiveMind standard library</name>
+    
+    <artifactId>hivemind-lib</artifactId>
+    <packaging>jar</packaging>
+    
+    <name>HiveMind Standard Library</name>
     <inceptionYear>2003</inceptionYear>
+    
     <dependencies>
         <dependency>
             <groupId>org.apache.hivemind</groupId>
             <artifactId>hivemind</artifactId>
+            <version>${project.version}</version>
         </dependency>
-        <!-- Here, again, we're using a scope of provided to mean
-             "optional at runtime" -->
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
+            <groupId>org.apache.hivemind</groupId>
+            <artifactId>hivemind</artifactId>
+            <version>${project.version}</version>
+            <classifier>tests</classifier>
         </dependency>
         <dependency>
-            <groupId>easymock</groupId>
-            <artifactId>easymock</artifactId>           
-        </dependency>
+                <groupId>log4j</groupId>
+                <artifactId>log4j</artifactId>
+                <version>1.2.8</version>
+                <scope>provided</scope>
+            </dependency>
         <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-            <version>1.2.8</version>
+            <groupId>easymock</groupId>
+            <artifactId>easymock</artifactId>
+            <version>1.1</version>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>groovy</groupId>
             <artifactId>groovy-all</artifactId>
             <version>1.0-jsr-03</version>
-            <scope>provided</scope>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>jboss</groupId>
             <artifactId>jboss-j2ee</artifactId>
             <version>3.2.1</version>
-            <scope>provided</scope>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-full</artifactId>
             <version>1.0.1</version>
-            <scope>provided</scope>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>aopalliance</groupId>
             <artifactId>aopalliance</artifactId>
             <version>1.0</version>
-            <scope>provided</scope>
+            <optional>true</optional>
         </dependency>
     </dependencies>
-    <scm>
-        <connection>svn:http://svn.apache.org/repos/asf/jakarta/hivemind/trunk/library</connection>
-        <url>http://svn.apache.org/viewvc/jakarta/hivemind/trunk/library</url>
-    </scm>
 </project>

Modified: hivemind/hivemind1/trunk/pom.xml
URL: http://svn.apache.org/viewvc/hivemind/hivemind1/trunk/pom.xml?rev=657103&r1=657102&r2=657103&view=diff
==============================================================================
--- hivemind/hivemind1/trunk/pom.xml (original)
+++ hivemind/hivemind1/trunk/pom.xml Fri May 16 08:23:02 2008
@@ -3,27 +3,30 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.hivemind</groupId>
-    <artifactId>hivemind-project</artifactId>
+    <artifactId>hivemind-parent</artifactId>
     <packaging>pom</packaging>
-    <version>1.2.1</version>
-    <name>HiveMind Project</name>
+    <version>1.2-SNAPSHOT</version>
+    <name>Apache HiveMind</name>
     <inceptionYear>2003</inceptionYear>
+    <organization>
+        <name>Apache Software Foundation</name>
+        <url>http://www.apache.org/</url>
+    </organization>
     <modules>
         <module>framework</module>
         <module>library</module>
         <module>jmx</module>
         <module>examples</module>
     </modules>
-    <url>http://jakarta.apache.org/hivemind/</url>
+    <url>http://hivemind.apache.org/</url>
     <developers>
         <developer>
-            <id>HLS</id>
-            <email>howard@howardlewisship.com</email>
-            <url>http://howardlewisship.com</url>
+            <id>JC</id>
+            <email>jcarman@apache.org</email>
             <roles>
                 <role>dev</role>
             </roles>
-            <timezone>-8</timezone>
+            <timezone>-5</timezone>
         </developer>
     </developers>
     <licenses>
@@ -33,77 +36,10 @@
             <distribution>repo</distribution>
         </license>
     </licenses>
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>log4j</groupId>
-                <artifactId>log4j</artifactId>
-                <version>1.2.8</version>
-                <scope>provided</scope>
-            </dependency>
-            <dependency>
-                <groupId>junit</groupId>
-                <artifactId>junit</artifactId>
-                <version>3.8.1</version>
-                <scope>test</scope>
-            </dependency>
-            <dependency>
-                <groupId>easymock</groupId>
-                <artifactId>easymock</artifactId>
-                <version>1.1</version>
-                <scope>test</scope>
-            </dependency>
-            <dependency>
-                <groupId>easymock</groupId>
-                <artifactId>easymockclassextension</artifactId>
-                <version>1.1</version>
-                <scope>test</scope>
-            </dependency>
-            <dependency>
-                <groupId>xerces</groupId>
-                <artifactId>xercesImpl</artifactId>
-                <version>2.6.2</version>
-            </dependency>
-            <dependency>
-                <groupId>cglib</groupId>
-                <artifactId>cglib-full</artifactId>
-                <version>2.0.1</version>
-                <scope>test</scope>
-            </dependency>
-            <dependency>
-                <groupId>xml-apis</groupId>
-                <artifactId>xml-apis</artifactId>
-                <version>1.3.02</version>
-                <scope>test</scope>
-            </dependency>
-            <dependency>
-                <groupId>commons-logging</groupId>
-                <artifactId>commons-logging</artifactId>
-                <version>1.0.3</version>
-            </dependency>
-            <dependency>
-                <groupId>jboss</groupId>
-                <artifactId>javassist</artifactId>
-                <version>3.0</version>
-            </dependency>
-            <dependency>
-                <groupId>oro</groupId>
-                <artifactId>oro</artifactId>
-                <version>2.0.8</version>
-            </dependency>
-            <dependency>
-                <groupId>javax.servlet</groupId>
-                <artifactId>servlet-api</artifactId>
-                <version>2.3</version>
-                <scope>test</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.hivemind</groupId>
-                <artifactId>hivemind</artifactId>
-                <version>1.2.1</version>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
+    <issueManagement>
+        <system>JIRA</system>
+        <url>http://issues.apache.org/jira/browse/HIVEMIND</url>
+    </issueManagement>
     <build>
         <sourceDirectory>src/java</sourceDirectory>
         <resources>
@@ -209,13 +145,6 @@
                 </plugin>
             </plugins>
         </pluginManagement>
-        <extensions>
-            <!-- Needed to support FTP deployment. -->
-            <extension>
-                <groupId>org.apache.maven.wagon</groupId>
-                <artifactId>wagon-ftp</artifactId>
-            </extension>
-        </extensions>
     </build>
     <!-- Standard reports used in the HiveMind projects. -->
     <reporting>
@@ -234,25 +163,15 @@
         </plugins>
     </reporting>
     <distributionManagement>
-        <!-- Alas, this doesn't work yet -->
         <site>
-            <id>apache.org</id>
-            <url>ssh://cvs.apache.org/jakarta/hivemind/%{pom.artifactId}</url>
+            <id>apache.website</id>
+            <name>Apache Website</name>
+            <url>scp://people.apache.org/www/hivemind.apache.org/</url>
         </site>
-        <repository>
-            <!-- The "maven" login id, specified in settings.xml, ensures that the Maven
-                repository (i.e. http://howardlewisship.com/repository) is accessed. -->
-            <!-- This is temporary, until HiveMind 1.2 is stable. -->
-            <id>howardlewisship.com</id>
-            <url>ftp://howardlewisship.com/repository</url>
-        </repository>
     </distributionManagement>
-    <organization>
-        <name>Apache Software Foundation</name>
-        <url>http://www.apache.org/</url>
-    </organization>
+    
     <scm>
-        <connection>svn:http://svn.apache.org/repos/asf/jakarta/hivemind/trunk/</connection>
-        <url>http://svn.apache.org/viewvc/jakarta/hivemind/trunk/</url>
+        <connection>svn:http://svn.apache.org/repos/asf/hivemind/hivemind/trunk/</connection>
+        <url>http://svn.apache.org/viewvc/hivemind/hivemind1/trunk/</url>
     </scm>
 </project>



Mime
View raw message