[picocontainer-scm] [scm-git][7/12] Merge branch 'master' of github.com:picocontainer/picocontainer
Michael Rimov <git-yCVjj/[email protected]> Thu, 8 Aug 2013 23:09:33 -0500 (CDT)
| Newsgroups | gmane.comp.java.picocontainer.cvs |
|---|---|
| Message-ID | <[email protected]> |
--1244f9f328e638303d7ee5eef930123b92702f14 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Content-Disposition: inline commit ec9430f08770382df7fc9c60119cd0e32aab51bb=0AMerge: a326c23 68212c6=0A= Author: Michael Rimov <[email protected]>=0AAuthorDate: Tue, 30= Jul 2013 15:11:32 -0700=0ACommit: Michael Rimov <mike.rimov@centercomp= .com>=0ACommitDate: Tue, 30 Jul 2013 15:11:32 -0700=0A=0A Merge branch '= master' of github.com:picocontainer/picocontainer=0A =0A Conflicts:= =0A pom.xml=0A script/script-core/pom.xml=0A=0Adiff --cc modules/pi= cocontainer-modules/pom.xml=0Aindex b7c4f2e,b7c4f2e..d41cc59=0A--- a/module= s/picocontainer-modules/pom.xml=0A+++ b/modules/picocontainer-modules/pom.x= ml=0A@@@ -25,13 -25,13 +25,20 @@@=0A <dependency>=0A = <groupId>com.picocontainer.script</groupId><artifactId>picocontainer-script= -groovy</artifactId><version>${pico-script-version}</version>=0A = <scope>provided</scope>=0A++ <optional>true</optional>=0A = </dependency>=0A <dependency>=0A <groupId>com.p= icocontainer.script</groupId><artifactId>picocontainer-script-rhino</artifa= ctId><version>${pico-script-version}</version>=0A <scope>provi= ded</scope>=0A++ <optional>true</optional>=0A </depende= ncy>=0A <dependency>=0A-- <groupId>org.slf4j</groupId><= artifactId>slf4j-api</artifactId><version>1.7.5</version>=0A++ <= groupId>com.picocontainer.web</groupId><artifactId>picocontainer-web-core</= artifactId><version>${pico-version}</version>=0A++ <scope>provid= ed</scope>=0A++ <optional>true</optional>=0A++ </dependen= cy> =0A++ <dependency>=0A++ <groupId>org.slf4j</gr= oupId><artifactId>slf4j-api</artifactId>=0A <scope>provided</s= cope>=0A </dependency>=0A <dependency>=0A@@@ -55,12 -55,1= 2 +62,28 @@@=0A <groupId>commons-logging</groupId><art= ifactId>commons-logging</artifactId>=0A </exclusion>=0A = </exclusions>=0A++ =0A++ <!-- For Web Integra= tion -->=0A </dependency>=0A++ <dependency>=0A++ <groupId>jav= ax.servlet</groupId>=0A++ <artifactId>javax.servlet-api</artifactId>=0A+= + <version>3.1.0</version>=0A++ <optional>true</optional>=0A++ </de= pendency>=0A++ <dependency>=0A++ <groupId>javax.servlet.jsp</groupId>= =0A++ <artifactId>jsp-api</artifactId>=0A++ <version>2.2</version>=0A= ++ <optional>true</optional>=0A++ </dependency> =0A++ = =0A <!-- For test -->=0A <dependency>=0A-- <gr= oupId>org.jmock</groupId><artifactId>jmock-junit4</artifactId><version>2.5.= 1</version>=0A++ <groupId>org.jmock</groupId><artifactId>jmock-j= unit4</artifactId>=0A <scope>test</scope>=0A </depend= ency>=0A++ =0A </dependencies>=0A <scm>=0A <connec= tion>scm:git:[email protected]/picocontainer-git.git</connection>=0A@@@ = -208,7 -208,7 +231,7 @@@=0A </executions>=0A = </plugin>=0A <plugin>=0A-- <groupId>org.apache.= maven.plugins</groupId><artifactId>maven-compiler-plugin</artifactId><versi= on>2.3.1</version>=0A++ <groupId>org.apache.maven.plugins</g= roupId><artifactId>maven-compiler-plugin</artifactId>=0A <= configuration>=0A <source>1.5</source>=0A = <target>1.5</target>=0A@@@ -219,7 -219,7 +242,7 @@@=0A = </configuration>=0A </plugin>=0A <plugin>= =0A-- <groupId>org.apache.maven.plugins</groupId><artifactId= >maven-source-plugin</artifactId><version>2.1.2</version>=0A++ = <groupId>org.apache.maven.plugins</groupId><artifactId>maven-source-plug= in</artifactId>=0A <executions>=0A <e= xecution>=0A <id>attach-sources</id>=0A@@@ -231,7 = -231,7 +254,7 @@@=0A </executions>=0A </plugi= n>=0A <plugin>=0A-- <groupId>org.apache.maven.p= lugins</groupId><artifactId>maven-javadoc-plugin</artifactId><version>2.7</= version>=0A++ <groupId>org.apache.maven.plugins</groupId><ar= tifactId>maven-javadoc-plugin</artifactId>=0A <executions>= =0A <execution>=0A <id>attach= -javadocs</id>=0A@@@ -255,7 -255,7 +278,7 @@@=0A </configu= ration>=0A </plugin>=0A <plugin>=0A-- = <groupId>org.apache.maven.plugins</groupId><artifactId>maven-surefire-p= lugin</artifactId><version>2.5</version>=0A++ <groupId>org.a= pache.maven.plugins</groupId><artifactId>maven-surefire-plugin</artifactId>= =0A <configuration>=0A <junitArtifact= Name>junit:junit-dep</junitArtifactName>=0A <forkMode>= once</forkMode>=0A@@@ -268,7 -268,7 +291,7 @@@=0A </config= uration>=0A </plugin>=0A <plugin>=0A-- = <groupId>org.codehaus.mojo</groupId><artifactId>cobertura-maven-plugin= </artifactId><version>2.4</version>=0A++ <groupId>org.codeha= us.mojo</groupId><artifactId>cobertura-maven-plugin</artifactId>=0A = <executions>=0A <execution>=0A = <goals>=0Adiff --cc modules/picocontainer-modules/src/main/java= /com/picocontainer/modules/deployer/AbstractPicoComposer.java=0Aindex 66bf5= 8b,66bf58b..f30a50d=0A--- a/modules/picocontainer-modules/src/main/java/com= /picocontainer/modules/deployer/AbstractPicoComposer.java=0A+++ b/modules/p= icocontainer-modules/src/main/java/com/picocontainer/modules/deployer/Abstr= actPicoComposer.java=0A@@@ -3,8 -3,8 +3,6 @@@=0A */=0A package com.picoc= ontainer.modules.deployer;=0A =0A--import com.picocontainer.modules.Publis= her;=0A--=0A import com.picocontainer.MutablePicoContainer;=0A import com= .picocontainer.PicoBuilder;=0A =0Adiff --cc modules/picocontainer-modules/= src/test/java/com/picocontainer/modules/ImporterTestCase.java=0Aindex 98ab3= 09,98ab309..a72573d=0A--- a/modules/picocontainer-modules/src/test/java/com= /picocontainer/modules/ImporterTestCase.java=0A+++ b/modules/picocontainer-= modules/src/test/java/com/picocontainer/modules/ImporterTestCase.java=0A@@@= -8,11 -8,11 +8,10 @@@ import org.apache.commons.vfs.VFS=0A import org.jun= it.After;=0A import org.junit.Before;=0A import org.junit.Test;=0A--impor= t com.picocontainer.modules.testing.InMemoryModuleFolder;=0A--import com.pi= cocontainer.script.util.MultiException;=0A--import com.picocontainer.testmo= del.DependsOnTouchable;=0A =0A import com.picocontainer.PicoContainer;=0A= ++import com.picocontainer.modules.testing.InMemoryModuleFolder;=0A++import= com.picocontainer.testmodel.DependsOnTouchable;=0A =0A public class Impo= rterTestCase {=0A =0A@@@ -112,7 -112,7 +111,7 @@@=0A =0A moduleFold= er.addModule("moduleA", moduleA);=0A moduleFolder.addModule("moduleB", m= oduleB);=0A-- moduleFolder.addModule("moduleC", moduleB);=0A++ moduleFold= er.addModule("moduleC", moduleC);=0A =0A try {=0A PicoContainer p= ico =3D moduleSystem.deploy().getPico();=0Adiff --cc modules/picocontainer-= modules/src/test/java/com/picocontainer/modules/PublisherTestCase.java=0Ain= dex d747181,d747181..3608e8b=0A--- a/modules/picocontainer-modules/src/test= /java/com/picocontainer/modules/PublisherTestCase.java=0A+++ b/modules/pico= container-modules/src/test/java/com/picocontainer/modules/PublisherTestCase= .java=0A@@@ -1,8 -1,8 +1,9 @@@=0A package com.picocontainer.modules;=0A = =0A--import static org.junit.Assert.*;=0A++import static org.junit.Assert.a= ssertEquals;=0A++import static org.junit.Assert.assertNotNull;=0A++import s= tatic org.junit.Assert.assertNull;=0A =0A--import org.junit.After;=0A imp= ort org.junit.Before;=0A import org.junit.Test;=0A =0Adiff --cc modules/p= icocontainer-modules/src/test/java/com/picocontainer/modules/deployer/Defau= ltModuleLayoutTestCase.java=0Aindex 05f93f8,05f93f8..d76b819=0A--- a/module= s/picocontainer-modules/src/test/java/com/picocontainer/modules/deployer/De= faultModuleLayoutTestCase.java=0A+++ b/modules/picocontainer-modules/src/te= st/java/com/picocontainer/modules/deployer/DefaultModuleLayoutTestCase.java= =0A@@@ -13,7 -13,7 +13,6 @@@ import java.util.Arrays=0A import org.apache.= commons.vfs.FileName;=0A import org.apache.commons.vfs.FileObject;=0A imp= ort org.apache.commons.vfs.FileSystemException;=0A--import org.apache.commo= ns.vfs.NameScope;=0A import org.apache.commons.vfs.impl.DefaultFileReplica= tor;=0A import org.apache.commons.vfs.impl.DefaultFileSystemManager;=0A i= mport org.apache.commons.vfs.impl.VFSClassLoader;=0Adiff --cc script/script= -core/pom.xml=0Aindex 94f959c,cca9130..6914a22=0A--- a/script/script-core/p= om.xml=0A+++ b/script/script-core/pom.xml=0A@@@ -24,7 -23,8 +24,8 @@@=0A = <groupId>xpp3</groupId><artifactId>xpp3_min</artifactId>= =0A </exclusion>=0A </exclusions>=0A - = <optional>true</optional>=0A + <scope>provided</scope>=0A+ = <scope>compile</scope>=0A </dependency>=0A <d= ependency>=0A <groupId>commons-cli</groupId><artifactId>common= s-cli</artifactId><version>1.2</version>=0AChanged files:=0A=0AA pico/mockp= ico/src/java/com/picocontainer/mockpico/Journal.java=0AA pico/mockpico/src/= java/com/picocontainer/mockpico/Mockpico.java=0AD pico/mockpico/src/java/co= m/thoughtworks/mockpico/Journal.java=0AD pico/mockpico/src/java/com/thought= works/mockpico/Mockpico.java=0AA pico/mockpico/src/test/com/picocontainer/m= ockpico/MockpicoTestCase.java=0AD pico/mockpico/src/test/com/thoughtworks/m= ockpico/MockpicoTestCase.java=0AD pico/mockpico/.gitignore=0AM pico/mockpic= o/pom.xml=0AA pico/mockpico/src/java/com/thoughtworks/mockpico/Journal.java= =0AA pico/mockpico/src/java/com/thoughtworks/mockpico/Mockpico.java=0AD pic= o/mockpico/src/main/java/com/thoughtworks/mockpico/Journal.java=0AD pico/mo= ckpico/src/main/java/com/thoughtworks/mockpico/Mockpico.java=0AA pico/mockp= ico/src/test/com/thoughtworks/mockpico/MockpicoTestCase.java=0AD pico/mockp= ico/src/test/java/com/thoughtworks/mockpico/MockpicoTestCase.java=0AM pico/= pom.xml=0AA pico/mockpico/.gitignore=0AA pico/mockpico/pom.xml=0AA pico/moc= kpico/src/main/java/com/thoughtworks/mockpico/Journal.java=0AA pico/mockpic= o/src/main/java/com/thoughtworks/mockpico/Mockpico.java=0AA pico/mockpico/s= rc/test/java/com/thoughtworks/mockpico/MockpicoTestCase.java=0AM pico/conta= iner/src/java/com/picocontainer/JTypeHelper.java=0AM pico/container/src/tes= t/com/picocontainer/parameters/ParameterTestCase.java=0AM pom.xml=0AM web/w= eb-core/src/test/com/picocontainer/web/JavaVersionTestCase.java=0AA web/web= -core/src/test/com/picocontainer/web/JavaVersionTestCase.java=0AM script/sc= ript-core/src/test-comp/NotStartable.jar=0AM script/script-core/src/test-co= mp/TestComp.jar=0AM script/script-core/src/test-comp/TestComp2.jar=0AM scri= pt/script-core/src/test-comp/build.bat=0AM script/script-core/src/test-comp= /build.sh=0AM script/script-core/pom.xml=0A=0A=0A=0A=0A= --1244f9f328e638303d7ee5eef930123b92702f14 Content-Type: text/html; charset=utf-8 Content-Transfer-Encoding: quoted-printable Content-Disposition: inline <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w= 3.org/TR/REC-html40/loose.dtd">=0A<html style=3D"font-size: 12px;">=0A<head= ><meta http-equiv=3D"Content-type" content=3D"text/html; charset=3Dutf-8"><= /head>=0A<body style=3D"font-size: 12px;">=0A<style type=3D"text/css">=0Adt= :after { content: ':' !important; }=0A></style>=0A<dl class=3D"title" style= =3D"font-size: 12px; font-family: Verdana; background-color: #ddd; padding:= 10px;">=0A<dt style=3D"font-size: 12px; float: left; font-weight: bold; mi= n-width: 6em;">Commit</dt>=0A<dd style=3D"font-size: 12px;">ec9430f08770382= df7fc9c60119cd0e32aab51bb</dd>=0A<dt style=3D"font-size: 12px; float: left;= font-weight: bold; min-width: 6em;">Branch</dt>=0A<dd style=3D"font-size: = 12px;">master</dd>=0A<dt style=3D"font-size: 12px; float: left; font-weight= : bold; min-width: 6em;">Author</dt>=0A<dd style=3D"font-size: 12px;">Micha= el Rimov <[email protected]></dd>=0A<dt style=3D"font-size: 1= 2px; float: left; font-weight: bold; min-width: 6em;">Date</dt>=0A<dd style= =3D"font-size: 12px;">Tue, 30 Jul 2013 15:11:32 -0700</dd>=0A<dt style=3D"f= ont-size: 12px; float: left; font-weight: bold; min-width: 6em;">Message</d= t>=0A<dd class=3D"multi-line" style=3D"font-size: 12px; clear: both; margin= -left: 0; padding-top: 1em;">Merge branch 'master' of github.com:picocontai= ner/picocontainer<br style=3D"font-size: 12px;"><br style=3D"font-size: 12p= x;">Conflicts:<br style=3D"font-size: 12px;">pom.xml<br style=3D"font-size:= 12px;">script/script-core/pom.xml</dd>=0A</dl>Changed files:<br style=3D"f= ont-size: 12px;"><br style=3D"font-size: 12px;">A pico/mockpico/src/java/co= m/picocontainer/mockpico/Journal.java<br style=3D"font-size: 12px;">A pico/= mockpico/src/java/com/picocontainer/mockpico/Mockpico.java<br style=3D"font= -size: 12px;">D pico/mockpico/src/java/com/thoughtworks/mockpico/Journal.ja= va<br style=3D"font-size: 12px;">D pico/mockpico/src/java/com/thoughtworks/= mockpico/Mockpico.java<br style=3D"font-size: 12px;">A pico/mockpico/src/te= st/com/picocontainer/mockpico/MockpicoTestCase.java<br style=3D"font-size: = 12px;">D pico/mockpico/src/test/com/thoughtworks/mockpico/MockpicoTestCase.= java<br style=3D"font-size: 12px;">D pico/mockpico/.gitignore<br style=3D"f= ont-size: 12px;">M pico/mockpico/pom.xml<br style=3D"font-size: 12px;">A pi= co/mockpico/src/java/com/thoughtworks/mockpico/Journal.java<br style=3D"fon= t-size: 12px;">A pico/mockpico/src/java/com/thoughtworks/mockpico/Mockpico.= java<br style=3D"font-size: 12px;">D pico/mockpico/src/main/java/com/though= tworks/mockpico/Journal.java<br style=3D"font-size: 12px;">D pico/mockpico/= src/main/java/com/thoughtworks/mockpico/Mockpico.java<br style=3D"font-size= : 12px;">A pico/mockpico/src/test/com/thoughtworks/mockpico/MockpicoTestCas= e.java<br style=3D"font-size: 12px;">D pico/mockpico/src/test/java/com/thou= ghtworks/mockpico/MockpicoTestCase.java<br style=3D"font-size: 12px;">M pic= o/pom.xml<br style=3D"font-size: 12px;">A pico/mockpico/.gitignore<br style= =3D"font-size: 12px;">A pico/mockpico/pom.xml<br style=3D"font-size: 12px;"= >A pico/mockpico/src/main/java/com/thoughtworks/mockpico/Journal.java<br st= yle=3D"font-size: 12px;">A pico/mockpico/src/main/java/com/thoughtworks/moc= kpico/Mockpico.java<br style=3D"font-size: 12px;">A pico/mockpico/src/test/= java/com/thoughtworks/mockpico/MockpicoTestCase.java<br style=3D"font-size:= 12px;">M pico/container/src/java/com/picocontainer/JTypeHelper.java<br sty= le=3D"font-size: 12px;">M pico/container/src/test/com/picocontainer/paramet= ers/ParameterTestCase.java<br style=3D"font-size: 12px;">M pom.xml<br style= =3D"font-size: 12px;">M web/web-core/src/test/com/picocontainer/web/JavaVer= sionTestCase.java<br style=3D"font-size: 12px;">A web/web-core/src/test/com= /picocontainer/web/JavaVersionTestCase.java<br style=3D"font-size: 12px;">M= script/script-core/src/test-comp/NotStartable.jar<br style=3D"font-size: 1= 2px;">M script/script-core/src/test-comp/TestComp.jar<br style=3D"font-size= : 12px;">M script/script-core/src/test-comp/TestComp2.jar<br style=3D"font-= size: 12px;">M script/script-core/src/test-comp/build.bat<br style=3D"font-= size: 12px;">M script/script-core/src/test-comp/build.sh<br style=3D"font-s= ize: 12px;">M script/script-core/pom.xml<br style=3D"font-size: 12px;"><br = style=3D"font-size: 12px;">=0A</body>=0A</html>=0A= --1244f9f328e638303d7ee5eef930123b92702f14--