summaryrefslogtreecommitdiffstats
path: root/branches
diff options
context:
space:
mode:
authorlresende <lresende@13f79535-47bb-0310-9956-ffa450edef68>2009-07-01 03:43:40 +0000
committerlresende <lresende@13f79535-47bb-0310-9956-ffa450edef68>2009-07-01 03:43:40 +0000
commitc196eccd131e1542245be2228847125139de757f (patch)
treef28a366259d0ca1448c362c3a090b61d008b3b30 /branches
parent059771d14acb3e11beb7253c5a12c08f6d99550d (diff)
TUSCANY-2878 - Moving to Dojo dependencies to Dojo 1.3.0 official release
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@790031 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'branches')
-rw-r--r--branches/sca-java-1.x/demos/alert-aggregator-webapp/build-dojo.xml2
-rw-r--r--branches/sca-java-1.x/demos/bigbank-account/build-dojo.xml2
-rw-r--r--branches/sca-java-1.x/demos/bigbank/build-dojo.xml2
-rw-r--r--branches/sca-java-1.x/distribution/src/main/release/bin/LICENSE2
-rw-r--r--branches/sca-java-1.x/modules/web-javascript-dojo/LICENSE35
-rw-r--r--branches/sca-java-1.x/modules/web-javascript-dojo/build-dojo.xml2
-rw-r--r--branches/sca-java-1.x/samples/customer-dojo-webapp/build-dojo.xml2
-rw-r--r--branches/sca-java-1.x/samples/customer-dojo/build-dojo.xml2
-rw-r--r--branches/sca-java-1.x/samples/helloworld-dojo-webapp/build-dojo.xml2
9 files changed, 42 insertions, 9 deletions
diff --git a/branches/sca-java-1.x/demos/alert-aggregator-webapp/build-dojo.xml b/branches/sca-java-1.x/demos/alert-aggregator-webapp/build-dojo.xml
index 57479f0cca..5c5a7dfe58 100644
--- a/branches/sca-java-1.x/demos/alert-aggregator-webapp/build-dojo.xml
+++ b/branches/sca-java-1.x/demos/alert-aggregator-webapp/build-dojo.xml
@@ -20,7 +20,7 @@
<project name="DojoZipInstaller">
- <property name="dojo.version" value="1.3.0b3"/>
+ <property name="dojo.version" value="1.3.0"/>
<property name="unpack.location" value="${basedir}/src/main/webapp/dojo"/>
diff --git a/branches/sca-java-1.x/demos/bigbank-account/build-dojo.xml b/branches/sca-java-1.x/demos/bigbank-account/build-dojo.xml
index c58645fcf4..9cc60c3d96 100644
--- a/branches/sca-java-1.x/demos/bigbank-account/build-dojo.xml
+++ b/branches/sca-java-1.x/demos/bigbank-account/build-dojo.xml
@@ -20,7 +20,7 @@
<project name="DojoZipInstaller">
- <property name="dojo.version" value="1.3.0b3"/>
+ <property name="dojo.version" value="1.3.0"/>
<property name="unpack.location" value="${basedir}/src/main/resources/web/dojo"/>
diff --git a/branches/sca-java-1.x/demos/bigbank/build-dojo.xml b/branches/sca-java-1.x/demos/bigbank/build-dojo.xml
index 55199967c3..8ef86445a0 100644
--- a/branches/sca-java-1.x/demos/bigbank/build-dojo.xml
+++ b/branches/sca-java-1.x/demos/bigbank/build-dojo.xml
@@ -20,7 +20,7 @@
<project name="DojoZipInstaller">
- <property name="dojo.version" value="1.3.0b3"/>
+ <property name="dojo.version" value="1.3.0"/>
<property name="unpack.location" value="${basedir}/src/main/resources/web/dojo"/>
diff --git a/branches/sca-java-1.x/distribution/src/main/release/bin/LICENSE b/branches/sca-java-1.x/distribution/src/main/release/bin/LICENSE
index 5b95ddbee0..277e37a8e0 100644
--- a/branches/sca-java-1.x/distribution/src/main/release/bin/LICENSE
+++ b/branches/sca-java-1.x/distribution/src/main/release/bin/LICENSE
@@ -2125,7 +2125,7 @@ dwr-2.0.3.jar :
==========================================================================
-dojotoolkit V1.0.0:
+dojotoolkit V1.3.0:
The "New" BSD License:
**********************
diff --git a/branches/sca-java-1.x/modules/web-javascript-dojo/LICENSE b/branches/sca-java-1.x/modules/web-javascript-dojo/LICENSE
index 8aa906c321..422e5f7033 100644
--- a/branches/sca-java-1.x/modules/web-javascript-dojo/LICENSE
+++ b/branches/sca-java-1.x/modules/web-javascript-dojo/LICENSE
@@ -202,4 +202,37 @@
limitations under the License.
-
+==========================================================================
+
+dojotoolkit V1.3.0:
+
+The "New" BSD License:
+**********************
+
+Copyright (c) 2005, The Dojo Foundation
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ * Redistributions of source code must retain the above copyright notice, this
+ list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+ * Neither the name of the Dojo Foundation nor the names of its contributors
+ may be used to endorse or promote products derived from this software
+ without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+================================================================================
diff --git a/branches/sca-java-1.x/modules/web-javascript-dojo/build-dojo.xml b/branches/sca-java-1.x/modules/web-javascript-dojo/build-dojo.xml
index 60f0657d68..f029ed7e87 100644
--- a/branches/sca-java-1.x/modules/web-javascript-dojo/build-dojo.xml
+++ b/branches/sca-java-1.x/modules/web-javascript-dojo/build-dojo.xml
@@ -20,7 +20,7 @@
<project name="DojoZipInstaller">
- <property name="dojo.version" value="1.3.0b3"/>
+ <property name="dojo.version" value="1.3.0"/>
<property name="unpack.location" value="${basedir}/src/main/resources/dojo"/>
diff --git a/branches/sca-java-1.x/samples/customer-dojo-webapp/build-dojo.xml b/branches/sca-java-1.x/samples/customer-dojo-webapp/build-dojo.xml
index 040e6d6a89..96942adbfe 100644
--- a/branches/sca-java-1.x/samples/customer-dojo-webapp/build-dojo.xml
+++ b/branches/sca-java-1.x/samples/customer-dojo-webapp/build-dojo.xml
@@ -20,7 +20,7 @@
<project name="DojoZipInstaller">
- <property name="dojo.version" value="1.3.0b3"/>
+ <property name="dojo.version" value="1.3.0"/>
<property name="unpack.location" value="${basedir}/src/main/webapp/dojo"/>
diff --git a/branches/sca-java-1.x/samples/customer-dojo/build-dojo.xml b/branches/sca-java-1.x/samples/customer-dojo/build-dojo.xml
index 9fedc9e7b4..f989148b64 100644
--- a/branches/sca-java-1.x/samples/customer-dojo/build-dojo.xml
+++ b/branches/sca-java-1.x/samples/customer-dojo/build-dojo.xml
@@ -20,7 +20,7 @@
<project name="DojoZipInstaller">
- <property name="dojo.version" value="1.3.0b3"/>
+ <property name="dojo.version" value="1.3.0"/>
<property name="unpack.location" value="${basedir}/target/classes/content/dojo"/>
diff --git a/branches/sca-java-1.x/samples/helloworld-dojo-webapp/build-dojo.xml b/branches/sca-java-1.x/samples/helloworld-dojo-webapp/build-dojo.xml
index 040e6d6a89..96942adbfe 100644
--- a/branches/sca-java-1.x/samples/helloworld-dojo-webapp/build-dojo.xml
+++ b/branches/sca-java-1.x/samples/helloworld-dojo-webapp/build-dojo.xml
@@ -20,7 +20,7 @@
<project name="DojoZipInstaller">
- <property name="dojo.version" value="1.3.0b3"/>
+ <property name="dojo.version" value="1.3.0"/>
<property name="unpack.location" value="${basedir}/src/main/webapp/dojo"/>