summaryrefslogtreecommitdiffstats
path: root/sca-java-2.x/branches/2.0-Beta1 (unfollow)
Commit message (Collapse)AuthorFilesLines
2010-07-26Merge r979244 change from trunk to beta1 branch to include the data-api in ↵antelder1-0/+6
base jar git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@979246 13f79535-47bb-0310-9956-ffa450edef68
2010-07-24Fix some snapshot -> beta1-snapshot versions which had conflicts during the ↵antelder3-3/+3
merges git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@978822 13f79535-47bb-0310-9956-ffa450edef68
2010-07-24Merge r967035, r967037, r967100, r967101 from trunk to beta1 brn to get ↵antelder5-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
2010-07-24Merge r966703 from trunk to branch for java ci compliance test err msg updateantelder1-1/+1
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@978816 13f79535-47bb-0310-9956-ffa450edef68
2010-07-24Merge r966706,966708,966983 from trunk to beta1 branch for policy intent and ↵antelder3-4/+70
policyset updates git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@978814 13f79535-47bb-0310-9956-ffa450edef68
2010-07-24Merge r966650,966653,966658,966714 from trunk to beta1 branch for property ↵antelder5-129/+417
source and writing fixes git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@978812 13f79535-47bb-0310-9956-ffa450edef68
2010-07-24Merge r966568,966629 from trunk to branch to fix the tomcat war legal checks ↵antelder1-1/+7
test git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@978811 13f79535-47bb-0310-9956-ffa450edef68
2010-07-23Merge r967047 from trunk to beta1 brn for the samples\pom.xml parent change ↵antelder34-60/+60
in all the samples git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@967108 13f79535-47bb-0310-9956-ffa450edef68
2010-07-22Update RELEASE_NOTES fileantelder1-2/+2
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@966558 13f79535-47bb-0310-9956-ffa450edef68
2010-07-22Update changes fileantelder1-1/+7
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@966557 13f79535-47bb-0310-9956-ffa450edef68
2010-07-22Create branch for next releaseantelder5550-0/+478816
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@966547 13f79535-47bb-0310-9956-ffa450edef68