From 2324e311dbd59189cdc5101c7edb4cd5adb932b9 Mon Sep 17 00:00:00 2001
From: nash <nash@13f79535-47bb-0310-9956-ffa450edef68>
Date: Mon, 25 Oct 2010 15:10:57 +0000
Subject: Merge r1001042 Delete redundant files and redundant entries in
 pom.xml and build.xml

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1027162 13f79535-47bb-0310-9956-ffa450edef68
---
 .../trunk/demos/bigbank-account/build-dojo.xml     | 92 ----------------------
 sca-java-1.x/trunk/demos/bigbank-account/build.xml | 39 +--------
 sca-java-1.x/trunk/demos/bigbank-account/pom.xml   | 14 ----
 .../src/main/resources/web/AccountJSON.html        | 92 ----------------------
 .../src/main/resources/web/style.css               | 22 ------
 .../src/main/resources/wsdl/AccountService.wsdl    | 91 ---------------------
 6 files changed, 1 insertion(+), 349 deletions(-)
 delete mode 100644 sca-java-1.x/trunk/demos/bigbank-account/build-dojo.xml
 delete mode 100644 sca-java-1.x/trunk/demos/bigbank-account/src/main/resources/web/AccountJSON.html
 delete mode 100644 sca-java-1.x/trunk/demos/bigbank-account/src/main/resources/web/style.css
 delete mode 100644 sca-java-1.x/trunk/demos/bigbank-account/src/main/resources/wsdl/AccountService.wsdl

(limited to 'sca-java-1.x/trunk/demos/bigbank-account')

