[jboss-svn-commits] JBL Code SVN: r19572 - in labs/jbosslabs/labs-3.0-build: views/admin/src/main/java/org/jboss/labs/admin and 1 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Apr 15 07:40:15 EDT 2008
Author: wrzep
Date: 2008-04-15 07:40:15 -0400 (Tue, 15 Apr 2008)
New Revision: 19572
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/views/admin/src/main/java/org/jboss/labs/admin/ClearspaceManager.java
labs/jbosslabs/labs-3.0-build/views/admin/src/main/resources/seam.properties
Log:
JBLAB-943 new CS page when project is accepted
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-04-15 11:21:58 UTC (rev 19571)
+++ labs/jbosslabs/labs-3.0-build/services/project-service/src/main/java/org/jboss/labs/core/service/impl/ProjectServiceBean.java 2008-04-15 11:40:15 UTC (rev 19572)
@@ -56,8 +56,6 @@
license.addProject(p);
p.addLicense(license);
- System.out.println("before merge");
-
em.merge(license);
if (projectRequest.isRepository()) {
Modified: labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/ClearspaceManager.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/ClearspaceManager.java 2008-04-15 11:21:58 UTC (rev 19571)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/ClearspaceManager.java 2008-04-15 11:40:15 UTC (rev 19572)
@@ -23,14 +23,12 @@
package org.jboss.labs.admin;
+import com.jivesoftware.community.webservices.*;
+import org.jboss.seam.annotations.AutoCreate;
+import org.jboss.seam.annotations.Logger;
import org.jboss.seam.annotations.Name;
-import org.jboss.seam.annotations.AutoCreate;
+import org.jboss.seam.log.Log;
-import com.jivesoftware.community.webservices.ServiceLocator;
-import com.jivesoftware.community.webservices.DocumentService;
-import com.jivesoftware.community.webservices.CommunityService;
-import com.jivesoftware.community.NameAlreadyExistsException;
-
import java.io.Serializable;
/**
@@ -40,18 +38,79 @@
@AutoCreate
public class ClearspaceManager implements Serializable {
+ private String clearspaceURL;
+ private String clearspaceUser;
+ private String clearspacePassword;
private static final long serialVersionUID = -5459205655998862680L;
+ @Logger private Log log;
+
+ private static final long DOCUMENT_TYPE_ID = 1; // Just a guess. CS API says nothing about it.
+
+
public void createSpace(String projectId, String name) {
- ServiceLocator locator = new ServiceLocator("http://10.18.66.160:8080/clearspace", "admin", "admin");
+ ServiceLocator locator = new ServiceLocator(clearspaceURL, clearspaceUser, clearspacePassword);
CommunityService communityService = locator.getCommunityService();
+ String description = getProjectDescription(projectId, name);
+
try {
- communityService.createCommunity(projectId, name, "description");
- } catch (NameAlreadyExistsException e) {
- e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates.
+ Community community = communityService.createCommunity(projectId, name, "description");
+
+ UserService userService = locator.getUserService();
+ User user = userService.getUserByUsername("admin");
+
+ DocumentService documentService = locator.getDocumentService();
+
+ documentService.publishDocument(community.getID(),
+ user.getID(),
+ DOCUMENT_TYPE_ID,
+ null,
+ "Main",
+ description);
+ } catch (Exception e) {
+ log.error("Error creating Clearspace space and project page", e);
}
}
+
+ private String getProjectDescription(String projectId, String name) {
+
+ StringBuilder s = new StringBuilder();
+
+ s.append("h1. ").append(name).append("\n")
+ .append("Comming soon.\n\n")
+ .append("You can find information about this project at ")
+ .append("[http://jboss.org/proj/").append(projectId).append("].\n\n")
+ .append("Please visit [http://jboss.org] to learn more about JBoss projects.");
+
+ return s.toString();
+ }
+
+ /* getters and setters */
+
+ public String getClearspaceURL() {
+ return clearspaceURL;
+ }
+
+ public void setClearspaceURL(String clearspaceURL) {
+ this.clearspaceURL = clearspaceURL;
+ }
+
+ public String getClearspaceUser() {
+ return clearspaceUser;
+ }
+
+ public void setClearspaceUser(String clearspaceUser) {
+ this.clearspaceUser = clearspaceUser;
+ }
+
+ public String getClearspacePassword() {
+ return clearspacePassword;
+ }
+
+ public void setClearspacePassword(String clearspacePassword) {
+ this.clearspacePassword = clearspacePassword;
+ }
}
\ No newline at end of file
Modified: labs/jbosslabs/labs-3.0-build/views/admin/src/main/resources/seam.properties
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/resources/seam.properties 2008-04-15 11:21:58 UTC (rev 19571)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/resources/seam.properties 2008-04-15 11:40:15 UTC (rev 19572)
@@ -0,0 +1,3 @@
+clearspaceManager.clearspaceURL=http://10.18.66.160:8080/clearspace
+clearspaceManager.clearspaceUser=admin
+clearspaceManager.clearspacePassword=admin
More information about the jboss-svn-commits
mailing list