commit ec9430f08770382df7fc9c60119cd0e32aab51bb
Merge: a326c23 68212c6
Author: Michael Rimov <mike.rimov-***@public.gmane.org>
AuthorDate: Tue, 30 Jul 2013 15:11:32 -0700
Commit: Michael Rimov <***@centercomp.com>
CommitDate: Tue, 30 Jul 2013 15:11:32 -0700
Merge branch 'master' of github.com:picocontainer/picocontainer
Conflicts:
pom.xml
script/script-core/pom.xml
diff --cc modules/picocontainer-modules/pom.xml
index b7c4f2e,b7c4f2e..d41cc59
--- a/modules/picocontainer-modules/pom.xml
+++ b/modules/picocontainer-modules/pom.xml
@@@ -25,13 -25,13 +25,20 @@@
<dependency>
<groupId>com.picocontainer.script</groupId><artifactId>picocontainer-script-groovy</artifactId><version>${pico-script-version}</version>
<scope>provided</scope>
++ <optional>true</optional>
</dependency>
<dependency>
<groupId>com.picocontainer.script</groupId><artifactId>picocontainer-script-rhino</artifactId><version>${pico-script-version}</version>
<scope>provided</scope>
++ <optional>true</optional>
</dependency>
<dependency>
-- <groupId>org.slf4j</groupId><artifactId>slf4j-api</artifactId><version>1.7.5</version>
++ <groupId>com.picocontainer.web</groupId><artifactId>picocontainer-web-core</artifactId><version>${pico-version}</version>
++ <scope>provided</scope>
++ <optional>true</optional>
++ </dependency>
++ <dependency>
++ <groupId>org.slf4j</groupId><artifactId>slf4j-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
@@@ -55,12 -55,12 +62,28 @@@
<groupId>commons-logging</groupId><artifactId>commons-logging</artifactId>
</exclusion>
</exclusions>
++
++ <!-- For Web Integration -->
</dependency>
++ <dependency>
++ <groupId>javax.servlet</groupId>
++ <artifactId>javax.servlet-api</artifactId>
++ <version>3.1.0</version>
++ <optional>true</optional>
++ </dependency>
++ <dependency>
++ <groupId>javax.servlet.jsp</groupId>
++ <artifactId>jsp-api</artifactId>
++ <version>2.2</version>
++ <optional>true</optional>
++ </dependency>
++
<!-- For test -->
<dependency>
-- <groupId>org.jmock</groupId><artifactId>jmock-junit4</artifactId><version>2.5.1</version>
++ <groupId>org.jmock</groupId><artifactId>jmock-junit4</artifactId>
<scope>test</scope>
</dependency>
++
</dependencies>
<scm>
<connection>scm:git:git-***@public.gmane.org/picocontainer-git.git</connection>
@@@ -208,7 -208,7 +231,7 @@@
</executions>
</plugin>
<plugin>
-- <groupId>org.apache.maven.plugins</groupId><artifactId>maven-compiler-plugin</artifactId><version>2.3.1</version>
++ <groupId>org.apache.maven.plugins</groupId><artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.5</source>
<target>1.5</target>
@@@ -219,7 -219,7 +242,7 @@@
</configuration>
</plugin>
<plugin>
-- <groupId>org.apache.maven.plugins</groupId><artifactId>maven-source-plugin</artifactId><version>2.1.2</version>
++ <groupId>org.apache.maven.plugins</groupId><artifactId>maven-source-plugin</artifactId>
<executions>
<execution>
<id>attach-sources</id>
@@@ -231,7 -231,7 +254,7 @@@
</executions>
</plugin>
<plugin>
-- <groupId>org.apache.maven.plugins</groupId><artifactId>maven-javadoc-plugin</artifactId><version>2.7</version>
++ <groupId>org.apache.maven.plugins</groupId><artifactId>maven-javadoc-plugin</artifactId>
<executions>
<execution>
<id>attach-javadocs</id>
@@@ -255,7 -255,7 +278,7 @@@
</configuration>
</plugin>
<plugin>
-- <groupId>org.apache.maven.plugins</groupId><artifactId>maven-surefire-plugin</artifactId><version>2.5</version>
++ <groupId>org.apache.maven.plugins</groupId><artifactId>maven-surefire-plugin</artifactId>
<configuration>
<junitArtifactName>junit:junit-dep</junitArtifactName>
<forkMode>once</forkMode>
@@@ -268,7 -268,7 +291,7 @@@
</configuration>
</plugin>
<plugin>
-- <groupId>org.codehaus.mojo</groupId><artifactId>cobertura-maven-plugin</artifactId><version>2.4</version>
++ <groupId>org.codehaus.mojo</groupId><artifactId>cobertura-maven-plugin</artifactId>
<executions>
<execution>
<goals>
diff --cc modules/picocontainer-modules/src/main/java/com/picocontainer/modules/deployer/AbstractPicoComposer.java
index 66bf58b,66bf58b..f30a50d
--- a/modules/picocontainer-modules/src/main/java/com/picocontainer/modules/deployer/AbstractPicoComposer.java
+++ b/modules/picocontainer-modules/src/main/java/com/picocontainer/modules/deployer/AbstractPicoComposer.java
@@@ -3,8 -3,8 +3,6 @@@
*/
package com.picocontainer.modules.deployer;
--import com.picocontainer.modules.Publisher;
--
import com.picocontainer.MutablePicoContainer;
import com.picocontainer.PicoBuilder;
diff --cc modules/picocontainer-modules/src/test/java/com/picocontainer/modules/ImporterTestCase.java
index 98ab309,98ab309..a72573d
--- a/modules/picocontainer-modules/src/test/java/com/picocontainer/modules/ImporterTestCase.java
+++ b/modules/picocontainer-modules/src/test/java/com/picocontainer/modules/ImporterTestCase.java
@@@ -8,11 -8,11 +8,10 @@@ import org.apache.commons.vfs.VFS
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
--import com.picocontainer.modules.testing.InMemoryModuleFolder;
--import com.picocontainer.script.util.MultiException;
--import com.picocontainer.testmodel.DependsOnTouchable;
import com.picocontainer.PicoContainer;
++import com.picocontainer.modules.testing.InMemoryModuleFolder;
++import com.picocontainer.testmodel.DependsOnTouchable;
public class ImporterTestCase {
@@@ -112,7 -112,7 +111,7 @@@
moduleFolder.addModule("moduleA", moduleA);
moduleFolder.addModule("moduleB", moduleB);
-- moduleFolder.addModule("moduleC", moduleB);
++ moduleFolder.addModule("moduleC", moduleC);
try {
PicoContainer pico = moduleSystem.deploy().getPico();
diff --cc modules/picocontainer-modules/src/test/java/com/picocontainer/modules/PublisherTestCase.java
index d747181,d747181..3608e8b
--- a/modules/picocontainer-modules/src/test/java/com/picocontainer/modules/PublisherTestCase.java
+++ b/modules/picocontainer-modules/src/test/java/com/picocontainer/modules/PublisherTestCase.java
@@@ -1,8 -1,8 +1,9 @@@
package com.picocontainer.modules;
--import static org.junit.Assert.*;
++import static org.junit.Assert.assertEquals;
++import static org.junit.Assert.assertNotNull;
++import static org.junit.Assert.assertNull;
--import org.junit.After;
import org.junit.Before;
import org.junit.Test;
diff --cc modules/picocontainer-modules/src/test/java/com/picocontainer/modules/deployer/DefaultModuleLayoutTestCase.java
index 05f93f8,05f93f8..d76b819
--- a/modules/picocontainer-modules/src/test/java/com/picocontainer/modules/deployer/DefaultModuleLayoutTestCase.java
+++ b/modules/picocontainer-modules/src/test/java/com/picocontainer/modules/deployer/DefaultModuleLayoutTestCase.java
@@@ -13,7 -13,7 +13,6 @@@ import java.util.Arrays
import org.apache.commons.vfs.FileName;
import org.apache.commons.vfs.FileObject;
import org.apache.commons.vfs.FileSystemException;
--import org.apache.commons.vfs.NameScope;
import org.apache.commons.vfs.impl.DefaultFileReplicator;
import org.apache.commons.vfs.impl.DefaultFileSystemManager;
import org.apache.commons.vfs.impl.VFSClassLoader;
diff --cc script/script-core/pom.xml
index 94f959c,cca9130..6914a22
--- a/script/script-core/pom.xml
+++ b/script/script-core/pom.xml
@@@ -24,7 -23,8 +24,8 @@@
<groupId>xpp3</groupId><artifactId>xpp3_min</artifactId>
</exclusion>
</exclusions>
- <optional>true</optional>
+ <scope>provided</scope>
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>commons-cli</groupId><artifactId>commons-cli</artifactId><version>1.2</version>
Changed files:
A pico/mockpico/src/java/com/picocontainer/mockpico/Journal.java
A pico/mockpico/src/java/com/picocontainer/mockpico/Mockpico.java
D pico/mockpico/src/java/com/thoughtworks/mockpico/Journal.java
D pico/mockpico/src/java/com/thoughtworks/mockpico/Mockpico.java
A pico/mockpico/src/test/com/picocontainer/mockpico/MockpicoTestCase.java
D pico/mockpico/src/test/com/thoughtworks/mockpico/MockpicoTestCase.java
D pico/mockpico/.gitignore
M pico/mockpico/pom.xml
A pico/mockpico/src/java/com/thoughtworks/mockpico/Journal.java
A pico/mockpico/src/java/com/thoughtworks/mockpico/Mockpico.java
D pico/mockpico/src/main/java/com/thoughtworks/mockpico/Journal.java
D pico/mockpico/src/main/java/com/thoughtworks/mockpico/Mockpico.java
A pico/mockpico/src/test/com/thoughtworks/mockpico/MockpicoTestCase.java
D pico/mockpico/src/test/java/com/thoughtworks/mockpico/MockpicoTestCase.java
M pico/pom.xml
A pico/mockpico/.gitignore
A pico/mockpico/pom.xml
A pico/mockpico/src/main/java/com/thoughtworks/mockpico/Journal.java
A pico/mockpico/src/main/java/com/thoughtworks/mockpico/Mockpico.java
A pico/mockpico/src/test/java/com/thoughtworks/mockpico/MockpicoTestCase.java
M pico/container/src/java/com/picocontainer/JTypeHelper.java
M pico/container/src/test/com/picocontainer/parameters/ParameterTestCase.java
M pom.xml
M web/web-core/src/test/com/picocontainer/web/JavaVersionTestCase.java
A web/web-core/src/test/com/picocontainer/web/JavaVersionTestCase.java
M script/script-core/src/test-comp/NotStartable.jar
M script/script-core/src/test-comp/TestComp.jar
M script/script-core/src/test-comp/TestComp2.jar
M script/script-core/src/test-comp/build.bat
M script/script-core/src/test-comp/build.sh
M script/script-core/pom.xml