Repository: roller Updated Branches: refs/heads/java11 e56f3123c -> 3daa8a7fa
Cleanup abandoned CDI efforts. Project: http://git-wip-us.apache.org/repos/asf/roller/repo Commit: http://git-wip-us.apache.org/repos/asf/roller/commit/3daa8a7f Tree: http://git-wip-us.apache.org/repos/asf/roller/tree/3daa8a7f Diff: http://git-wip-us.apache.org/repos/asf/roller/diff/3daa8a7f Branch: refs/heads/java11 Commit: 3daa8a7fa1ac0173190197c8201b41590dafa009 Parents: e56f312 Author: Dave Johnson <[email protected]> Authored: Sun Oct 21 13:58:19 2018 -0400 Committer: Dave Johnson <[email protected]> Committed: Sun Oct 21 13:58:19 2018 -0400 ---------------------------------------------------------------------- .../weblogger/business/WebloggerImpl.java | 9 ++++---- .../business/jpa/JPAWebloggerImpl.java | 16 ++------------ app/src/main/resources/META-INF/beans.xml | 23 -------------------- 3 files changed, 6 insertions(+), 42 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/roller/blob/3daa8a7f/app/src/main/java/org/apache/roller/weblogger/business/WebloggerImpl.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/roller/weblogger/business/WebloggerImpl.java b/app/src/main/java/org/apache/roller/weblogger/business/WebloggerImpl.java index 53894fc..e7e7e14 100644 --- a/app/src/main/java/org/apache/roller/weblogger/business/WebloggerImpl.java +++ b/app/src/main/java/org/apache/roller/weblogger/business/WebloggerImpl.java @@ -18,9 +18,6 @@ package org.apache.roller.weblogger.business; -import org.apache.roller.weblogger.business.plugins.PluginManager; -import java.io.IOException; -import java.util.Properties; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.roller.planet.business.PlanetManager; @@ -29,12 +26,14 @@ import org.apache.roller.weblogger.WebloggerException; import org.apache.roller.weblogger.business.pings.AutoPingManager; import org.apache.roller.weblogger.business.pings.PingQueueManager; import org.apache.roller.weblogger.business.pings.PingTargetManager; -import org.apache.roller.weblogger.business.search.IndexManager; +import org.apache.roller.weblogger.business.plugins.PluginManager; import org.apache.roller.weblogger.business.runnable.ThreadManager; +import org.apache.roller.weblogger.business.search.IndexManager; import org.apache.roller.weblogger.business.themes.ThemeManager; import org.apache.roller.weblogger.config.PingConfig; -import javax.enterprise.inject.Alternative; +import java.io.IOException; +import java.util.Properties; /** http://git-wip-us.apache.org/repos/asf/roller/blob/3daa8a7f/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWebloggerImpl.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWebloggerImpl.java b/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWebloggerImpl.java index b612f18..0cc005d 100644 --- a/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWebloggerImpl.java +++ b/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWebloggerImpl.java @@ -21,31 +21,19 @@ import org.apache.roller.planet.business.PlanetManager; import org.apache.roller.planet.business.PlanetURLStrategy; import org.apache.roller.planet.business.fetcher.FeedFetcher; import org.apache.roller.weblogger.WebloggerException; -import org.apache.roller.weblogger.business.BookmarkManager; -import org.apache.roller.weblogger.business.FileContentManager; -import org.apache.roller.weblogger.business.OAuthManager; -import org.apache.roller.weblogger.business.MediaFileManager; -import org.apache.roller.weblogger.business.PropertiesManager; -import org.apache.roller.weblogger.business.URLStrategy; -import org.apache.roller.weblogger.business.WebloggerImpl; -import org.apache.roller.weblogger.business.UserManager; -import org.apache.roller.weblogger.business.WeblogEntryManager; -import org.apache.roller.weblogger.business.WeblogManager; -import org.apache.roller.weblogger.business.runnable.ThreadManager; +import org.apache.roller.weblogger.business.*; import org.apache.roller.weblogger.business.pings.AutoPingManager; import org.apache.roller.weblogger.business.pings.PingQueueManager; import org.apache.roller.weblogger.business.pings.PingTargetManager; import org.apache.roller.weblogger.business.plugins.PluginManager; +import org.apache.roller.weblogger.business.runnable.ThreadManager; import org.apache.roller.weblogger.business.search.IndexManager; import org.apache.roller.weblogger.business.themes.ThemeManager; -import javax.enterprise.inject.Default; - /** * A JPA specific implementation of the Weblogger business layer. */ @com.google.inject.Singleton -@Default public class JPAWebloggerImpl extends WebloggerImpl { // a persistence utility class http://git-wip-us.apache.org/repos/asf/roller/blob/3daa8a7f/app/src/main/resources/META-INF/beans.xml ---------------------------------------------------------------------- diff --git a/app/src/main/resources/META-INF/beans.xml b/app/src/main/resources/META-INF/beans.xml deleted file mode 100644 index 402c564..0000000 --- a/app/src/main/resources/META-INF/beans.xml +++ /dev/null @@ -1,23 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -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. ---> - -<beans xmlns="http://java.sun.com/xml/ns/javaee"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee - http://java.sun.com/xml/ns/javaee/beans_1_0.xsd";> -</beans>
