Author: mes
Date: 2010-07-30 15:10:31 -0700 (Fri, 30 Jul 2010)
New Revision: 21097
Added:
cytoscape/trunk/src/main/resources/xsd/bookmarks.xsd
Removed:
cytoscape/trunk/resources/schema/bookmarks.xsd
Modified:
cytoscape/trunk/pom.xml
Log:
fixed xsd class generation
Modified: cytoscape/trunk/pom.xml
===================================================================
--- cytoscape/trunk/pom.xml 2010-07-30 19:31:07 UTC (rev 21096)
+++ cytoscape/trunk/pom.xml 2010-07-30 22:10:31 UTC (rev 21097)
@@ -24,7 +24,6 @@
</resource>
</resources>
- <pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -42,6 +41,7 @@
<redirectTestOutputToFile>true</redirectTestOutputToFile>
</configuration>
</plugin>
+ <!--
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
@@ -77,6 +77,7 @@
</execution>
</executions>
</plugin>
+ -->
<plugin>
<groupId>org.jvnet.jaxb2.maven2</groupId>
<artifactId>maven-jaxb2-plugin</artifactId>
@@ -91,18 +92,50 @@
<schemaIncludes>
<include>cysession.xsd</include>
</schemaIncludes>
- <generatePackage>cytoscape.generated </generatePackage>
+ <generatePackage>cytoscape.generated</generatePackage>
<verbose>true</verbose>
<removeOldOutput>false</removeOldOutput>
<forceRegenerate>true</forceRegenerate>
</configuration>
</execution>
+ <execution>
+ <id>bookmarks</id>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ <configuration>
+ <schemaDirectory>src/main/resources/xsd</schemaDirectory>
+ <schemaIncludes>
+ <include>bookmarks.xsd</include>
+ </schemaIncludes>
+ <generatePackage>cytoscape.bookmarks</generatePackage>
+ <verbose>true</verbose>
+ <removeOldOutput>false</removeOldOutput>
+ <forceRegenerate>true</forceRegenerate>
+ </configuration>
+ </execution>
</executions>
</plugin>
</plugins>
- </pluginManagement>
</build>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>maven2-repository.dev.java.net</id>
+ <name>Java.net Maven 2 Repository</name>
+ <url>http://download.java.net/maven/2
+ </url>
+ </pluginRepository>
+ <pluginRepository>
+ <id>maven-repository.dev.java.net</id>
+ <name>Java.net Maven 1 Repository (legacy)</name>
+ <url>http://download.java.net/maven/1
+ </url>
+ <layout>legacy</layout>
+ </pluginRepository>
+ </pluginRepositories>
+
+
<dependencies>
<dependency>
<groupId>junit</groupId>
Deleted: cytoscape/trunk/resources/schema/bookmarks.xsd
===================================================================
--- cytoscape/trunk/resources/schema/bookmarks.xsd 2010-07-30 19:31:07 UTC
(rev 21096)
+++ cytoscape/trunk/resources/schema/bookmarks.xsd 2010-07-30 22:10:31 UTC
(rev 21097)
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema";
elementFormDefault="qualified" xmlns:xlink="http://www.w3.org/1999/xlink";>
- <xs:import namespace="http://www.w3.org/1999/xlink";
schemaLocation="xlinks-2001.xsd"/>
- <xs:element name="bookmarks">
- <xs:complexType>
- <xs:sequence>
- <xs:element ref="description"/>
- <xs:element maxOccurs="unbounded" ref="category"/>
- </xs:sequence>
- <xs:attribute name="version" use="required" type="xs:decimal"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="description" type="xs:string"/>
- <xs:element name="category">
- <xs:complexType>
- <xs:choice minOccurs="0" maxOccurs="unbounded">
- <xs:element ref="category"/>
- <xs:element ref="dataSource"/>
- </xs:choice>
- <xs:attribute name="name" use="required" type="xs:NCName"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="dataSource">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" maxOccurs="unbounded" ref="attribute"/>
- </xs:sequence>
- <xs:attribute name="format"/>
- <xs:attribute name="name" use="required"/>
- <xs:attribute ref="xlink:href" use="required"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="attribute">
- <xs:complexType mixed="true">
- <xs:attribute name="name" use="required" type="xs:NCName"/>
- </xs:complexType>
- </xs:element>
-</xs:schema>
Copied: cytoscape/trunk/src/main/resources/xsd/bookmarks.xsd (from rev 21096,
cytoscape/trunk/resources/schema/bookmarks.xsd)
===================================================================
--- cytoscape/trunk/src/main/resources/xsd/bookmarks.xsd
(rev 0)
+++ cytoscape/trunk/src/main/resources/xsd/bookmarks.xsd 2010-07-30
22:10:31 UTC (rev 21097)
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema";
elementFormDefault="qualified" xmlns:xlink="http://www.w3.org/1999/xlink";>
+ <xs:import namespace="http://www.w3.org/1999/xlink";
schemaLocation="xlinks-2001.xsd"/>
+ <xs:element name="bookmarks">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element ref="description"/>
+ <xs:element maxOccurs="unbounded" ref="category"/>
+ </xs:sequence>
+ <xs:attribute name="version" use="required" type="xs:decimal"/>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="description" type="xs:string"/>
+ <xs:element name="category">
+ <xs:complexType>
+ <xs:choice minOccurs="0" maxOccurs="unbounded">
+ <xs:element ref="category"/>
+ <xs:element ref="dataSource"/>
+ </xs:choice>
+ <xs:attribute name="name" use="required" type="xs:NCName"/>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="dataSource">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" maxOccurs="unbounded" ref="attribute"/>
+ </xs:sequence>
+ <xs:attribute name="format"/>
+ <xs:attribute name="name" use="required"/>
+ <xs:attribute ref="xlink:href" use="required"/>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="attribute">
+ <xs:complexType mixed="true">
+ <xs:attribute name="name" use="required" type="xs:NCName"/>
+ </xs:complexType>
+ </xs:element>
+</xs:schema>
--
You received this message because you are subscribed to the Google Groups
"cytoscape-cvs" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/cytoscape-cvs?hl=en.
