ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hi...@apache.org
Subject svn commit: r809276 - in /ant/ivy/ivyde/trunk: CHANGES.txt org.apache.ivyde.eclipse/META-INF/MANIFEST.MF org.apache.ivyde.eclipse/build.properties org.apache.ivyde.eclipse/plugin.xml org.apache.ivyde.eclipse/xsd/ org.apache.ivyde.eclipse/xsd/ivy.xsd
Date Sun, 30 Aug 2009 08:53:41 GMT
Author: hibou
Date: Sun Aug 30 08:53:41 2009
New Revision: 809276

URL: http://svn.apache.org/viewvc?rev=809276&view=rev
Log:
IVYDE-190 : add the Ivy xml schema to Eclipse's catalog

Added:
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/xsd/
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/xsd/ivy.xsd   (with props)
Modified:
    ant/ivy/ivyde/trunk/CHANGES.txt
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/META-INF/MANIFEST.MF
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/build.properties
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/plugin.xml

Modified: ant/ivy/ivyde/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/CHANGES.txt?rev=809276&r1=809275&r2=809276&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/CHANGES.txt (original)
+++ ant/ivy/ivyde/trunk/CHANGES.txt Sun Aug 30 08:53:41 2009
@@ -3,6 +3,8 @@
 
   version 2.1.0
 ==========================
+- NEW: Inclusion of Ivy related schemas into the Eclipse XML Catalog (IVYDE-190) (thanks
to Miguel Griffa)
+
 - FIX: "Ivy Settings Path" Browse button results in an incorrectly formatted URL (IVYDE-191)
