[jboss-svn-commits] JBL Code SVN: r18502 - in labs/jbosslabs/labs-3.0-build: services/project-service/src/main/java/org/jboss/labs/core/service/impl and 2 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Feb 19 06:09:58 EST 2008
Author: wrzep
Date: 2008-02-19 06:09:58 -0500 (Tue, 19 Feb 2008)
New Revision: 18502
Removed:
labs/jbosslabs/labs-3.0-build/core/core-model/src/main/java/org/jboss/labs/core/model/Repository.java
Modified:
labs/jbosslabs/labs-3.0-build/core/core-model/src/main/java/org/jboss/labs/core/model/IssueTracker.java
labs/jbosslabs/labs-3.0-build/core/core-model/src/main/java/org/jboss/labs/core/model/Project.java
labs/jbosslabs/labs-3.0-build/core/core-model/src/main/java/org/jboss/labs/core/model/Release.java
labs/jbosslabs/labs-3.0-build/services/project-service/src/main/java/org/jboss/labs/core/service/impl/ProjectServiceBean.java
labs/jbosslabs/labs-3.0-build/services/project-service/src/main/resources/META-INF/persistence.xml
labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/ProjectManager.java
Log:
JBLAB-904 fixed SQL issues
Modified: labs/jbosslabs/labs-3.0-build/core/core-model/src/main/java/org/jboss/labs/core/model/IssueTracker.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/core/core-model/src/main/java/org/jboss/labs/core/model/IssueTracker.java 2008-02-19 10:28:54 UTC (rev 18501)
+++ labs/jbosslabs/labs-3.0-build/core/core-model/src/main/java/org/jboss/labs/core/model/IssueTracker.java 2008-02-19 11:09:58 UTC (rev 18502)
@@ -35,14 +35,14 @@
private Integer version;
private String url;
- private String key;
+ private String jiraKey;
private IssueTrackerType type;
public IssueTracker() {
}
- public IssueTracker(String key, IssueTrackerType type) {
- this.key = key;
+ public IssueTracker(String jiraKey, IssueTrackerType type) {
+ this.jiraKey = jiraKey;
this.type = type;
}
@@ -80,11 +80,11 @@
return type;
}
- public void setKey(String newkey) {
- this.key = newkey;
+ public void setJiraKey(String newkey) {
+ this.jiraKey = newkey;
}
- public String getKey() {
- return key;
+ public String getJiraKey() {
+ return jiraKey;
}
}
Modified: labs/jbosslabs/labs-3.0-build/core/core-model/src/main/java/org/jboss/labs/core/model/Project.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/core/core-model/src/main/java/org/jboss/labs/core/model/Project.java 2008-02-19 10:28:54 UTC (rev 18501)
+++ labs/jbosslabs/labs-3.0-build/core/core-model/src/main/java/org/jboss/labs/core/model/Project.java 2008-02-19 11:09:58 UTC (rev 18502)
@@ -44,11 +44,10 @@
private String documentationURL;
private String ohlohId;
+ private String anonymusRepository;
+ private String commiterRepository;
+ private RepositoryType repositoryType;
@OneToOne(cascade = CascadeType.PERSIST)
- private Repository anonymusRepository;
- @OneToOne(cascade = CascadeType.PERSIST)
- private Repository commiterRepository;
- @OneToOne(cascade = CascadeType.PERSIST)
private IssueTracker issueTracker;
@ManyToMany(cascade = CascadeType.PERSIST)
private List<License> licenseList;
@@ -131,23 +130,31 @@
}
- public Repository getAnonymusRepository() {
+ public String getAnonymusRepository() {
return anonymusRepository;
}
- public void setAnonymusRepository(Repository anonymusRepository) {
+ public void setAnonymusRepository(String anonymusRepository) {
this.anonymusRepository = anonymusRepository;
}
- public Repository getCommiterRepository() {
+ public String getCommiterRepository() {
return commiterRepository;
}
- public void setCommiterRepository(Repository commiterRepository) {
+ public void setCommiterRepository(String commiterRepository) {
this.commiterRepository = commiterRepository;
}
+ public RepositoryType getRepositoryType() {
+ return repositoryType;
+ }
+
+ public void setRepositoryType(RepositoryType repositoryType) {
+ this.repositoryType = repositoryType;
+ }
+
public IssueTracker getIssueTracker() {
return issueTracker;
}
Modified: labs/jbosslabs/labs-3.0-build/core/core-model/src/main/java/org/jboss/labs/core/model/Release.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/core/core-model/src/main/java/org/jboss/labs/core/model/Release.java 2008-02-19 10:28:54 UTC (rev 18501)
+++ labs/jbosslabs/labs-3.0-build/core/core-model/src/main/java/org/jboss/labs/core/model/Release.java 2008-02-19 11:09:58 UTC (rev 18502)
@@ -29,13 +29,14 @@
@Entity
+ at Table(name = "ProjectRelease")
public class Release implements Serializable {
@Id @GeneratedValue
private Integer id;
@Version
private Integer version;
- private Calendar date;
+ private Calendar releaseDate;
private String releaseVersion;
private String announcementText;
private String announcementURL;
@@ -67,12 +68,12 @@
this.version = version;
}
- public void setDate(Calendar newdate) {
- this.date = newdate;
+ public void setReleaseDate(Calendar newdate) {
+ this.releaseDate = newdate;
}
- public Calendar getDate() {
- return date;
+ public Calendar getReleaseDate() {
+ return releaseDate;
}
public void setReleaseVersion(String newreleaseVersion) {
Deleted: labs/jbosslabs/labs-3.0-build/core/core-model/src/main/java/org/jboss/labs/core/model/Repository.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/core/core-model/src/main/java/org/jboss/labs/core/model/Repository.java 2008-02-19 10:28:54 UTC (rev 18501)
+++ labs/jbosslabs/labs-3.0-build/core/core-model/src/main/java/org/jboss/labs/core/model/Repository.java 2008-02-19 11:09:58 UTC (rev 18502)
@@ -1,80 +0,0 @@
-/*
-* JBoss Labs. http://labs.jboss.com/jbosslabs
-*
-* Copyright © 2008 Red Hat Middleware, LLC. All rights reserved.
-*
-* This copyrighted material is made available to anyone wishing to use,
-* modify, copy, or redistribute it subject to the terms and conditions
-* of the GNU Lesser General Public License, v. 2.1.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT A 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, v.2.1 along with this distribution; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-* 02110-1301, USA.
-*
-* Red Hat Author(s): Bob McWhirter, Przemyslaw Dej, Ryszard Kozmik,
-* Tomasz Szymanski, Adam Warski, Pawel Wrzeszcz
-*/
-
-package org.jboss.labs.core.model;
-
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Version;
-import java.io.Serializable;
-
- at Entity
-public class Repository implements Serializable {
-
- private Integer id;
- private Integer version;
- private RepositoryType type;
- private String url;
-
- public Repository() {
- }
-
- public Repository(RepositoryType type) {
- this.type = type;
- }
-
- @Id @GeneratedValue
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- @Version
- public Integer getVersion() {
- return version;
- }
-
- public void setVersion(Integer version) {
- this.version = version;
- }
-
- public void setType(RepositoryType newtype) {
- this.type = newtype;
- }
-
- public RepositoryType getType() {
- return type;
- }
-
- public void setUrl(String newurl) {
- this.url = newurl;
- }
-
- public String getUrl() {
- return url;
- }
-}
Modified: labs/jbosslabs/labs-3.0-build/services/project-service/src/main/java/org/jboss/labs/core/service/impl/ProjectServiceBean.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/services/project-service/src/main/java/org/jboss/labs/core/service/impl/ProjectServiceBean.java 2008-02-19 10:28:54 UTC (rev 18501)
+++ labs/jbosslabs/labs-3.0-build/services/project-service/src/main/java/org/jboss/labs/core/service/impl/ProjectServiceBean.java 2008-02-19 11:09:58 UTC (rev 18502)
@@ -1,7 +1,6 @@
package org.jboss.labs.core.service.impl;
-import org.jboss.labs.core.model.Project;
-import org.jboss.labs.core.model.Username;
+import org.jboss.labs.core.model.*;
import org.jboss.labs.core.model.admin.ProjectRequest;
import org.jboss.labs.core.service.ProjectService;
import org.jboss.labs.exception.admin.CreateProjectException;
@@ -58,16 +57,16 @@
leadUsername.addLeadProject(p);
p.addProjectLead(leadUsername);
- /* if (repository) {
- Repository r = new Repository(RepositoryType.SVN);
- p.setAnonymusRepository(r);
- p.setCommiterRepository(r);
+ if (projectRequest.isRepository()) {
+ p.setAnonymusRepository("http://anonsvn.jboss.org/" + projectId);
+ p.setCommiterRepository("https://svn.jboss.org/" + projectId);
+ p.setRepositoryType(RepositoryType.SVN);
}
- if (jira) {
- IssueTracker it = new IssueTracker(jiraKey, IssueTrackerType.JIRA);
+ if (projectRequest.isJira()) {
+ IssueTracker it = new IssueTracker(projectRequest.getJiraKey(), IssueTrackerType.JIRA);
p.setIssueTracker(it);
- }*/
+ }
// TODO forums
Modified: labs/jbosslabs/labs-3.0-build/services/project-service/src/main/resources/META-INF/persistence.xml
===================================================================
--- labs/jbosslabs/labs-3.0-build/services/project-service/src/main/resources/META-INF/persistence.xml 2008-02-19 10:28:54 UTC (rev 18501)
+++ labs/jbosslabs/labs-3.0-build/services/project-service/src/main/resources/META-INF/persistence.xml 2008-02-19 11:09:58 UTC (rev 18502)
@@ -16,7 +16,6 @@
<class>org.jboss.labs.core.model.Project</class>
<class>org.jboss.labs.core.model.Release</class>
<class>org.jboss.labs.core.model.ReleaseCategory</class>
- <class>org.jboss.labs.core.model.Repository</class>
<class>org.jboss.labs.core.model.SignedContributorAgreement</class>
<class>org.jboss.labs.core.model.Username</class>
</persistence-unit>
Modified: labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/ProjectManager.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/ProjectManager.java 2008-02-19 10:28:54 UTC (rev 18501)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/ProjectManager.java 2008-02-19 11:09:58 UTC (rev 18502)
@@ -52,6 +52,7 @@
projectService.createProject(projectRequest);
} catch (Exception e) {
log.warn(e);
+ e.printStackTrace();//DEBUG
return false;
}
More information about the jboss-svn-commits
mailing list