You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by lr...@apache.org on 2011/02/06 19:54:53 UTC
svn commit: r1067728 - in /tuscany/sca-java-2.x/trunk: ./
modules/web-javascript-dojo/ samples/applications/store-webapp/
samples/applications/store/
samples/learning-more/binding-jsonrpc/calculator-webapp/
Author: lresende
Date: Sun Feb 6 18:54:53 2011
New Revision: 1067728
URL: http://svn.apache.org/viewvc?rev=1067728&view=rev
Log:
Moving to latest dojo release (1.5.0)
Removed:
tuscany/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-webapp/build-dojo.xml
Modified:
tuscany/sca-java-2.x/trunk/modules/web-javascript-dojo/build-dojo.xml
tuscany/sca-java-2.x/trunk/modules/web-javascript-dojo/pom.xml
tuscany/sca-java-2.x/trunk/pom.xml
tuscany/sca-java-2.x/trunk/samples/applications/store-webapp/pom.xml
tuscany/sca-java-2.x/trunk/samples/applications/store/pom.xml
tuscany/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-webapp/pom.xml
Modified: tuscany/sca-java-2.x/trunk/modules/web-javascript-dojo/build-dojo.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/web-javascript-dojo/build-dojo.xml?rev=1067728&r1=1067727&r2=1067728&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/web-javascript-dojo/build-dojo.xml (original)
+++ tuscany/sca-java-2.x/trunk/modules/web-javascript-dojo/build-dojo.xml Sun Feb 6 18:54:53 2011
@@ -18,12 +18,14 @@
* under the License.
-->
<project name="DojoZipInstaller">
-
- <property name="dojo.version" value="1.3.0"/>
+ <property name="dojo.version" value="${dojoVersion}"/>
+ <echo message="${dojo.version}"/>
<property name="dojo.zip" value="${localRepository}/org/dojotoolkit/dojo/${dojo.version}/dojo-${dojo.version}.zip"/>
+ <echo message="${dojo.zip}"/>
<property name="unpack.location" value="${basedir}/src/main/resources/dojo"/>
-
+ <echo message="${unpack.location}"/>
+
<target name="check-dojo-installed">
<condition property="already.installed" >
@@ -40,7 +42,7 @@
<target name="unpack-dojo-files" depends="check-dojo-installed, check-dojo-unpacked" unless="already.unpacked">
<fail message="dojo zip file not installed in local repository: ${localRepository}" unless="already.installed"/>
<mkdir dir="${basedir}/target/dojo-unpack-temp/"/>
- <unzip src="${localRepository}/org/dojotoolkit/dojo/${dojo.version}/dojo-${dojo.version}.zip"
+ <unzip src="${dojo.zip}"
dest="${basedir}/target/dojo-unpack-temp/"
overwrite="false"
encoding="native-encoding">
@@ -57,7 +59,7 @@
verbose="true"/>
<delete dir="${basedir}/target/dojo-unpack-temp/"/>
</target>
-
+
<target name="clean-dojo-files">
<delete dir="${unpack.location}"/>
</target>
Modified: tuscany/sca-java-2.x/trunk/modules/web-javascript-dojo/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/web-javascript-dojo/pom.xml?rev=1067728&r1=1067727&r2=1067728&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/web-javascript-dojo/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/modules/web-javascript-dojo/pom.xml Sun Feb 6 18:54:53 2011
@@ -35,31 +35,31 @@
<artifactId>tuscany-core</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
-
+
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-implementation-widget</artifactId>
<version>2.0-SNAPSHOT</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-common-http</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
-
+
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-host-http</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
-
+
<dependency>
<groupId>org.dojotoolkit</groupId>
<artifactId>dojo</artifactId>
- <version>1.3.0</version>
+ <version>1.5.0</version>
<type>zip</type>
- </dependency>
+ </dependency>
<dependency>
<groupId>javax.servlet</groupId>
@@ -94,6 +94,7 @@
<ant antfile="./build-dojo.xml" target="unpack-dojo-files">
<property name="localRepository" value="${settings.localRepository}"/>
<property name="artifactId" value="${project.artifactId}"/>
+ <property name="dojoVersion" value="${dojo.version}"/>
</ant>
</tasks>
</configuration>
@@ -109,6 +110,7 @@
<ant antfile="./build-dojo.xml" target="clean-dojo-files">
<property name="localRepository" value="${settings.localRepository}"/>
<property name="artifactId" value="${project.artifactId}"/>
+ <property name="dojoVersion" value="${dojo.version}"/>
</ant>
</tasks>
</configuration>
Modified: tuscany/sca-java-2.x/trunk/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/pom.xml?rev=1067728&r1=1067727&r2=1067728&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/pom.xml Sun Feb 6 18:54:53 2011
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>7</version>
+ <version>8</version>
</parent>
<!-- ====================================================================== -->
@@ -48,6 +48,7 @@
<properties>
<notice.dir>.</notice.dir>
<tools.jar>${java.home}/../lib/tools.jar</tools.jar>
+ <dojo.version>1.5.0</dojo.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
</properties>
@@ -73,7 +74,17 @@
<enabled>false</enabled>
</snapshots>
</repository>
-
+ <repository>
+ <id>maven.org</id>
+ <name>Maven.org</name> <!-- dojo.dojotoolit repository -->
+ <url>http://repo2.maven.org/maven2/</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
</repositories>
<!-- ====================================================================== -->
Modified: tuscany/sca-java-2.x/trunk/samples/applications/store-webapp/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/applications/store-webapp/pom.xml?rev=1067728&r1=1067727&r2=1067728&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/applications/store-webapp/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/samples/applications/store-webapp/pom.xml Sun Feb 6 18:54:53 2011
@@ -7,15 +7,15 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
- * under the License.
+ * under the License.
-->
<project>
<modelVersion>4.0.0</modelVersion>
@@ -82,8 +82,7 @@
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-web-javascript-dojo</artifactId>
<version>2.0-SNAPSHOT</version>
- </dependency>
-
+ </dependency>
<dependency>
<groupId>junit</groupId>
@@ -93,7 +92,7 @@
</dependency>
</dependencies>
-
+
<build>
<finalName>${project.artifactId}</finalName>
<plugins>
@@ -108,12 +107,12 @@
<!-- context for the webapp, as finalName is not being honored -->
<path>/${project.artifactId}</path>
</configuration>
- </plugin>
+ </plugin>
<plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>maven-jetty-plugin</artifactId>
<version>6.1.18</version>
- </plugin>
+ </plugin>
</plugins>
</build>
Modified: tuscany/sca-java-2.x/trunk/samples/applications/store/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/applications/store/pom.xml?rev=1067728&r1=1067727&r2=1067728&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/applications/store/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/samples/applications/store/pom.xml Sun Feb 6 18:54:53 2011
@@ -7,15 +7,15 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
- * under the License.
+ * under the License.
-->
<project>
<modelVersion>4.0.0</modelVersion>
@@ -33,15 +33,13 @@
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-base-runtime-pom</artifactId>
<version>2.0-SNAPSHOT</version>
- <type>pom</type>
+ <type>pom</type>
</dependency>
-
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-data-api</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
-
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-binding-atom-runtime</artifactId>
@@ -77,27 +75,23 @@
<artifactId>tuscany-implementation-widget-runtime-dojo</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
-
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-web-javascript-dojo</artifactId>
<version>2.0-SNAPSHOT</version>
- </dependency>
-
+ </dependency>
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty</artifactId>
<version>6.1.19</version>
<scope>test</scope>
</dependency>
-
<dependency>
<groupId>net.sourceforge.htmlunit</groupId>
<artifactId>htmlunit</artifactId>
<version>2.6</version>
<scope>test</scope>
</dependency>
-
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
@@ -105,7 +99,7 @@
<scope>test</scope>
</dependency>
</dependencies>
-
+
<build>
<finalName>${project.artifactId}</finalName>
<plugins>
Modified: tuscany/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-webapp/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-webapp/pom.xml?rev=1067728&r1=1067727&r2=1067728&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-webapp/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-webapp/pom.xml Sun Feb 6 18:54:53 2011
@@ -7,15 +7,15 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
- * under the License.
+ * under the License.
-->
<project>
<modelVersion>4.0.0</modelVersion>
@@ -34,20 +34,19 @@
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-base-runtime</artifactId>
<version>2.0-SNAPSHOT</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
-
+
<dependency>
- <groupId>org.dojotoolkit</groupId>
- <artifactId>dojo</artifactId>
- <version>1.3.0</version>
- <type>zip</type>
- </dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-web-javascript-dojo</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ </dependency>
<dependency>
<groupId>junit</groupId>
@@ -66,42 +65,6 @@
<artifactId>maven-tuscany-plugin</artifactId>
<version>2.0-SNAPSHOT</version>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-dojo-files</id>
- <phase>generate-resources</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <ant antfile="./build-dojo.xml" target="unpack-dojo-files">
- <property name="localRepository" value="${settings.localRepository}"/>
- <property name="artifactId" value="${project.artifactId}"/>
- </ant>
- </tasks>
- </configuration>
- </execution>
- <execution>
- <id>clean-dojo-files</id>
- <phase>clean</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <ant antfile="./build-dojo.xml" target="clean-dojo-files">
- <property name="localRepository" value="${settings.localRepository}"/>
- <property name="artifactId" value="${project.artifactId}"/>
- </ant>
- </tasks>
- </configuration>
- </execution>
- </executions>
- </plugin>
<plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>maven-jetty-plugin</artifactId>
Re: svn commit: r1067728 - in /tuscany/sca-java-2.x/trunk: ./
modules/web-javascript-dojo/ samples/applications/store-webapp/
samples/applications/store/ samples/learning-more/binding-jsonrpc/calculator-webapp/
Posted by Luciano Resende <lr...@apache.org>.
On Sun, Feb 6, 2011 at 12:19 PM, ant elder <an...@gmail.com> wrote:
> On Sun, Feb 6, 2011 at 6:54 PM, <lr...@apache.org> wrote:
>
>> Modified: tuscany/sca-java-2.x/trunk/pom.xml
>> URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/pom.xml?rev=1067728&r1=1067727&r2=1067728&view=diff
>> ==============================================================================
>> --- tuscany/sca-java-2.x/trunk/pom.xml (original)
>> +++ tuscany/sca-java-2.x/trunk/pom.xml Sun Feb 6 18:54:53 2011
>> @@ -22,7 +22,7 @@
>> <parent>
>> <groupId>org.apache</groupId>
>> <artifactId>apache</artifactId>
>> - <version>7</version>
>> + <version>8</version>
>> </parent>
>>
>> <!-- ====================================================================== -->
>> @@ -48,6 +48,7 @@
>> <properties>
>> <notice.dir>.</notice.dir>
>> <tools.jar>${java.home}/../lib/tools.jar</tools.jar>
>> + <dojo.version>1.5.0</dojo.version>
>> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
>> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
>> </properties>
>> @@ -73,7 +74,17 @@
>> <enabled>false</enabled>
>> </snapshots>
>> </repository>
>> -
>> + <repository>
>> + <id>maven.org</id>
>> + <name>Maven.org</name> <!-- dojo.dojotoolit repository -->
>> + <url>http://repo2.maven.org/maven2/</url>
>> + <releases>
>> + <enabled>true</enabled>
>> + </releases>
>> + <snapshots>
>> + <enabled>false</enabled>
>> + </snapshots>
>> + </repository>
>> </repositories>
>>
>
> I've only just finished cleaning up all the repositories from the top
> level pom.xml is this new one really necessary, and if so couldn't it
> be moved to the module that requires it?
>
> ...ant
>
Done in svn r1067755.
--
Luciano Resende
http://people.apache.org/~lresende
http://twitter.com/lresende1975
http://lresende.blogspot.com/
Re: svn commit: r1067728 - in /tuscany/sca-java-2.x/trunk: ./
modules/web-javascript-dojo/ samples/applications/store-webapp/
samples/applications/store/ samples/learning-more/binding-jsonrpc/calculator-webapp/
Posted by ant elder <an...@gmail.com>.
On Sun, Feb 6, 2011 at 6:54 PM, <lr...@apache.org> wrote:
> Modified: tuscany/sca-java-2.x/trunk/pom.xml
> URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/pom.xml?rev=1067728&r1=1067727&r2=1067728&view=diff
> ==============================================================================
> --- tuscany/sca-java-2.x/trunk/pom.xml (original)
> +++ tuscany/sca-java-2.x/trunk/pom.xml Sun Feb 6 18:54:53 2011
> @@ -22,7 +22,7 @@
> <parent>
> <groupId>org.apache</groupId>
> <artifactId>apache</artifactId>
> - <version>7</version>
> + <version>8</version>
> </parent>
>
> <!-- ====================================================================== -->
> @@ -48,6 +48,7 @@
> <properties>
> <notice.dir>.</notice.dir>
> <tools.jar>${java.home}/../lib/tools.jar</tools.jar>
> + <dojo.version>1.5.0</dojo.version>
> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
> </properties>
> @@ -73,7 +74,17 @@
> <enabled>false</enabled>
> </snapshots>
> </repository>
> -
> + <repository>
> + <id>maven.org</id>
> + <name>Maven.org</name> <!-- dojo.dojotoolit repository -->
> + <url>http://repo2.maven.org/maven2/</url>
> + <releases>
> + <enabled>true</enabled>
> + </releases>
> + <snapshots>
> + <enabled>false</enabled>
> + </snapshots>
> + </repository>
> </repositories>
>
I've only just finished cleaning up all the repositories from the top
level pom.xml is this new one really necessary, and if so couldn't it
be moved to the module that requires it?
...ant