svn commit: r1204543 - in /aries/trunk/blueprint/blueprint-core: pom.xml src/main/java/org/apache/aries/blueprint/ExtendedBlueprintContainer.java src/main/java/org/apache/aries/blueprint/container/BlueprintContainerImpl.java

[dk...@apache.org]

Author: dkulp
Date: Mon Nov 21 15:37:33 2011
New Revision: 1204543

URL: http://svn.apache.org/viewvc?rev=1204543&view=rev
Log:
Add ExtendedBlueprintContainer back into same location as in 0.3 for
compatibility

Added:
    aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ExtendedBlueprintContainer.java   (with props)
Modified:
    aries/trunk/blueprint/blueprint-core/pom.xml
    aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintContainerImpl.java

Modified: aries/trunk/blueprint/blueprint-core/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-core/pom.xml?rev=1204543&r1=1204542&r2=1204543&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-core/pom.xml (original)
+++ aries/trunk/blueprint/blueprint-core/pom.xml Mon Nov 21 15:37:33 2011
@@ -47,7 +47,7 @@
       <!-- Export package versions are maintained in packageinfo files -->
       <aries.osgi.export.pkg>
           !org.apache.aries.blueprint.annotation*,
-          org.apache.aries.blueprint,
+          org.apache.aries.blueprint;-split-package:=merge-first,
           org.apache.aries.blueprint.mutable,
           org.apache.aries.blueprint.ext,
           org.apache.aries.blueprint.ext.evaluator,

Added: aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ExtendedBlueprintContainer.java
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ExtendedBlueprintContainer.java?rev=1204543&view=auto
==============================================================================
--- aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ExtendedBlueprintContainer.java (added)
+++ aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ExtendedBlueprintContainer.java Mon Nov 21 15:37:33 2011
@@ -0,0 +1,28 @@
+/**
+ *  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.aries.blueprint;
+
+
+/**
+ * @deprecated - use org.apache.aries.blueprint.services.ExtendedBlueprintContainer
+ *               Will be removed in a future version of Aries Blueprint
+ */
+@Deprecated
+public interface ExtendedBlueprintContainer extends org.apache.aries.blueprint.services.ExtendedBlueprintContainer {
+
+            
+}

Propchange: aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ExtendedBlueprintContainer.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ExtendedBlueprintContainer.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintContainerImpl.java
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintContainerImpl.java?rev=1204543&r1=1204542&r2=1204543&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintContainerImpl.java (original)
+++ aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintContainerImpl.java Mon Nov 21 15:37:33 2011
@@ -99,7 +99,11 @@ import org.slf4j.LoggerFactory;
  *
  * @version $Rev$, $Date$
  */
-public class BlueprintContainerImpl implements ExtendedBlueprintContainer, NamespaceHandlerSet.Listener, Runnable, SatisfiableRecipe.SatisfactionListener {
+@SuppressWarnings("deprecation") // due to the deprecated org.apache.aries.blueprint.ExtendedBlueprintContainer
+public class BlueprintContainerImpl 
+    implements ExtendedBlueprintContainer, NamespaceHandlerSet.Listener, 
+    Runnable, SatisfiableRecipe.SatisfactionListener,
+    org.apache.aries.blueprint.ExtendedBlueprintContainer {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(BlueprintContainerImpl.class);