[jbossweb-commits] JBossWeb SVN: r972 - in trunk: java/org/apache/catalina/core and 4 other directories.

Author: remy.maucherat(a)jboss.com Date: 2009-03-27 11:12:28 -0400 (Fri, 27 Mar 2009) New Revision: 972 Added: trunk/java/org/apache/tomcat/InstanceManager.java trunk/java/org/apache/tomcat/PeriodicEventListener.java Removed: trunk/java/org/apache/AnnotationProcessor.java trunk/java/org/apache/InstanceManager.java trunk/java/org/apache/PeriodicEventListener.java trunk/java/org/apache/tomcat/Apr.java trunk/java/org/apache/tomcat/apr.properties Modified: trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java trunk/java/org/apache/catalina/core/DefaultInstanceManager.java trunk/java/org/apache/catalina/core/StandardContext.java trunk/java/org/apache/catalina/core/StandardWrapper.java trunk/java/org/apache/jasper/runtime/InstanceManagerFactory.java trunk/java/org/apache/jasper/runtime/TagHandlerPool.java trunk/java/org/apache/jasper/servlet/JspServlet.java trunk/java/org/apache/jasper/servlet/JspServletWrapper.java trunk/webapps/docs/changelog.xml Log: - Port move of classes to org.apache.tomcat. Deleted: trunk/java/org/apache/AnnotationProcessor.java =================================================================== --- trunk/java/org/apache/AnnotationProcessor.java 2009-03-27 13:54:49 UTC (rev 971) +++ trunk/java/org/apache/AnnotationProcessor.java 2009-03-27 15:12:28 UTC (rev 972) @@ -1,38 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache; - -import java.lang.reflect.InvocationTargetException; - -import javax.naming.NamingException; - -/** - * Comment - * - * @author <a href="mailto:bill@jboss.org">Bill Burke</a> - * @version $Revision$ - * @deprecated Replaced by InstanceManager which provides a subset of the capabilities - */ -public interface AnnotationProcessor { - public void postConstruct(Object instance) - throws IllegalAccessException, InvocationTargetException; - public void preDestroy(Object instance) - throws IllegalAccessException, InvocationTargetException; - public void processAnnotations(Object instance) - throws IllegalAccessException, InvocationTargetException, NamingException; -} Deleted: trunk/java/org/apache/InstanceManager.java =================================================================== --- trunk/java/org/apache/InstanceManager.java 2009-03-27 13:54:49 UTC (rev 971) +++ trunk/java/org/apache/InstanceManager.java 2009-03-27 15:12:28 UTC (rev 972) @@ -1,45 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - - -package org.apache; - -import java.lang.reflect.InvocationTargetException; - -import javax.naming.NamingException; - -/** - * @version $Rev:$ $Date:$ - */ -public interface InstanceManager { - - public Object newInstance(String className) - throws IllegalAccessException, InvocationTargetException, NamingException, - InstantiationException, ClassNotFoundException; - - public Object newInstance(String fqcn, ClassLoader classLoader) - throws IllegalAccessException, InvocationTargetException, NamingException, - InstantiationException, ClassNotFoundException; - - public void newInstance(Object o) - throws IllegalAccessException, InvocationTargetException, NamingException; - - public void destroyInstance(Object o) - throws IllegalAccessException, InvocationTargetException; -} Deleted: trunk/java/org/apache/PeriodicEventListener.java =================================================================== --- trunk/java/org/apache/PeriodicEventListener.java 2009-03-27 13:54:49 UTC (rev 971) +++ trunk/java/org/apache/PeriodicEventListener.java 2009-03-27 15:12:28 UTC (rev 972) @@ -1,25 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache; - -public interface PeriodicEventListener { - /** - * Execute a periodic task, such as reloading, etc. - */ - public void periodicEvent(); -} Modified: trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java =================================================================== --- trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java 2009-03-27 13:54:49 UTC (rev 971) +++ trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java 2009-03-27 15:12:28 UTC (rev 972) @@ -32,13 +32,13 @@ import javax.servlet.ServletContext; import javax.servlet.ServletException; -import org.apache.InstanceManager; import org.apache.catalina.Context; import org.apache.catalina.Globals; import org.apache.catalina.deploy.FilterDef; import org.apache.catalina.security.SecurityUtil; import org.apache.catalina.util.Enumerator; import org.apache.catalina.util.StringManager; +import org.apache.tomcat.InstanceManager; import org.apache.tomcat.util.log.SystemLogHandler; Modified: trunk/java/org/apache/catalina/core/DefaultInstanceManager.java =================================================================== --- trunk/java/org/apache/catalina/core/DefaultInstanceManager.java 2009-03-27 13:54:49 UTC (rev 971) +++ trunk/java/org/apache/catalina/core/DefaultInstanceManager.java 2009-03-27 15:12:28 UTC (rev 972) @@ -44,12 +44,12 @@ import javax.servlet.Filter; import javax.servlet.Servlet; -import org.apache.InstanceManager; import org.apache.catalina.security.SecurityUtil; import org.apache.catalina.ContainerServlet; import org.apache.catalina.Globals; import org.apache.catalina.core.Constants; import org.apache.catalina.util.StringManager; +import org.apache.tomcat.InstanceManager; /** * @version $Rev$ $Date$ Modified: trunk/java/org/apache/catalina/core/StandardContext.java =================================================================== --- trunk/java/org/apache/catalina/core/StandardContext.java 2009-03-27 13:54:49 UTC (rev 971) +++ trunk/java/org/apache/catalina/core/StandardContext.java 2009-03-27 15:12:28 UTC (rev 972) @@ -26,8 +26,6 @@ import java.io.InputStream; import java.io.InputStreamReader; import java.io.ObjectOutputStream; -import java.io.Serializable; -import java.lang.reflect.InvocationTargetException; import java.util.ArrayList; import java.util.EnumSet; import java.util.HashMap; @@ -64,8 +62,6 @@ import javax.servlet.http.HttpSessionAttributeListener; import javax.servlet.http.HttpSessionListener; -import org.apache.AnnotationProcessor; -import org.apache.InstanceManager; import org.apache.catalina.Container; import org.apache.catalina.ContainerListener; import org.apache.catalina.Context; @@ -106,6 +102,7 @@ import org.apache.naming.resources.FileDirContext; import org.apache.naming.resources.ProxyDirContext; import org.apache.naming.resources.WARDirContext; +import org.apache.tomcat.InstanceManager; import org.apache.tomcat.util.modeler.Registry; import org.jboss.logging.Logger; @@ -193,12 +190,6 @@ /** - * Dummy annotation processor. - */ - private AnnotationProcessor annotationProcessor = new DummyAnnotationProcessor(); - - - /** * The antiJARLocking flag for this Context. */ private boolean antiJARLocking = false; @@ -4461,7 +4452,6 @@ } else { getServletContext().setAttribute(InstanceManager.class.getName(), instanceManager); } - getServletContext().setAttribute(AnnotationProcessor.class.getName(), annotationProcessor); } try { @@ -5855,28 +5845,4 @@ } - // ----------------------------------------------- DummyAnnotationProcessor Inner Class - - - protected class DummyAnnotationProcessor implements AnnotationProcessor { - - public void postConstruct(Object instance) - throws IllegalAccessException, InvocationTargetException { - // Do nothing - } - - public void preDestroy(Object instance) throws IllegalAccessException, - InvocationTargetException { - getInstanceManager().destroyInstance(instance); - } - - public void processAnnotations(Object instance) - throws IllegalAccessException, InvocationTargetException, - NamingException { - getInstanceManager().newInstance(instance); - } - - } - - } Modified: trunk/java/org/apache/catalina/core/StandardWrapper.java =================================================================== --- trunk/java/org/apache/catalina/core/StandardWrapper.java 2009-03-27 13:54:49 UTC (rev 971) +++ trunk/java/org/apache/catalina/core/StandardWrapper.java 2009-03-27 15:12:28 UTC (rev 972) @@ -44,8 +44,6 @@ import javax.servlet.SingleThreadModel; import javax.servlet.UnavailableException; -import org.apache.InstanceManager; -import org.apache.PeriodicEventListener; import org.apache.catalina.Container; import org.apache.catalina.ContainerServlet; import org.apache.catalina.Context; @@ -57,6 +55,8 @@ import org.apache.catalina.security.SecurityUtil; import org.apache.catalina.util.Enumerator; import org.apache.catalina.util.InstanceSupport; +import org.apache.tomcat.InstanceManager; +import org.apache.tomcat.PeriodicEventListener; import org.apache.tomcat.util.log.SystemLogHandler; import org.apache.tomcat.util.modeler.Registry; Modified: trunk/java/org/apache/jasper/runtime/InstanceManagerFactory.java =================================================================== --- trunk/java/org/apache/jasper/runtime/InstanceManagerFactory.java 2009-03-27 13:54:49 UTC (rev 971) +++ trunk/java/org/apache/jasper/runtime/InstanceManagerFactory.java 2009-03-27 15:12:28 UTC (rev 972) @@ -22,10 +22,10 @@ import javax.servlet.ServletConfig; -import org.apache.InstanceManager; +import org.apache.tomcat.InstanceManager; /** - * @version $Rev:$ $Date:$ + * @version $Rev$ $Date$ */ public class InstanceManagerFactory { Modified: trunk/java/org/apache/jasper/runtime/TagHandlerPool.java =================================================================== --- trunk/java/org/apache/jasper/runtime/TagHandlerPool.java 2009-03-27 13:54:49 UTC (rev 971) +++ trunk/java/org/apache/jasper/runtime/TagHandlerPool.java 2009-03-27 15:12:28 UTC (rev 972) @@ -21,8 +21,8 @@ import javax.servlet.jsp.JspException; import javax.servlet.jsp.tagext.Tag; -import org.apache.InstanceManager; import org.apache.jasper.Constants; +import org.apache.tomcat.InstanceManager; import org.jboss.logging.Logger; import org.jboss.logging.Logger; Modified: trunk/java/org/apache/jasper/servlet/JspServlet.java =================================================================== --- trunk/java/org/apache/jasper/servlet/JspServlet.java 2009-03-27 13:54:49 UTC (rev 971) +++ trunk/java/org/apache/jasper/servlet/JspServlet.java 2009-03-27 15:12:28 UTC (rev 972) @@ -27,13 +27,13 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.PeriodicEventListener; import org.apache.jasper.Constants; import org.apache.jasper.EmbeddedServletOptions; import org.apache.jasper.Options; import org.apache.jasper.compiler.JspRuntimeContext; import org.apache.jasper.compiler.Localizer; import org.apache.jasper.security.SecurityUtil; +import org.apache.tomcat.PeriodicEventListener; import org.jboss.logging.Logger; /** Modified: trunk/java/org/apache/jasper/servlet/JspServletWrapper.java =================================================================== --- trunk/java/org/apache/jasper/servlet/JspServletWrapper.java 2009-03-27 13:54:49 UTC (rev 971) +++ trunk/java/org/apache/jasper/servlet/JspServletWrapper.java 2009-03-27 15:12:28 UTC (rev 972) @@ -31,7 +31,6 @@ import javax.servlet.http.HttpServletResponse; import javax.servlet.jsp.tagext.TagInfo; -import org.apache.InstanceManager; import org.apache.jasper.JasperException; import org.apache.jasper.JspCompilationContext; import org.apache.jasper.Options; @@ -41,6 +40,7 @@ import org.apache.jasper.compiler.Localizer; import org.apache.jasper.runtime.InstanceManagerFactory; import org.apache.jasper.runtime.JspSourceDependent; +import org.apache.tomcat.InstanceManager; import org.jboss.logging.Logger; import org.jboss.logging.Logger; Deleted: trunk/java/org/apache/tomcat/Apr.java =================================================================== --- trunk/java/org/apache/tomcat/Apr.java 2009-03-27 13:54:49 UTC (rev 971) +++ trunk/java/org/apache/tomcat/Apr.java 2009-03-27 15:12:28 UTC (rev 972) @@ -1,41 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -package org.apache.tomcat; - -import java.io.InputStream; -import java.util.Properties; - -public class Apr { - private static String aprInfo = null; - - static { - - try { - InputStream is = Apr.class.getResourceAsStream - ("/org/apache/tomcat/apr.properties"); - Properties props = new Properties(); - props.load(is); - is.close(); - aprInfo = props.getProperty("tcn.info"); - } - catch (Throwable t) { - ; // Nothing - } - } -} Copied: trunk/java/org/apache/tomcat/InstanceManager.java (from rev 970, trunk/java/org/apache/InstanceManager.java) =================================================================== --- trunk/java/org/apache/tomcat/InstanceManager.java (rev 0) +++ trunk/java/org/apache/tomcat/InstanceManager.java 2009-03-27 15:12:28 UTC (rev 972) @@ -0,0 +1,45 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + + +package org.apache.tomcat; + +import java.lang.reflect.InvocationTargetException; + +import javax.naming.NamingException; + +/** + * @version $Rev$ $Date$ + */ +public interface InstanceManager { + + public Object newInstance(String className) + throws IllegalAccessException, InvocationTargetException, NamingException, + InstantiationException, ClassNotFoundException; + + public Object newInstance(String fqcn, ClassLoader classLoader) + throws IllegalAccessException, InvocationTargetException, NamingException, + InstantiationException, ClassNotFoundException; + + public void newInstance(Object o) + throws IllegalAccessException, InvocationTargetException, NamingException; + + public void destroyInstance(Object o) + throws IllegalAccessException, InvocationTargetException; +} Property changes on: trunk/java/org/apache/tomcat/InstanceManager.java ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/java/org/apache/tomcat/PeriodicEventListener.java (from rev 970, trunk/java/org/apache/PeriodicEventListener.java) =================================================================== --- trunk/java/org/apache/tomcat/PeriodicEventListener.java (rev 0) +++ trunk/java/org/apache/tomcat/PeriodicEventListener.java 2009-03-27 15:12:28 UTC (rev 972) @@ -0,0 +1,25 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.tomcat; + +public interface PeriodicEventListener { + /** + * Execute a periodic task, such as reloading, etc. + */ + public void periodicEvent(); +} Property changes on: trunk/java/org/apache/tomcat/PeriodicEventListener.java ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Deleted: trunk/java/org/apache/tomcat/apr.properties =================================================================== --- trunk/java/org/apache/tomcat/apr.properties 2009-03-27 13:54:49 UTC (rev 971) +++ trunk/java/org/apache/tomcat/apr.properties 2009-03-27 15:12:28 UTC (rev 972) @@ -1 +0,0 @@ -tcn.info=Tomcat Native/@VERSION@ Modified: trunk/webapps/docs/changelog.xml =================================================================== --- trunk/webapps/docs/changelog.xml 2009-03-27 13:54:49 UTC (rev 971) +++ trunk/webapps/docs/changelog.xml 2009-03-27 15:12:28 UTC (rev 972) @@ -44,6 +44,9 @@ <fix> <bug>45332</bug>: Encoding fix for tomcat-users file. (markt) </fix> + <update> + Move InstanceManager and PeriodicEventListener to org.apache.tomcat. (markt) + </update> </changelog> </subsection> <subsection name="Coyote">