cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From reinh...@apache.org
Subject svn commit: r374190 - in /cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src: main/java/org/apache/cocoon/deployer/ test/java/org/apache/cocoon/deployer/ test/mocks/validDeploy-04/ test/mocks/validDeploy-05/
Date Wed, 01 Feb 2006 22:01:22 GMT
Author: reinhard
Date: Wed Feb  1 14:01:14 2006
New Revision: 374190

URL: http://svn.apache.org/viewcvs?rev=374190&view=rev
Log:
COCOON-1745

prefixes for blocks are not required (mvn:)

Modified:
    cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/main/java/org/apache/cocoon/deployer/AutoWiringResolver.java
    cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/test/java/org/apache/cocoon/deployer/AutoWiringResolverTest.java
    cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/test/java/org/apache/cocoon/deployer/BlockDeployerTest.java
    cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/test/mocks/validDeploy-04/deploy.xml
    cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/test/mocks/validDeploy-05/deploy.xml

Modified: cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/main/java/org/apache/cocoon/deployer/AutoWiringResolver.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/main/java/org/apache/cocoon/deployer/AutoWiringResolver.java?rev=374190&r1=374189&r2=374190&view=diff
==============================================================================
--- cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/main/java/org/apache/cocoon/deployer/AutoWiringResolver.java
(original)
+++ cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/main/java/org/apache/cocoon/deployer/AutoWiringResolver.java
Wed Feb  1 14:01:14 2006
@@ -89,7 +89,7 @@
 				// create a new block
 				String newBlockDeployId = getNextDeployBlockId();
 				Block autoWiredBlock = BlockFactory.createAutowiredBlock(
-			        artifactProvider.getArtifact("mvn:" + requires[i].getDefault()), newBlockDeployId);
+			        artifactProvider.getArtifact(requires[i].getDefault()), newBlockDeployId);
 				this.log.info("auto-wiring: create new block [" + newBlockDeployId + "].");
 				
 				// add the connection to the deployer

Modified: cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/test/java/org/apache/cocoon/deployer/AutoWiringResolverTest.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/test/java/org/apache/cocoon/deployer/AutoWiringResolverTest.java?rev=374190&r1=374189&r2=374190&view=diff
==============================================================================
--- cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/test/java/org/apache/cocoon/deployer/AutoWiringResolverTest.java
(original)
+++ cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/test/java/org/apache/cocoon/deployer/AutoWiringResolverTest.java
Wed Feb  1 14:01:14 2006
@@ -48,13 +48,13 @@
 		MockControl aProviderCtrl = MockControl.createControl(ArtifactProvider.class);
 		ArtifactProvider aProvider = (ArtifactProvider) aProviderCtrl.getMock();
 		
-		aProvider.getArtifact("mvn:anyblock:anyblock-05:1.0");
+		aProvider.getArtifact("anyblock:anyblock-05:1.0");
 		aProviderCtrl.setReturnValue(this.getMockArtefact("validBlock-05/valid-block-1.0.jar"));
 		
-		aProvider.getArtifact("mvn:anyblock:anyblock-06:1.0");
+		aProvider.getArtifact("anyblock:anyblock-06:1.0");
 		aProviderCtrl.setReturnValue(this.getMockArtefact("validBlock-06/valid-block-1.0.jar"));
	
 		
-		aProvider.getArtifact("mvn:anyblock:anyblock-07:1.0");
+		aProvider.getArtifact("anyblock:anyblock-07:1.0");
 		aProviderCtrl.setReturnValue(this.getMockArtefact("validBlock-07/valid-block-1.0.jar"));

 		
 		aProviderCtrl.replay();

