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 2011/01/17 18:23:01 UTC
svn commit: r1060004 - in
/cocoon/tags/cocoon-2.2/cocoon-tools-modules/cocoon-tools-modules-8: ./
cocoon-daisy-export-strategy/src/main/java/org/apache/cocoon/tools/maven/daisy/export/strategy/
cocoon-maven-plugin/src/main/java/org/apache/cocoon/maven/...
Author: reinhard
Date: Mon Jan 17 17:23:00 2011
New Revision: 1060004
URL: http://svn.apache.org/viewvc?rev=1060004&view=rev
Log:
[maven-release-plugin] copy for tag cocoon-tools-modules-8
Added:
cocoon/tags/cocoon-2.2/cocoon-tools-modules/cocoon-tools-modules-8/
- copied from r999546, cocoon/trunk/tools/
cocoon/tags/cocoon-2.2/cocoon-tools-modules/cocoon-tools-modules-8/cocoon-maven-plugin/src/main/java/org/apache/cocoon/maven/deployer/DeployExplodedMojo.java
- copied unchanged from r1060000, cocoon/trunk/tools/cocoon-maven-plugin/src/main/java/org/apache/cocoon/maven/deployer/DeployExplodedMojo.java
cocoon/tags/cocoon-2.2/cocoon-tools-modules/cocoon-tools-modules-8/cocoon-maven-plugin/src/main/java/org/apache/cocoon/maven/deployer/utils/XMLUtils.java
- copied unchanged from r1060000, cocoon/trunk/tools/cocoon-maven-plugin/src/main/java/org/apache/cocoon/maven/deployer/utils/XMLUtils.java
cocoon/tags/cocoon-2.2/cocoon-tools-modules/cocoon-tools-modules-8/cocoon-maven-plugin/src/main/java/org/apache/cocoon/maven/rcl/RwmProperties.java
- copied unchanged from r1060000, cocoon/trunk/tools/cocoon-maven-plugin/src/main/java/org/apache/cocoon/maven/rcl/RwmProperties.java
cocoon/tags/cocoon-2.2/cocoon-tools-modules/cocoon-tools-modules-8/cocoon-rcl/cocoon-rcl-spring-reloader/pom.xml
- copied unchanged from r1059999, cocoon/trunk/tools/cocoon-rcl/cocoon-rcl-spring-reloader/pom.xml
cocoon/tags/cocoon-2.2/cocoon-tools-modules/cocoon-tools-modules-8/cocoon-rcl/cocoon-rcl-spring-reloader/src/main/java/org/apache/cocoon/tools/rcl/springreloader/SpringReloader.java
- copied unchanged from r1059999, cocoon/trunk/tools/cocoon-rcl/cocoon-rcl-spring-reloader/src/main/java/org/apache/cocoon/tools/rcl/springreloader/SpringReloader.java
cocoon/tags/cocoon-2.2/cocoon-tools-modules/cocoon-tools-modules-8/cocoon-rcl/cocoon-rcl-spring-reloader/src/main/java/org/apache/cocoon/tools/rcl/springreloader/SynchronizedConfigureableWebApplicationContext.java
- copied unchanged from r1059999, cocoon/trunk/tools/cocoon-rcl/cocoon-rcl-spring-reloader/src/main/java/org/apache/cocoon/tools/rcl/springreloader/SynchronizedConfigureableWebApplicationContext.java
cocoon/tags/cocoon-2.2/cocoon-tools-modules/cocoon-tools-modules-8/cocoon-rcl/cocoon-rcl-webapp-wrapper/src/main/java/org/apache/cocoon/tools/rcl/wrapper/servlet/CocoonReloadingListener.java
- copied unchanged from r1059998, cocoon/trunk/tools/cocoon-rcl/cocoon-rcl-webapp-wrapper/src/main/java/org/apache/cocoon/tools/rcl/wrapper/servlet/CocoonReloadingListener.java
cocoon/tags/cocoon-2.2/cocoon-tools-modules/cocoon-tools-modules-8/cocoon-rcl/cocoon-rcl-webapp-wrapper/src/main/java/org/apache/cocoon/tools/rcl/wrapper/servlet/Constants.java
- copied unchanged from r1059998, cocoon/trunk/tools/cocoon-rcl/cocoon-rcl-webapp-wrapper/src/main/java/org/apache/cocoon/tools/rcl/wrapper/servlet/Constants.java
cocoon/tags/cocoon-2.2/cocoon-tools-modules/cocoon-tools-modules-8/cocoon-rcl/cocoon-rcl-webapp-wrapper/src/main/java/org/apache/cocoon/tools/rcl/wrapper/servlet/ReloadingClassloaderCreationException.java
- copied unchanged from r1059998, cocoon/trunk/tools/cocoon-rcl/cocoon-rcl-webapp-wrapper/src/main/java/org/apache/cocoon/tools/rcl/wrapper/servlet/ReloadingClassloaderCreationException.java
cocoon/tags/cocoon-2.2/cocoon-tools-modules/cocoon-tools-modules-8/cocoon-rcl/cocoon-rcl-webapp-wrapper/src/main/java/org/apache/cocoon/tools/rcl/wrapper/servlet/ReloadingClassloaderManager.java
- copied unchanged from r1059998, cocoon/trunk/tools/cocoon-rcl/cocoon-rcl-webapp-wrapper/src/main/java/org/apache/cocoon/tools/rcl/wrapper/servlet/ReloadingClassloaderManager.java
cocoon/tags/cocoon-2.2/cocoon-tools-modules/cocoon-tools-modules-8/cocoon-rcl/cocoon-rcl-webapp-wrapper/src/main/java/org/apache/cocoon/tools/rcl/wrapper/servlet/ReloadingListener.java
- copied unchanged from r1059998, cocoon/trunk/tools/cocoon-rcl/cocoon-rcl-webapp-wrapper/src/main/java/org/apache/cocoon/tools/rcl/wrapper/servlet/ReloadingListener.java
cocoon/tags/cocoon-2.2/cocoon-tools-modules/cocoon-tools-modules-8/cocoon-rcl/cocoon-rcl-webapp-wrapper/src/main/java/org/apache/cocoon/tools/rcl/wrapper/servlet/ReloadingNotificationSubscriber.java
- copied unchanged from r1059998, cocoon/trunk/tools/cocoon-rcl/cocoon-rcl-webapp-wrapper/src/main/java/org/apache/cocoon/tools/rcl/wrapper/servlet/ReloadingNotificationSubscriber.java
cocoon/tags/cocoon-2.2/cocoon-tools-modules/cocoon-tools-modules-8/cocoon-rcl/cocoon-rcl-webapp-wrapper/src/main/java/org/apache/cocoon/tools/rcl/wrapper/servlet/ReloadingServlet.java
- copied unchanged from r1059998, cocoon/trunk/tools/cocoon-rcl/cocoon-rcl-webapp-wrapper/src/main/java/org/apache/cocoon/tools/rcl/wrapper/servlet/ReloadingServlet.java
cocoon/tags/cocoon-2.2/cocoon-tools-modules/cocoon-tools-modules-8/cocoon-rcl/cocoon-rcl-webapp-wrapper/src/main/java/org/apache/cocoon/tools/rcl/wrapper/servlet/ReloadingServletFilter.java
- copied unchanged from r1059998, cocoon/trunk/tools/cocoon-rcl/cocoon-rcl-webapp-wrapper/src/main/java/org/apache/cocoon/tools/rcl/wrapper/servlet/ReloadingServletFilter.java
cocoon/tags/cocoon-2.2/cocoon-tools-modules/cocoon-tools-modules-8/cocoon-rcl/cocoon-rcl-webapp-wrapper/src/main/java/org/apache/cocoon/tools/rcl/wrapper/servlet/ReloadingSpringFilter.java
- copied unchanged from r1059998, cocoon/trunk/tools/cocoon-rcl/cocoon-rcl-webapp-wrapper/src/main/java/org/apache/cocoon/tools/rcl/wrapper/servlet/ReloadingSpringFilter.java
cocoon/tags/cocoon-2.2/cocoon-tools-modules/cocoon-tools-modules-8/pom.xml
- copied unchanged from r1060003, cocoon/trunk/tools/pom.xml
Removed:
cocoon/tags/cocoon-2.2/cocoon-tools-modules/cocoon-tools-modules-8/cocoon-maven-plugin/src/main/java/org/apache/cocoon/maven/rcl/RCLMojo.java
Modified:
cocoon/tags/cocoon-2.2/cocoon-tools-modules/cocoon-tools-modules-8/cocoon-daisy-export-strategy/src/main/java/org/apache/cocoon/tools/maven/daisy/export/strategy/CocoonExportStrategy.java
cocoon/tags/cocoon-2.2/cocoon-tools-modules/cocoon-tools-modules-8/cocoon-rcl/cocoon-rcl-webapp-wrapper/pom.xml
Modified: cocoon/tags/cocoon-2.2/cocoon-tools-modules/cocoon-tools-modules-8/cocoon-daisy-export-strategy/src/main/java/org/apache/cocoon/tools/maven/daisy/export/strategy/CocoonExportStrategy.java
URL: http://svn.apache.org/viewvc/cocoon/tags/cocoon-2.2/cocoon-tools-modules/cocoon-tools-modules-8/cocoon-daisy-export-strategy/src/main/java/org/apache/cocoon/tools/maven/daisy/export/strategy/CocoonExportStrategy.java?rev=1060004&r1=999546&r2=1060004&view=diff
==============================================================================
--- cocoon/tags/cocoon-2.2/cocoon-tools-modules/cocoon-tools-modules-8/cocoon-daisy-export-strategy/src/main/java/org/apache/cocoon/tools/maven/daisy/export/strategy/CocoonExportStrategy.java (original)
+++ cocoon/tags/cocoon-2.2/cocoon-tools-modules/cocoon-tools-modules-8/cocoon-daisy-export-strategy/src/main/java/org/apache/cocoon/tools/maven/daisy/export/strategy/CocoonExportStrategy.java Mon Jan 17 17:23:00 2011
@@ -60,6 +60,7 @@ public class CocoonExportStrategy extend
throw new DaisyClientException("Problems occurred while accessing the Daisy repository.", e);
}
}
+ /*
// documentTypeId == 9 --> MultiMediaObject (flash hopefully)
else if(documentTypeId == 9) {
si.relativeName = PATH_RESOURCES_FLASH + DaisyDocumentProxy.createUniqeFileName(doc) + ".swf";
@@ -74,6 +75,7 @@ public class CocoonExportStrategy extend
}
log.debug("The " + si.relativeName + " has been exported succesfully.");
}
+ */
else {
log.warn("Document id=" + doc.getDocId() + " not streamed because there is no available serialization strategy. documentTypeId=" + documentTypeId);
return null;
Modified: cocoon/tags/cocoon-2.2/cocoon-tools-modules/cocoon-tools-modules-8/cocoon-rcl/cocoon-rcl-webapp-wrapper/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/tags/cocoon-2.2/cocoon-tools-modules/cocoon-tools-modules-8/cocoon-rcl/cocoon-rcl-webapp-wrapper/pom.xml?rev=1060004&r1=999546&r2=1060004&view=diff
==============================================================================
--- cocoon/tags/cocoon-2.2/cocoon-tools-modules/cocoon-tools-modules-8/cocoon-rcl/cocoon-rcl-webapp-wrapper/pom.xml (original)
+++ cocoon/tags/cocoon-2.2/cocoon-tools-modules/cocoon-tools-modules-8/cocoon-rcl/cocoon-rcl-webapp-wrapper/pom.xml Mon Jan 17 17:23:00 2011
@@ -26,11 +26,11 @@
<parent>
<artifactId>cocoon-tools-modules</artifactId>
<groupId>org.apache.cocoon</groupId>
- <version>5-SNAPSHOT</version>
+ <version>8</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>cocoon-rcl-webapp-wrapper</artifactId>
- <version>1.0.0-RC1-SNAPSHOT</version>
+ <version>1.0.0</version>
<name>Cocoon Reloading ClassLoader - Webapp Wrapper</name>
<dependencies>
@@ -62,6 +62,7 @@
<version>2.5</version>
<scope>provided</scope>
</dependency>
+
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
@@ -71,27 +72,28 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
- <version>3.0.1.RELEASE</version>
+ <version>3.0.1.RELEASE</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
- <version>3.0.1.RELEASE</version>
+ <version>3.0.1.RELEASE</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-aop</artifactId>
- <version>3.0.1.RELEASE</version>
+ <version>3.0.1.RELEASE</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
- <version>3.0.1.RELEASE</version>
+ <version>3.0.1.RELEASE</version>
<scope>provided</scope>
</dependency>
+
<!-- test dependencies -->
<dependency>
<groupId>xmlunit</groupId>
@@ -104,4 +106,10 @@
<scope>test</scope>
</dependency>
</dependencies>
+
+ <scm>
+ <connection>scm:svn:https://svn.apache.org/repos/asf/cocoon/tags/cocoon-2.2/cocoon-rcl-webapp-wrapper/cocoon-rcl-webapp-wrapper-1.0.0</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/cocoon/tags/cocoon-2.2/cocoon-rcl-webapp-wrapper/cocoon-rcl-webapp-wrapper-1.0.0</developerConnection>
+ <url>https://svn.apache.org/repos/asf/cocoon/tags/cocoon-2.2/cocoon-rcl-webapp-wrapper/cocoon-rcl-webapp-wrapper-1.0.0</url>
+ </scm>
</project>