[jboss-svn-commits] JBL Code SVN: r7013 - in labs/jbosslabs/trunk/portal-extensions/forge-common/src: java/org/jboss/forge/common/projects/test web/WEB-INF

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Mon Oct 23 07:38:46 EDT 2006


Author: unibrew
Date: 2006-10-23 07:38:41 -0400 (Mon, 23 Oct 2006)
New Revision: 7013

Added:
   labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/test/Jmm.java
Removed:
   labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/test/Link.java
   labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/test/LinkType.java
Modified:
   labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/test/Downloads.java
   labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/test/File.java
   labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/test/Menu.java
   labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/test/ObjectFactory.java
   labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/test/package-info.java
   labs/jbosslabs/trunk/portal-extensions/forge-common/src/web/WEB-INF/project.xsd
Log:
[JBLAB-754] Adding new functionality and debugging old one in project.xml parsing classes.

Modified: labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/test/Downloads.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/test/Downloads.java	2006-10-22 22:47:02 UTC (rev 7012)
+++ labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/test/Downloads.java	2006-10-23 11:38:41 UTC (rev 7013)
@@ -24,9 +24,7 @@
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
-import org.jboss.forge.common.projects.test.Downloads.Counters;
 
 
 /**
@@ -41,19 +39,18 @@
  */
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "downloads", propOrder = {
-
+    "categories",
+    "name",
+    "description",
+    "counters",
+    "files"
 })
 public class Downloads {
 
-    @XmlElement(namespace = "http://jboss.org")
     protected Categories categories;
-    @XmlElement(namespace = "http://jboss.org")
     protected String name;
-    @XmlElement(namespace = "http://jboss.org")
     protected String description;
-    @XmlElement(namespace = "http://jboss.org")
-    protected Counters counters;
-    @XmlElement(namespace = "http://jboss.org")
+    protected Downloads.Counters counters;
     protected Files files;
 
     /**
@@ -133,10 +130,10 @@
      * 
      * @return
      *     possible object is
-     *     {@link Counters }
+     *     {@link Downloads.Counters }
      *     
      */
-    public Counters getCounters() {
+    public Downloads.Counters getCounters() {
         return counters;
     }
 
@@ -145,10 +142,10 @@
      * 
      * @param value
      *     allowed object is
-     *     {@link Counters }
+     *     {@link Downloads.Counters }
      *     
      */
-    public void setCounters(Counters value) {
+    public void setCounters(Downloads.Counters value) {
         this.counters = value;
     }
 
@@ -204,9 +201,7 @@
     })
     public static class Counters {
 
-        @XmlElement(namespace = "http://jboss.org")
         protected Sorting sorting;
-        @XmlElement(namespace = "http://jboss.org")
         protected Boolean visible;
 
         /**

Modified: labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/test/File.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/test/File.java	2006-10-22 22:47:02 UTC (rev 7012)
+++ labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/test/File.java	2006-10-23 11:38:41 UTC (rev 7013)
@@ -29,7 +29,6 @@
 import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
-import org.jboss.forge.common.projects.test.File.Button;
 
 
 /**
@@ -55,22 +54,15 @@
 })
 public class File {
 
-    @XmlElement(namespace = "http://jboss.org", required = true)
+    @XmlElement(required = true)
     protected String id;
-    @XmlElement(namespace = "http://jboss.org", required = true)
     protected String name;
-    @XmlElement(namespace = "http://jboss.org", required = true)
     protected String description;
-    @XmlElement(namespace = "http://jboss.org", required = true)
     protected String size;
-    @XmlElement(namespace = "http://jboss.org", required = true)
     protected String license;
-    @XmlElement(namespace = "http://jboss.org", required = true)
     protected String release;
-    @XmlElement(namespace = "http://jboss.org")
     protected String type;
-    @XmlElement(namespace = "http://jboss.org", required = true)
-    protected List<Button> button;
+    protected List<File.Button> button;
     @XmlAttribute
     protected Boolean visible;
 
@@ -260,13 +252,13 @@
      * 
      * <p>
      * Objects of the following type(s) are allowed in the list
-     * {@link Button }
+     * {@link File.Button }
      * 
      * 
      */
-    public List<Button> getButton() {
+    public List<File.Button> getButton() {
         if (button == null) {
-            button = new ArrayList<Button>();
+            button = new ArrayList<File.Button>();
         }
         return this.button;
     }
@@ -311,8 +303,8 @@
      *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
      *       &lt;sequence>
      *         &lt;element name="id" type="{http://www.w3.org/2001/XMLSchema}string"/>
-     *         &lt;element name="name" type="{http://www.w3.org/2001/XMLSchema}string"/>
-     *         &lt;element name="freezone" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
+     *         &lt;element name="name" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+     *         &lt;element name="freezone" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
      *       &lt;/sequence>
      *     &lt;/restriction>
      *   &lt;/complexContent>
@@ -329,12 +321,10 @@
     })
     public static class Button {
 
-        @XmlElement(namespace = "http://jboss.org", required = true)
+        @XmlElement(required = true)
         protected String id;
-        @XmlElement(namespace = "http://jboss.org", required = true)
         protected String name;
-        @XmlElement(namespace = "http://jboss.org")
-        protected boolean freezone;
+        protected Boolean freezone;
 
         /**
          * Gets the value of the id property.
@@ -387,16 +377,24 @@
         /**
          * Gets the value of the freezone property.
          * 
+         * @return
+         *     possible object is
+         *     {@link Boolean }
+         *     
          */
-        public boolean isFreezone() {
+        public Boolean isFreezone() {
             return freezone;
         }
 
         /**
          * Sets the value of the freezone property.
          * 
+         * @param value
+         *     allowed object is
+         *     {@link Boolean }
+         *     
          */
-        public void setFreezone(boolean value) {
+        public void setFreezone(Boolean value) {
             this.freezone = value;
         }
 

Added: labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/test/Jmm.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/test/Jmm.java	2006-10-22 22:47:02 UTC (rev 7012)
+++ labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/test/Jmm.java	2006-10-23 11:38:41 UTC (rev 7013)
@@ -0,0 +1,45 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.forge.common.projects.test;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * 
+ *         Class representing JMM menu entry.
+ *         PLEASE, DO NOT MODIFY THIS CLASS UNLESS YOU KNOW JAXB.
+ *         @author Ryszard Kozmik
+ *                     
+ * 
+ * 
+ * 
+ */
+ at XmlAccessorType(XmlAccessType.FIELD)
+ at XmlType(name = "jmm")
+public class Jmm {
+
+
+}

Deleted: labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/test/Link.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/test/Link.java	2006-10-22 22:47:02 UTC (rev 7012)
+++ labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/test/Link.java	2006-10-23 11:38:41 UTC (rev 7013)
@@ -1,101 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.jboss.forge.common.projects.test;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.XmlValue;
-
-
-/**
- * 
- *             Class for keeping information about one of predefined links for project's navigation menu.
- *             PLEASE, DO NOT MODIFY THIS CLASS UNLESS YOU KNOW JAXB.
- *             @author Ryszard Kozmik
- *                     
- * 
- * 
- * 
- */
- at XmlAccessorType(XmlAccessType.FIELD)
- at XmlType(name = "link", propOrder = {
-    "value"
-})
-public class Link {
-
-    @XmlValue
-    protected String value;
-    @XmlAttribute
-    protected String display;
-
-    /**
-     * Gets the value of the value property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getValue() {
-        return value;
-    }
-
-    /**
-     * Sets the value of the value property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setValue(String value) {
-        this.value = value;
-    }
-
-    /**
-     * Gets the value of the display property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getDisplay() {
-        return display;
-    }
-
-    /**
-     * Sets the value of the display property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setDisplay(String value) {
-        this.display = value;
-    }
-
-}

Deleted: labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/test/LinkType.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/test/LinkType.java	2006-10-22 22:47:02 UTC (rev 7012)
+++ labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/test/LinkType.java	2006-10-23 11:38:41 UTC (rev 7013)
@@ -1,78 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.jboss.forge.common.projects.test;
-
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
-
-
-/**
- * 
- *         Enum describing types of possbile repository-monitors.
- *         @author Ryszard Kozmik
- *                 
- * 
- * <p>Java class for LinkType.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * <p>
- * <pre>
- * &lt;simpleType name="LinkType">
- *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *     &lt;enumeration value="repository"/>
- *     &lt;enumeration value="issue-tracker"/>
- *     &lt;enumeration value="repo-monitor"/>
- *   &lt;/restriction>
- * &lt;/simpleType>
- * </pre>
- * 
- */
- at XmlEnum
-public enum LinkType {
-
-    @XmlEnumValue("issue-tracker")
-    ISSUE_TRACKER("issue-tracker"),
-    @XmlEnumValue("repository")
-    REPOSITORY("repository"),
-    @XmlEnumValue("repo-monitor")
-    REPO_MONITOR("repo-monitor");
-    private final String value;
-
-    LinkType(String v) {
-        value = v;
-    }
-
-    public String value() {
-        return value;
-    }
-
-    public static LinkType fromValue(String v) {
-        for (LinkType c: LinkType.values()) {
-            if (c.value.equals(v)) {
-                return c;
-            }
-        }
-        throw new IllegalArgumentException(v.toString());
-    }
-
-}

Modified: labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/test/Menu.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/test/Menu.java	2006-10-22 22:47:02 UTC (rev 7012)
+++ labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/test/Menu.java	2006-10-23 11:38:41 UTC (rev 7013)
@@ -26,14 +26,9 @@
 import java.util.List;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlElements;
 import javax.xml.bind.annotation.XmlType;
-import org.jboss.forge.common.projects.test.Menu.Documentation;
-import org.jboss.forge.common.projects.test.Menu.Forum;
-import org.jboss.forge.common.projects.test.Menu.IssueTracker;
-import org.jboss.forge.common.projects.test.Menu.RepoMonitor;
-import org.jboss.forge.common.projects.test.Menu.SupportService;
 
 
 /**
@@ -48,450 +43,54 @@
  */
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "menu", propOrder = {
-    "page",
-    "documentation",
-    "supportService",
-    "forum",
-    "issueTracker",
-    "repoMonitor"
+    "menuEntry"
 })
 public class Menu {
 
-    @XmlElement(namespace = "http://jboss.org", required = true)
-    protected List<Page> page;
-    @XmlElement(namespace = "http://jboss.org", required = true)
-    protected List<Documentation> documentation;
-    @XmlElement(name = "support-service", namespace = "http://jboss.org", required = true)
-    protected List<SupportService> supportService;
-    @XmlElement(namespace = "http://jboss.org", required = true)
-    protected List<Forum> forum;
-    @XmlElement(name = "issue-tracker", namespace = "http://jboss.org")
-    protected IssueTracker issueTracker;
-    @XmlElement(name = "repo-monitor", namespace = "http://jboss.org", required = true)
-    protected List<RepoMonitor> repoMonitor;
+    @XmlElements({
+        @XmlElement(name = "jmm", type = Jmm.class),
+        @XmlElement(name = "repo-monitor", type = RepoMonitor.class),
+        @XmlElement(name = "documentation", type = Documentation.class),
+        @XmlElement(name = "page", type = Page.class),
+        @XmlElement(name = "issue-tracker", type = IssueTracker.class),
+        @XmlElement(name = "forum", type = Forum.class),
+        @XmlElement(name = "support-service", type = SupportService.class)
+    })
+    protected List<Object> menuEntry;
 
     /**
-     * Gets the value of the page property.
+     * Gets the value of the menuEntry property.
      * 
      * <p>
      * This accessor method returns a reference to the live list,
      * not a snapshot. Therefore any modification you make to the
      * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the page property.
+     * This is why there is not a <CODE>set</CODE> method for the menuEntry property.
      * 
      * <p>
      * For example, to add a new item, do as follows:
      * <pre>
-     *    getPage().add(newItem);
+     *    getMenuEntry().add(newItem);
      * </pre>
      * 
      * 
      * <p>
      * Objects of the following type(s) are allowed in the list
-     * {@link Page }
-     * 
-     * 
-     */
-    public List<Page> getPage() {
-        if (page == null) {
-            page = new ArrayList<Page>();
-        }
-        return this.page;
-    }
-
-    /**
-     * Gets the value of the documentation property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the documentation property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getDocumentation().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
+     * {@link Jmm }
+     * {@link RepoMonitor }
      * {@link Documentation }
-     * 
-     * 
-     */
-    public List<Documentation> getDocumentation() {
-        if (documentation == null) {
-            documentation = new ArrayList<Documentation>();
-        }
-        return this.documentation;
-    }
-
-    /**
-     * Gets the value of the supportService property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the supportService property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getSupportService().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
+     * {@link Page }
+     * {@link IssueTracker }
+     * {@link Forum }
      * {@link SupportService }
      * 
      * 
      */
-    public List<SupportService> getSupportService() {
-        if (supportService == null) {
-            supportService = new ArrayList<SupportService>();
+    public List<Object> getMenuEntry() {
+        if (menuEntry == null) {
+            menuEntry = new ArrayList<Object>();
         }
-        return this.supportService;
+        return this.menuEntry;
     }
 
-    /**
-     * Gets the value of the forum property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the forum property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getForum().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Forum }
-     * 
-     * 
-     */
-    public List<Forum> getForum() {
-        if (forum == null) {
-            forum = new ArrayList<Forum>();
-        }
-        return this.forum;
-    }
-
-    /**
-     * Gets the value of the issueTracker property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link IssueTracker }
-     *     
-     */
-    public IssueTracker getIssueTracker() {
-        return issueTracker;
-    }
-
-    /**
-     * Sets the value of the issueTracker property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link IssueTracker }
-     *     
-     */
-    public void setIssueTracker(IssueTracker value) {
-        this.issueTracker = value;
-    }
-
-    /**
-     * Gets the value of the repoMonitor property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the repoMonitor property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getRepoMonitor().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link RepoMonitor }
-     * 
-     * 
-     */
-    public List<RepoMonitor> getRepoMonitor() {
-        if (repoMonitor == null) {
-            repoMonitor = new ArrayList<RepoMonitor>();
-        }
-        return this.repoMonitor;
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;complexContent>
-     *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       &lt;attribute name="type" use="required" type="{http://jboss.org}DocumentationType" />
-     *     &lt;/restriction>
-     *   &lt;/complexContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "")
-    public static class Documentation {
-
-        @XmlAttribute(required = true)
-        protected DocumentationType type;
-
-        /**
-         * Gets the value of the type property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link DocumentationType }
-         *     
-         */
-        public DocumentationType getType() {
-            return type;
-        }
-
-        /**
-         * Sets the value of the type property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link DocumentationType }
-         *     
-         */
-        public void setType(DocumentationType value) {
-            this.type = value;
-        }
-
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;complexContent>
-     *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       &lt;attribute name="type" use="required" type="{http://jboss.org}ForumType" />
-     *     &lt;/restriction>
-     *   &lt;/complexContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "")
-    public static class Forum {
-
-        @XmlAttribute(required = true)
-        protected ForumType type;
-
-        /**
-         * Gets the value of the type property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link ForumType }
-         *     
-         */
-        public ForumType getType() {
-            return type;
-        }
-
-        /**
-         * Sets the value of the type property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link ForumType }
-         *     
-         */
-        public void setType(ForumType value) {
-            this.type = value;
-        }
-
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;complexContent>
-     *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       &lt;attribute name="type" use="required" type="{http://jboss.org}IssueTrackerType" />
-     *     &lt;/restriction>
-     *   &lt;/complexContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "")
-    public static class IssueTracker {
-
-        @XmlAttribute(required = true)
-        protected IssueTrackerType type;
-
-        /**
-         * Gets the value of the type property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link IssueTrackerType }
-         *     
-         */
-        public IssueTrackerType getType() {
-            return type;
-        }
-
-        /**
-         * Sets the value of the type property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link IssueTrackerType }
-         *     
-         */
-        public void setType(IssueTrackerType value) {
-            this.type = value;
-        }
-
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;complexContent>
-     *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       &lt;attribute name="type" use="required" type="{http://jboss.org}RepoType" />
-     *     &lt;/restriction>
-     *   &lt;/complexContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "")
-    public static class RepoMonitor {
-
-        @XmlAttribute(required = true)
-        protected RepoType type;
-
-        /**
-         * Gets the value of the type property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link RepoType }
-         *     
-         */
-        public RepoType getType() {
-            return type;
-        }
-
-        /**
-         * Sets the value of the type property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link RepoType }
-         *     
-         */
-        public void setType(RepoType value) {
-            this.type = value;
-        }
-
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;complexContent>
-     *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       &lt;attribute name="type" use="required" type="{http://jboss.org}SupportType" />
-     *     &lt;/restriction>
-     *   &lt;/complexContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "")
-    public static class SupportService {
-
-        @XmlAttribute(required = true)
-        protected SupportType type;
-
-        /**
-         * Gets the value of the type property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link SupportType }
-         *     
-         */
-        public SupportType getType() {
-            return type;
-        }
-
-        /**
-         * Sets the value of the type property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link SupportType }
-         *     
-         */
-        public void setType(SupportType value) {
-            this.type = value;
-        }
-
-    }
-
 }

Modified: labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/test/ObjectFactory.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/test/ObjectFactory.java	2006-10-22 22:47:02 UTC (rev 7012)
+++ labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/test/ObjectFactory.java	2006-10-23 11:38:41 UTC (rev 7013)
@@ -51,54 +51,22 @@
     }
 
     /**
-     * Create an instance of {@link File }
+     * Create an instance of {@link Developers }
      * 
      */
-    public File createFile() {
-        return new File();
+    public Developers createDevelopers() {
+        return new Developers();
     }
 
     /**
-     * Create an instance of {@link Menu.Documentation }
+     * Create an instance of {@link Polls }
      * 
      */
-    public Menu.Documentation createMenuDocumentation() {
-        return new Menu.Documentation();
+    public Polls createPolls() {
+        return new Polls();
     }
 
     /**
-     * Create an instance of {@link Files }
-     * 
-     */
-    public Files createFiles() {
-        return new Files();
-    }
-
-    /**
-     * Create an instance of {@link Menu.RepoMonitor }
-     * 
-     */
-    public Menu.RepoMonitor createMenuRepoMonitor() {
-        return new Menu.RepoMonitor();
-    }
-
-    /**
-     * Create an instance of {@link org.jboss.forge.common.projects.test.IssueTracker }
-     * 
-     */
-    public org.jboss.forge.common.projects.test.IssueTracker createIssueTracker() {
-        return new org.jboss.forge.common.projects.test.IssueTracker();
-    }
-
-    /**
-     * Create an instance of {@link BuildResult }
-     * 
-     */
-    public BuildResult createBuildResult() {
-        return new BuildResult();
-    }
-
-    /**
      * Create an instance of {@link Project }
      * 
      */
@@ -107,43 +75,43 @@
     }
 
     /**
-     * Create an instance of {@link Category }
+     * Create an instance of {@link Categories }
      * 
      */
-    public Category createCategory() {
-        return new Category();
+    public Categories createCategories() {
+        return new Categories();
     }
 
     /**
-     * Create an instance of {@link org.jboss.forge.common.projects.test.Documentation }
+     * Create an instance of {@link Downloads }
      * 
      */
-    public org.jboss.forge.common.projects.test.Documentation createDocumentation() {
-        return new org.jboss.forge.common.projects.test.Documentation();
+    public Downloads createDownloads() {
+        return new Downloads();
     }
 
     /**
-     * Create an instance of {@link Menu.IssueTracker }
+     * Create an instance of {@link Documentation }
      * 
      */
-    public Menu.IssueTracker createMenuIssueTracker() {
-        return new Menu.IssueTracker();
+    public Documentation createDocumentation() {
+        return new Documentation();
     }
 
     /**
-     * Create an instance of {@link File.Button }
+     * Create an instance of {@link Jmm }
      * 
      */
-    public File.Button createFileButton() {
-        return new File.Button();
+    public Jmm createJmm() {
+        return new Jmm();
     }
 
     /**
-     * Create an instance of {@link Polls }
+     * Create an instance of {@link SupportService }
      * 
      */
-    public Polls createPolls() {
-        return new Polls();
+    public SupportService createSupportService() {
+        return new SupportService();
     }
 
     /**
@@ -155,22 +123,14 @@
     }
 
     /**
-     * Create an instance of {@link Categories }
+     * Create an instance of {@link IssueTracker }
      * 
      */
-    public Categories createCategories() {
-        return new Categories();
+    public IssueTracker createIssueTracker() {
+        return new IssueTracker();
     }
 
     /**
-     * Create an instance of {@link Developers }
-     * 
-     */
-    public Developers createDevelopers() {
-        return new Developers();
-    }
-
-    /**
      * Create an instance of {@link Page }
      * 
      */
@@ -179,43 +139,43 @@
     }
 
     /**
-     * Create an instance of {@link org.jboss.forge.common.projects.test.SupportService }
+     * Create an instance of {@link Category }
      * 
      */
-    public org.jboss.forge.common.projects.test.SupportService createSupportService() {
-        return new org.jboss.forge.common.projects.test.SupportService();
+    public Category createCategory() {
+        return new Category();
     }
 
     /**
-     * Create an instance of {@link org.jboss.forge.common.projects.test.RepoMonitor }
+     * Create an instance of {@link Files }
      * 
      */
-    public org.jboss.forge.common.projects.test.RepoMonitor createRepoMonitor() {
-        return new org.jboss.forge.common.projects.test.RepoMonitor();
+    public Files createFiles() {
+        return new Files();
     }
 
     /**
-     * Create an instance of {@link Menu.Forum }
+     * Create an instance of {@link File }
      * 
      */
-    public Menu.Forum createMenuForum() {
-        return new Menu.Forum();
+    public File createFile() {
+        return new File();
     }
 
     /**
-     * Create an instance of {@link Menu.SupportService }
+     * Create an instance of {@link Menu }
      * 
      */
-    public Menu.SupportService createMenuSupportService() {
-        return new Menu.SupportService();
+    public Menu createMenu() {
+        return new Menu();
     }
 
     /**
-     * Create an instance of {@link Downloads }
+     * Create an instance of {@link BuildResult }
      * 
      */
-    public Downloads createDownloads() {
-        return new Downloads();
+    public BuildResult createBuildResult() {
+        return new BuildResult();
     }
 
     /**
@@ -227,19 +187,19 @@
     }
 
     /**
-     * Create an instance of {@link org.jboss.forge.common.projects.test.Forum }
+     * Create an instance of {@link File.Button }
      * 
      */
-    public org.jboss.forge.common.projects.test.Forum createForum() {
-        return new org.jboss.forge.common.projects.test.Forum();
+    public File.Button createFileButton() {
+        return new File.Button();
     }
 
     /**
-     * Create an instance of {@link Menu }
+     * Create an instance of {@link RepoMonitor }
      * 
      */
-    public Menu createMenu() {
-        return new Menu();
+    public RepoMonitor createRepoMonitor() {
+        return new RepoMonitor();
     }
 
     /**
@@ -250,4 +210,12 @@
         return new Downloads.Counters();
     }
 
+    /**
+     * Create an instance of {@link Forum }
+     * 
+     */
+    public Forum createForum() {
+        return new Forum();
+    }
+
 }

Modified: labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/test/package-info.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/test/package-info.java	2006-10-22 22:47:02 UTC (rev 7012)
+++ labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/test/package-info.java	2006-10-23 11:38:41 UTC (rev 7013)
@@ -20,5 +20,5 @@
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
 
- at javax.xml.bind.annotation.XmlSchema(namespace = "http://jboss.org")
+ at javax.xml.bind.annotation.XmlSchema(namespace = "http://jboss.org", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
 package org.jboss.forge.common.projects.test;

Modified: labs/jbosslabs/trunk/portal-extensions/forge-common/src/web/WEB-INF/project.xsd
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-common/src/web/WEB-INF/project.xsd	2006-10-22 22:47:02 UTC (rev 7012)
+++ labs/jbosslabs/trunk/portal-extensions/forge-common/src/web/WEB-INF/project.xsd	2006-10-23 11:38:41 UTC (rev 7013)
@@ -405,34 +405,20 @@
             </jxb:class>
         </xs:appinfo>
     </xs:annotation>
-    <xs:sequence>
+    <xs:choice minOccurs="0" maxOccurs="unbounded" >
+        <xs:annotation>
+            <xs:appinfo>
+                <jxb:property name="menu-entry" />
+            </xs:appinfo>
+        </xs:annotation>
         <xs:element name="page" type="page" minOccurs="0" maxOccurs="unbounded" />
-        <xs:element name="documentation" minOccurs="0" maxOccurs="unbounded" >
-        <xs:complexType mixed="false" >
-                <xs:attribute name="type" use="required" type="DocumentationType" />
-        </xs:complexType>
-        </xs:element>
-        <xs:element name="support-service"  minOccurs="0" maxOccurs="unbounded" >
-            <xs:complexType mixed="false" >
-                <xs:attribute name="type" use="required" type="SupportType" />
-            </xs:complexType>
-        </xs:element>
-        <xs:element name="forum" minOccurs="0" maxOccurs="unbounded" >
-            <xs:complexType mixed="false" >
-                <xs:attribute name="type" use="required" type="ForumType" />
-            </xs:complexType>
-        </xs:element>
-        <xs:element name="issue-tracker" minOccurs="0" maxOccurs="1" >
-            <xs:complexType mixed="false" >
-                <xs:attribute name="type" use="required" type="IssueTrackerType" />
-            </xs:complexType>
-        </xs:element>
-        <xs:element name="repo-monitor" minOccurs="0" maxOccurs="unbounded" >
-            <xs:complexType>
-                <xs:attribute name="type" use="required" type="RepoType" />
-            </xs:complexType>
-        </xs:element>
-    </xs:sequence>
+        <xs:element name="documentation" minOccurs="0" maxOccurs="unbounded" type="documentation" />
+        <xs:element name="support-service"  minOccurs="0" maxOccurs="unbounded" type="support-service" />
+        <xs:element name="forum" minOccurs="0" maxOccurs="unbounded" type="forum" />
+        <xs:element name="issue-tracker" minOccurs="0" maxOccurs="1" type="issue-tracker" />
+        <xs:element name="repo-monitor" minOccurs="0" maxOccurs="unbounded" type="repo-monitor" />
+        <xs:element name="jmm" minOccurs="0" maxOccurs="1" type="jmm" />
+    </xs:choice>
 </xs:complexType>
 
     <xs:complexType name="page" mixed="true" >
@@ -453,6 +439,20 @@
             </xs:extension>
         </xs:simpleContent>
     </xs:complexType>
+    
+    <xs:complexType name="jmm" >
+        <xs:annotation>
+            <xs:appinfo>
+                <jxb:class name="jmm" >
+                    <jxb:javadoc>
+        Class representing JMM menu entry.
+        PLEASE, DO NOT MODIFY THIS CLASS UNLESS YOU KNOW JAXB.
+        @author Ryszard Kozmik
+                    </jxb:javadoc>
+                </jxb:class>
+            </xs:appinfo>
+        </xs:annotation>
+    </xs:complexType>
 
 
 <!--                                             -->
@@ -511,7 +511,7 @@
             </jxb:class>
         </xs:appinfo>
     </xs:annotation>
-    <xs:all>
+    <xs:sequence>
         <xs:element name="categories" minOccurs="0" maxOccurs="1" type="categories" />
         <xs:element name="name" minOccurs="0" maxOccurs="1" type="xs:string" />
         <xs:element name="description" minOccurs="0" maxOccurs="1" type="xs:string" />
@@ -524,7 +524,7 @@
             </xs:complexType>
         </xs:element>
         <xs:element name="files" minOccurs="0" maxOccurs="1" type="files" />
-    </xs:all>
+    </xs:sequence>
 </xs:complexType>
 
     <xs:complexType name="files" >
@@ -560,11 +560,11 @@
             </xs:annotation>
             <xs:sequence>
                 <xs:element name="id" type="xs:string" minOccurs="1" maxOccurs="1" />
-                <xs:element name="name" type="xs:string" maxOccurs="1" />
-                <xs:element name="description" type="xs:string" maxOccurs="1" />
-                <xs:element name="size" type="xs:string" maxOccurs="1" />
-                <xs:element name="license" type="xs:string" maxOccurs="1" />
-                <xs:element name="release" type="xs:string" maxOccurs="1" />
+                <xs:element name="name" type="xs:string" maxOccurs="1" minOccurs="0" />
+                <xs:element name="description" type="xs:string" maxOccurs="1" minOccurs="0" />
+                <xs:element name="size" type="xs:string" maxOccurs="1" minOccurs="0" />
+                <xs:element name="license" type="xs:string" maxOccurs="1" minOccurs="0" />
+                <xs:element name="release" type="xs:string" maxOccurs="1" minOccurs="0" />
                 <xs:element name="type" minOccurs="0" maxOccurs="1" >
                     <xs:simpleType>
                         <xs:restriction base="xs:string">
@@ -573,17 +573,17 @@
                         </xs:restriction>
                     </xs:simpleType>
                 </xs:element>
-                <xs:element name="button" minOccurs="1" maxOccurs="unbounded" >
+                <xs:element name="button" minOccurs="0" maxOccurs="unbounded" >
                     <xs:complexType>
                         <xs:sequence>
-                            <xs:element name="id" type="xs:string" />
-                            <xs:element name="name" type="xs:string" />
-                            <xs:element name="freezone" type="xs:boolean" />
+                            <xs:element name="id" type="xs:string" maxOccurs="1" minOccurs="1" />
+                            <xs:element name="name" type="xs:string" minOccurs="0" maxOccurs="1" />
+                            <xs:element name="freezone" type="xs:boolean" minOccurs="0" maxOccurs="1" />
                         </xs:sequence>
                     </xs:complexType>
                 </xs:element>
             </xs:sequence>
-            <xs:attribute name="visible" type="xs:boolean" default="true" />
+            <xs:attribute name="visible" type="xs:boolean" default="true" use="optional" />
         </xs:complexType>
 
 




More information about the jboss-svn-commits mailing list