summaryrefslogtreecommitdiffstats
path: root/sca-java-2.x/branches (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
2010-06-09Add missing OSGi importrfeng1-1/+2
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@953179 13f79535-47bb-0310-9956-ffa450edef68
2010-06-05TUSCANY-3565 - Fixing merge conflict on dependency versionlresende1-1/+1
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@951646 13f79535-47bb-0310-9956-ffa450edef68
2010-06-04svn propset svn:eol-style nativelresende1-26/+26
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@951607 13f79535-47bb-0310-9956-ffa450edef68
2010-06-04TUSCANY-3565 - Adding missing dojo extension providerlresende2-2/+108
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@951590 13f79535-47bb-0310-9956-ffa450edef68
2010-06-04TUSCANY-3585 - Moving to Spring 2.5.6lresende3-16/+16
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@951526 13f79535-47bb-0310-9956-ffa450edef68
2010-06-04add README to signal /lib directory as volatilekelvingoodson2-1/+12
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@951438 13f79535-47bb-0310-9956-ffa450edef68
2010-06-04TUSCANY-3565 - Registering dojo resource servlet only when implementation ↵lresende9-107/+74
widget starts... git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@951244 13f79535-47bb-0310-9956-ffa450edef68
2010-06-03TUSCANY-3583 - Making sure we recognize the headers configured declaratively ↵lresende2-2/+46
in composite file when delegating to JAX-RS runtime git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@951133 13f79535-47bb-0310-9956-ffa450edef68
2010-06-03add licensekelvingoodson1-0/+18
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@950981 13f79535-47bb-0310-9956-ffa450edef68
2010-06-03add /lib description to install filekelvingoodson1-0/+5
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@950944 13f79535-47bb-0310-9956-ffa450edef68
2010-06-03Remove extra surefire config to try to fix the tests not running issuesantelder12-353/+144
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@950942 13f79535-47bb-0310-9956-ffa450edef68
2010-06-03Update to not use rmi binding as that seems to conflict with something left ↵antelder1-87/+70
running in the build git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@950940 13f79535-47bb-0310-9956-ffa450edef68
2010-06-03minor doc fixeskelvingoodson2-2/+2
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@950912 13f79535-47bb-0310-9956-ffa450edef68
2010-06-02TUSCANY-3564 - Updated build instructions to specify JDK 6 requirement and ↵lresende2-4/+5
updated changes file to notify users we droped JDK 5 support git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@950812 13f79535-47bb-0310-9956-ffa450edef68
2010-06-02Add a workaround for TUSCANY-3572rfeng1-0/+4
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@950788 13f79535-47bb-0310-9956-ffa450edef68
2010-06-02Update jackson to 1.5.3rfeng3-8/+8
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@950787 13f79535-47bb-0310-9956-ffa450edef68
2010-06-02Adjust the path URI for web app deploymentrfeng6-5/+34
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@950786 13f79535-47bb-0310-9956-ffa450edef68
2010-06-02Remove obsolute methodsrfeng4-55/+0
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@950785 13f79535-47bb-0310-9956-ffa450edef68
2010-06-02TUSCANY-3582 - Pointing to the proper tuscany manifest filelresende1-3/+3
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@950782 13f79535-47bb-0310-9956-ffa450edef68
2010-06-02merge manifest updates from trunk for fixing dosgi samples (revision r950581)kelvingoodson7-1/+8
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@950691 13f79535-47bb-0310-9956-ffa450edef68
2010-06-02Merge 950539 to m5 branch to update test to use local loop back addressantelder1-5/+3
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@950540 13f79535-47bb-0310-9956-ffa450edef68
2010-06-02Update plugin version to match branch versionantelder6-129/+129
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@950432 13f79535-47bb-0310-9956-ffa450edef68
2010-06-02Merge 950415,950416 from trunk to add tuscany pluginantelder7-0/+591
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@950425 13f79535-47bb-0310-9956-ffa450edef68
2010-06-01fix dates in READMEs etc, fix dependency version of mavan-tuscany-pluginkelvingoodson10-10/+10
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@950157 13f79535-47bb-0310-9956-ffa450edef68
2010-05-29TUSCANY-3570 - Reverting previous changes from r948319 as they didn't seem ↵lresende7-20/+0
to have any effect to the issue reported git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@949341 13f79535-47bb-0310-9956-ffa450edef68
2010-05-28copy maven-tuscany-plugin version fix into branchkelvingoodson1-2/+2
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@949207 13f79535-47bb-0310-9956-ffa450edef68
2010-05-28more maven tuscany plugin version updateskelvingoodson3-3/+3
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@949178 13f79535-47bb-0310-9956-ffa450edef68
2010-05-28use a non snapshot maven tuscany plugin that can be downloadedkelvingoodson3-3/+3
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@949170 13f79535-47bb-0310-9956-ffa450edef68
2010-05-28fix bad pom dependencies versionskelvingoodson8-41/+41
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@949139 13f79535-47bb-0310-9956-ffa450edef68
2010-05-28merge r949110 from trunk to branchkelvingoodson7-29/+104
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@949138 13f79535-47bb-0310-9956-ffa450edef68
2010-05-28TUSCANY-3573 Add a bit more info to the READMEslaws1-1/+7
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@949114 13f79535-47bb-0310-9956-ffa450edef68
2010-05-27update branch versionkelvingoodson348-9874/+9874
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@948871 13f79535-47bb-0310-9956-ffa450edef68
2010-05-27Merge r948804 from trunk to m5 to include all samples by defaultantelder1-51/+18
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@948812 13f79535-47bb-0310-9956-ffa450edef68
2010-05-27mention possibility of hazelcast related errors in the buildkelvingoodson1-0/+11
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@948807 13f79535-47bb-0310-9956-ffa450edef68
2010-05-27Branch for 2.0 Milestone M5kelvingoodson5359-0/+451926
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@948800 13f79535-47bb-0310-9956-ffa450edef68
2009-11-11Moving 2.x brancheslresende3928-0/+342254
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@835137 13f79535-47bb-0310-9956-ffa450edef68
2009-11-11Moving 2.x brancheslresende2913-0/+260756
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@835136 13f79535-47bb-0310-9956-ffa450edef68
2009-11-11Moving 2.x brancheslresende3401-0/+289275
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@835134 13f79535-47bb-0310-9956-ffa450edef68
2009-11-11Moving 2.x brancheslresende7400-0/+603555
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@835133 13f79535-47bb-0310-9956-ffa450edef68