Author: ilgrosso
Date: Mon Apr 23 14:00:15 2012
New Revision: 1329244
URL: http://svn.apache.org/viewvc?rev=1329244&view=rev
Log:
Moving cocoon-rcl to /subprojects
Added:
cocoon/subprojects/cocoon-rcl-spring-reloader/
cocoon/subprojects/cocoon-rcl-spring-reloader/branches/
cocoon/subprojects/cocoon-rcl-spring-reloader/tags/
cocoon/subprojects/cocoon-rcl-spring-reloader/trunk/
- copied from r1328013, cocoon/trunk/tools/cocoon-rcl/cocoon-rcl-spring-reloader/
cocoon/subprojects/cocoon-rcl-webapp-wrapper/
cocoon/subprojects/cocoon-rcl-webapp-wrapper/branches/
cocoon/subprojects/cocoon-rcl-webapp-wrapper/tags/
cocoon/subprojects/cocoon-rcl-webapp-wrapper/trunk/
- copied from r1328013, cocoon/trunk/tools/cocoon-rcl/cocoon-rcl-webapp-wrapper/
Removed:
cocoon/trunk/tools/cocoon-rcl/cocoon-rcl-spring-reloader/
cocoon/trunk/tools/cocoon-rcl/cocoon-rcl-webapp-wrapper/
Modified:
cocoon/subprojects/cocoon-maven-plugin/trunk/pom.xml
cocoon/subprojects/cocoon-rcl-spring-reloader/trunk/pom.xml
cocoon/subprojects/cocoon-rcl-spring-reloader/trunk/src/main/java/org/apache/cocoon/tools/rcl/springreloader/SpringReloader.java
cocoon/subprojects/cocoon-rcl-spring-reloader/trunk/src/main/java/org/apache/cocoon/tools/rcl/springreloader/SynchronizedConfigureableWebApplicationContext.java
cocoon/subprojects/cocoon-rcl-webapp-wrapper/trunk/pom.xml
cocoon/trunk/tools/pom.xml
Modified: cocoon/subprojects/cocoon-maven-plugin/trunk/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/subprojects/cocoon-maven-plugin/trunk/pom.xml?rev=1329244&r1=1329243&r2=1329244&view=diff
==============================================================================
--- cocoon/subprojects/cocoon-maven-plugin/trunk/pom.xml (original)
+++ cocoon/subprojects/cocoon-maven-plugin/trunk/pom.xml Mon Apr 23 14:00:15 2012
@@ -32,7 +32,7 @@
<artifactId>cocoon-maven-plugin</artifactId>
<version>1.0.2-SNAPSHOT</version>
- <name>Cocoon Maven 2 Plugin</name>
+ <name>Cocoon Maven Plugin</name>
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/cocoon/subprojects/cocoon-maven-plugin/trunk</connection>
Modified: cocoon/subprojects/cocoon-rcl-spring-reloader/trunk/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/subprojects/cocoon-rcl-spring-reloader/trunk/pom.xml?rev=1329244&r1=1328013&r2=1329244&view=diff
==============================================================================
--- cocoon/subprojects/cocoon-rcl-spring-reloader/trunk/pom.xml (original)
+++ cocoon/subprojects/cocoon-rcl-spring-reloader/trunk/pom.xml Mon Apr 23 14:00:15 2012
@@ -24,21 +24,32 @@
<packaging>jar</packaging>
<parent>
- <artifactId>cocoon-tools-modules</artifactId>
<groupId>org.apache.cocoon</groupId>
- <version>5-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
+ <artifactId>cocoon</artifactId>
+ <version>9-SNAPSHOT</version>
+ <relativePath/>
</parent>
+
<artifactId>cocoon-rcl-spring-reloader</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.0.2-SNAPSHOT</version>
<name>Cocoon Reloading ClassLoader - Spring reloader</name>
<description>
- This module provides a single class "SpringReloader" that is used by the
- ReloadingSpringFilter to reload a Spring web application context.
- In order not to run into NoClassDefFoundErrors, is is important that this
- class is loaded through the reloading classloader.
+ This module provides a single class "SpringReloader" that is used by the
+ ReloadingSpringFilter to reload a Spring web application context.
+ In order not to run into NoClassDefFoundErrors, is is important that this
+ class is loaded through the reloading classloader.
</description>
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/cocoon/subprojects/cocoon-rcl-spring-reloader/trunk</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/cocoon/subprojects/cocoon-rcl-spring-reloader/trunk</developerConnection>
+ <url>http://svn.apache.org/repos/asf/cocoon/subprojects/cocoon-rcl-spring-reloader/trunk</url>
+ </scm>
+
+ <properties>
+ <spring.version>3.1.1.RELEASE</spring.version>
+ </properties>
+
<!--+
| Be careful with any dependency that you add here. If its scope is NOT set
| to provided or test, it will be added to the Classloader of each application
@@ -46,55 +57,38 @@
+-->
<dependencies>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.1.1</version>
- <exclusions>
- <exclusion>
- <artifactId>logkit</artifactId>
- <groupId>logkit</groupId>
- </exclusion>
- <exclusion>
- <artifactId>avalon-framework</artifactId>
- <groupId>avalon-framework</groupId>
- </exclusion>
- </exclusions>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
- <version>2.5</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
- <version>3.0.1.RELEASE</version>
+ <version>${spring.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
- <version>3.0.1.RELEASE</version>
+ <version>${spring.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
- <version>3.0.1.RELEASE</version>
+ <version>${spring.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-aop</artifactId>
- <version>3.0.1.RELEASE</version>
+ <version>${spring.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
- <version>3.0.1.RELEASE</version>
+ <version>${spring.version}</version>
<scope>provided</scope>
</dependency>
Modified: cocoon/subprojects/cocoon-rcl-spring-reloader/trunk/src/main/java/org/apache/cocoon/tools/rcl/springreloader/SpringReloader.java
URL: http://svn.apache.org/viewvc/cocoon/subprojects/cocoon-rcl-spring-reloader/trunk/src/main/java/org/apache/cocoon/tools/rcl/springreloader/SpringReloader.java?rev=1329244&r1=1328013&r2=1329244&view=diff
==============================================================================
--- cocoon/subprojects/cocoon-rcl-spring-reloader/trunk/src/main/java/org/apache/cocoon/tools/rcl/springreloader/SpringReloader.java (original)
+++ cocoon/subprojects/cocoon-rcl-spring-reloader/trunk/src/main/java/org/apache/cocoon/tools/rcl/springreloader/SpringReloader.java Mon Apr 23 14:00:15 2012
@@ -17,7 +17,6 @@
package org.apache.cocoon.tools.rcl.springreloader;
import javax.servlet.ServletContext;
-
import org.springframework.web.context.support.WebApplicationContextUtils;
/**
Modified: cocoon/subprojects/cocoon-rcl-spring-reloader/trunk/src/main/java/org/apache/cocoon/tools/rcl/springreloader/SynchronizedConfigureableWebApplicationContext.java
URL: http://svn.apache.org/viewvc/cocoon/subprojects/cocoon-rcl-spring-reloader/trunk/src/main/java/org/apache/cocoon/tools/rcl/springreloader/SynchronizedConfigureableWebApplicationContext.java?rev=1329244&r1=1328013&r2=1329244&view=diff
==============================================================================
--- cocoon/subprojects/cocoon-rcl-spring-reloader/trunk/src/main/java/org/apache/cocoon/tools/rcl/springreloader/SynchronizedConfigureableWebApplicationContext.java (original)
+++ cocoon/subprojects/cocoon-rcl-spring-reloader/trunk/src/main/java/org/apache/cocoon/tools/rcl/springreloader/SynchronizedConfigureableWebApplicationContext.java Mon Apr 23 14:00:15 2012
@@ -37,6 +37,7 @@ import org.springframework.context.Appli
import org.springframework.context.ApplicationListener;
import org.springframework.context.MessageSourceResolvable;
import org.springframework.context.NoSuchMessageException;
+import org.springframework.core.env.ConfigurableEnvironment;
import org.springframework.core.io.Resource;
import org.springframework.web.context.ConfigurableWebApplicationContext;
import org.springframework.web.context.support.XmlWebApplicationContext;
@@ -44,10 +45,10 @@ import org.springframework.web.context.s
/**
* This implementation of a {@link ConfigurableWebApplicationContext} is completely synchronized. It wraps all calls and
* delegates them to an internally managed ConfigurableWebApplicationContext instance.
- *
+ *
* Additionally it provides a {@link #reload()} method which exchanges the internal application context with a newly
* created one.
- *
+ *
* @version $Id$
*/
public class SynchronizedConfigureableWebApplicationContext implements ConfigurableWebApplicationContext {
@@ -62,182 +63,227 @@ public class SynchronizedConfigureableWe
}
}
+ @Override
public synchronized void addApplicationListener(ApplicationListener arg0) {
this.appContext.addApplicationListener(arg0);
}
+ @Override
public synchronized void addBeanFactoryPostProcessor(BeanFactoryPostProcessor arg0) {
this.appContext.addBeanFactoryPostProcessor(arg0);
}
+ @Override
public synchronized void close() {
this.appContext.close();
}
+ @Override
public synchronized boolean containsBean(String arg0) {
return this.appContext.containsBean(arg0);
}
+ @Override
public synchronized boolean containsBeanDefinition(String arg0) {
return this.appContext.containsBeanDefinition(arg0);
}
+ @Override
public synchronized boolean containsLocalBean(String arg0) {
return this.appContext.containsLocalBean(arg0);
}
+ @Override
public synchronized <A extends Annotation> A findAnnotationOnBean(String arg0, Class<A> arg1) {
return this.appContext.findAnnotationOnBean(arg0, arg1);
}
+ @Override
public synchronized String[] getAliases(String arg0) {
return this.appContext.getAliases(arg0);
}
+ @Override
public synchronized AutowireCapableBeanFactory getAutowireCapableBeanFactory() throws IllegalStateException {
return this.appContext.getAutowireCapableBeanFactory();
}
+ @Override
public synchronized <T> T getBean(Class<T> requiredType) throws BeansException {
return this.appContext.getBean(requiredType);
}
+ @Override
public synchronized Object getBean(String arg0) throws BeansException {
return this.appContext.getBean(arg0);
}
+ @Override
public synchronized <T> T getBean(String arg0, Class<T> arg1) throws BeansException {
return this.appContext.getBean(arg0, arg1);
}
+ @Override
public Object getBean(String arg0, Object... arg1) throws BeansException {
return this.appContext.getBean(arg0, arg1);
}
+ @Override
public synchronized int getBeanDefinitionCount() {
return this.appContext.getBeanDefinitionCount();
}
+ @Override
public synchronized String[] getBeanDefinitionNames() {
return this.appContext.getBeanDefinitionNames();
}
+ @Override
public synchronized ConfigurableListableBeanFactory getBeanFactory() throws IllegalStateException {
return this.appContext.getBeanFactory();
}
+ @Override
public synchronized String[] getBeanNamesForType(Class arg0) {
return this.appContext.getBeanNamesForType(arg0);
}
+ @Override
public synchronized String[] getBeanNamesForType(Class arg0, boolean arg1, boolean arg2) {
return this.appContext.getBeanNamesForType(arg0, arg1, arg2);
}
+ @Override
public <T> Map<String, T> getBeansOfType(Class<T> arg0) throws BeansException {
return this.appContext.getBeansOfType(arg0);
}
+ @Override
public <T> Map<String, T> getBeansOfType(Class<T> arg0, boolean arg1, boolean arg2) throws BeansException {
return this.appContext.getBeansOfType(arg0, arg1, arg2);
}
+ @Override
public Map<String, Object> getBeansWithAnnotation(Class<? extends Annotation> arg0) throws BeansException {
return this.appContext.getBeansWithAnnotation(arg0);
}
+ @Override
public synchronized ClassLoader getClassLoader() {
return this.appContext.getClassLoader();
}
+ @Override
public synchronized String[] getConfigLocations() {
return this.appContext.getConfigLocations();
}
+ @Override
public synchronized String getDisplayName() {
return this.appContext.getDisplayName();
}
+ @Override
public synchronized String getId() {
return this.appContext.getId();
}
+ @Override
public synchronized String getMessage(MessageSourceResolvable arg0, Locale arg1) throws NoSuchMessageException {
return this.appContext.getMessage(arg0, arg1);
}
+ @Override
public synchronized String getMessage(String arg0, Object[] arg1, Locale arg2) throws NoSuchMessageException {
return this.appContext.getMessage(arg0, arg1, arg2);
}
+ @Override
public synchronized String getMessage(String arg0, Object[] arg1, String arg2, Locale arg3) {
return this.appContext.getMessage(arg0, arg1, arg2, arg3);
}
+ @Override
public synchronized String getNamespace() {
return this.appContext.getNamespace();
}
+ @Override
public synchronized ApplicationContext getParent() {
return this.appContext.getParent();
}
+ @Override
public synchronized BeanFactory getParentBeanFactory() {
return this.appContext.getParentBeanFactory();
}
+ @Override
public synchronized Resource getResource(String arg0) {
return this.appContext.getResource(arg0);
}
+ @Override
public synchronized Resource[] getResources(String arg0) throws IOException {
return this.appContext.getResources(arg0);
}
+ @Override
public synchronized ServletConfig getServletConfig() {
return this.appContext.getServletConfig();
}
+ @Override
public synchronized ServletContext getServletContext() {
return this.appContext.getServletContext();
}
+ @Override
public synchronized long getStartupDate() {
return this.appContext.getStartupDate();
}
+ @Override
public synchronized Class getType(String arg0) throws NoSuchBeanDefinitionException {
return this.appContext.getType(arg0);
}
+ @Override
public synchronized boolean isActive() {
return this.appContext.isActive();
}
+ @Override
public synchronized boolean isPrototype(String arg0) throws NoSuchBeanDefinitionException {
return this.appContext.isPrototype(arg0);
}
+ @Override
public synchronized boolean isRunning() {
return this.appContext.isRunning();
}
+ @Override
public synchronized boolean isSingleton(String arg0) throws NoSuchBeanDefinitionException {
return this.appContext.isSingleton(arg0);
}
+ @Override
public synchronized boolean isTypeMatch(String arg0, Class arg1) throws NoSuchBeanDefinitionException {
return this.appContext.isTypeMatch(arg0, arg1);
}
+ @Override
public synchronized void publishEvent(ApplicationEvent arg0) {
this.appContext.publishEvent(arg0);
}
+ @Override
public synchronized void refresh() throws BeansException, IllegalStateException {
this.appContext.refresh();
}
+ @Override
public synchronized void registerShutdownHook() {
this.appContext.registerShutdownHook();
}
@@ -259,39 +305,58 @@ public class SynchronizedConfigureableWe
this.appContext.refresh();
}
- public synchronized void setConfigLocation(String configLocation) {
- this.appContext.setConfigLocation(configLocation);
+ @Override
+ public synchronized void setConfigLocation(String location) {
+ this.appContext.setConfigLocation(location);
}
- public synchronized void setConfigLocations(String[] arg0) {
- this.appContext.setConfigLocations(arg0);
+ @Override
+ public synchronized void setConfigLocations(String[] locations) {
+ this.appContext.setConfigLocations(locations);
}
- public void setId(String arg0) {
- this.appContext.setId(arg0);
+ @Override
+ public void setId(String id) {
+ this.appContext.setId(id);
}
- public synchronized void setNamespace(String arg0) {
- this.appContext.setNamespace(arg0);
+ @Override
+ public synchronized void setNamespace(String namespace) {
+ this.appContext.setNamespace(namespace);
}
- public synchronized void setParent(ApplicationContext arg0) {
- this.appContext.setParent(arg0);
+ @Override
+ public synchronized void setParent(ApplicationContext context) {
+ this.appContext.setParent(context);
}
- public synchronized void setServletConfig(ServletConfig arg0) {
- this.appContext.setServletConfig(arg0);
+ @Override
+ public synchronized void setServletConfig(ServletConfig config) {
+ this.appContext.setServletConfig(config);
}
- public synchronized void setServletContext(ServletContext arg0) {
- this.appContext.setServletContext(arg0);
+ @Override
+ public synchronized void setServletContext(final ServletContext context) {
+ this.appContext.setServletContext(context);
}
+ @Override
public synchronized void start() {
this.appContext.start();
}
+ @Override
public synchronized void stop() {
this.appContext.stop();
}
+
+ @Override
+ public ConfigurableEnvironment getEnvironment() {
+ return this.appContext.getEnvironment();
+ }
+
+ @Override
+ public void setEnvironment(final ConfigurableEnvironment environment) {
+ this.appContext.setEnvironment(environment);
+ }
}
\ No newline at end of file
Modified: cocoon/subprojects/cocoon-rcl-webapp-wrapper/trunk/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/subprojects/cocoon-rcl-webapp-wrapper/trunk/pom.xml?rev=1329244&r1=1328013&r2=1329244&view=diff
==============================================================================
--- cocoon/subprojects/cocoon-rcl-webapp-wrapper/trunk/pom.xml (original)
+++ cocoon/subprojects/cocoon-rcl-webapp-wrapper/trunk/pom.xml Mon Apr 23 14:00:15 2012
@@ -24,86 +24,31 @@
<packaging>jar</packaging>
<parent>
- <artifactId>cocoon-tools-modules</artifactId>
<groupId>org.apache.cocoon</groupId>
- <version>5-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
+ <artifactId>cocoon</artifactId>
+ <version>9-SNAPSHOT</version>
+ <relativePath/>
</parent>
+
<artifactId>cocoon-rcl-webapp-wrapper</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.0.2-SNAPSHOT</version>
<name>Cocoon Reloading ClassLoader - Webapp Wrapper</name>
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/cocoon/subprojects/cocoon-rcl-webapp-wrapper/trunk</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/cocoon/subprojects/cocoon-rcl-webapp-wrapper/trunk</developerConnection>
+ <url>http://svn.apache.org/repos/asf/cocoon/subprojects/cocoon-rcl-webapp-wrapper/trunk</url>
+ </scm>
+
<dependencies>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-jci-core</artifactId>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <exclusions>
- <exclusion>
- <artifactId>logkit</artifactId>
- <groupId>logkit</groupId>
- </exclusion>
- <exclusion>
- <artifactId>avalon-framework</artifactId>
- <groupId>avalon-framework</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
- <dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
- <version>2.5</version>
<scope>provided</scope>
</dependency>
-
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
- <version>3.0.1.RELEASE</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- <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>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-aop</artifactId>
- <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>
- <scope>provided</scope>
- </dependency>
-
- <!-- test dependencies -->
- <dependency>
- <groupId>xmlunit</groupId>
- <artifactId>xmlunit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
</project>
Modified: cocoon/trunk/tools/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/tools/pom.xml?rev=1329244&r1=1329243&r2=1329244&view=diff
==============================================================================
--- cocoon/trunk/tools/pom.xml (original)
+++ cocoon/trunk/tools/pom.xml Mon Apr 23 14:00:15 2012
@@ -40,8 +40,6 @@
<module>cocoon-maven-reports</module>
<module>cocoon-maven-docs-cleaner-plugin</module>
<module>cocoon-maven-javadocs-script-report</module>
- <module>cocoon-rcl/cocoon-rcl-webapp-wrapper</module>
- <module>cocoon-rcl/cocoon-rcl-spring-reloader</module>
<module>cocoon-sitemaptags2daisy-plugin</module>
</modules>
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.