Return-Path: 
 <tuscany-commits-return-10148-apmail-ws-tuscany-commits-archive=ws.apache.org@ws.apache.org>
Delivered-To: apmail-ws-tuscany-commits-archive@locus.apache.org
Received: (qmail 6036 invoked from network); 15 Jun 2007 14:44:59 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 15 Jun 2007 14:44:59 -0000
Received: (qmail 17162 invoked by uid 500); 15 Jun 2007 14:45:02 -0000
Delivered-To: apmail-ws-tuscany-commits-archive@ws.apache.org
Received: (qmail 17142 invoked by uid 500); 15 Jun 2007 14:45:02 -0000
Mailing-List: contact tuscany-commits-help@ws.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:tuscany-commits-help@ws.apache.org>
List-Unsubscribe: <mailto:tuscany-commits-unsubscribe@ws.apache.org>
List-Post: <mailto:tuscany-commits@ws.apache.org>
List-Id: <tuscany-commits.ws.apache.org>
Reply-To: tuscany-dev@ws.apache.org
Delivered-To: mailing list tuscany-commits@ws.apache.org
Received: (qmail 17131 invoked by uid 99); 15 Jun 2007 14:45:02 -0000
Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 15 Jun 2007 07:45:02 -0700
X-ASF-Spam-Status: No, hits=-99.5 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 15 Jun 2007 07:44:58 -0700
Received: by eris.apache.org (Postfix, from userid 65534)
	id EEF811A981D; Fri, 15 Jun 2007 07:44:37 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r547699 - in
 /incubator/tuscany/java/sca/samples/helloworld-jsonrpc: build-dojo.xml
 build.xml pom.xml src/main/webapp/HelloWorldJSONRPC.html
Date: Fri, 15 Jun 2007 14:44:37 -0000
To: tuscany-commits@ws.apache.org
From: antelder@apache.org
X-Mailer: svnmailer-1.1.0
Message-Id: <20070615144437.EEF811A981D@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

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