[jboss-svn-commits] JBL Code SVN: r9515 - in labs/jbosslabs/trunk/portal-extensions: forge-common/src/web/WEB-INF and 1 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Feb 15 03:37:53 EST 2007
Author: unibrew
Date: 2007-02-15 03:37:53 -0500 (Thu, 15 Feb 2007)
New Revision: 9515
Modified:
labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/ejb3/ProjectsService.java
labs/jbosslabs/trunk/portal-extensions/forge-common/src/web/WEB-INF/project.xsd
labs/jbosslabs/trunk/portal-extensions/forge-ejb3/src/java/org/jboss/forge/ejb3/projects/ProjectsServiceImpl.java
Log:
[JBLAB-841] Updating ProjectsService to latest changes in project.xml parser classes. Additionally,adding newest version of project.xsd XMLSchema file.
Modified: labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/ejb3/ProjectsService.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/ejb3/ProjectsService.java 2007-02-15 08:35:36 UTC (rev 9514)
+++ labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/ejb3/ProjectsService.java 2007-02-15 08:37:53 UTC (rev 9515)
@@ -29,14 +29,12 @@
import org.jboss.forge.common.projects.project.Developers;
import org.jboss.forge.common.projects.project.Documentation;
import org.jboss.forge.common.projects.project.Downloads;
-import org.jboss.forge.common.projects.project.Forum;
import org.jboss.forge.common.projects.project.IssueTracker;
import org.jboss.forge.common.projects.project.Pages;
import org.jboss.forge.common.projects.project.Polls;
import org.jboss.forge.common.projects.project.Project;
import org.jboss.forge.common.projects.project.RepoMonitor;
-import org.jboss.forge.common.projects.project.Repository;
-import org.jboss.forge.common.projects.project.SupportService;
+import org.jboss.forge.common.projects.project.RepoType;
/**
* @author <a href="mailto:ryszard.kozmik at jboss.com">Ryszard Kozmik</a>
@@ -62,18 +60,26 @@
public List<String> getProjectJems (String projectId);
- public List<Repository> getProjectRepositories (String projectId);
+ public RepoType getProjectRepoType (String projectId);
- public List<RepoMonitor> getProjectRepoMonitors (String projectId);
+ public String getProjectAnonRepo (String projectId);
- public List<IssueTracker> getProjectIssueTrackers (String projectId);
+ public String getProjectCommiterRepo (String projectId);
+ public RepoMonitor getProjectRepoMonitor (String projectId);
+
+ public IssueTracker getProjectIssueTracker (String projectId);
+
public List<BuildResult> getProjectBuildresults (String projectId);
- public List<SupportService> getProjectSupportServices (String projectId);
+ public String getProjectSupport (String projectId);
- public List<Forum> getProjectForums (String projectId);
+ public String getProjectTraining (String projectId);
+ public String getProjectUserForum (String projectId);
+
+ public String getProjectDevForum (String projectId);
+
public List<Documentation> getProjectDocumentation (String projectId);
public long getOverallDownloadsForProject(String projectId);
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 2007-02-15 08:35:36 UTC (rev 9514)
+++ labs/jbosslabs/trunk/portal-extensions/forge-common/src/web/WEB-INF/project.xsd 2007-02-15 08:37:53 UTC (rev 9515)
@@ -32,9 +32,14 @@
<xs:annotation>
<xs:appinfo>
- <jxb:globalBindings>
+ <jxb:globalBindings collectionType="java.util.Vector" >
<jxb:serializable uid="1"/>
</jxb:globalBindings>
+ <jxb:schemaBindings>
+ <jxb:nameXmlTransform>
+ <jxb:typeName suffix="Impl"/>
+ </jxb:nameXmlTransform>
+ </jxb:schemaBindings>
</xs:appinfo>
</xs:annotation>
@@ -42,7 +47,7 @@
<!-- PROJECT -->
<!-- -->
-<xs:element name="project" >
+<xs:element name="projectImpl" >
<xs:annotation>
<xs:appinfo>
<jxb:class>
@@ -64,31 +69,17 @@
<xs:element name="info" type="xs:string" minOccurs="0" maxOccurs="1" />
<xs:element name="developers" type="developers" minOccurs="0" maxOccurs="1" />
<xs:element name="jems" minOccurs="0" maxOccurs="unbounded" type="xs:string" />
- <xs:element name="repository" minOccurs="0" maxOccurs="unbounded" type="repository" >
- <xs:annotation>
- <xs:appinfo>
- <jxb:property name="repositories"/>
- </xs:appinfo>
- </xs:annotation>
- </xs:element>
- <xs:element name="repo-monitor" minOccurs="0" maxOccurs="unbounded" type="repo-monitor" >
- <xs:annotation>
- <xs:appinfo>
- <jxb:property name="repo-monitors"/>
- </xs:appinfo>
- </xs:annotation>
- </xs:element>
- <xs:element name="issue-tracker" minOccurs="0" maxOccurs="unbounded" type="issue-tracker" >
- <xs:annotation>
- <xs:appinfo>
- <jxb:property name="issue-trackers"/>
- </xs:appinfo>
- </xs:annotation>
- </xs:element>
+ <xs:element name="repo-type" minOccurs="0" maxOccurs="1" type="RepoType" />
+ <xs:element name="anon-repo" minOccurs="0" maxOccurs="1" type="xs:string" />
+ <xs:element name="commmiter-repo" minOccurs="0" maxOccurs="1" type="xs:string" />
+ <xs:element name="repo-monitor" minOccurs="0" maxOccurs="1" type="repo-monitor" />
+ <xs:element name="issue-tracker" minOccurs="0" maxOccurs="1" type="issue-tracker" />
<xs:element name="build-results" type="build-result" minOccurs="0" maxOccurs="unbounded" />
- <xs:element name="support-services" minOccurs="0" maxOccurs="unbounded" type="support-service" />
+ <xs:element name="support" minOccurs="0" maxOccurs="1" type="xs:string" />
+ <xs:element name="training" minOccurs="0" maxOccurs="1" type="xs:string" />
<xs:element name="packaged-for-download" nillable="false" maxOccurs="1" type="xs:boolean" default="false" />
- <xs:element name="forums" minOccurs="0" maxOccurs="unbounded" type="forum" />
+ <xs:element name="user-forum" minOccurs="0" maxOccurs="1" type="xs:string" />
+ <xs:element name="dev-forum" minOccurs="0" maxOccurs="1" type="xs:string" />
<xs:element name="documentation" minOccurs="0" maxOccurs="unbounded" type="documentation" />
<xs:element name="pages" minOccurs="1" maxOccurs="1" type="pages" />
<xs:element name="downloads" minOccurs="0" maxOccurs="1" type="downloads" />
@@ -175,45 +166,24 @@
<!-- REPOSITORY AND TASKTRACKERS -->
<!-- -->
-<xs:complexType name="repository" mixed="true" >
+<xs:simpleType name="RepoType" >
<xs:annotation>
<xs:appinfo>
- <jxb:class>
+ <jxb:typesafeEnumClass>
<jxb:javadoc>
- Class for keeping information about project's repository type.
- PLEASE, DO NOT MODIFY THIS CLASS UNLESS YOU KNOW JAXB.
+ Enum describing types of possbile repositories.
+ PLEASE, DO NOT MODIFY THIS ENUM UNLESS YOU KNOW JAXB.
@author Ryszard Kozmik
</jxb:javadoc>
- </jxb:class>
+ </jxb:typesafeEnumClass>
</xs:appinfo>
</xs:annotation>
- <xs:simpleContent>
- <xs:extension base="xs:string" >
- <xs:attribute name="type" use="required" type="RepoType" />
- </xs:extension>
- </xs:simpleContent>
-</xs:complexType>
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="svn"/>
+ <xs:enumeration value="cvs"/>
+ </xs:restriction>
+</xs:simpleType>
- <xs:simpleType name="RepoType" >
- <xs:annotation>
- <xs:appinfo>
- <jxb:typesafeEnumClass>
- <jxb:javadoc>
- Enum describing types of possbile repositories.
- PLEASE, DO NOT MODIFY THIS ENUM UNLESS YOU KNOW JAXB.
- @author Ryszard Kozmik
- </jxb:javadoc>
- </jxb:typesafeEnumClass>
- </xs:appinfo>
- </xs:annotation>
- <xs:restriction base="xs:string">
- <xs:enumeration value="svn"/>
- <xs:enumeration value="cvs"/>
- <xs:enumeration value="anonsvn"/>
- <xs:enumeration value="anoncvs"/>
- </xs:restriction>
- </xs:simpleType>
-
<xs:complexType name="repo-monitor" mixed="true" >
<xs:annotation>
<xs:appinfo>
@@ -289,92 +259,7 @@
</xs:simpleType>
-
<!-- -->
-<!-- SUPPORT -->
-<!-- -->
-
-<xs:complexType name="support-service" mixed="true" >
- <xs:annotation>
- <xs:appinfo>
- <jxb:class>
- <jxb:javadoc>
- Class for keeping information about support services provided by project.
- PLEASE, DO NOT MODIFY THIS CLASS UNLESS YOU KNOW JAXB.
- @author Ryszard Kozmik
- </jxb:javadoc>
- </jxb:class>
- </xs:appinfo>
- </xs:annotation>
- <xs:simpleContent>
- <xs:extension base="xs:string" >
- <xs:attribute name="type" use="required" type="SupportType" />
- </xs:extension>
- </xs:simpleContent>
-</xs:complexType>
-
- <xs:simpleType name="SupportType" >
- <xs:annotation>
- <xs:appinfo>
- <jxb:typesafeEnumClass>
- <jxb:javadoc>
- Enum describing types of possbile support services.
- PLEASE, DO NOT MODIFY THIS ENUM UNLESS YOU KNOW JAXB.
- @author Ryszard Kozmik
- </jxb:javadoc>
- </jxb:typesafeEnumClass>
- </xs:appinfo>
- </xs:annotation>
- <xs:restriction base="xs:string">
- <xs:enumeration value="support"/>
- <xs:enumeration value="training"/>
- </xs:restriction>
- </xs:simpleType>
-
-
-<!-- -->
-<!-- FORUMS -->
-<!-- -->
-
-<xs:complexType name="forum" mixed="true" >
- <xs:annotation>
- <xs:appinfo>
- <jxb:class>
- <jxb:javadoc>
- Class for keeping links to project's forums.
- PLEASE, DO NOT MODIFY THIS CLASS UNLESS YOU KNOW JAXB.
- @author Ryszard Kozmik
- </jxb:javadoc>
- </jxb:class>
- </xs:appinfo>
- </xs:annotation>
- <xs:simpleContent>
- <xs:extension base="xs:string" >
- <xs:attribute name="type" use="required" type="ForumType" />
- </xs:extension>
- </xs:simpleContent>
-</xs:complexType>
-
- <xs:simpleType name="ForumType" >
- <xs:annotation>
- <xs:appinfo>
- <jxb:typesafeEnumClass>
- <jxb:javadoc>
- Enum describing types of forums.
- PLEASE, DO NOT MODIFY THIS ENUM UNLESS YOU KNOW JAXB.
- @author Ryszard Kozmik
- </jxb:javadoc>
- </jxb:typesafeEnumClass>
- </xs:appinfo>
- </xs:annotation>
- <xs:restriction base="xs:string">
- <xs:enumeration value="user"/>
- <xs:enumeration value="dev"/>
- </xs:restriction>
- </xs:simpleType>
-
-
-<!-- -->
<!-- DOCUMENTATION -->
<!-- -->
Modified: labs/jbosslabs/trunk/portal-extensions/forge-ejb3/src/java/org/jboss/forge/ejb3/projects/ProjectsServiceImpl.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-ejb3/src/java/org/jboss/forge/ejb3/projects/ProjectsServiceImpl.java 2007-02-15 08:35:36 UTC (rev 9514)
+++ labs/jbosslabs/trunk/portal-extensions/forge-ejb3/src/java/org/jboss/forge/ejb3/projects/ProjectsServiceImpl.java 2007-02-15 08:37:53 UTC (rev 9515)
@@ -43,14 +43,12 @@
import org.jboss.forge.common.projects.project.Developers;
import org.jboss.forge.common.projects.project.Documentation;
import org.jboss.forge.common.projects.project.Downloads;
-import org.jboss.forge.common.projects.project.Forum;
import org.jboss.forge.common.projects.project.IssueTracker;
import org.jboss.forge.common.projects.project.Pages;
import org.jboss.forge.common.projects.project.Polls;
import org.jboss.forge.common.projects.project.Project;
import org.jboss.forge.common.projects.project.RepoMonitor;
-import org.jboss.forge.common.projects.project.Repository;
-import org.jboss.forge.common.projects.project.SupportService;
+import org.jboss.forge.common.projects.project.RepoType;
import org.jboss.forge.common.ejb3.ProjectsService;
import org.jboss.forge.common.Constants;
import org.jboss.logging.Logger;
@@ -130,22 +128,34 @@
return project.getJems();
}
- public List<Repository> getProjectRepositories(String projectId) {
+ public RepoType getProjectRepoType(String projectId) {
Project project = getProjectByName(projectId);
if (project==null) return null;
- return project.getRepositories();
+ return project.getRepoType();
}
+
+ public String getProjectAnonRepo (String projectId) {
+ Project project = getProjectByName(projectId);
+ if (project==null) return null;
+ return project.getAnonRepo();
+ }
+
+ public String getProjectCommiterRepo (String projectId) {
+ Project project = getProjectByName(projectId);
+ if (project==null) return null;
+ return project.getCommmiterRepo();
+ }
- public List<RepoMonitor> getProjectRepoMonitors(String projectId) {
+ public RepoMonitor getProjectRepoMonitor(String projectId) {
Project project = getProjectByName(projectId);
if (project==null) return null;
- return project.getRepoMonitors();
+ return project.getRepoMonitor();
}
- public List<IssueTracker> getProjectIssueTrackers(String projectId) {
+ public IssueTracker getProjectIssueTracker(String projectId) {
Project project = getProjectByName(projectId);
if (project==null) return null;
- return project.getIssueTrackers();
+ return project.getIssueTracker();
}
public List<BuildResult> getProjectBuildresults(String projectId) {
@@ -154,17 +164,29 @@
return project.getBuildResults();
}
- public List<SupportService> getProjectSupportServices(String projectId) {
+ public String getProjectSupport (String projectId) {
Project project = getProjectByName(projectId);
if (project==null) return null;
- return project.getSupportServices();
+ return project.getSupport();
}
+
+ public String getProjectTraining (String projectId) {
+ Project project = getProjectByName(projectId);
+ if (project==null) return null;
+ return project.getTraining();
+ }
- public List<Forum> getProjectForums(String projectId) {
+ public String getProjectUserForum(String projectId) {
Project project = getProjectByName(projectId);
if (project==null) return null;
- return project.getForums();
+ return project.getUserForum();
}
+
+ public String getProjectDevForum(String projectId) {
+ Project project = getProjectByName(projectId);
+ if (project==null) return null;
+ return project.getDevForum();
+ }
public List<Documentation> getProjectDocumentation(String projectId) {
Project project = getProjectByName(projectId);
More information about the jboss-svn-commits
mailing list