cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From reinh...@apache.org
Subject svn commit: r407530 - in /cocoon/trunk/tools/cocoon-block-deployer: cocoon-deployer-core/src/main/java/org/apache/cocoon/deployer/ cocoon-deployer-core/src/main/java/org/apache/cocoon/deployer/applicationserver/ cocoon-deployer-core/src/test/java/org/a...
Date Thu, 18 May 2006 11:27:36 GMT
Author: reinhard
Date: Thu May 18 04:27:35 2006
New Revision: 407530

URL: http://svn.apache.org/viewvc?rev=407530&view=rev
Log:
use '2.2' as version number

Added:
    cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-core/src/main/java/org/apache/cocoon/deployer/applicationserver/MonolithicServer22.java
      - copied, changed from r407514, cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-core/src/main/java/org/apache/cocoon/deployer/applicationserver/MonolithicServer23.java
Removed:
    cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-core/src/main/java/org/apache/cocoon/deployer/applicationserver/MonolithicServer23.java
Modified:
    cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-core/src/main/java/org/apache/cocoon/deployer/MonolithicCocoonDeployer.java
    cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-core/src/test/java/org/apache/cocoon/deployer/applicationserver/MonoliticServerTest.java
    cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin/src/main/java/org/apache/cocoon/maven/deployer/DeployExplodedMojo.java

Modified: cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-core/src/main/java/org/apache/cocoon/deployer/MonolithicCocoonDeployer.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-core/src/main/java/org/apache/cocoon/deployer/MonolithicCocoonDeployer.java?rev=407530&r1=407529&r2=407530&view=diff
==============================================================================
--- cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-core/src/main/java/org/apache/cocoon/deployer/MonolithicCocoonDeployer.java
(original)
+++ cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-core/src/main/java/org/apache/cocoon/deployer/MonolithicCocoonDeployer.java
Thu May 18 04:27:35 2006
@@ -20,7 +20,7 @@
 import java.util.Iterator;
 import java.util.Map;
 
-import org.apache.cocoon.deployer.applicationserver.MonolithicServer23;
+import org.apache.cocoon.deployer.applicationserver.MonolithicServer22;
 import org.apache.cocoon.deployer.logger.Logger;
 import org.apache.cocoon.deployer.monolithic.SingleFileDeployer;
 
