summaryrefslogtreecommitdiffstats
path: root/sca-java-2.x/branches (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
* Add missing OSGi importrfeng2010-06-091-1/+2
| | | | git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@953179 13f79535-47bb-0310-9956-ffa450edef68
* TUSCANY-3565 - Fixing merge conflict on dependency versionlresende2010-06-051-1/+1
| | | | git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@951646 13f79535-47bb-0310-9956-ffa450edef68
* svn propset svn:eol-style nativelresende2010-06-041-26/+26
| | | | git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@951607 13f79535-47bb-0310-9956-ffa450edef68
* TUSCANY-3565 - Adding missing dojo extension providerlresende2010-06-042-2/+108
| | | | git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@951590 13f79535-47bb-0310-9956-ffa450edef68
* TUSCANY-3585 - Moving to Spring 2.5.6lresende2010-06-043-16/+16
| | | | git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@951526 13f79535-47bb-0310-9956-ffa450edef68
* add README to signal /lib directory as volatilekelvingoodson2010-06-042-1/+12
| | | | git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@951438 13f79535-47bb-0310-9956-ffa450edef68
* TUSCANY-3565 - Registering dojo resource servlet only when implementation ↵lresende2010-06-049-107/+74
| | | | | | widget starts... git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@951244 13f79535-47bb-0310-9956-ffa450edef68
* TUSCANY-3583 - Making sure we recognize the headers configured declaratively ↵lresende2010-06-032-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
* add licensekelvingoodson2010-06-031-0/+18
| | | | git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@950981 13f79535-47bb-0310-9956-ffa450edef68
* add /lib description to install filekelvingoodson2010-06-031-0/+5
| | | | git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@950944 13f79535-47bb-0310-9956-ffa450edef68
* Remove extra surefire config to try to fix the tests not running issuesantelder2010-06-0312-353/+144
| | | | git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@950942 13f79535-47bb-0310-9956-ffa450edef68
* Update to not use rmi binding as that seems to conflict with something left ↵antelder2010-06-031-87/+70
| | | | | | running in the build git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@950940 13f79535-47bb-0310-9956-ffa450edef68
* minor doc fixeskelvingoodson2010-06-032-2/+2
| | | | git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@950912 13f79535-47bb-0310-9956-ffa450edef68
* TUSCANY-3564 - Updated build instructions to specify JDK 6 requirement and ↵lresende2010-06-022-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
* Add a workaround for TUSCANY-3572rfeng2010-06-021-0/+4
| | | | git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@950788 13f79535-47bb-0310-9956-ffa450edef68
* Update jackson to 1.5.3rfeng2010-06-023-8/+8
| | | | git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@950787 13f79535-47bb-0310-9956-ffa450edef68
* Adjust the path URI for web app deploymentrfeng2010-06-026-5/+34
| | | | git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@950786 13f79535-47bb-0310-9956-ffa450edef68
* Remove obsolute methodsrfeng2010-06-024-55/+0
| | | | git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@950785 13f79535-47bb-0310-9956-ffa450edef68
* TUSCANY-3582 - Pointing to the proper tuscany manifest filelresende2010-06-021-3/+3
| | | | git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@950782 13f79535-47bb-0310-9956-ffa450edef68
* merge manifest updates from trunk for fixing dosgi samples (revision r950581)kelvingoodson2010-06-027-1/+8
| | | | git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@950691 13f79535-47bb-0310-9956-ffa450edef68
* Merge 950539 to m5 branch to update test to use local loop back addressantelder2010-06-021-5/+3
| | | | git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@950540 13f79535-47bb-0310-9956-ffa450edef68
* Update plugin version to match branch versionantelder2010-06-026-129/+129
| | | | git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@950432 13f79535-47bb-0310-9956-ffa450edef68
* Merge 950415,950416 from trunk to add tuscany pluginantelder2010-06-027-0/+591
| | | | git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@950425 13f79535-47bb-0310-9956-ffa450edef68
* fix dates in READMEs etc, fix dependency version of mavan-tuscany-pluginkelvingoodson2010-06-0110-10/+10
| | | | git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@950157 13f79535-47bb-0310-9956-ffa450edef68
* TUSCANY-3570 - Reverting previous changes from r948319 as they didn't seem ↵lresende2010-05-297-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
* copy maven-tuscany-plugin version fix into branchkelvingoodson2010-05-281-2/+2
| | | | git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@949207 13f79535-47bb-0310-9956-ffa450edef68
* more maven tuscany plugin version updateskelvingoodson2010-05-283-3/+3
| | | | git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@949178 13f79535-47bb-0310-9956-ffa450edef68
* use a non snapshot maven tuscany plugin that can be downloadedkelvingoodson2010-05-283-3/+3
| | | | git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@949170 13f79535-47bb-0310-9956-ffa450edef68
* fix bad pom dependencies versionskelvingoodson2010-05-288-41/+41
| | | | git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@949139 13f79535-47bb-0310-9956-ffa450edef68
* merge r949110 from trunk to branchkelvingoodson2010-05-287-29/+104
| | | | git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@949138 13f79535-47bb-0310-9956-ffa450edef68
* TUSCANY-3573 Add a bit more info to the READMEslaws2010-05-281-1/+7
| | | | git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@949114 13f79535-47bb-0310-9956-ffa450edef68
* update branch versionkelvingoodson2010-05-27348-9874/+9874
| | | | git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@948871 13f79535-47bb-0310-9956-ffa450edef68
* Merge r948804 from trunk to m5 to include all samples by defaultantelder2010-05-271-51/+18
| | | | git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@948812 13f79535-47bb-0310-9956-ffa450edef68
* mention possibility of hazelcast related errors in the buildkelvingoodson2010-05-271-0/+11
| | | | git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@948807 13f79535-47bb-0310-9956-ffa450edef68
* Branch for 2.0 Milestone M5kelvingoodson2010-05-275359-0/+451926
| | | | git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@948800 13f79535-47bb-0310-9956-ffa450edef68
* Moving 2.x brancheslresende2009-11-113928-0/+342254
| | | | git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@835137 13f79535-47bb-0310-9956-ffa450edef68
* Moving 2.x brancheslresende2009-11-112913-0/+260756
| | | | git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@835136 13f79535-47bb-0310-9956-ffa450edef68
* Moving 2.x brancheslresende2009-11-113401-0/+289275
| | | | git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@835134 13f79535-47bb-0310-9956-ffa450edef68
* Moving 2.x brancheslresende2009-11-117400-0/+603555
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@835133 13f79535-47bb-0310-9956-ffa450edef68