You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by si...@apache.org on 2012/02/29 17:19:24 UTC
svn commit: r1295177 - in /commons/proper/chain/trunk: ./ configuration/
configuration/src/main/java/org/ configuration/src/main/java/org/apache/
configuration/src/main/java/org/apache/commons/
configuration/src/main/java/org/apache/commons/chain2/ con...
Author: simonetripodi
Date: Wed Feb 29 16:19:22 2012
New Revision: 1295177
URL: http://svn.apache.org/viewvc?rev=1295177&view=rev
Log:
[CHAIN-55] split the huge project in submodules.
Added:
commons/proper/chain/trunk/configuration/src/main/java/org/
commons/proper/chain/trunk/configuration/src/main/java/org/apache/
commons/proper/chain/trunk/configuration/src/main/java/org/apache/commons/
commons/proper/chain/trunk/configuration/src/main/java/org/apache/commons/chain2/
commons/proper/chain/trunk/configuration/src/main/java/org/apache/commons/chain2/config/
- copied from r1294382, commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/config/
commons/proper/chain/trunk/configuration/src/test/java/org/
commons/proper/chain/trunk/configuration/src/test/java/org/apache/
commons/proper/chain/trunk/configuration/src/test/java/org/apache/commons/
commons/proper/chain/trunk/configuration/src/test/java/org/apache/commons/chain2/
commons/proper/chain/trunk/configuration/src/test/java/org/apache/commons/chain2/config/
- copied from r1294382, commons/proper/chain/trunk/src/test/java/org/apache/commons/chain2/config/
commons/proper/chain/trunk/configuration/src/test/resources/org/
- copied from r1294382, commons/proper/chain/trunk/src/test/resources/org/
commons/proper/chain/trunk/core/src/main/java/org/
- copied from r1294382, commons/proper/chain/trunk/src/main/java/org/
commons/proper/chain/trunk/core/src/test/java/org/
- copied from r1294382, commons/proper/chain/trunk/src/test/java/org/
commons/proper/chain/trunk/web/src/main/java/org/
commons/proper/chain/trunk/web/src/main/java/org/apache/
commons/proper/chain/trunk/web/src/main/java/org/apache/commons/
commons/proper/chain/trunk/web/src/main/java/org/apache/commons/chain2/
commons/proper/chain/trunk/web/src/main/java/org/apache/commons/chain2/web/
- copied from r1294382, commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/
commons/proper/chain/trunk/web/src/test/java/org/
commons/proper/chain/trunk/web/src/test/java/org/apache/
commons/proper/chain/trunk/web/src/test/java/org/apache/commons/
commons/proper/chain/trunk/web/src/test/java/org/apache/commons/chain2/
commons/proper/chain/trunk/web/src/test/java/org/apache/commons/chain2/web/
- copied from r1294382, commons/proper/chain/trunk/src/test/java/org/apache/commons/chain2/web/
Removed:
commons/proper/chain/trunk/core/src/main/java/org/apache/commons/chain/
commons/proper/chain/trunk/core/src/main/java/org/apache/commons/chain2/config/
commons/proper/chain/trunk/core/src/main/java/org/apache/commons/chain2/web/
commons/proper/chain/trunk/core/src/test/java/org/apache/commons/chain/
commons/proper/chain/trunk/core/src/test/java/org/apache/commons/chain2/config/
commons/proper/chain/trunk/core/src/test/java/org/apache/commons/chain2/web/
commons/proper/chain/trunk/src/main/assembly/
commons/proper/chain/trunk/src/main/java/org/
commons/proper/chain/trunk/src/test/java/org/
commons/proper/chain/trunk/src/test/resources/org/
Modified:
commons/proper/chain/trunk/configuration/pom.xml
commons/proper/chain/trunk/core/pom.xml
commons/proper/chain/trunk/core/src/test/java/org/apache/commons/chain2/impl/ContextBaseTestCase.java
commons/proper/chain/trunk/pom.xml
commons/proper/chain/trunk/src/changes/changes.xml
commons/proper/chain/trunk/web/pom.xml
Modified: commons/proper/chain/trunk/configuration/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/configuration/pom.xml?rev=1295177&r1=1295176&r2=1295177&view=diff
==============================================================================
--- commons/proper/chain/trunk/configuration/pom.xml (original)
+++ commons/proper/chain/trunk/configuration/pom.xml Wed Feb 29 16:19:22 2012
@@ -39,6 +39,19 @@
<version>${project.parent.version}</version>
<scope>compile</scope>
</dependency>
+ <dependency>
+ <groupId>commons-digester</groupId>
+ <artifactId>commons-digester</artifactId>
+ <version>2.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>commons-chain2</artifactId>
+ <version>${project.parent.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
Modified: commons/proper/chain/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/core/pom.xml?rev=1295177&r1=1295176&r2=1295177&view=diff
==============================================================================
--- commons/proper/chain/trunk/core/pom.xml (original)
+++ commons/proper/chain/trunk/core/pom.xml Wed Feb 29 16:19:22 2012
@@ -43,6 +43,19 @@
</includes>
</resource>
</resources>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
</build>
</project>
Modified: commons/proper/chain/trunk/core/src/test/java/org/apache/commons/chain2/impl/ContextBaseTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/core/src/test/java/org/apache/commons/chain2/impl/ContextBaseTestCase.java?rev=1295177&r1=1294382&r2=1295177&view=diff
==============================================================================
--- commons/proper/chain/trunk/core/src/test/java/org/apache/commons/chain2/impl/ContextBaseTestCase.java (original)
+++ commons/proper/chain/trunk/core/src/test/java/org/apache/commons/chain2/impl/ContextBaseTestCase.java Wed Feb 29 16:19:22 2012
@@ -35,7 +35,6 @@ import java.util.Set;
import org.apache.commons.chain2.Context;
import org.apache.commons.chain2.impl.ContextBase;
-import org.apache.commons.chain2.web.WebContext;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -346,7 +345,7 @@ public class ContextBaseTestCase {
// the concrete subclasses of WebContext Serializable, because
// the underlying container objects that they wrap will not be.
// Therefore, skip testing serializability of these implementations
- if (context instanceof WebContext) {
+ if (ContextBase.class != context.getClass()) {
return;
}
Modified: commons/proper/chain/trunk/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/pom.xml?rev=1295177&r1=1295176&r2=1295177&view=diff
==============================================================================
--- commons/proper/chain/trunk/pom.xml (original)
+++ commons/proper/chain/trunk/pom.xml Wed Feb 29 16:19:22 2012
@@ -24,10 +24,11 @@
<version>23</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.commons.chain</groupId>
- <artifactId>commons-chain2</artifactId>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-chain-parent</artifactId>
<version>2.0-SNAPSHOT</version>
- <name>Commons Chain</name>
+ <packaging>pom</packaging>
+ <name>Apache Commons Chain :: Parent</name>
<description>
An implementation of the GoF Chain of Responsibility pattern
</description>
@@ -96,6 +97,14 @@
</contributor>
</contributors>
+ <modules>
+ <module>build-tools</module>
+ <module>core</module>
+ <module>configuration</module>
+ <module>web</module>
+ <module>dist</module>
+ </modules>
+
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/commons/proper/chain/trunk/</connection>
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/commons/proper/chain/trunk/</developerConnection>
@@ -115,30 +124,8 @@
<commons.osgi.dynamicImport>javax.portlet</commons.osgi.dynamicImport>
</properties>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
- <descriptor>${basedir}/src/main/assembly/bin.xml</descriptor>
- <descriptor>${basedir}/src/main/assembly/src.xml</descriptor>
- </descriptors>
- <tarLongFileMode>gnu</tarLongFileMode>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
<dependencies>
-
- <dependency>
- <groupId>commons-digester</groupId>
- <artifactId>commons-digester</artifactId>
- <version>2.1</version>
- </dependency>
-
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
@@ -146,69 +133,6 @@
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
- <optional>true</optional>
- </dependency>
-
- <dependency>
- <groupId>javax.portlet</groupId>
- <artifactId>portlet-api</artifactId>
- <version>2.0</version>
- <optional>true</optional>
- </dependency>
-
- <dependency>
- <groupId>myfaces</groupId>
- <artifactId>myfaces-api</artifactId>
- <version>1.1.0</version>
- <optional>true</optional>
- <exclusions>
- <exclusion>
- <groupId>oro</groupId>
- <artifactId>oro</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-validator</groupId>
- <artifactId>commons-validator</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-fileupload</groupId>
- <artifactId>commons-fileupload</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-el</groupId>
- <artifactId>commons-el</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-digester</groupId>
- <artifactId>commons-digester</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.10</version>
@@ -216,6 +140,30 @@
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <version>2.9.1</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-chain2-build-tools</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <goals>
+ <goal>checkstyle-aggregate</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
<reporting>
<plugins>
@@ -241,9 +189,9 @@
<artifactId>maven-checkstyle-plugin</artifactId>
<version>2.9.1</version>
<configuration>
- <configLocation>${basedir}/checkstyle.xml</configLocation>
+ <configLocation>org/apache/commons/chain2/checkstyle.xml</configLocation>
<enableRulesSummary>false</enableRulesSummary>
- <headerFile>${basedir}/license-header.txt</headerFile>
+ <headerLocation>org/apache/commons/chain2/license-header.txt</headerLocation>
</configuration>
</plugin>
@@ -262,6 +210,7 @@
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.8.1</version>
<configuration>
+ <aggregate>true</aggregate>
<linksource>true</linksource>
<links>
<link>http://download.oracle.com/javase/1.5.0/docs/api/</link>
Modified: commons/proper/chain/trunk/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/src/changes/changes.xml?rev=1295177&r1=1295176&r2=1295177&view=diff
==============================================================================
--- commons/proper/chain/trunk/src/changes/changes.xml (original)
+++ commons/proper/chain/trunk/src/changes/changes.xml Wed Feb 29 16:19:22 2012
@@ -52,6 +52,9 @@ The <action> type attribute can be add,u
<action dev="simonetripodi" type="add" issue="CHAIN-56">
clever Context with generic type "auto-cast" feature.
</action>
+ <action dev="simonetripodi" type="add" issue="CHAIN-55">
+ split the huge project in submodules.
+ </action>
<action dev="simonetripodi" type="add" issue="CHAIN-53" due-to="Elijah Zupancic">
Global Update of Chain - Generics, JDK 1.5, Update Dependency Versions.
</action>
Modified: commons/proper/chain/trunk/web/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/web/pom.xml?rev=1295177&r1=1295176&r2=1295177&view=diff
==============================================================================
--- commons/proper/chain/trunk/web/pom.xml (original)
+++ commons/proper/chain/trunk/web/pom.xml Wed Feb 29 16:19:22 2012
@@ -45,6 +45,77 @@
<version>${project.parent.version}</version>
<scope>compile</scope>
</dependency>
+
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
+ <optional>true</optional>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.portlet</groupId>
+ <artifactId>portlet-api</artifactId>
+ <version>2.0</version>
+ <optional>true</optional>
+ </dependency>
+
+ <dependency>
+ <groupId>myfaces</groupId>
+ <artifactId>myfaces-api</artifactId>
+ <version>1.1.0</version>
+ <optional>true</optional>
+ <exclusions>
+ <exclusion>
+ <groupId>oro</groupId>
+ <artifactId>oro</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-validator</groupId>
+ <artifactId>commons-validator</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-fileupload</groupId>
+ <artifactId>commons-fileupload</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-el</groupId>
+ <artifactId>commons-el</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-digester</groupId>
+ <artifactId>commons-digester</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>commons-chain2</artifactId>
+ <version>${project.parent.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>