[jboss-svn-commits] JBL Code SVN: r17013 - in labs/jbosslabs/trunk/stats-server/sources/metrics_web: src/model/org/jboss/labs/metrics/web/ws and 1 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Dec 4 08:34:33 EST 2007
Author: wrzep
Date: 2007-12-04 08:34:33 -0500 (Tue, 04 Dec 2007)
New Revision: 17013
Added:
labs/jbosslabs/trunk/stats-server/sources/metrics_web/src/model/org/jboss/labs/metrics/web/ws/Project.java
labs/jbosslabs/trunk/stats-server/sources/metrics_web/src/model/org/jboss/labs/metrics/web/ws/ProjectArray.java
Modified:
labs/jbosslabs/trunk/stats-server/sources/metrics_web/src/model/org/jboss/labs/metrics/web/service/ProjectsService.java
labs/jbosslabs/trunk/stats-server/sources/metrics_web/src/model/org/jboss/labs/metrics/web/ws/LabsWebServiceBean.java
labs/jbosslabs/trunk/stats-server/sources/metrics_web/src/model/org/jboss/labs/metrics/web/ws/LabsWebServiceBean.wsdl
labs/jbosslabs/trunk/stats-server/sources/metrics_web/src/model/org/jboss/labs/metrics/web/ws/ObjectFactory.java
labs/jbosslabs/trunk/stats-server/sources/metrics_web/view/home.xhtml
Log:
fetching all data we need from labs ws
Modified: labs/jbosslabs/trunk/stats-server/sources/metrics_web/src/model/org/jboss/labs/metrics/web/service/ProjectsService.java
===================================================================
--- labs/jbosslabs/trunk/stats-server/sources/metrics_web/src/model/org/jboss/labs/metrics/web/service/ProjectsService.java 2007-12-04 13:31:51 UTC (rev 17012)
+++ labs/jbosslabs/trunk/stats-server/sources/metrics_web/src/model/org/jboss/labs/metrics/web/service/ProjectsService.java 2007-12-04 13:34:33 UTC (rev 17013)
@@ -5,7 +5,8 @@
import org.jboss.labs.metrics.web.ws.LabsWebServiceBean;
import org.jboss.labs.metrics.web.ws.LabsWebServiceBeanService;
-import org.jboss.labs.metrics.web.ws.StringArray;
+import org.jboss.labs.metrics.web.ws.Project;
+import org.jboss.labs.metrics.web.ws.ProjectArray;
import org.jboss.seam.ScopeType;
import org.jboss.seam.annotations.Factory;
import org.jboss.seam.annotations.Name;
@@ -20,22 +21,18 @@
public class ProjectsService {
@Factory("projects")
- public List<String> getProjects() {
+ public List<Project> getProjects() {
- List<String> projects = null;
+ List<Project> projects = null;
LabsWebServiceBean service = new LabsWebServiceBeanService().getLabsWebServiceBeanPort();
-
- System.out.println("*** service " + service);
- StringArray arr = null;
+ ProjectArray arr = null;
if (service != null) {
- arr = service.getProjectIds();
+ arr = service.getProjects();
}
- System.out.println("********************** arr: " + arr);
-
if (arr != null) {
projects = arr.getItem();
}
Modified: labs/jbosslabs/trunk/stats-server/sources/metrics_web/src/model/org/jboss/labs/metrics/web/ws/LabsWebServiceBean.java
===================================================================
--- labs/jbosslabs/trunk/stats-server/sources/metrics_web/src/model/org/jboss/labs/metrics/web/ws/LabsWebServiceBean.java 2007-12-04 13:31:51 UTC (rev 17012)
+++ labs/jbosslabs/trunk/stats-server/sources/metrics_web/src/model/org/jboss/labs/metrics/web/ws/LabsWebServiceBean.java 2007-12-04 13:34:33 UTC (rev 17013)
@@ -68,4 +68,12 @@
@WebParam(name = "arg0", partName = "arg0")
String arg0);
+ /**
+ *
+ * @return
+ * returns metrics.ProjectArray
+ */
+ @WebMethod
+ @WebResult(partName = "return")
+ public ProjectArray getProjects();
}
Modified: labs/jbosslabs/trunk/stats-server/sources/metrics_web/src/model/org/jboss/labs/metrics/web/ws/LabsWebServiceBean.wsdl
===================================================================
--- labs/jbosslabs/trunk/stats-server/sources/metrics_web/src/model/org/jboss/labs/metrics/web/ws/LabsWebServiceBean.wsdl 2007-12-04 13:31:51 UTC (rev 17012)
+++ labs/jbosslabs/trunk/stats-server/sources/metrics_web/src/model/org/jboss/labs/metrics/web/ws/LabsWebServiceBean.wsdl 2007-12-04 13:34:33 UTC (rev 17013)
@@ -1,5 +1,20 @@
<definitions name='LabsWebServiceBeanService' targetNamespace='http://ws.ejb3.forge.jboss.org/' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://jaxb.dev.java.net/array' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://ws.ejb3.forge.jboss.org/' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
<types>
+ <xs:schema targetNamespace='http://ws.ejb3.forge.jboss.org/' version='1.0' xmlns:tns='http://ws.ejb3.forge.jboss.org/' xmlns:xs='http://www.w3.org/2001/XMLSchema'>
+ <xs:complexType name='project'>
+ <xs:sequence>
+ <xs:element minOccurs='0' name='id' type='xs:string'/>
+ <xs:element minOccurs='0' name='jira' type='xs:string'/>
+ <xs:element minOccurs='0' name='name' type='xs:string'/>
+ <xs:element minOccurs='0' name='svn' type='xs:string'/>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType final='#all' name='projectArray'>
+ <xs:sequence>
+ <xs:element maxOccurs='unbounded' minOccurs='0' name='item' nillable='true' type='tns:project'/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:schema>
<xs:schema targetNamespace='http://jaxb.dev.java.net/array' version='1.0' xmlns:xs='http://www.w3.org/2001/XMLSchema'>
<xs:complexType final='#all' name='stringArray'>
<xs:sequence>
@@ -11,12 +26,16 @@
<message name='LabsWebServiceBean_getProjectSVNResponse'>
<part name='return' type='xsd:string'></part>
</message>
+ <message name='LabsWebServiceBean_getProjects'></message>
<message name='LabsWebServiceBean_getProjectName'>
<part name='arg0' type='xsd:string'></part>
</message>
<message name='LabsWebServiceBean_getProjectIdsResponse'>
<part name='return' type='ns1:stringArray'></part>
</message>
+ <message name='LabsWebServiceBean_getProjectsResponse'>
+ <part name='return' type='tns:projectArray'></part>
+ </message>
<message name='LabsWebServiceBean_getProjectNameResponse'>
<part name='return' type='xsd:string'></part>
</message>
@@ -47,6 +66,10 @@
<input message='tns:LabsWebServiceBean_getProjectSVN'></input>
<output message='tns:LabsWebServiceBean_getProjectSVNResponse'></output>
</operation>
+ <operation name='getProjects'>
+ <input message='tns:LabsWebServiceBean_getProjects'></input>
+ <output message='tns:LabsWebServiceBean_getProjectsResponse'></output>
+ </operation>
</portType>
<binding name='LabsWebServiceBeanBinding' type='tns:LabsWebServiceBean'>
<soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/>
@@ -86,6 +109,15 @@
<soap:body namespace='http://ws.ejb3.forge.jboss.org/' use='literal'/>
</output>
</operation>
+ <operation name='getProjects'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body namespace='http://ws.ejb3.forge.jboss.org/' use='literal'/>
+ </input>
+ <output>
+ <soap:body namespace='http://ws.ejb3.forge.jboss.org/' use='literal'/>
+ </output>
+ </operation>
</binding>
<service name='LabsWebServiceBeanService'>
<port binding='tns:LabsWebServiceBeanBinding' name='LabsWebServiceBeanPort'>
Modified: labs/jbosslabs/trunk/stats-server/sources/metrics_web/src/model/org/jboss/labs/metrics/web/ws/ObjectFactory.java
===================================================================
--- labs/jbosslabs/trunk/stats-server/sources/metrics_web/src/model/org/jboss/labs/metrics/web/ws/ObjectFactory.java 2007-12-04 13:31:51 UTC (rev 17012)
+++ labs/jbosslabs/trunk/stats-server/sources/metrics_web/src/model/org/jboss/labs/metrics/web/ws/ObjectFactory.java 2007-12-04 13:34:33 UTC (rev 17013)
@@ -1,3 +1,25 @@
+ /*
+ * JBoss, a division of Red Hat
+ * Copyright 2007, Red Hat Middleware LLC 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.labs.metrics.web.ws;
import javax.xml.bind.annotation.XmlRegistry;
@@ -29,6 +51,14 @@
}
/**
+ * Create an instance of {@link Project }
+ *
+ */
+ public Project createProject() {
+ return new Project();
+ }
+
+ /**
* Create an instance of {@link StringArray }
*
*/
@@ -36,5 +66,12 @@
return new StringArray();
}
+ /**
+ * Create an instance of {@link ProjectArray }
+ *
+ */
+ public ProjectArray createProjectArray() {
+ return new ProjectArray();
+ }
+
}
-
Added: labs/jbosslabs/trunk/stats-server/sources/metrics_web/src/model/org/jboss/labs/metrics/web/ws/Project.java
===================================================================
--- labs/jbosslabs/trunk/stats-server/sources/metrics_web/src/model/org/jboss/labs/metrics/web/ws/Project.java (rev 0)
+++ labs/jbosslabs/trunk/stats-server/sources/metrics_web/src/model/org/jboss/labs/metrics/web/ws/Project.java 2007-12-04 13:34:33 UTC (rev 17013)
@@ -0,0 +1,161 @@
+ /*
+ * JBoss, a division of Red Hat
+ * Copyright 2007, Red Hat Middleware LLC 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.labs.metrics.web.ws;
+
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for project complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
+ * <pre>
+ * <complexType name="project">
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <sequence>
+ * <element name="jira" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ * <element name="svn" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ * </sequence>
+ * </restriction>
+ * </complexContent>
+ * </complexType>
+ * </pre>
+ *
+ *
+ */
+ at XmlAccessorType(XmlAccessType.FIELD)
+ at XmlType(name = "project", propOrder = {
+ "id",
+ "jira",
+ "name",
+ "svn"
+})
+public class Project {
+
+ protected String id;
+ protected String jira;
+ protected String name;
+ protected String svn;
+
+ /**
+ * Gets the value of the id property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getId() {
+ return id;
+ }
+
+ /**
+ * Sets the value of the id property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setId(String value) {
+ this.id = value;
+ }
+
+ /**
+ * Gets the value of the jira property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getJira() {
+ return jira;
+ }
+
+ /**
+ * Sets the value of the jira property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setJira(String value) {
+ this.jira = value;
+ }
+
+ /**
+ * Gets the value of the name property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getName() {
+ return name;
+ }
+
+ /**
+ * Sets the value of the name property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setName(String value) {
+ this.name = value;
+ }
+
+ /**
+ * Gets the value of the svn property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getSvn() {
+ return svn;
+ }
+
+ /**
+ * Sets the value of the svn property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setSvn(String value) {
+ this.svn = value;
+ }
+
+}
Added: labs/jbosslabs/trunk/stats-server/sources/metrics_web/src/model/org/jboss/labs/metrics/web/ws/ProjectArray.java
===================================================================
--- labs/jbosslabs/trunk/stats-server/sources/metrics_web/src/model/org/jboss/labs/metrics/web/ws/ProjectArray.java (rev 0)
+++ labs/jbosslabs/trunk/stats-server/sources/metrics_web/src/model/org/jboss/labs/metrics/web/ws/ProjectArray.java 2007-12-04 13:34:33 UTC (rev 17013)
@@ -0,0 +1,90 @@
+ /*
+ * JBoss, a division of Red Hat
+ * Copyright 2007, Red Hat Middleware LLC 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.labs.metrics.web.ws;
+
+import java.util.ArrayList;
+import java.util.List;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for projectArray complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
+ * <pre>
+ * <complexType name="projectArray">
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <sequence>
+ * <element name="item" type="{http://ws.ejb3.forge.jboss.org/}project" maxOccurs="unbounded" minOccurs="0"/>
+ * </sequence>
+ * </restriction>
+ * </complexContent>
+ * </complexType>
+ * </pre>
+ *
+ *
+ */
+ at XmlAccessorType(XmlAccessType.FIELD)
+ at XmlType(name = "projectArray", propOrder = {
+ "item"
+})
+public class ProjectArray {
+
+ @XmlElement(nillable = true)
+ protected List<Project> item;
+
+ /**
+ * Gets the value of the item 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 item property.
+ *
+ * <p>
+ * For example, to add a new item, do as follows:
+ * <pre>
+ * getItem().add(newItem);
+ * </pre>
+ *
+ *
+ * <p>
+ * Objects of the following type(s) are allowed in the list
+ * {@link Project }
+ *
+ *
+ */
+ public List<Project> getItem() {
+ if (item == null) {
+ item = new ArrayList<Project>();
+ }
+ return this.item;
+ }
+
+}
Modified: labs/jbosslabs/trunk/stats-server/sources/metrics_web/view/home.xhtml
===================================================================
--- labs/jbosslabs/trunk/stats-server/sources/metrics_web/view/home.xhtml 2007-12-04 13:31:51 UTC (rev 17012)
+++ labs/jbosslabs/trunk/stats-server/sources/metrics_web/view/home.xhtml 2007-12-04 13:34:33 UTC (rev 17013)
@@ -16,9 +16,18 @@
<f:facet name="header">Welcome!</f:facet>
<p>Projects</p>
<rich:dataTable value="#{projects}" var="p">
+ <rich:column>
+ #{p.id}
+ </rich:column>
<rich:column>
- #{p}
+ #{p.name}
</rich:column>
+ <rich:column>
+ #{p.jira}
+ </rich:column>
+ <rich:column>
+ #{p.svn}
+ </rich:column>
</rich:dataTable>
</rich:panel>
More information about the jboss-svn-commits
mailing list