You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hivemind.apache.org by hl...@apache.org on 2005/12/09 03:59:21 UTC
svn commit: r355331 - in /jakarta/hivemind/branches/maven2-dec12-2005:
.classpath config/ config/impl/ framework/pom.xml
framework/src/test/resources/log4j.properties
Author: hlship
Date: Thu Dec 8 18:59:13 2005
New Revision: 355331
URL: http://svn.apache.org/viewcvs?rev=355331&view=rev
Log:
Refactor into Maven 2 layout
Added:
jakarta/hivemind/branches/maven2-dec12-2005/config/
jakarta/hivemind/branches/maven2-dec12-2005/config/impl/
jakarta/hivemind/branches/maven2-dec12-2005/framework/src/test/resources/log4j.properties (contents, props changed)
- copied, changed from r355086, jakarta/hivemind/branches/maven2-dec12-2005/framework/src/conf/log4j.properties
Modified:
jakarta/hivemind/branches/maven2-dec12-2005/.classpath
jakarta/hivemind/branches/maven2-dec12-2005/framework/pom.xml
Modified: jakarta/hivemind/branches/maven2-dec12-2005/.classpath
URL: http://svn.apache.org/viewcvs/jakarta/hivemind/branches/maven2-dec12-2005/.classpath?rev=355331&r1=355330&r2=355331&view=diff
==============================================================================
--- jakarta/hivemind/branches/maven2-dec12-2005/.classpath (original)
+++ jakarta/hivemind/branches/maven2-dec12-2005/.classpath Thu Dec 8 18:59:13 2005
@@ -1,18 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry output="framework/target/eclipse-classes" kind="src" path="framework/src/java"/>
- <classpathentry output="framework/target/eclipse-test-classes" kind="src" path="framework/src/test"/>
- <classpathentry output="framework/target/eclipse-classes" kind="src" path="framework/src/descriptor"/>
- <classpathentry output="framework/target/eclipse-test-classes" kind="src" path="framework/src/conf"/>
- <classpathentry output="library/target/eclipse-classes" kind="src" path="library/src/java"/>
- <classpathentry output="library/target/eclipse-test-classes" kind="src" path="library/src/test"/>
- <classpathentry output="library/target/eclipse-classes" kind="src" path="library/src/descriptor"/>
- <classpathentry output="jmx/target/eclipse-classes" kind="src" path="jmx/src/java"/>
- <classpathentry output="jmx/target/eclipse-test-classes" kind="src" path="jmx/src/test"/>
- <classpathentry output="jmx/target/eclipse-classes" kind="src" path="jmx/src/descriptor"/>
- <classpathentry output="examples/target/eclipse-classes" kind="src" path="examples/src/java"/>
- <classpathentry output="examples/target/eclipse-test-classes" kind="src" path="examples/src/test"/>
- <classpathentry kind="src" path="hivebuild/src/java"/>
+ <classpathentry kind="src" path="framework/src/java"/>
+ <classpathentry kind="src" path="framework/src/test/java"/>
+ <classpathentry kind="src" path="framework/src/main/java"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="lib" path="ext-package/lib/commons-logging-1.0.3.jar"/>
<classpathentry kind="lib" path="ext-package/lib/easymock-1.1.jar"/>
@@ -33,5 +23,8 @@
<classpathentry kind="lib" path="ext-package/lib/mx4j-remote-2.1.1.jar"/>
<classpathentry kind="lib" path="ext-package/lib/mx4j-tools-2.1.1.jar"/>
<classpathentry kind="lib" path="ext-package/lib/javassist-3.0.jar"/>
+ <classpathentry kind="lib" path="framework/src/main/resources"/>
+ <classpathentry kind="src" path="config/impl"/>
+ <classpathentry kind="lib" path="framework/src/test/resources"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: jakarta/hivemind/branches/maven2-dec12-2005/framework/pom.xml
URL: http://svn.apache.org/viewcvs/jakarta/hivemind/branches/maven2-dec12-2005/framework/pom.xml?rev=355331&r1=355330&r2=355331&view=diff
==============================================================================
--- jakarta/hivemind/branches/maven2-dec12-2005/framework/pom.xml (original)
+++ jakarta/hivemind/branches/maven2-dec12-2005/framework/pom.xml Thu Dec 8 18:59:13 2005
@@ -35,55 +35,45 @@
<version>3.8.1</version>
<scope>compile</scope>
</dependency>
-
- <dependency>
- <groupId>easymock</groupId>
- <artifactId>easymock</artifactId>
- <version>1.1</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>easymock</groupId>
- <artifactId>easymockclassextension</artifactId>
- <version>1.1</version>
- <scope>compile</scope>
- </dependency>
-
- <!-- HiveMindTestCase directly references log4j -->
-
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.8</version>
- <scope>compile</scope>
- </dependency>
-
- <!-- This is caused by the Ant tasks provided in the JAR -->
-
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant</artifactId>
- <version>1.6.5</version>
- <scope>compile</scope>
- </dependency>
-
- <!-- Some Xerces dependencies related to the ConstructRegistry Ant task. -->
-
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- <version>2.7.1</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- <version>1.0.b2</version>
- <scope>compile</scope>
- </dependency>
-
+ <dependency>
+ <groupId>easymock</groupId>
+ <artifactId>easymock</artifactId>
+ <version>1.1</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>easymock</groupId>
+ <artifactId>easymockclassextension</artifactId>
+ <version>1.1</version>
+ <scope>compile</scope>
+ </dependency>
+ <!-- HiveMindTestCase directly references log4j -->
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.8</version>
+ <scope>compile</scope>
+ </dependency>
+ <!-- This is caused by the Ant tasks provided in the JAR -->
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant</artifactId>
+ <version>1.6.5</version>
+ <scope>compile</scope>
+ </dependency>
+ <!-- Some Xerces dependencies related to the ConstructRegistry Ant task. -->
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>2.6.2</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ <version>1.0.b2</version>
+ <scope>compile</scope>
+ </dependency>
<dependency>
<groupId>javassist</groupId>
<artifactId>javassist</artifactId>
@@ -96,33 +86,45 @@
<version>1.0.4</version>
<scope>compile</scope>
</dependency>
- <dependency>
- <groupId>ognl</groupId>
- <artifactId>ognl</artifactId>
- <version>2.6.7</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>oro</groupId>
- <artifactId>oro</artifactId>
- <version>2.0.8</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.3</version>
- <scope>compile</scope>
- </dependency>
- </dependencies>
- <build>
+ <dependency>
+ <groupId>ognl</groupId>
+ <artifactId>ognl</artifactId>
+ <version>2.6.7</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>oro</groupId>
+ <artifactId>oro</artifactId>
+ <version>2.0.8</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.3</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+ <build>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <linksource>true</linksource>
- </configuration>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <linksource>true</linksource>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <systemProperties>
+ <property>
+ <name>PROJECT_ROOT</name>
+ <value>${basedir}/..</value>
+ </property>
+ </systemProperties>
+ </configuration>
</plugin>
</plugins>
</build>
Copied: jakarta/hivemind/branches/maven2-dec12-2005/framework/src/test/resources/log4j.properties (from r355086, jakarta/hivemind/branches/maven2-dec12-2005/framework/src/conf/log4j.properties)
URL: http://svn.apache.org/viewcvs/jakarta/hivemind/branches/maven2-dec12-2005/framework/src/test/resources/log4j.properties?p2=jakarta/hivemind/branches/maven2-dec12-2005/framework/src/test/resources/log4j.properties&p1=jakarta/hivemind/branches/maven2-dec12-2005/framework/src/conf/log4j.properties&r1=355086&r2=355331&rev=355331&view=diff
==============================================================================
(empty)
Propchange: jakarta/hivemind/branches/maven2-dec12-2005/framework/src/test/resources/log4j.properties
------------------------------------------------------------------------------
cvs2svn:cvs-rev = 1.7
Propchange: jakarta/hivemind/branches/maven2-dec12-2005/framework/src/test/resources/log4j.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/hivemind/branches/maven2-dec12-2005/framework/src/test/resources/log4j.properties
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
---------------------------------------------------------------------
To unsubscribe, e-mail: hivemind-cvs-unsubscribe@jakarta.apache.org
For additional commands, e-mail: hivemind-cvs-help@jakarta.apache.org