diff --git a/sca-java-1.x/trunk/demos/bigbank-account/build-dojo.xml b/sca-java-1.x/trunk/demos/bigbank-account/build-dojo.xml
deleted file mode 100644
index 9cc60c3d96..0000000000
--- a/sca-java-1.x/trunk/demos/bigbank-account/build-dojo.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * 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.
--->
-<project name="DojoZipInstaller">
-	
-
-    <property name="dojo.version" value="1.3.0"/>
-    <property name="unpack.location" value="${basedir}/src/main/resources/web/dojo"/>
-	
-
-    <target name="check-dojo-installed">
-        <condition property="already.installed" >
-            <available file="${localRepository}/dojo/dojo/${dojo.version}/dojo-${dojo.version}.zip"/>
-        </condition>
-        <condition property="maven.suffix" value="">
-            <os family="unix"/>
-        </condition>
-        <condition property="maven.suffix" value=".bat">
-            <os family="windows"/>
-        </condition>
-    </target>
-	
-
-    <target name="check-dojo-unpacked">
-        <condition property="already.unpacked" >
-            <available file="${unpack.location}"/>
-        </condition>
-    </target>
-
-    <target name="install-dojo" depends="check-dojo-installed" unless="already.installed">
-        <mkdir dir="${basedir}/target/dojo-download/"/>
-        <get src="http://download.dojotoolkit.org/release-${dojo.version}/dojo-release-${dojo.version}.zip"
-            dest="${basedir}/target/dojo-download/dojo-release-${dojo.version}.zip"
-            verbose="true"
-            usetimestamp="true"/>
-        <exec executable="mvn${maven.suffix}" dir="${basedir}" failonerror="false">
-            <arg line="install:install-file -DgroupId=dojo  -DartifactId=dojo -Dversion=${dojo.version} -Dpackaging=zip -DgeneratePom=true -Dfile=${basedir}/target/dojo-download/dojo-release-${dojo.version}.zip"/>
-        </exec>
-    </target>
-
-    <target name="install-dojo-nomaven" depends="check-dojo-installed" unless="already.installed">
-        <mkdir dir="${basedir}/target/dojo-download/"/>
-        <get src="http://download.dojotoolkit.org/release-${dojo.version}/dojo-release-${dojo.version}.zip"
-            dest="${basedir}/target/dojo-download/dojo-release-${dojo.version}.zip"
-            verbose="true"
-            usetimestamp="true"/>
-        <copy file="${basedir}/target/dojo-download/dojo-release-${dojo.version}.zip" 
-              tofile="${localRepository}/dojo/dojo/${dojo.version}/dojo-${dojo.version}.zip"/>
-    </target>
-	
-
-    <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}/dojo/dojo/${dojo.version}/dojo-${dojo.version}.zip"
-               dest="${basedir}/target/dojo-unpack-temp/"
-               overwrite="false">
-            <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}/dojox/**"/>
-                <exclude name="dojo-release-${dojo.version}/util/**"/>
-            </patternset>
-        </unzip>
-        <move file="${basedir}/target/dojo-unpack-temp/dojo-release-${dojo.version}"
-              tofile="${unpack.location}"
-              verbose="true"/>
-        <delete dir="${basedir}/target/dojo-unpack-temp/"/>
-    </target>
-	
-
-    <target name="clean-dojo-files">
-        <delete dir="${unpack.location}"/>
-    </target>
-</project>
diff --git a/sca-java-1.x/trunk/demos/bigbank-account/build.xml b/sca-java-1.x/trunk/demos/bigbank-account/build.xml
index 71f4c31c1c..b99099c3a2 100644
--- a/sca-java-1.x/trunk/demos/bigbank-account/build.xml
+++ b/sca-java-1.x/trunk/demos/bigbank-account/build.xml
@@ -18,35 +18,11 @@
  * under the License.
 -->
 <project name="bigbank-account" default="compile">
-    <property name="settings.localRepository" value="./target/repo" />
-    <property name="artifactId" value="demo-bigbank-account" />	
     
-    <!--path id="test.classpath">
-    	<pathelement location="target/classes"/>
-        <pathelement location="../../modules/tuscany-host-jetty-1.7-SNAPSHOT.jar"/>
-        <pathelement location="../../modules/tuscany-binding-jsonrpc-1.7-SNAPSHOT.jar"/>
-        <pathelement location="../../modules/tuscany-binding-rmi-1.7-SNAPSHOT.jar"/>
-    	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>    	
-    	<pathelement location="target/demo-bigbank-account.jar"/>    
-    </path-->
-	
     <target name="init">
         <mkdir dir="target/classes"/>
-        <mkdir dir="target/classes/web"/>
-    	<mkdir dir="target/repo"/>
     </target>
 	
-    <!--target name="dojo" depends="init">
-        <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>
-    </target-->
-	
     <target name="compile" depends="init">
         <javac srcdir="src/main/java"
                destdir="target/classes"
@@ -60,22 +36,9 @@
         <copy todir="target/classes">
             <fileset dir="src/main/resources"/>
         </copy>
-        <jar destfile="target/demo-bigbank-account.jar" basedir="target/classes">
-            <!--manifest>
-                <attribute name="Main-Class" value="${test.class}" /> 
-            </manifest-->
-        </jar>    	
+        <jar destfile="target/demo-bigbank-account.jar" basedir="target/classes"/>
     </target>		
 	
-    <!--target name="run" depends="compile">
-        <java classname="${test.class}"
-              fork="true">
-            <classpath>
-                <path refid="test.classpath"/>
-            </classpath>
-        </java>    	
-    </target-->
-
     <target name="clean">
         <delete dir="target" includeemptydirs="true"/>
     </target>
diff --git a/sca-java-1.x/trunk/demos/bigbank-account/pom.xml b/sca-java-1.x/trunk/demos/bigbank-account/pom.xml
index 821f50f59d..adbaf83e7f 100644
--- a/sca-java-1.x/trunk/demos/bigbank-account/pom.xml
+++ b/sca-java-1.x/trunk/demos/bigbank-account/pom.xml
@@ -58,19 +58,5 @@
 
     <build>
         <finalName>demo-bigbank-account</finalName>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-
-                <dependencies>
-                    <dependency>
-                        <groupId>ant</groupId>
-                        <artifactId>ant-trax</artifactId>
-                        <version>1.6.5</version>
-                    </dependency>
-                </dependencies>
-            </plugin>
-        </plugins>
     </build>
 </project>
diff --git a/sca-java-1.x/trunk/demos/bigbank-account/src/main/resources/web/AccountJSON.html b/sca-java-1.x/trunk/demos/bigbank-account/src/main/resources/web/AccountJSON.html
deleted file mode 100644
index 1609bf4b43..0000000000
--- a/sca-java-1.x/trunk/demos/bigbank-account/src/main/resources/web/AccountJSON.html
+++ /dev/null
@@ -1,92 +0,0 @@
-<html>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * 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.    
- -->
-<head>
-<title>Tuscany JSON-RPC BigBank Client</TITLE>
-
-<script type="text/javascript">
-        var djConfig = {isDebug: true,debugContainerId: "dojoDebug" };
-		djConfig.usePlainJson=true ;
-        //djConfig.debugAtAllCosts = true;
-    </script>
-<script type="text/javascript" src="dojo/dojo/dojo.js"> 
-    </script>
-<script type="text/javascript" src="dojo/dijit/dijit.js"> 
-    </script>
-
-<script type="text/javascript">
-    	dojo.require("dijit.form.Button");
-    	dojo.require("dojo.rpc.JsonService");    	
-    </script>
-
-<link rel="stylesheet" type="text/css" href="style.css" />
-</head>
-
-<body>
-
-<table>
-	<tr>
-		<th colspan="2">Tuscany JSON-RPC BigBank Client</th>
-	</tr>
-	<tr>
-		<td colspan="2">
-		<p>This example uses the <a href="http://dojotoolkit.org/">Dojo
-		Toolkit</a> to create a JavaScript object <code>accountService</code> for
-		the service at <b>http://localhost:8080/AccountJSONService</b> using <a
-			href="http://manual.dojotoolkit.org/WikiHome/DojoDotBook/Book9">Dojo's
-		RPC classes</a> and providing them with <a href="AccountJSONService?smd">http://localhost:8080/AccountJSONService?smd</a>
-		for <a href="http://dojo.jot.com/SMD">Simple Method Description
-		(SMD)</a> input.</p>
-		<p>It then creates a Dojo button that will envoke the <code>getAccountReport</code>
-		method of the <code>accountService</code> object.</p>
-	</tr>
-	<tr>
-		<td>Request</td>
-		<td>Response</td>
-	</tr>
-	<tr>
-		<td><br>
-		<button id="myaccount" dojoType="dijit.form.Button"
-			onClick='accountService.getAccountReport("Dojo1234").addCallback(contentCallBack);'>getAccountReport("Dojo1234")</button>
-		<br>
-		</td>
-		<td>
-		<div id="ReturnedContent">None Yet.</div>
-		</td>
-	</tr>
-	<tr>
-		<td colspan="2">
-		<div id="dojoDebug">Dojo Debug:</div>
-		</td>
-	</tr>
-</table>
-
-<script type="text/javascript">
-    
-    	function contentCallBack(result) {
-    		var handlerNode = document.getElementById("ReturnedContent");
-    		handlerNode.innerHTML = "<p>" + result + "</p>" ;
-    	}
-    
-    	var accountService = new dojo.rpc.JsonService("AccountJSONService?smd");
-    
-    </script>
-
-</body>
-</html>
diff --git a/sca-java-1.x/trunk/demos/bigbank-account/src/main/resources/web/style.css b/sca-java-1.x/trunk/demos/bigbank-account/src/main/resources/web/style.css
deleted file mode 100644
index 1071583264..0000000000
--- a/sca-java-1.x/trunk/demos/bigbank-account/src/main/resources/web/style.css
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * 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.
- */
-* { font-family: arial; }
-
-table, th, td { border: 2px solid blue; border-collapse: collapse; }
-th { color: white; background-color: blue; }
diff --git a/sca-java-1.x/trunk/demos/bigbank-account/src/main/resources/wsdl/AccountService.wsdl b/sca-java-1.x/trunk/demos/bigbank-account/src/main/resources/wsdl/AccountService.wsdl
deleted file mode 100644
index ac4d987a57..0000000000
--- a/sca-java-1.x/trunk/demos/bigbank-account/src/main/resources/wsdl/AccountService.wsdl
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one
-   or more contributor license agreements.  See the NOTICE file
-   distributed with this work for additional information
-   regarding copyright ownership.  The ASF licenses this file
-   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.
--->
-
-<wsdl:definitions xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-	xmlns:tns="http://bigbank"
-	xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	targetNamespace="http://bigbank"
-	name="AccountService">
-
-	<wsdl:types>
-		<xsd:schema
-			targetNamespace="http://bigbank"
-			xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-
-			<xsd:element name="getAccountReport">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="customerID" type="xsd:string" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-
-			<xsd:element name="getAccountReportResponse">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="balance" type="xsd:double" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-
-		</xsd:schema>
-	</wsdl:types>
-
-	<wsdl:message name="getAccountReportRequest">
-		<wsdl:part element="tns:getAccountReport"
-			name="getAccountReportRequest" />
-	</wsdl:message>
-
-	<wsdl:message name="getAccountReportResponse">
-		<wsdl:part element="tns:getAccountReportResponse"
-			name="getAccountReportResponse" />
-	</wsdl:message>
-
-	<wsdl:portType name="AccountService">
-		<wsdl:operation name="getAccountReport">
-			<wsdl:input message="tns:getAccountReportRequest" />
-			<wsdl:output message="tns:getAccountReportResponse" />
-		</wsdl:operation>
-	</wsdl:portType>
-
-	<wsdl:binding name="AccountServiceSoap" type="tns:AccountService">
-		<soap:binding style="document"
-			transport="http://schemas.xmlsoap.org/soap/http" />
-		<wsdl:operation name="getAccountReport">
-			<soap:operation
-				soapAction="" />
-			<wsdl:input>
-				<soap:body use="literal" />
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal" />
-			</wsdl:output>
-		</wsdl:operation>
-	</wsdl:binding>
-
-	<wsdl:service name="AccountService">
-		<wsdl:port binding="tns:AccountServiceSoap"
-			name="AccountServiceSoap">
-			<soap:address
-				location="http://localhost:8082/services/AccountWebService" />
-		</wsdl:port>
-	</wsdl:service>
-</wsdl:definitions>
-- 
cgit v1.2.3