You are viewing a plain text version of this content. The canonical link for it is here.
Posted to droids-commits@incubator.apache.org by ol...@apache.org on 2008/11/07 09:47:12 UTC

svn commit: r712097 - in /incubator/droids/trunk: ./ module-core/ module-core/src/main/java/org/ module-core/src/main/resources/ module-core/src/test/java/org/ module-core/src/test/resources/resources/ src/java/ src/java/org/ src/test/java/org/ src/tes...

Author: olegk
Date: Fri Nov  7 01:47:09 2008
New Revision: 712097

URL: http://svn.apache.org/viewvc?rev=712097&view=rev
Log:
Set up basic Maven multi-module layout

Added:
    incubator/droids/trunk/module-core/pom.xml
    incubator/droids/trunk/module-core/src/main/java/org/   (props changed)
      - copied from r712095, incubator/droids/trunk/src/java/org/
    incubator/droids/trunk/module-core/src/main/resources/log4j.properties   (props changed)
      - copied unchanged from r712095, incubator/droids/trunk/src/java/log4j.properties
    incubator/droids/trunk/module-core/src/main/resources/regex-urlfilter.txt   (props changed)
      - copied unchanged from r712095, incubator/droids/trunk/src/java/regex-urlfilter.txt
    incubator/droids/trunk/module-core/src/test/java/org/   (props changed)
      - copied from r712095, incubator/droids/trunk/src/test/java/org/
    incubator/droids/trunk/module-core/src/test/resources/resources/   (props changed)
      - copied from r712095, incubator/droids/trunk/src/test/java/resources/
Removed:
    incubator/droids/trunk/src/java/log4j.properties
    incubator/droids/trunk/src/java/org/
    incubator/droids/trunk/src/java/regex-urlfilter.txt
    incubator/droids/trunk/src/test/java/org/
    incubator/droids/trunk/src/test/java/resources/
Modified:
    incubator/droids/trunk/pom.xml