(thanks to Jon Schneider)
 
   version 2.0.0 final

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/META-INF/MANIFEST.MF?rev=809276&r1=809275&r2=809276&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/META-INF/MANIFEST.MF (original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/META-INF/MANIFEST.MF Sun Aug 30 08:53:41
2009
@@ -33,5 +33,6 @@
  org.eclipse.jdt.ui,
  org.eclipse.ui.console,
  org.apache.ivy,
- org.eclipse.help
+ org.eclipse.help,
+ org.eclipse.wst.xml.core
 Eclipse-LazyStart: true

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/build.properties
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/build.properties?rev=809276&r1=809275&r2=809276&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/build.properties (original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/build.properties Sun Aug 30 08:53:41 2009
@@ -22,7 +22,8 @@
                ivyde-eclipse.jar,\
                icons/,\
                META-INF/,\
-               doc/
+               doc/,\
+               xsd/
                
 module.type = tools
 
@@ -41,4 +42,5 @@
                .settings/,\
                IvyDE.launch,\
                META-INF/,\
-               CHANGES.txt
+               CHANGES.txt,\
+               xsd/

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/plugin.xml
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/plugin.xml?rev=809276&r1=809275&r2=809276&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/plugin.xml (original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/plugin.xml Sun Aug 30 08:53:41 2009
@@ -259,6 +259,16 @@
       </super>
    </extension>
    
+    <extension
+    	id="org.apache.ivyide.eclipse.ivyschema"
+    	name="Ivy Schema" 
+    	point="org.eclipse.wst.xml.core.catalogContributions">
+        <catalogContribution id="ivySchema">
+		<uri 
+		    name="http://ant.apache.org/ivy/schemas/ivy.xsd" 
+			uri="platform:/plugin/org.apache.ivyde.eclipse/xsd/ivy.xsd"/>
+    </catalogContribution>
+   </extension>
 
 
    <!--

Added: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/xsd/ivy.xsd
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/xsd/ivy.xsd?rev=809276&view=auto
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/xsd/ivy.xsd (added)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/xsd/ivy.xsd Sun Aug 30 08:53:41 2009
@@ -0,0 +1,280 @@
+<?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.    
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
+
+	<xs:complexType name="configurations-conf">
+        <xs:attribute name="name" type="xs:string" use="required"/>
+        <xs:attribute name="transitive" type="xs:boolean"/>
+        <xs:attribute name="extends" type="xs:string"/>
+        <xs:attribute name="description" type="xs:string"/>
+        <xs:attribute name="deprecated" type="xs:string"/>
+        <xs:attribute name="visibility" default="public">
+			<xs:simpleType>
+				<xs:restriction base="xs:string">
+					<xs:enumeration value="private"/>
+					<xs:enumeration value="public"/>
+				</xs:restriction>
+			</xs:simpleType>
+		</xs:attribute>
+        <xs:anyAttribute namespace="##other" processContents="lax" />
+	</xs:complexType>
+
+	<xs:complexType name="global-exclude">
+        <xs:sequence>
+      		<xs:element name="conf" minOccurs="0" maxOccurs="unbounded">
+            	<xs:complexType>
+		            <xs:attribute name="name" type="xs:string" use="required"/>
+            	</xs:complexType>
+      		</xs:element>
+        </xs:sequence>
+        <xs:attribute name="org" type="xs:string"/>
+        <xs:attribute name="module" type="xs:string"/>
+        <xs:attribute name="artifact" type="xs:string"/>
+        <xs:attribute name="type" type="xs:string"/>
+        <xs:attribute name="ext" type="xs:string"/>
+        <xs:attribute name="conf" type="xs:string"/>
+        <xs:attribute name="matcher" type="xs:string"/>
+        <xs:anyAttribute namespace="##other" processContents="lax" />
+	</xs:complexType>
+
+  <xs:element name="ivy-module">
+      <xs:complexType>
+        <xs:sequence>
+  		    <xs:element name="info">
+            	<xs:complexType>
+			        <xs:sequence>
+			      		<xs:element name="license" minOccurs="0" maxOccurs="unbounded">
+			            	<xs:complexType>
+					            <xs:attribute name="name" type="xs:string" use="required"/>
+					            <xs:attribute name="url" type="xs:string"/>
+			            	</xs:complexType>
+			      		</xs:element>
+			      		<xs:element name="ivyauthor" minOccurs="0" maxOccurs="unbounded">
+			            	<xs:complexType>
+					            <xs:attribute name="name" type="xs:string" use="required"/>
+					            <xs:attribute name="url" type="xs:string"/>
+			            	</xs:complexType>
+			      		</xs:element>
+			      		<xs:element name="repository" minOccurs="0" maxOccurs="unbounded">
+			            	<xs:complexType>
+					            <xs:attribute name="name" type="xs:string" use="required"/>
+					            <xs:attribute name="url" type="xs:string"/>
+					            <xs:attribute name="pattern" type="xs:string"/>
+					            <xs:attribute name="ivys" type="xs:boolean"/>
+					            <xs:attribute name="artifacts" type="xs:boolean"/>
+			            	</xs:complexType>
+			      		</xs:element>
+			      		<xs:element name="description" minOccurs="0" maxOccurs="1">
+			            	<xs:complexType mixed="true">
+			            			<xs:sequence>
+			            				<xs:any minOccurs="0" maxOccurs="unbounded" processContents="lax"/>
+					            	</xs:sequence>
+					            <xs:attribute name="homepage" type="xs:string"/>
+			            	</xs:complexType>
+			      		</xs:element>
+			      		<xs:any minOccurs="0" maxOccurs="unbounded" namespace="##other" processContents="lax"/>
+			        </xs:sequence>
+		            <xs:attribute name="organisation" type="xs:string" use="required"/>
+		            <xs:attribute name="module" type="xs:string" use="required"/>
+		            <xs:attribute name="branch" type="xs:string"/>
+		            <xs:attribute name="revision" type="xs:string"/>
+		            <xs:attribute name="status" type="xs:string"/>
+		            <xs:attribute name="publication" type="xs:string"/>
+		            <xs:attribute name="resolver" type="xs:string"/>
+		            <xs:attribute name="namespace" type="xs:string"/>
+		            <xs:attribute name="default" type="xs:boolean"/>
+		            <xs:anyAttribute namespace="##other" processContents="lax" />
+	            </xs:complexType>
+      		</xs:element>
+      		<xs:element name="configurations" minOccurs="0">
+			      <xs:complexType>
+				        <xs:sequence>
+				        	<xs:choice minOccurs="0" maxOccurs="unbounded">
+					      		<xs:element name="conf" type="configurations-conf"/>
+					      		<xs:element name="include">
+					            	<xs:complexType>
+							            <xs:attribute name="file" type="xs:string"/>
+							            <xs:attribute name="url"  type="xs:string"/>
+					            	</xs:complexType>
+					      		</xs:element>
+					      	</xs:choice>
+				        </xs:sequence>
+						<xs:attribute name="defaultconfmapping" type="xs:string"/>				  
+						<xs:attribute name="confmappingoverride" type="xs:boolean" />      
+			      </xs:complexType>
+      		</xs:element>
+      		<xs:element name="publications" minOccurs="0">
+			      <xs:complexType>
+				        <xs:sequence>
+				      		<xs:element name="artifact" minOccurs="0" maxOccurs="unbounded">
+				            	<xs:complexType>
+							        <xs:sequence>
+							      		<xs:element name="conf" minOccurs="0" maxOccurs="unbounded">
+							            	<xs:complexType>
+									            <xs:attribute name="name" type="xs:string" use="required"/>
+							            	</xs:complexType>
+							      		</xs:element>
+							        </xs:sequence>
+						            <xs:attribute name="name" type="xs:string"/>
+						            <xs:attribute name="type" type="xs:string"/>
+						            <xs:attribute name="ext" type="xs:string"/>
+						            <xs:attribute name="conf" type="xs:string"/>
+						            <xs:attribute name="url" type="xs:string"/>
+						            <xs:anyAttribute namespace="##other" processContents="lax" />
+				            	</xs:complexType>
+				      		</xs:element>
+				        </xs:sequence>
+						<xs:attribute name="defaultconf" type="xs:string"/>				  
+			      </xs:complexType>
+      		</xs:element>
+      		<xs:element name="dependencies" minOccurs="0">
+			      <xs:complexType>
+				        <xs:sequence>
+				      		<xs:element name="dependency" minOccurs="0" maxOccurs="unbounded">
+				            	<xs:complexType>
+							        <xs:sequence>
+							      		<xs:element name="conf" minOccurs="0" maxOccurs="unbounded">
+							            	<xs:complexType>
+										        <xs:sequence>
+										      		<xs:element name="mapped" minOccurs="0" maxOccurs="unbounded">
+										            	<xs:complexType>
+												            <xs:attribute name="name" type="xs:string" use="required"/>
+										            	</xs:complexType>
+										      		</xs:element>
+										        </xs:sequence>
+									            <xs:attribute name="name" type="xs:string" use="required"/>
+									            <xs:attribute name="mapped" type="xs:string"/>
+							            	</xs:complexType>
+							      		</xs:element>
+							      		<xs:element name="artifact" minOccurs="0" maxOccurs="unbounded">
+							            	<xs:complexType>
+										        <xs:sequence>
+										      		<xs:element name="conf" minOccurs="0" maxOccurs="unbounded">
+										            	<xs:complexType>
+												            <xs:attribute name="name" type="xs:string" use="required"/>
+										            	</xs:complexType>
+										      		</xs:element>
+										        </xs:sequence>
+									            <xs:attribute name="name" type="xs:string" use="required"/>
+									            <xs:attribute name="type" type="xs:string"/>
+									            <xs:attribute name="ext" type="xs:string"/>
+									            <xs:attribute name="conf" type="xs:string"/>
+									            <xs:attribute name="url" type="xs:string"/>
+									            <xs:anyAttribute namespace="##other" processContents="lax" />
+							            	</xs:complexType>
+							      		</xs:element>
+							      		<xs:element name="include" minOccurs="0" maxOccurs="unbounded">
+							            	<xs:complexType>
+										        <xs:sequence>
+										      		<xs:element name="conf" minOccurs="0" maxOccurs="unbounded">
+										            	<xs:complexType>
+												            <xs:attribute name="name" type="xs:string" use="required"/>
+										            	</xs:complexType>
+										      		</xs:element>
+										        </xs:sequence>
+									            <xs:attribute name="name" type="xs:string"/>
+									            <xs:attribute name="type" type="xs:string"/>
+									            <xs:attribute name="ext" type="xs:string"/>
+									            <xs:attribute name="conf" type="xs:string"/>
+									            <xs:attribute name="matcher" type="xs:string"/>
+									            <xs:anyAttribute namespace="##other" processContents="lax" />
+							            	</xs:complexType>
+							      		</xs:element>
+							      		<xs:element name="exclude" minOccurs="0" maxOccurs="unbounded">
+							            	<xs:complexType>
+										        <xs:sequence>
+										      		<xs:element name="conf" minOccurs="0" maxOccurs="unbounded">
+										            	<xs:complexType>
+												            <xs:attribute name="name" type="xs:string" use="required"/>
+										            	</xs:complexType>
+										      		</xs:element>
+										        </xs:sequence>
+									            <xs:attribute name="org" type="xs:string"/>
+									            <xs:attribute name="module" type="xs:string"/>
+									            <xs:attribute name="name" type="xs:string"/>
+									            <xs:attribute name="type" type="xs:string"/>
+									            <xs:attribute name="ext" type="xs:string"/>
+									            <xs:attribute name="conf" type="xs:string"/>
+									            <xs:attribute name="matcher" type="xs:string"/>
+									            <xs:anyAttribute namespace="##other" processContents="lax" />
+							            	</xs:complexType>
+							      		</xs:element>
+							        </xs:sequence>
+						            <xs:attribute name="org" type="xs:string"/>
+						            <xs:attribute name="name" type="xs:string" use="required"/>
+						            <xs:attribute name="branch" type="xs:string"/>
+						            <xs:attribute name="branchConstraint" type="xs:string"/>
+						            <xs:attribute name="rev" type="xs:string" use="required"/>
+						            <xs:attribute name="revConstraint" type="xs:string"/>
+						            <xs:attribute name="force" type="xs:boolean"/>
+						            <xs:attribute name="changing" type="xs:boolean" default="false"/>
+						            <xs:attribute name="transitive" type="xs:boolean" default="true"/>
+						            <xs:attribute name="conf" type="xs:string"/>
+						            <xs:anyAttribute namespace="##other" processContents="lax" />
+				            	</xs:complexType>
+				      		</xs:element>
+				      		<xs:element name="exclude" type="global-exclude" minOccurs="0" maxOccurs="unbounded"
/>
+				      		<xs:element name="override" minOccurs="0" maxOccurs="unbounded">
+				            	<xs:complexType>
+						            <xs:attribute name="org" type="xs:string"/>
+						            <xs:attribute name="module" type="xs:string"/>
+						            <xs:attribute name="matcher" type="xs:string"/>
+						            <xs:attribute name="rev" type="xs:string"/>
+						            <xs:attribute name="branch" type="xs:string"/>
+				            	</xs:complexType>
+				      		</xs:element>
+				      		<xs:element name="conflict" minOccurs="0" maxOccurs="unbounded">
+				            	<xs:complexType>
+						            <xs:attribute name="org" type="xs:string"/>
+						            <xs:attribute name="module" type="xs:string"/>
+						            <xs:attribute name="manager" type="xs:string"/>
+						            <xs:attribute name="rev" type="xs:string"/>
+						            <xs:attribute name="matcher" type="xs:string"/>
+						            <xs:anyAttribute namespace="##other" processContents="lax" />
+				            	</xs:complexType>
+				      		</xs:element>
+				        </xs:sequence>
+						<xs:attribute name="defaultconf" type="xs:string"/>				        
+						<xs:attribute name="defaultconfmapping" type="xs:string"/>				        
+                        <xs:attribute name="confmappingoverride" type="xs:boolean" />
+			      </xs:complexType>
+      		</xs:element>
+      		<xs:element name="conflicts" minOccurs="0">
+			      <xs:complexType>
+				        <xs:sequence>
+				      		<xs:element name="manager" maxOccurs="unbounded">
+				            	<xs:complexType>
+						            <xs:attribute name="org" type="xs:string"/>
+						            <xs:attribute name="module" type="xs:string"/>
+						            <xs:attribute name="name" type="xs:string"/>
+						            <xs:attribute name="rev" type="xs:string"/>
+						            <xs:attribute name="matcher" type="xs:string"/>
+						            <xs:anyAttribute namespace="##other" processContents="lax" />
+				            	</xs:complexType>
+				      		</xs:element>
+				        </xs:sequence>
+			      </xs:complexType>
+      		</xs:element>
+        </xs:sequence>
+        <xs:attribute name="version" type="xs:string" use="required"/>
+      </xs:complexType>
+  </xs:element>
+
+</xs:schema>

Propchange: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/xsd/ivy.xsd
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/xsd/ivy.xsd
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/xsd/ivy.xsd
------------------------------------------------------------------------------
    svn:mime-type = text/xml



Mime
View raw message