cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From reinh...@apache.org
Subject svn commit: r377178 - in /cocoon/trunk/cocoon-block-deployer: cocoon-deployer-core/src/main/java/org/apache/cocoon/deployer/applicationserver/ cocoon-deployer-core/src/test/java/org/apache/cocoon/deployer/applicationserver/ cocoon-deployer-plugin/src/m...
Date Sun, 12 Feb 2006 14:13:22 GMT
Author: reinhard
Date: Sun Feb 12 06:13:21 2006
New Revision: 377178

URL: http://svn.apache.org/viewcvs?rev=377178&view=rev
Log:
COCOON-1759 -  RAD works now for resources - thanks to Daniel's latest changes to block-fw.
After integrating the reloading classloader into the blocks-fw we have everything we want
:-)

Modified:
    cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/main/java/org/apache/cocoon/deployer/applicationserver/CocoonServer22.java
    cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/test/java/org/apache/cocoon/deployer/applicationserver/CocoonServer22Test.java
    cocoon/trunk/cocoon-block-deployer/cocoon-deployer-plugin/src/main/java/org/apache/cocoon/maven/deployer/SingleBlockDeployMojo.java

Modified: cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/main/java/org/apache/cocoon/deployer/applicationserver/CocoonServer22.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/main/java/org/apache/cocoon/deployer/applicationserver/CocoonServer22.java?rev=377178&r1=377177&r2=377178&view=diff
==============================================================================
--- cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/main/java/org/apache/cocoon/deployer/applicationserver/CocoonServer22.java
(original)
+++ cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/main/java/org/apache/cocoon/deployer/applicationserver/CocoonServer22.java
Sun Feb 12 06:13:21 2006
@@ -134,7 +134,7 @@
 						String nextDirectory = intDirToStringDirConvert(
 								getNextDirectory(new File(baseDirectoryFile, BLOCKS_DIR), this.lastDir));
 						this.lastDir = Integer.parseInt(nextDirectory);
-						String installDirectory = BLOCKS_DIR + nextDirectory;
+						String installDirectory = BLOCKS_DIR + nextDirectory + "/";
 						wiringBlock.setLocation(installDirectory);					
 						deployBlock(binaryBlock, frm, txId, BLOCKS_DIR + nextDirectory);
 						installedBlocks.put(block.getId(), installDirectory);

Modified: cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/test/java/org/apache/cocoon/deployer/applicationserver/CocoonServer22Test.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/test/java/org/apache/cocoon/deployer/applicationserver/CocoonServer22Test.java?rev=377178&r1=377177&r2=377178&view=diff
==============================================================================
--- cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/test/java/org/apache/cocoon/deployer/applicationserver/CocoonServer22Test.java
(original)
+++ cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/test/java/org/apache/cocoon/deployer/applicationserver/CocoonServer22Test.java
Sun Feb 12 06:13:21 2006
@@ -82,9 +82,9 @@
 		assertEquals("db", wiring.getBlock(1).getId());
 		
 		// check locations
-		assertEquals("/blocks/00000001", wiring.getBlock(0).getLocation());
-		assertEquals("/blocks/00000002", wiring.getBlock(1).getLocation());
-		assertEquals("/blocks/00000002", wiring.getBlock(2).getLocation()); // ensure that a block
is unpacked only once
+		assertEquals("/blocks/00000001/", wiring.getBlock(0).getLocation());
+		assertEquals("/blocks/00000002/", wiring.getBlock(1).getLocation());
+		assertEquals("/blocks/00000002/", wiring.getBlock(2).getLocation()); // ensure that a block
is unpacked only once
 		
 		// check connections
 		assertEquals("db", wiring.getBlock(0).getConnections().getConnection(0).getName());

Modified: cocoon/trunk/cocoon-block-deployer/cocoon-deployer-plugin/src/main/java/org/apache/cocoon/maven/deployer/SingleBlockDeployMojo.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-block-deployer/cocoon-deployer-plugin/src/main/java/org/apache/cocoon/maven/deployer/SingleBlockDeployMojo.java?rev=377178&r1=377177&r2=377178&view=diff
==============================================================================
--- cocoon/trunk/cocoon-block-deployer/cocoon-deployer-plugin/src/main/java/org/apache/cocoon/maven/deployer/SingleBlockDeployMojo.java
(original)
+++ cocoon/trunk/cocoon-block-deployer/cocoon-deployer-plugin/src/main/java/org/apache/cocoon/maven/deployer/SingleBlockDeployMojo.java
Sun Feb 12 06:13:21 2006
@@ -141,7 +141,7 @@
         block.setUrn(urn);
         // needs to be commented out as long as the blocks-fw supports directories outside
         // of the servlet context
-//        block.setLocation("target/classes");
+        block.setLocation("target/classes");
                 
         // create the deployment object
         Deploy deploy = new Deploy();



Mime
View raw message