[MMBASE CVS] contributions/CMSContainer/overview_generator/src/java/com/finalist/cmsc/tools/generator BatchOperation.java CheckOutSourceCode.java

[kevinshen]

Update of 
/var/cvs/contributions/CMSContainer/overview_generator/src/java/com/finalist/cmsc/tools/generator
In directory james.mmbase.org:/tmp/cvs-serv24322

Modified Files:
        BatchOperation.java CheckOutSourceCode.java 
Log Message:
CMSC-472,Automatic generation of available portlets / modules


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/overview_generator/src/java/com/finalist/cmsc/tools/generator
See also: http://www.mmbase.org/jira/browse/CMSC-472


Index: BatchOperation.java
===================================================================
RCS file: 
/var/cvs/contributions/CMSContainer/overview_generator/src/java/com/finalist/cmsc/tools/generator/BatchOperation.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- BatchOperation.java 21 Jan 2008 11:38:02 -0000      1.3
+++ BatchOperation.java 14 Apr 2008 02:27:42 -0000      1.4
@@ -68,9 +68,13 @@
         VCSConfig config = new VCSConfig("svn");
         StringTokenizer tokens = new StringTokenizer(str, " ");
         tokens.nextElement();
+               if(tokens.hasMoreElements())
         config.setUrl(tokens.nextElement().toString());
+               if(tokens.hasMoreElements())
         config.setModule(tokens.nextElement().toString());
+               if(tokens.hasMoreElements())
         config.setUsername(tokens.nextElement().toString());
+               if(tokens.hasMoreElements())
         config.setPassword(tokens.nextElement().toString());
         return config;
     }


Index: CheckOutSourceCode.java
===================================================================
RCS file: 
/var/cvs/contributions/CMSContainer/overview_generator/src/java/com/finalist/cmsc/tools/generator/CheckOutSourceCode.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- CheckOutSourceCode.java     21 Jan 2008 11:38:02 -0000      1.2
+++ CheckOutSourceCode.java     14 Apr 2008 02:27:42 -0000      1.3
@@ -83,9 +83,11 @@
         String userName = vcsConfig.getUsername();
         String passWord = vcsConfig.getPassword();
         String url = vcsConfig.getUrl();
-        String hostName = url.substring(0, url.indexOf(":"));
+        String temp = url.substring(url.indexOf("@")+1);
+        String hostName = temp.substring(0, temp.indexOf(":"));
         String module = vcsConfig.getModule();
-        String rootDirectory = url.substring(url.indexOf(":") + 1, 
url.length());
+        String rootDirectory = temp.substring(temp.indexOf("/"));
+               
         String localDirectory = 
CVSCUtilities.stripFinalSeparator(path.getPath());
 
         boolean isPServer = true;
@@ -122,6 +124,7 @@
         // Now establish information required by CVSProject
         project.setProjectDef(projectDef);
         project.setUserName(userName);
+
         project.setRepository(module);
         project.setRootDirectory(rootDirectory);
         project.setLocalRootDirectory(localDirectory);
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs