You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by re...@apache.org on 2006/03/18 16:38:52 UTC
svn commit: r386857 - in
/cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core: ./
src/main/java/org/apache/cocoon/deployer/
src/main/java/org/apache/cocoon/deployer/applicationserver/
src/test/java/org/apache/cocoon/ src/test/java/org/apache/cocoon...
Author: reinhard
Date: Sat Mar 18 07:38:49 2006
New Revision: 386857
URL: http://svn.apache.org/viewcvs?rev=386857&view=rev
Log:
change names to avoid future naming collisions
Added:
cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/main/java/org/apache/cocoon/deployer/applicationserver/ApplicationServerFactory.java
- copied, changed from r385479, cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/main/java/org/apache/cocoon/deployer/applicationserver/CocoonServerFactory.java
cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/main/java/org/apache/cocoon/deployer/applicationserver/BlocksFramework.java
- copied, changed from r385479, cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/main/java/org/apache/cocoon/deployer/applicationserver/CocoonServer.java
cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/main/java/org/apache/cocoon/deployer/applicationserver/BlocksFramework23.java
- copied, changed from r385479, 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/BlocksFramework23Test.java
- copied, changed from r385479, cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/test/java/org/apache/cocoon/deployer/applicationserver/CocoonServer22Test.java
Removed:
cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/main/java/org/apache/cocoon/deployer/applicationserver/CocoonServer.java
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/main/java/org/apache/cocoon/deployer/applicationserver/CocoonServerFactory.java
cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/test/java/org/apache/cocoon/AppTest.java
cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/test/java/org/apache/cocoon/deployer/applicationserver/CocoonServer22Test.java
Modified:
cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/pom.xml
cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/main/java/org/apache/cocoon/deployer/BlockDeployer.java
cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/test/java/org/apache/cocoon/deployer/AbstractDeployerTestCase.java
Modified: cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/pom.xml?rev=386857&r1=386856&r2=386857&view=diff
==============================================================================
--- cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/pom.xml (original)
+++ cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/pom.xml Sat Mar 18 07:38:49 2006
@@ -108,5 +108,82 @@
</plugin>
</plugins>
</build>
+
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>surefire-report-maven-plugin</artifactId>
+ <version>2.0-beta-2-SNAPSHOT</version>
+ </plugin>
+ <!--plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.0-beta-3-SNAPSHOT</version>
+ </plugin-->
+ <!--plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>jxr-maven-plugin</artifactId>
+ </plugin-->
+ <!--plugin>
+ <artifactId>maven-clover-plugin</artifactId>
+ <configuration>
+ <jdk>1.5</jdk>
+ <licenseFile>${basedir}/tools/licenses/clover.license</licenseFile>
+ </configuration>
+ </plugin-->
+ <!--plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>cobertura-maven-plugin</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ </plugin-->
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>jdepend-maven-plugin</artifactId>
+ <version>2.0-beta-1-SNAPSHOT</version>
+ </plugin>
+ <!--plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>changelog-maven-plugin</artifactId>
+ <version>2.0-beta-1</version>
+ <reportSets>
+ <reportSet>
+ <id>dual-report</id>
+ <configuration>
+ <type>range</type>
+ <range>30</range>
+ </configuration>
+ <reports>
+ <report>changelog</report>
+ <report>file-activity</report>
+ <report>dev-activity</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin-->
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>simian-report-maven-plugin</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </plugin>
+ <!--plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>taglist-maven-plugin</artifactId>
+ <version>2.0-beta-1</version>
+ </plugin-->
+ </plugins>
+ </reporting>
+
+ <pluginRepositories>
+ <pluginRepository>
+ <id>Maven Codehaus Snapshots</id>
+ <url>http://snapshots.maven.codehaus.org/maven2/</url>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ </pluginRepository>
+ </pluginRepositories>
</project>
Modified: cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/main/java/org/apache/cocoon/deployer/BlockDeployer.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/main/java/org/apache/cocoon/deployer/BlockDeployer.java?rev=386857&r1=386856&r2=386857&view=diff
==============================================================================
--- cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/main/java/org/apache/cocoon/deployer/BlockDeployer.java (original)
+++ cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/main/java/org/apache/cocoon/deployer/BlockDeployer.java Sat Mar 18 07:38:49 2006
@@ -13,9 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-/**
- *
- */
package org.apache.cocoon.deployer;
import java.io.File;
@@ -24,8 +21,8 @@
import java.util.Iterator;
import java.util.List;
-import org.apache.cocoon.deployer.applicationserver.CocoonServer;
-import org.apache.cocoon.deployer.applicationserver.CocoonServerFactory;
+import org.apache.cocoon.deployer.applicationserver.BlocksFramework;
+import org.apache.cocoon.deployer.applicationserver.ApplicationServerFactory;
import org.apache.cocoon.deployer.block.Block;
import org.apache.cocoon.deployer.block.BlockFactory;
import org.apache.cocoon.deployer.generated.deploy.x10.Deploy;
@@ -104,7 +101,7 @@
this.getAllBlockUrns(blockList, cocoonBlockFwWebappUrn));
// deploy the blocks
- CocoonServer cocoonServer = CocoonServerFactory.createServer(
+ BlocksFramework cocoonServer = ApplicationServerFactory.createServer(
deploymentDescriptor.getCocoon(), this.variableResolver, this.artifactProvider, exclusive);
Collections.reverse(blockList);
@@ -118,6 +115,7 @@
/**
* Reads a deployment descriptor and creates a list of <code>Block</code> objects to be installed.
+ *
* @param deploymentDescriptor
* @return a list of <code>Block</code> objects
*/
Copied: cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/main/java/org/apache/cocoon/deployer/applicationserver/ApplicationServerFactory.java (from r385479, cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/main/java/org/apache/cocoon/deployer/applicationserver/CocoonServerFactory.java)
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/main/java/org/apache/cocoon/deployer/applicationserver/ApplicationServerFactory.java?p2=cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/main/java/org/apache/cocoon/deployer/applicationserver/ApplicationServerFactory.java&p1=cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/main/java/org/apache/cocoon/deployer/applicationserver/CocoonServerFactory.java&r1=385479&r2=386857&rev=386857&view=diff
==============================================================================
--- cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/main/java/org/apache/cocoon/deployer/applicationserver/CocoonServerFactory.java (original)
+++ cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/main/java/org/apache/cocoon/deployer/applicationserver/ApplicationServerFactory.java Sat Mar 18 07:38:49 2006
@@ -23,12 +23,12 @@
import org.apache.cocoon.deployer.generated.deploy.x10.Cocoon;
import org.apache.cocoon.deployer.resolver.VariableResolver;
-public class CocoonServerFactory {
+public class ApplicationServerFactory {
- public static CocoonServer createServer(Cocoon cocoon, VariableResolver variableResolver,
+ public static BlocksFramework createServer(Cocoon cocoon, VariableResolver variableResolver,
ArtifactProvider artifactProvider, boolean exclusive) {
- CocoonServer cocoonServer = new CocoonServer22();
+ BlocksFramework cocoonServer = new BlocksFramework23();
cocoonServer.setExclusive(exclusive);
cocoonServer.setVariableResolver(variableResolver);
cocoonServer.setArtifactProvider(artifactProvider);
Copied: cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/main/java/org/apache/cocoon/deployer/applicationserver/BlocksFramework.java (from r385479, cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/main/java/org/apache/cocoon/deployer/applicationserver/CocoonServer.java)
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/main/java/org/apache/cocoon/deployer/applicationserver/BlocksFramework.java?p2=cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/main/java/org/apache/cocoon/deployer/applicationserver/BlocksFramework.java&p1=cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/main/java/org/apache/cocoon/deployer/applicationserver/CocoonServer.java&r1=385479&r2=386857&rev=386857&view=diff
==============================================================================
--- cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/main/java/org/apache/cocoon/deployer/applicationserver/CocoonServer.java (original)
+++ cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/main/java/org/apache/cocoon/deployer/applicationserver/BlocksFramework.java Sat Mar 18 07:38:49 2006
@@ -26,7 +26,7 @@
import org.apache.cocoon.deployer.logger.Logger;
import org.apache.cocoon.deployer.resolver.VariableResolver;
-public interface CocoonServer {
+public interface BlocksFramework {
public boolean deploy(Block[] blocks, String serverArtifact, File[] libraries, Logger log, boolean transactional);
Copied: cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/main/java/org/apache/cocoon/deployer/applicationserver/BlocksFramework23.java (from r385479, 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/BlocksFramework23.java?p2=cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/main/java/org/apache/cocoon/deployer/applicationserver/BlocksFramework23.java&p1=cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/main/java/org/apache/cocoon/deployer/applicationserver/CocoonServer22.java&r1=385479&r2=386857&rev=386857&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/BlocksFramework23.java Sat Mar 18 07:38:49 2006
@@ -51,7 +51,7 @@
import org.exolab.castor.xml.ValidationException;
import org.xml.sax.SAXException;
-public class CocoonServer22 implements CocoonServer {
+public class BlocksFramework23 implements BlocksFramework {
public static final String WIRING_10_NAMESPACE = "http://apache.org/cocoon/blocks/wiring/1.0";
public static final String WIRING_FILE = "WEB-INF/wiring.xml";
Modified: cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/test/java/org/apache/cocoon/deployer/AbstractDeployerTestCase.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/test/java/org/apache/cocoon/deployer/AbstractDeployerTestCase.java?rev=386857&r1=386856&r2=386857&view=diff
==============================================================================
--- cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/test/java/org/apache/cocoon/deployer/AbstractDeployerTestCase.java (original)
+++ cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/test/java/org/apache/cocoon/deployer/AbstractDeployerTestCase.java Sat Mar 18 07:38:49 2006
@@ -49,6 +49,12 @@
return new File(getMockDirectory(), artifact);
}
+ /**
+ * Get access to the mock artifacts. This method reads the 'basedir' system property
+ * set by Maven and ensures that always the correct base directory is used. This
+ * is a problem with Maven 2 in version >= 2.0.2
+ * @return
+ */
public File getMockDirectory() {
String basedir = System.getProperty("basedir");
if(basedir != null || "".equals(basedir)) {
Copied: cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/test/java/org/apache/cocoon/deployer/applicationserver/BlocksFramework23Test.java (from r385479, 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/BlocksFramework23Test.java?p2=cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/test/java/org/apache/cocoon/deployer/applicationserver/BlocksFramework23Test.java&p1=cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/test/java/org/apache/cocoon/deployer/applicationserver/CocoonServer22Test.java&r1=385479&r2=386857&rev=386857&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/BlocksFramework23Test.java Sat Mar 18 07:38:49 2006
@@ -30,7 +30,7 @@
import org.apache.cocoon.deployer.util.FileUtils;
import org.easymock.MockControl;
-public class CocoonServer22Test extends AbstractDeployerTestCase {
+public class BlocksFramework23Test extends AbstractDeployerTestCase {
private static final String deployPath = "target/test/deployServer22";
private static final String DEFAULT_WEBAPP_ARTIFACT = "org.apache.cocoon:cocoon-minimal-webapp:1.0-SNAPSHOT:war";
@@ -39,7 +39,7 @@
* Test method for 'org.apache.cocoon.deployer.applicationserver.CocoonServer22.deploy(Block[])'
*/
public void testDeploy() throws Exception {
- CocoonServer22 cocoonServer = new CocoonServer22();
+ BlocksFramework23 cocoonServer = new BlocksFramework23();
URI baseUri = new File(deployPath).toURI();
cocoonServer.setBaseDirectory(baseUri);
cocoonServer.setArtifactProvider(getArtifactProviderInstance());
@@ -60,7 +60,7 @@
}
public void testDeployWithConnections() throws Exception {
- CocoonServer22 cocoonServer = new CocoonServer22();
+ BlocksFramework23 cocoonServer = new BlocksFramework23();
URI baseUri = new File(deployPath).toURI();
cocoonServer.setBaseDirectory(baseUri);
cocoonServer.setArtifactProvider(getArtifactProviderInstance());
@@ -104,7 +104,7 @@
* Test method for 'org.apache.cocoon.deployer.applicationserver.CocoonServer22.deployCocoonServer(OutputStream)'
*/
public void testDeployCocoonServerTransactionalMode() throws Exception {
- CocoonServer22 cocoonServer = new CocoonServer22();
+ BlocksFramework23 cocoonServer = new BlocksFramework23();
// set the basedirectory (JUnit test output dir)
File outputdir = this.createOutputDir("deployServer22");