Menu
▾
▴
[Unicore-cvs-commits] SF.net SVN: unicore:[5658] CommonInformationService/cis-types/trunk
|
From: <shi...@us...> - 2009-10-30 10:19:42
|
Revision: 5658
http://unicore.svn.sourceforge.net/unicore/?rev=5658&view=rev
Author: shiraz_79
Date: 2009-10-30 10:19:31 +0000 (Fri, 30 Oct 2009)
Log Message:
-----------
- version incremented to 1.2.1-SNAPSHOT
- cleaning up namespaces and rp's
Modified Paths:
--------------
CommonInformationService/cis-types/trunk/pom.xml
CommonInformationService/cis-types/trunk/src/main/schema/aggregator.xsd
CommonInformationService/cis-types/trunk/src/main/schema/cis-messages.xsd
CommonInformationService/cis-types/trunk/src/main/schema/cis-model.xsd
Modified: CommonInformationService/cis-types/trunk/pom.xml
===================================================================
--- CommonInformationService/cis-types/trunk/pom.xml 2009-10-30 10:00:12 UTC (rev 5657)
+++ CommonInformationService/cis-types/trunk/pom.xml 2009-10-30 10:19:31 UTC (rev 5658)
@@ -10,18 +10,10 @@
<version>1.2.1-SNAPSHOT</version>
<name>UNICORE 6 CIS Info Types</name>
<dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
+ <dependency>
<groupId>eu.unicore</groupId>
<artifactId>cis-u6-infoprovider-types</artifactId>
<version>1.2.2</version>
- <scope>provided</scope>
</dependency>
</dependencies>
<!--
@@ -34,18 +26,18 @@
<url>http://zam904.zam.kfa-juelich.de/maven</url>
</repository>
</repositories>
- <distributionManagement>
- <!-- use the following if you're not using a snapshot version. -->
+ <distributionManagement>
+<!-- use the following if you're not using a snapshot version. -->
<repository>
<id>vsgc-public</id>
<name>VSGC repository</name>
- <url>scp://zam904.zam.kfa-juelich.de/srv/www/htdocs/maven</url>
+ <url>dav:http://zam904.zam.kfa-juelich.de/maven</url>
</repository>
- <!-- use the following if you ARE using a snapshot version. -->
+<!-- use the following if you ARE using a snapshot version. -->
<snapshotRepository>
<id>vsgc-public-snapshot</id>
<name>VSGC SNAPSHOT Repository</name>
- <url>scp://zam904.zam.kfa-juelich.de/srv/www/htdocs/maven</url>
+ <url>dav:http://zam904.zam.kfa-juelich.de/maven</url>
</snapshotRepository>
</distributionManagement>
<build>
@@ -82,32 +74,9 @@
<!-- <xmlConfigs>-->
<!-- <xmlConfig implementation="java.io.File">src/main/schema/xmlbeans_config.xsdconfig</xmlConfig>-->
<!-- </xmlConfigs>-->
- <noUpa>false</noUpa>
+ <noUpa>true</noUpa>
</configuration>
- </plugin>
- <plugin>
- <artifactId>maven-release-plugin</artifactId>
- <version>2.0-beta-4</version>
- <configuration>
- <tagBase>https://unicore.svn.sourceforge.net/svnroot/unicore/unicorex/uas-types/tags</tagBase>
- </configuration>
- </plugin>
+ </plugin>
</plugins>
- </build>
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <reportSets>
- <reportSet>
- <reports>
- <report>project-team</report>
- <report>mailing-list</report>
- </reports>
- </reportSet>
- </reportSets>
- </plugin>
- </plugins>
- </reporting>
+ </build>
</project>
Modified: CommonInformationService/cis-types/trunk/src/main/schema/aggregator.xsd
===================================================================
--- CommonInformationService/cis-types/trunk/src/main/schema/aggregator.xsd 2009-10-30 10:00:12 UTC (rev 5657)
+++ CommonInformationService/cis-types/trunk/src/main/schema/aggregator.xsd 2009-10-30 10:19:31 UTC (rev 5658)
@@ -2,9 +2,9 @@
<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
targetNamespace="http://www.unicore.eu/unicore6/cis/aggregator"
xmlns:agg="http://www.unicore.eu/unicore6/cis/aggregator"
- xmlns:wsa="http://www.w3.org/2005/08/addressing" elementFormDefault="qualified"
+ xmlns:wsa="http://www.w3.org/2005/08/addressing" elementFormDefault="unqualified"
attributeFormDefault="unqualified">
- <xsd:import namespace="http://www.w3.org/2005/08/addressing" schemaLocation="http://www.w3.org/2005/08/addressing"/>
+ <xsd:import namespace="http://www.w3.org/2005/08/addressing" schemaLocation="http://www.w3.org/2006/03/addressing/ws-addr.xsd"/>
<xsd:element name="CIPRegistrant">
<xsd:complexType>
<xsd:sequence>
Modified: CommonInformationService/cis-types/trunk/src/main/schema/cis-messages.xsd
===================================================================
--- CommonInformationService/cis-types/trunk/src/main/schema/cis-messages.xsd 2009-10-30 10:00:12 UTC (rev 5657)
+++ CommonInformationService/cis-types/trunk/src/main/schema/cis-messages.xsd 2009-10-30 10:19:31 UTC (rev 5658)
@@ -5,7 +5,7 @@
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:glue="http://schemas.ogf.org/glue/2008/05/spec_2.0_d42_r01"
xmlns:agg="http://www.unicore.eu/unicore6/cis/aggregator"
- elementFormDefault="qualified" attributeFormDefault="unqualified">
+ elementFormDefault="unqualified" attributeFormDefault="unqualified">
<xsd:import namespace="http://www.unicore.eu/unicore6/cis/aggregator" schemaLocation="aggregator.xsd"></xsd:import>
<!-- ========== Message Types ============ -->
Modified: CommonInformationService/cis-types/trunk/src/main/schema/cis-model.xsd
===================================================================
--- CommonInformationService/cis-types/trunk/src/main/schema/cis-model.xsd 2009-10-30 10:00:12 UTC (rev 5657)
+++ CommonInformationService/cis-types/trunk/src/main/schema/cis-model.xsd 2009-10-30 10:19:31 UTC (rev 5658)
@@ -1,71 +1,74 @@
<?xml version="1.0" encoding="UTF-8"?>
<xsd:schema targetNamespace="http://www.unicore.eu/unicore6/cis/model"
- xmlns:cis="http://www.unicore.eu/unicore6/cis/model" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- elementFormDefault="qualified" attributeFormDefault="unqualified">
+ xmlns:cis="http://www.unicore.eu/unicore6/cis/model" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ elementFormDefault="unqualified" attributeFormDefault="unqualified">
- <!-- General information -->
- <xsd:element name="Name" type="xsd:string"/>
- <xsd:element name="URL" type="xsd:string"/>
- <xsd:element name="Description" type="xsd:string"/>
+ <!-- General information -->
+ <xsd:element name="Name" type="xsd:string" />
+ <xsd:element name="URL" type="xsd:string" />
+ <xsd:element name="Description" type="xsd:string" />
- <!-- Geo-spatial information -->
- <xsd:element name="GeoData">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="Longitude" type="xsd:string"/>
- <xsd:element name="Latitude" type="xsd:string"/>
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
+ <!-- Geo-spatial information -->
+ <xsd:element name="GeoData">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="Longitude" type="xsd:string" />
+ <xsd:element name="Latitude" type="xsd:string" />
+ </xsd:sequence>
+ </xsd:complexType>
+ </xsd:element>
- <!-- Status data -->
- <xsd:simpleType name="SiteStateEnumeration">
- <xsd:restriction base="xsd:string">
- <xsd:enumeration value="Red"/>
- <xsd:enumeration value="Yellow"/>
- <xsd:enumeration value="Green"/>
- </xsd:restriction>
- </xsd:simpleType>
- <xsd:element name="Status">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="StatusDescription" type="xsd:string"/>
- </xsd:sequence>
- <xsd:attribute name="Value" type="cis:SiteStateEnumeration"/>
- </xsd:complexType>
- </xsd:element>
+ <!-- Status data -->
+ <xsd:simpleType name="SiteStateEnumeration">
+ <xsd:restriction base="xsd:string">
+ <xsd:enumeration value="Red" />
+ <xsd:enumeration value="Yellow" />
+ <xsd:enumeration value="Green" />
+ </xsd:restriction>
+ </xsd:simpleType>
+ <xsd:element name="Status">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="StatusDescription" type="xsd:string" />
+ </xsd:sequence>
+ <xsd:attribute name="Value" type="cis:SiteStateEnumeration" />
+ </xsd:complexType>
+ </xsd:element>
- <xsd:element name="NumberOfCPUs" type="xsd:int"/>
+ <xsd:element name="NumberOfCPUs" type="xsd:int" />
- <xsd:element name="Uptime" type="xsd:dateTime"/>
+ <xsd:element name="Uptime" type="xsd:dateTime" />
- <xsd:element name="Jobs">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="TotalJobs" type="xsd:int"/>
- <xsd:element name="RunningJobs" type="xsd:int"/>
- <xsd:element name="WaitingJobs" type="xsd:int"/>
- <xsd:element name="FinishedJobs" type="xsd:int"/>
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
+ <xsd:element name="Jobs">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="TotalJobs" type="xsd:int" />
+ <xsd:element name="RunningJobs" type="xsd:int" />
+ <xsd:element name="WaitingJobs" type="xsd:int" />
+ <xsd:element name="FinishedJobs" type="xsd:int" />
+ </xsd:sequence>
+ </xsd:complexType>
+ </xsd:element>
- <!-- Root Element -->
- <xsd:element name="Site">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element ref="cis:Name"/>
- <xsd:element ref="cis:URL"/>
- <xsd:element ref="cis:Description"/>
- <xsd:element ref="cis:GeoData"/>
- <xsd:element ref="cis:Status"/>
- <xsd:element ref="cis:Uptime"/>
- <xsd:element ref="cis:NumberOfCPUs"/>
- <xsd:element ref="cis:Jobs"/>
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
+ <xsd:element name="CISProperties">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element ref="cis:Site" />
+ </xsd:sequence>
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="Site">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element ref="cis:Name" />
+ <xsd:element ref="cis:URL" />
+ <xsd:element ref="cis:GeoData" />
+ <xsd:element ref="cis:Status" />
+ </xsd:sequence>
+ </xsd:complexType>
+ </xsd:element>
+
</xsd:schema>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|