Added: incubator/droids/trunk/module-core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/droids/trunk/module-core/pom.xml?rev=712097&view=auto
==============================================================================
--- incubator/droids/trunk/module-core/pom.xml (added)
+++ incubator/droids/trunk/module-core/pom.xml Fri Nov  7 01:47:09 2008
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!-- 
+   ====================================================================
+   Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information
+   regarding copyright ownership.  The ASF licenses this file
+   to you under the Apache License, Version 2.0 (the
+   "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing,
+   software distributed under the License is distributed on an
+   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+   KIND, either express or implied.  See the License for the
+   specific language governing permissions and limitations
+   under the License.
+   ====================================================================
+
+   This software consists of voluntary contributions made by many
+   individuals on behalf of the Apache Software Foundation.  For more
+   information on the Apache Software Foundation, please see
+   <http://www.apache.org />.
+ -->
+
+<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>
+  <parent>
+    <artifactId>droids</artifactId>
+    <groupId>org.apache.droids</groupId>
+    <version>0.1-incubating-SNAPSHOT</version>
+    <relativePath>../pom.xml</relativePath>
+  </parent>
+  <artifactId>droids-core</artifactId>
+  <name>Droids Core</name>
+  <inceptionYear>2007</inceptionYear>
+  <description>
+   Droids API and core components
+  </description>
+  <packaging>jar</packaging>  
+
+  <scm>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/droids/trunk/core</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/droids/trunk/core</developerConnection>
+    <url>http://svn.apache.org/repos/asf/labs/incubator/trunk/core</url>
+  </scm>
+
+  <dependencies>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.woodstox</groupId>
+      <artifactId>wstx-asl</artifactId>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.httpcomponents</groupId>
+      <artifactId>httpclient</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>nekohtml</groupId>
+      <artifactId>nekohtml</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+  
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>${maven.compile.source}</source>
+          <target>${maven.compile.target}</target>
+          <optimize>${maven.compile.optimize}</optimize>
+          <showDeprecations>${maven.compile.deprecation}</showDeprecations>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-surefire-plugin</artifactId>
+      </plugin>
+    </plugins>
+  </build>
+
+</project>

Propchange: incubator/droids/trunk/module-core/src/main/java/org/
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: incubator/droids/trunk/module-core/src/main/resources/log4j.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/droids/trunk/module-core/src/main/resources/log4j.properties
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: incubator/droids/trunk/module-core/src/main/resources/regex-urlfilter.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/droids/trunk/module-core/src/main/resources/regex-urlfilter.txt
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: incubator/droids/trunk/module-core/src/test/java/org/
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: incubator/droids/trunk/module-core/src/test/resources/resources/
------------------------------------------------------------------------------
    svn:mergeinfo = 

Modified: incubator/droids/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/droids/trunk/pom.xml?rev=712097&r1=712096&r2=712097&view=diff
==============================================================================
--- incubator/droids/trunk/pom.xml (original)
+++ incubator/droids/trunk/pom.xml Fri Nov  7 01:47:09 2008
@@ -35,8 +35,8 @@
   <description>
    Droids - an intelligent robot framework
   </description>
-  <url>http://labs.apache.org/</url>
-  <packaging>jar</packaging>  
+  <url>http://incubator.apache.org/projects/droids.html</url>
+  <packaging>pom</packaging>  
 
   <licenses>
     <license>
@@ -47,9 +47,9 @@
   </licenses>
 
   <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/labs/droids/trunk/</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/labs/droids/trunk/</developerConnection>
-    <url>http://svn.apache.org/repos/asf/labs/droids/trunk/</url>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/droids/trunk/</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/droids/trunk/</developerConnection>
+    <url>http://svn.apache.org/repos/asf/incubator/droids/trunk/</url>
   </scm>
 
   <properties>
@@ -67,100 +67,65 @@
     <log4j.version>1.2.14</log4j.version>
   </properties>
 
-  <dependencies>
-    <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
-      <version>${commons-logging.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>commons-io</groupId>
-      <artifactId>commons-io</artifactId>
-      <version>${commons-io.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-stax-api_1.0_spec</artifactId>
-      <version>${stax-api.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.codehaus.woodstox</groupId>
-      <artifactId>wstx-asl</artifactId>
-      <version>${wstx-asl.version}</version>
-      <scope>runtime</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>stax</groupId>
-          <artifactId>stax-api</artifactId>
-       </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.httpcomponents</groupId>
-      <artifactId>httpclient</artifactId>
-      <version>${httpclient.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>nekohtml</groupId>
-      <artifactId>nekohtml</artifactId>
-      <version>${nekohtml.version}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>xml-apis</groupId>
-          <artifactId>xml-apis</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-      <version>${log4j.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>${junit.version}</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-  <build>
-    <sourceDirectory>src/java</sourceDirectory>
-    <resources>
-      <resource>
-        <directory>src/java</directory>
-        <filtering>false</filtering>
-        <includes>
-            <include>**/*.xml</include>
-            <include>**/*.properties</include>
-            <include>**/*.txt</include>
-        </includes>
-      </resource>
-    </resources>
-    <testResources>
-      <testResource>
-        <directory>src/test/java</directory>
-        <filtering>false</filtering>
-        <includes>
-            <include>**/resources/**</include>
-        </includes>
-      </testResource>
-    </testResources>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <source>${maven.compile.source}</source>
-          <target>${maven.compile.target}</target>
-          <optimize>${maven.compile.optimize}</optimize>
-          <showDeprecations>${maven.compile.deprecation}</showDeprecations>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-surefire-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </build>
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>commons-logging</groupId>
+        <artifactId>commons-logging</artifactId>
+        <version>${commons-logging.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>commons-io</groupId>
+        <artifactId>commons-io</artifactId>
+        <version>${commons-io.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+        <version>${stax-api.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.codehaus.woodstox</groupId>
+        <artifactId>wstx-asl</artifactId>
+        <version>${wstx-asl.version}</version>
+        <exclusions>
+          <exclusion>
+            <groupId>stax</groupId>
+            <artifactId>stax-api</artifactId>
+         </exclusion>
+        </exclusions>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.httpcomponents</groupId>
+        <artifactId>httpclient</artifactId>
+        <version>${httpclient.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>nekohtml</groupId>
+        <artifactId>nekohtml</artifactId>
+        <version>${nekohtml.version}</version>
+        <exclusions>
+          <exclusion>
+            <groupId>xml-apis</groupId>
+            <artifactId>xml-apis</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
+      <dependency>
+        <groupId>log4j</groupId>
+        <artifactId>log4j</artifactId>
+        <version>${log4j.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>junit</groupId>
+        <artifactId>junit</artifactId>
+        <version>${junit.version}</version>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
+  <modules>
+    <module>module-core</module>
+  </modules>
 
 </project>