You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by an...@apache.org on 2007/06/15 16:44:37 UTC
svn commit: r547699 - in
/incubator/tuscany/java/sca/samples/helloworld-jsonrpc: build-dojo.xml
build.xml pom.xml src/main/webapp/HelloWorldJSONRPC.html
Author: antelder
Date: Fri Jun 15 07:44:37 2007
New Revision: 547699
URL: http://svn.apache.org/viewvc?view=rev&rev=547699
Log:
json/ajax binding converge: Seperate out jsonrpc and dojo into seperate samples
Removed:
incubator/tuscany/java/sca/samples/helloworld-jsonrpc/build-dojo.xml
incubator/tuscany/java/sca/samples/helloworld-jsonrpc/src/main/webapp/HelloWorldJSONRPC.html
Modified:
incubator/tuscany/java/sca/samples/helloworld-jsonrpc/build.xml
incubator/tuscany/java/sca/samples/helloworld-jsonrpc/pom.xml
Modified: incubator/tuscany/java/sca/samples/helloworld-jsonrpc/build.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/helloworld-jsonrpc/build.xml?view=diff&rev=547699&r1=547698&r2=547699
==============================================================================
--- incubator/tuscany/java/sca/samples/helloworld-jsonrpc/build.xml (original)
+++ incubator/tuscany/java/sca/samples/helloworld-jsonrpc/build.xml Fri Jun 15 07:44:37 2007
@@ -40,14 +40,6 @@
</target>
<target name="package" depends="compile">
- <ant antfile="./build-dojo.xml" target="install-dojo-nomaven">
- <property name="localRepository" value="${settings.localRepository}"/>
- </ant>
-
- <ant antfile="./build-dojo.xml" target="unpack-dojo-files">
- <property name="localRepository" value="${settings.localRepository}"/>
- <property name="artifactId" value="${artifactId}"/>
- </ant>
<war destfile="target/sample-helloworldjsonrpc.war"
webxml="src/main/webapp/WEB-INF/web.xml">
@@ -90,10 +82,6 @@
<classes dir="target/classes"/>
</war>
- <ant antfile="./build-dojo.xml" target="clean-dojo-files">
- <property name="localRepository" value="${settings.localRepository}"/>
- <property name="artifactId" value="${artifactId}"/>
- </ant>
</target>
Modified: incubator/tuscany/java/sca/samples/helloworld-jsonrpc/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/helloworld-jsonrpc/pom.xml?view=diff&rev=547699&r1=547698&r2=547699
==============================================================================
--- incubator/tuscany/java/sca/samples/helloworld-jsonrpc/pom.xml (original)
+++ incubator/tuscany/java/sca/samples/helloworld-jsonrpc/pom.xml Fri Jun 15 07:44:37 2007
@@ -67,59 +67,7 @@
</dependencies>
<build>
- <finalName>sample-helloworldjsonrpc</finalName>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>1.1</version>
- <executions>
- <execution>
- <id>install-dojo</id>
- <phase>validate</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <ant antfile="./build-dojo.xml" target="install-dojo">
- <property name="localRepository" value="${settings.localRepository}"/>
- </ant>
- </tasks>
- </configuration>
- </execution>
- <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="${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="${artifactId}"/>
- </ant>
- </tasks>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
+ <finalName>${artifactId}</finalName>
</build>
+
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org