diff options
author | rfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68> | 2009-10-26 23:44:59 +0000 |
---|---|---|
committer | rfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68> | 2009-10-26 23:44:59 +0000 |
commit | 71a7cba384b8ae7f4578fb9ab1f725d5ce616074 (patch) | |
tree | 98bbc7c066d037a8d9ea1fea7a3ccfa64419ab11 /branches/sca-java-1.x/modules/web-javascript-dojo | |
parent | 01a38d872dc2692d2a31f07f9c8f8098aa078853 (diff) |
Merge all changes from 1.5.2 branch into trunk
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@830026 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to '')
4 files changed, 6 insertions, 13 deletions
diff --git a/branches/sca-java-1.x/modules/web-javascript-dojo/NOTICE b/branches/sca-java-1.x/modules/web-javascript-dojo/NOTICE index 4b63e48b54..c11317f24d 100644 --- a/branches/sca-java-1.x/modules/web-javascript-dojo/NOTICE +++ b/branches/sca-java-1.x/modules/web-javascript-dojo/NOTICE @@ -8,3 +8,4 @@ This product includes dojotoolkit files (http://dojotoolkit.org/) under the "New" BSD License (see the LICENSE file contained in this distribution) under the following copyright Copyright (c) 2005, The Dojo Foundation. All rights reserved. + 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 15444f7d39..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 @@ -74,7 +74,7 @@ <patternset> <include name="dojo-release-${dojo.version}/dojo/**"/> <exclude name="dojo-release-${dojo.version}/dojo/tests/**"/> - <include name="dojo-release-${dojo.version}/dijit/**"/> + <exclude name="dojo-release-${dojo.version}/dijit/**"/> <exclude name="dojo-release-${dojo.version}/dojox/**"/> <exclude name="dojo-release-${dojo.version}/util/**"/> </patternset> diff --git a/branches/sca-java-1.x/modules/web-javascript-dojo/pom.xml b/branches/sca-java-1.x/modules/web-javascript-dojo/pom.xml index 5ccfe4a992..47460d3005 100644 --- a/branches/sca-java-1.x/modules/web-javascript-dojo/pom.xml +++ b/branches/sca-java-1.x/modules/web-javascript-dojo/pom.xml @@ -30,14 +30,6 @@ <name>Apache Tuscany SCA Web JavaScript for DOJO</name> <dependencies> - - <dependency> - <groupId>org.dojotoolkit</groupId> - <artifactId>dojo</artifactId> - <version>1.3.0</version> - <type>zip</type> - </dependency> - <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-core</artifactId> @@ -81,8 +73,8 @@ </dependency> </dependencies> <executions> - <execution> - <id>install-dojo</id> + <execution> + <id>install-dojo</id> <phase>validate</phase> <goals> <goal>run</goal> @@ -94,7 +86,7 @@ </ant> </tasks> </configuration> - </execution> + </execution> <execution> <id>copy-dojo-files</id> <phase>generate-resources</phase> diff --git a/branches/sca-java-1.x/modules/web-javascript-dojo/src/main/java/org/apache/tuscany/sca/web/javascript/dojo/DojoModuleActivator.java b/branches/sca-java-1.x/modules/web-javascript-dojo/src/main/java/org/apache/tuscany/sca/web/javascript/dojo/DojoModuleActivator.java index 3eaf6bf47a..987ef466fc 100644 --- a/branches/sca-java-1.x/modules/web-javascript-dojo/src/main/java/org/apache/tuscany/sca/web/javascript/dojo/DojoModuleActivator.java +++ b/branches/sca-java-1.x/modules/web-javascript-dojo/src/main/java/org/apache/tuscany/sca/web/javascript/dojo/DojoModuleActivator.java @@ -69,7 +69,7 @@ public class DojoModuleActivator implements ModuleActivator { public void stop(ExtensionPointRegistry registry) { Servlet servlet = servletHost.getServletMapping(dojoBaseUri); - if(servlet == null) { + if(servlet != null) { servletHost.removeServletMapping(dojoBaseUri); servletHost.removeServletMapping(dojoUri); |