Modified: cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/test/java/org/apache/cocoon/deployer/BlockDeployerTest.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/test/java/org/apache/cocoon/deployer/BlockDeployerTest.java?rev=374190&r1=374189&r2=374190&view=diff
==============================================================================
--- cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/test/java/org/apache/cocoon/deployer/BlockDeployerTest.java
(original)
+++ cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/test/java/org/apache/cocoon/deployer/BlockDeployerTest.java
Wed Feb  1 14:01:14 2006
@@ -47,19 +47,19 @@
 		assertTrue(vanillaCocoonServerArtifact.exists());		
 		aProviderCtrl.setReturnValue(vanillaCocoonServerArtifact);
 		
-		aProvider.getArtifact("mvn:validBlock-03:validBlock-03:1.0");
+		aProvider.getArtifact("validBlock-03:validBlock-03:1.0");
 		aProviderCtrl.setReturnValue(this.getMockArtefact("validBlock-03/valid-block-1.0.jar"));
 		
-		aProvider.getArtifact("mvn:validBlock-04:validBlock-04:1.0");
+		aProvider.getArtifact("validBlock-04:validBlock-04:1.0");
 		aProviderCtrl.setReturnValue(this.getMockArtefact("validBlock-04/valid-block-1.0.jar"));
	
 		
-		aProvider.getArtifact("mvn:anyblock:anyblock-05:1.0");
+		aProvider.getArtifact("anyblock:anyblock-05:1.0");
 		aProviderCtrl.setReturnValue(this.getMockArtefact("validBlock-05/valid-block-1.0.jar"));
 		
-		aProvider.getArtifact("mvn:anyblock:anyblock-06:1.0");
+		aProvider.getArtifact("anyblock:anyblock-06:1.0");
 		aProviderCtrl.setReturnValue(this.getMockArtefact("validBlock-06/valid-block-1.0.jar"));
	
 		
-		aProvider.getArtifact("mvn:anyblock:anyblock-07:1.0");
+		aProvider.getArtifact("anyblock:anyblock-07:1.0");
 		aProviderCtrl.setReturnValue(this.getMockArtefact("validBlock-07/valid-block-1.0.jar"));
		
 		
 		aProvider.getArtifact((String[]) null);

Modified: cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/test/mocks/validDeploy-04/deploy.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/test/mocks/validDeploy-04/deploy.xml?rev=374190&r1=374189&r2=374190&view=diff
==============================================================================
--- cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/test/mocks/validDeploy-04/deploy.xml
(original)
+++ cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/test/mocks/validDeploy-04/deploy.xml
Wed Feb  1 14:01:14 2006
@@ -19,7 +19,7 @@
   <cocoon target-url="target/test/validDeploy-02/myServer" 
     webapp-urn="org.apache.cocoon:cocoon-minimal-webapp:2.0-SNAPSHOT:war" exclusive="true"/>
 
   
-  <block id="b03" urn="mvn:validBlock-03:validBlock-03:1.0">
+  <block id="b03" urn="validBlock-03:validBlock-03:1.0">
     <connections>
       <connection name="db" block="db"/>
     </connections>
@@ -28,6 +28,6 @@
     </properties>
   </block>
   
-  <block id="db" urn="mvn:validBlock-04:validBlock-04:1.0"/>  
+  <block id="db" urn="validBlock-04:validBlock-04:1.0"/>  
   
 </deploy>

Modified: cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/test/mocks/validDeploy-05/deploy.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/test/mocks/validDeploy-05/deploy.xml?rev=374190&r1=374189&r2=374190&view=diff
==============================================================================
--- cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/test/mocks/validDeploy-05/deploy.xml
(original)
+++ cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/test/mocks/validDeploy-05/deploy.xml
Wed Feb  1 14:01:14 2006
@@ -19,6 +19,6 @@
   <cocoon target-url=".target/test/validDeploy-02/myServer" 
     urn="org.apache.cocoon:cocoon-minimal-webapp:1.0-SNAPSHOT:war" exclusive="true"/>
   
   
-  <block id="db" urn="mvn:validBlock-04:validBlock-04:1.0"/>  
+  <block id="db" urn="validBlock-04:validBlock-04:1.0"/>  
   
 </deploy>



Mime
View raw message