summaryrefslogtreecommitdiffstats
path: root/sca-java-2.x/branches/2.0-Beta1 (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge r979244 change from trunk to beta1 branch to include the data-api in ↵antelder2010-07-261-0/+6
| | | | | | base jar git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@979246 13f79535-47bb-0310-9956-ffa450edef68
* Fix some snapshot -> beta1-snapshot versions which had conflicts during the ↵antelder2010-07-243-3/+3
| | | | | | merges git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@978822 13f79535-47bb-0310-9956-ffa450edef68
* Merge r967035, r967037, r967100, r967101 from trunk to beta1 brn to get ↵antelder2010-07-245-9/+38
| | | | | | samples building in brn and not deploying to mvn repo git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@978820 13f79535-47bb-0310-9956-ffa450edef68
* Merge r966703 from trunk to branch for java ci compliance test err msg updateantelder2010-07-241-1/+1
| | | | git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@978816 13f79535-47bb-0310-9956-ffa450edef68
* Merge r966706,966708,966983 from trunk to beta1 branch for policy intent and ↵antelder2010-07-243-4/+70
| | | | | | policyset updates git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@978814 13f79535-47bb-0310-9956-ffa450edef68
* Merge r966650,966653,966658,966714 from trunk to beta1 branch for property ↵antelder2010-07-245-129/+417
| | | | | | source and writing fixes git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@978812 13f79535-47bb-0310-9956-ffa450edef68
* Merge r966568,966629 from trunk to branch to fix the tomcat war legal checks ↵antelder2010-07-241-1/+7
| | | | | | test git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@978811 13f79535-47bb-0310-9956-ffa450edef68
* Merge r967047 from trunk to beta1 brn for the samples\pom.xml parent change ↵antelder2010-07-2334-60/+60
| | | | | | in all the samples git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@967108 13f79535-47bb-0310-9956-ffa450edef68
* Update RELEASE_NOTES fileantelder2010-07-221-2/+2
| | | | git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@966558 13f79535-47bb-0310-9956-ffa450edef68
* Update changes fileantelder2010-07-221-1/+7
| | | | git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@966557 13f79535-47bb-0310-9956-ffa450edef68
* Create branch for next releaseantelder2010-07-225550-0/+478816
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@966547 13f79535-47bb-0310-9956-ffa450edef68