[utilities COMMIT] in /spring-extensions/trunk/src: main/java/net/shibboleth/ext/spring/factory/AbstractComponentAwar...

[noreply at shibboleth.net]

Author: scantor
Date: Sat Jan 17 15:16:48 2015
New Revision: 727

URL: http://svn.shibboleth.net/view/utilities?rev=727&view=rev
Log:
Add missing svn:eol-style props.

Modified:
    spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/factory/AbstractComponentAwareFactoryBean.java   (contents, props changed)
    spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/resource/HTTPResource.java   (contents, props changed)
    spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/resource/ResourceHelper.java   (contents, props changed)
    spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/resource/SVNBasicAuthenticationManager.java   (contents, props changed)
    spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/resource/SVNResource.java   (contents, props changed)
    spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/resource/package-info.java   (contents, props changed)
    spring-extensions/trunk/src/test/java/net/shibboleth/ext/spring/resource/HTTPResourceTest.java   (contents, props changed)
    spring-extensions/trunk/src/test/java/net/shibboleth/ext/spring/resource/ResourceTestHelper.java   (contents, props changed)
    spring-extensions/trunk/src/test/java/net/shibboleth/ext/spring/resource/SVNResourceTest.java   (contents, props changed)
    spring-extensions/trunk/src/test/java/net/shibboleth/ext/spring/resource/TestHTTPResource.java   (contents, props changed)
    spring-extensions/trunk/src/test/java/net/shibboleth/ext/spring/service/ReloadableSpringServiceTest.java   (contents, props changed)
    spring-extensions/trunk/src/test/java/net/shibboleth/ext/spring/service/TestServiceableComponent.java   (contents, props changed)

Modified: spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/factory/AbstractComponentAwareFactoryBean.java
URL: http://svn.shibboleth.net/view/utilities/spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/factory/AbstractComponentAwareFactoryBean.java?rev=727&r1=726&r2=727&view=diff
==============================================================================
--- spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/factory/AbstractComponentAwareFactoryBean.java (original)
+++ spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/factory/AbstractComponentAwareFactoryBean.java Sat Jan 17 15:16:48 2015
@@ -1,61 +1,61 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID 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 net.shibboleth.ext.spring.factory;
-
-import net.shibboleth.utilities.java.support.component.ComponentSupport;
-
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.BeanCreationException;
-import org.springframework.beans.factory.config.AbstractFactoryBean;
-
-/**
- * A Factory bean which is aware of {@link net.shibboleth.utilities.java.support.component.DestructableComponent}.
- * 
- * @param <T> The type to implement
- */
-public abstract class AbstractComponentAwareFactoryBean<T> extends AbstractFactoryBean<T> {
-
-    /** {@inheritDoc}. Call our destroy method if aposite. */
-    @Override protected void destroyInstance(T instance) throws Exception {
-        super.destroyInstance(instance);
-        ComponentSupport.destroy(instance);
-    }
-
-    /**
-     * Call the parent class to create the object, then initialize it aposite. {@inheritDoc}.
-     */
-    @Override protected final T createInstance() throws Exception {
-        if (!isSingleton()) {
-            LoggerFactory.getLogger(AbstractComponentAwareFactoryBean.class).error(
-                    "Configuration error: {} should not be used to create prototype beans."
-                            + "  Destroy is never called for prototype beans", AbstractComponentAwareFactoryBean.class);
-            throw new BeanCreationException("Do not use AbstractComponentAwareFactoryBean to create prototype beans");
-        }
-        final T theBean = doCreateInstance();
-        ComponentSupport.initialize(theBean);
-        return theBean;
-    }
-
-    /**
-     * Call the parent class to create the instance.
-     * 
-     * @return the bean.
-     * @throws Exception if needed.
-     */
-    protected abstract T doCreateInstance() throws Exception;
-}
+/*

[... 4006 lines stripped ...]