@@ -36,7 +36,7 @@
         	File lib = (File) libraries.get(id);  	
         	try {
         		
-        		MonolithicServer23 zipExtractor = new MonolithicServer23(basedir, logger);
+        		MonolithicServer22 zipExtractor = new MonolithicServer22(basedir, logger);
                 zipExtractor.addRule("**legacy**.xconf", new SingleFileDeployer("WEB-INF/xconf"));
                 zipExtractor.addRule("**legacy**.xmap", new SingleFileDeployer("WEB-INF/sitemap-additions"));
 
                 zipExtractor.addRule("COB-INF**", new SingleFileDeployer(blocksdir + "/"
+ (String) id, true));  

Copied: cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-core/src/main/java/org/apache/cocoon/deployer/applicationserver/MonolithicServer22.java
(from r407514, cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-core/src/main/java/org/apache/cocoon/deployer/applicationserver/MonolithicServer23.java)
URL: http://svn.apache.org/viewvc/cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-core/src/main/java/org/apache/cocoon/deployer/applicationserver/MonolithicServer22.java?p2=cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-core/src/main/java/org/apache/cocoon/deployer/applicationserver/MonolithicServer22.java&p1=cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-core/src/main/java/org/apache/cocoon/deployer/applicationserver/MonolithicServer23.java&r1=407514&r2=407530&rev=407530&view=diff
==============================================================================
--- cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-core/src/main/java/org/apache/cocoon/deployer/applicationserver/MonolithicServer23.java
(original)
+++ cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-core/src/main/java/org/apache/cocoon/deployer/applicationserver/MonolithicServer22.java
Thu May 18 04:27:35 2006
@@ -34,14 +34,14 @@
 import org.apache.cocoon.deployer.util.WildcardHelper;
 import org.apache.commons.lang.Validate;
 
-public class MonolithicServer23 {
+public class MonolithicServer22 {
 
 	private Logger logger;
 	private File basedir;
 	private List rules = new ArrayList();
 	private Set alreadyDeployedFilesSet =  new HashSet();
 	
-	public MonolithicServer23(File basedir, Logger logger) {
+	public MonolithicServer22(File basedir, Logger logger) {
 		Validate.notNull(basedir, "The basedir of the server mustn't be null.");
 		Validate.notNull(logger, "A logger must be set.");
 		this.basedir = basedir;

Modified: cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-core/src/test/java/org/apache/cocoon/deployer/applicationserver/MonoliticServerTest.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-core/src/test/java/org/apache/cocoon/deployer/applicationserver/MonoliticServerTest.java?rev=407530&r1=407529&r2=407530&view=diff
==============================================================================
--- cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-core/src/test/java/org/apache/cocoon/deployer/applicationserver/MonoliticServerTest.java
(original)
+++ cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-core/src/test/java/org/apache/cocoon/deployer/applicationserver/MonoliticServerTest.java
Thu May 18 04:27:35 2006
@@ -27,7 +27,7 @@
 	private static final String SERVER_DIR = "target/test/monolithicServer23";
 	
 	public void testSimpleDeploy() throws Exception {
-		MonolithicServer23 monolithicServer = new MonolithicServer23(new File(SERVER_DIR), new
ConsoleLogger());
+		MonolithicServer22 monolithicServer = new MonolithicServer22(new File(SERVER_DIR), new
ConsoleLogger());
 		monolithicServer.addRule("**webdav*.xconf", new SingleFileDeployer("WEB-INF/xconf"));
 		monolithicServer.addRule("**legacy**.xmap", new SingleFileDeployer("WEB-INF/sitemap-additions"));
 		monolithicServer.addRule("COB-INF**", new SingleFileDeployer("app/block1", true));  
@@ -39,7 +39,7 @@
 	}
 	
 	public void testNotWorkingDeploy() throws Exception {
-		MonolithicServer23 monolithicServer = new MonolithicServer23(new File(SERVER_DIR), new
ConsoleLogger());
+		MonolithicServer22 monolithicServer = new MonolithicServer22(new File(SERVER_DIR), new
ConsoleLogger());
 		monolithicServer.addRule("**webdav*.xconf", new SingleFileDeployer("WEB-INF/xconf"));
 		monolithicServer.extract(this.getMockArtefact("validMonolithicBlock-02/valid-block-1.0.jar"));
 		try {

Modified: cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin/src/main/java/org/apache/cocoon/maven/deployer/DeployExplodedMojo.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin/src/main/java/org/apache/cocoon/maven/deployer/DeployExplodedMojo.java?rev=407530&r1=407529&r2=407530&view=diff
==============================================================================
--- cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin/src/main/java/org/apache/cocoon/maven/deployer/DeployExplodedMojo.java
(original)
+++ cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin/src/main/java/org/apache/cocoon/maven/deployer/DeployExplodedMojo.java
Thu May 18 04:27:35 2006
@@ -29,7 +29,7 @@
 public class DeployExplodedMojo extends AbstractDeployMojo {
 	
     /** 
-     * @parameter expression="${targetVersion}" default-value="3.0"	
+     * @parameter expression="${targetVersion}" default-value="2.2"	
      */
 	private String serverVersion;
 
@@ -39,7 +39,7 @@
 	private String blocksdir;	
 	
 	public void execute() throws MojoExecutionException {
-		if(this.serverVersion.equals("2.3")) {
+		if(this.serverVersion.equals("2.2")) {
 			this.deployMonolithicCocoonApp(blocksdir);
 		} else {
 			this.deployBlocks();



Mime
View raw message