[picocontainer-scm] [scm-git][2/4] Merge pull request #1 from siordache/jsonpico

Paul Hammant <git-yCVjj/[email protected]> Wed, 25 Dec 2013 14:27:26 -0600 (CST)
Newsgroups gmane.comp.java.picocontainer.cvs
Message-ID <[email protected]>
--1362581d92e45403af1d7cde6e4a985225a8b318
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
Content-Disposition: inline

commit a7e93674688e785b16a44ba20b4892b94c92822c=0AMerge: 2fb33cc 6e17359=0A=
Author:     Paul Hammant <[email protected]>=0AAuthorDate: Wed, 25 Dec 2013 =
10:22:25 -0800=0ACommit:     Paul Hammant <[email protected]>=0ACommitDate: =
Wed, 25 Dec 2013 10:22:25 -0800=0A=0A    Merge pull request #1 from siordac=
he/jsonpico=0A    =0A    Added JSON pico container=0A=0AChanged files:=0A=
=0AM	pico/gems/pom.xml=0AA	pico/gems/src/java/com/picocontainer/gems/contai=
ners/JsonPicoContainer.java=0AA	pico/gems/src/java/com/picocontainer/gems/c=
ontainers/PicoJsonException.java=0AA	pico/gems/src/test/com/picocontainer/g=
ems/containers/AbsProcessor.java=0AA	pico/gems/src/test/com/picocontainer/g=
ems/containers/JsonPicoContainerTest.java=0AA	pico/gems/src/test/com/picoco=
ntainer/gems/containers/Processor.java=0AA	pico/gems/src/test/com/picoconta=
iner/gems/containers/SeriesHandler.java=0AA	pico/gems/src/test/com/picocont=
ainer/gems/containers/SumProcessor.java=0AA	pico/gems/src/test/com/picocont=
ainer/gems/containers/cfg1.json=0AA	pico/gems/src/test/com/picocontainer/ge=
ms/containers/cfg2.json=0AA	pico/gems/src/test/com/picocontainer/gems/conta=
iners/cfg3.json=0AA	pico/gems/src/test/com/picocontainer/gems/containers/cf=
g4.json=0A=0A=0A=0A=0A=

--1362581d92e45403af1d7cde6e4a985225a8b318
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;">a7e93674688e785=
b16a44ba20b4892b94c92822c</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;">Paul =
Hammant &lt;[email protected]&gt;</dd>=0A<dt style=3D"font-size: 12px; float=
: left; font-weight: bold; min-width: 6em;">Date</dt>=0A<dd style=3D"font-s=
ize: 12px;">Wed, 25 Dec 2013 10:22:25 -0800</dd>=0A<dt style=3D"font-size: =
12px; float: left; font-weight: bold; min-width: 6em;">Message</dt>=0A<dd c=
lass=3D"multi-line" style=3D"font-size: 12px; clear: both; margin-left: 0; =
padding-top: 1em;">Merge pull request #1 from siordache/jsonpico<br style=
=3D"font-size: 12px;"><br style=3D"font-size: 12px;">Added JSON pico contai=
ner</dd>=0A</dl>Changed files:<br style=3D"font-size: 12px;"><br style=3D"f=
ont-size: 12px;">M	pico/gems/pom.xml<br style=3D"font-size: 12px;">A	pico/g=
ems/src/java/com/picocontainer/gems/containers/JsonPicoContainer.java<br st=
yle=3D"font-size: 12px;">A	pico/gems/src/java/com/picocontainer/gems/contai=
ners/PicoJsonException.java<br style=3D"font-size: 12px;">A	pico/gems/src/t=
est/com/picocontainer/gems/containers/AbsProcessor.java<br style=3D"font-si=
ze: 12px;">A	pico/gems/src/test/com/picocontainer/gems/containers/JsonPicoC=
ontainerTest.java<br style=3D"font-size: 12px;">A	pico/gems/src/test/com/pi=
cocontainer/gems/containers/Processor.java<br style=3D"font-size: 12px;">A	=
pico/gems/src/test/com/picocontainer/gems/containers/SeriesHandler.java<br =
style=3D"font-size: 12px;">A	pico/gems/src/test/com/picocontainer/gems/cont=
ainers/SumProcessor.java<br style=3D"font-size: 12px;">A	pico/gems/src/test=
/com/picocontainer/gems/containers/cfg1.json<br style=3D"font-size: 12px;">=
A	pico/gems/src/test/com/picocontainer/gems/containers/cfg2.json<br style=
=3D"font-size: 12px;">A	pico/gems/src/test/com/picocontainer/gems/container=
s/cfg3.json<br style=3D"font-size: 12px;">A	pico/gems/src/test/com/picocont=
ainer/gems/containers/cfg4.json<br style=3D"font-size: 12px;"><br style=3D"=
font-size: 12px;">=0A</body>=0A</html>=0A=

--1362581d92e45403af1d7cde6e4a985225a8b318--