You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by cz...@apache.org on 2006/04/09 16:38:47 UTC
svn commit: r392738 - in /cocoon/trunk/core/cocoon-core: ./
src/main/java/org/apache/cocoon/components/flow/
src/main/java/org/apache/cocoon/core/
src/main/java/org/apache/cocoon/core/osgi/
src/main/java/org/apache/cocoon/util/jmx/
Author: cziegeler
Date: Sun Apr 9 07:38:46 2006
New Revision: 392738
URL: http://svn.apache.org/viewcvs?rev=392738&view=rev
Log:
Clean up code and remove jmx related stuff which is not used anymore
Removed:
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/flow/ContinuationsManagerImplMBean.java
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/util/jmx/
Modified:
cocoon/trunk/core/cocoon-core/pom.xml
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/CoreUtil.java
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/osgi/OSGiSpringECMFactory.java
Modified: cocoon/trunk/core/cocoon-core/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/core/cocoon-core/pom.xml?rev=392738&r1=392737&r2=392738&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-core/pom.xml (original)
+++ cocoon/trunk/core/cocoon-core/pom.xml Sun Apr 9 07:38:46 2006
@@ -321,21 +321,4 @@
<version>1.2.6</version>
</dependency>
</dependencies>
- <profiles>
- <profile>
- <id>jdk14</id>
- <activation>
- <jdk>1.4</jdk>
- </activation>
- <dependencies>
- <!-- this dependency is only needed on JDK 1.4 (our oldest supported JDK version)
- as later versions include the javax.management classes -->
- <dependency>
- <groupId>mx4j</groupId>
- <artifactId>mx4j</artifactId>
- <version>3.0.1</version>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
</project>
Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/CoreUtil.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/CoreUtil.java?rev=392738&r1=392737&r2=392738&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/CoreUtil.java (original)
+++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/CoreUtil.java Sun Apr 9 07:38:46 2006
@@ -31,7 +31,6 @@
import java.util.Map;
import java.util.Properties;
-import javax.servlet.ServletConfig;
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/osgi/OSGiSpringECMFactory.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/osgi/OSGiSpringECMFactory.java?rev=392738&r1=392737&r2=392738&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/osgi/OSGiSpringECMFactory.java (original)
+++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/osgi/OSGiSpringECMFactory.java Sun Apr 9 07:38:46 2006
@@ -16,18 +16,14 @@
package org.apache.cocoon.core.osgi;
import java.beans.PropertyEditor;
-import java.io.FileNotFoundException;
import java.net.URL;
import org.apache.avalon.framework.context.DefaultContext;
import org.apache.avalon.framework.logger.Logger;
import org.apache.cocoon.core.CoreUtil;
-import org.apache.cocoon.core.MutableSettings;
import org.apache.cocoon.core.Settings;
import org.apache.cocoon.core.container.spring.AvalonEnvironment;
import org.apache.cocoon.core.container.spring.BeanFactoryUtil;
-import org.apache.cocoon.core.container.spring.ConfigReader;
-import org.apache.cocoon.core.container.spring.ConfigurationInfo;
import org.osgi.service.component.ComponentContext;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.BeanFactory;