lose duplicate schema (other in jagg-logic project) and commit working version of composite file

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@921957 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 1 insertions, 134 deletions

diff --git a/sandbox/kgoodson/jagg-webapp/src/main/resources/JiraSideband.xsd b/sandbox/kgoodson/jagg-webapp/src/main/resources/JiraSideband.xsd
deleted file mode 100644
index 19b2beca32..0000000000
--- a/sandbox/kgoodson/jagg-webapp/src/main/resources/JiraSideband.xsd
+++ /dev/null
@@ -1,133 +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.

-	-->

-<xsd:schema targetNamespace="http://www.example.com/tracking"

-	xmlns:jagg="http://www.example.com/tracking" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-
-	<xsd:element name="plan">
-		<xsd:complexType>
-			<xsd:sequence>
-				<xsd:element name="issueBase" type="xsd:string"
-					maxOccurs="1" minOccurs="0"></xsd:element>
-
-
-				<xsd:element name="milestone" type="jagg:Milestone"
-					maxOccurs="unbounded" minOccurs="0"></xsd:element>
-			</xsd:sequence>
-		</xsd:complexType>

-	</xsd:element>

-

-

-	<xsd:complexType name="WorkItem">

-		<xsd:annotation>

-			<xsd:documentation>

-				The milestone or deliverable name that we require this

-				function for

-    		</xsd:documentation>

-		</xsd:annotation>

-		<xsd:sequence>

-

-			<xsd:element name="title" type="xsd:string" maxOccurs="1"

-				minOccurs="1"></xsd:element>

-			<xsd:element name="responsible" type="xsd:string"

-				maxOccurs="1" minOccurs="0">

-			</xsd:element>

-			<xsd:element name="dueDate" type="xsd:string" maxOccurs="1"

-				minOccurs="0" />

-			<xsd:element name="jira" type="xsd:string" maxOccurs="1"

-				minOccurs="0">

-			</xsd:element>

-			<xsd:element name="status" type="xsd:string" maxOccurs="1"

-				minOccurs="0">

-			</xsd:element>

-

-

-			<xsd:element name="repository_vid" type="xsd:string"

-				maxOccurs="1" minOccurs="0">

-			</xsd:element>

-			<xsd:element name="note" type="xsd:string" maxOccurs="1"

-				minOccurs="0">

-			</xsd:element>

-

-			<xsd:element name="jiraData" type="jagg:JiraData"

-				maxOccurs="1" minOccurs="0"></xsd:element>

-		</xsd:sequence>

-		<xsd:attribute name="ID" type="xsd:ID"></xsd:attribute>

-	</xsd:complexType>

-

-

-	<xsd:complexType name="Milestone">

-

-		<xsd:sequence>

-			<xsd:element name="dueDate" type="xsd:string" maxOccurs="1"

-				minOccurs="0">

-			</xsd:element>

-

-			<xsd:element name="deliveredby" type="xsd:string"

-				maxOccurs="1" minOccurs="0">

-				<xsd:annotation>

-					<xsd:documentation>

-						A tuscany source code repository branch name or

-						repository version number

-    				</xsd:documentation>

-				</xsd:annotation>

-			</xsd:element>

-			<xsd:element name="note" type="xsd:string" maxOccurs="1"

-				minOccurs="0">

-			</xsd:element>

-

-			<xsd:element name="workItem" type="jagg:WorkItem"

-				maxOccurs="unbounded" minOccurs="0">

-			</xsd:element>

-		</xsd:sequence>

-

-

-		<xsd:attribute name="ID" type="xsd:string"></xsd:attribute>

-	</xsd:complexType>

-

-	<xsd:complexType name="Milestones">
-		<xsd:sequence>
-			<xsd:element name="milestone" type="jagg:Milestone"
-				maxOccurs="unbounded" minOccurs="0"></xsd:element>

-		</xsd:sequence>

-	</xsd:complexType>
-
-	<xsd:complexType name="WorkItems">
-		<xsd:sequence>
-			<xsd:element name="workitem" type="jagg:WorkItem"
-				maxOccurs="unbounded" minOccurs="0"></xsd:element>

-		</xsd:sequence>

-	</xsd:complexType>
-
-
-	<xsd:complexType name="PlanDTO">
-		<xsd:sequence>
-			<xsd:element name="milestones" type="jagg:Milestone"
-				maxOccurs="unbounded" minOccurs="0"></xsd:element>
-			<xsd:element name="workitems" type="jagg:WorkItem"
-				maxOccurs="unbounded" minOccurs="0"></xsd:element>
-		</xsd:sequence>
-	</xsd:complexType>
-
-	<xsd:complexType name="JiraData">
-		<xsd:sequence>
-			<xsd:element name="title" type="xsd:string"></xsd:element>
-			<xsd:element name="status" type="xsd:string"></xsd:element>
-			<xsd:element name="assignedTo" type="xsd:string"></xsd:element>
-		</xsd:sequence>
-		<xsd:attribute name="ID" type="xsd:string"></xsd:attribute>
-	</xsd:complexType>
-</xsd:schema>
\ No newline at end of file
diff --git a/sandbox/kgoodson/jagg-webapp/src/main/resources/plan.composite b/sandbox/kgoodson/jagg-webapp/src/main/resources/plan.composite
index fd34364429..126f66841c 100644
--- a/sandbox/kgoodson/jagg-webapp/src/main/resources/plan.composite
+++ b/sandbox/kgoodson/jagg-webapp/src/main/resources/plan.composite
@@ -29,7 +29,7 @@
     
 	<component name="Plan">
 		<implementation.java class="services.PlanViewImpl"/> 
-   		<property name="planFile">src/main/resources/jiraSideBand.xml</property>
+   		<property name="planFile">jiraSideBand.xml</property>
 		<service name="PlanView">
 			<tuscany:binding.jsonrpc uri="/Plan"/>
    		</service>