[maven-scm] copy for tag org.apache.aries.blueprint.core-0.4
git-svn-id: https://svn.apache.org/repos/asf/aries/tags/org.apache.aries.blueprint.core-0.4@1190562 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/pom.xml b/pom.xml
index 2ca4afc..2fdb464 100644
--- a/pom.xml
+++ b/pom.xml
@@ -51,6 +51,7 @@
org.apache.aries.blueprint.mutable,
org.apache.aries.blueprint.ext.evaluator,
org.apache.aries.blueprint.services,
+ org.apache.aries.blueprint.utils,
org.osgi.service.blueprint;version=1.0.0
</aries.osgi.export.pkg>
<!--
diff --git a/src/main/java/org/apache/aries/blueprint/container/RecipeBuilder.java b/src/main/java/org/apache/aries/blueprint/container/RecipeBuilder.java
index 10e43cf..32eb839 100644
--- a/src/main/java/org/apache/aries/blueprint/container/RecipeBuilder.java
+++ b/src/main/java/org/apache/aries/blueprint/container/RecipeBuilder.java
@@ -29,6 +29,7 @@
import org.apache.aries.blueprint.ComponentDefinitionRegistry;
import org.apache.aries.blueprint.ExtendedBeanMetadata;
import org.apache.aries.blueprint.services.ExtendedBlueprintContainer;
+import org.apache.aries.blueprint.utils.ServiceListener;
import org.apache.aries.blueprint.PassThroughMetadata;
import org.apache.aries.blueprint.di.ArrayRecipe;
import org.apache.aries.blueprint.di.CollectionRecipe;
diff --git a/src/main/java/org/apache/aries/blueprint/container/ServiceRecipe.java b/src/main/java/org/apache/aries/blueprint/container/ServiceRecipe.java
index 6f66d20..cb04004 100644
--- a/src/main/java/org/apache/aries/blueprint/container/ServiceRecipe.java
+++ b/src/main/java/org/apache/aries/blueprint/container/ServiceRecipe.java
@@ -43,6 +43,7 @@
import org.apache.aries.blueprint.services.ExtendedBlueprintContainer;
import org.apache.aries.blueprint.utils.JavaUtils;
import org.apache.aries.blueprint.utils.ReflectionUtils;
+import org.apache.aries.blueprint.utils.ServiceListener;
import org.apache.aries.proxy.InvocationListener;
import org.apache.aries.proxy.UnableToProxyException;
import org.apache.aries.util.AriesFrameworkUtil;
diff --git a/src/main/java/org/apache/aries/blueprint/ext/ExtNamespaceHandler.java b/src/main/java/org/apache/aries/blueprint/ext/ExtNamespaceHandler.java
index 2bb9921..a966777 100644
--- a/src/main/java/org/apache/aries/blueprint/ext/ExtNamespaceHandler.java
+++ b/src/main/java/org/apache/aries/blueprint/ext/ExtNamespaceHandler.java
@@ -37,6 +37,8 @@
import org.apache.aries.blueprint.mutable.MutableReferenceMetadata;
import org.apache.aries.blueprint.mutable.MutableServiceReferenceMetadata;
import org.apache.aries.blueprint.mutable.MutableValueMetadata;
+import org.apache.aries.blueprint.utils.PlaceholdersUtils;
+import org.apache.aries.blueprint.utils.PropertyPlaceholder;
import org.osgi.framework.BundleContext;
import org.osgi.service.blueprint.container.ComponentDefinitionException;
import org.osgi.service.blueprint.reflect.BeanMetadata;
diff --git a/src/main/java/org/apache/aries/blueprint/ext/packageinfo b/src/main/java/org/apache/aries/blueprint/ext/packageinfo
index 47ea543..db7285e 100644
--- a/src/main/java/org/apache/aries/blueprint/ext/packageinfo
+++ b/src/main/java/org/apache/aries/blueprint/ext/packageinfo
@@ -16,4 +16,4 @@
# specific language governing permissions and limitations
# under the License.
#
-version 0.3.0
+version 0.4.0
diff --git a/src/main/java/org/apache/aries/blueprint/ext/PlaceholdersUtils.java b/src/main/java/org/apache/aries/blueprint/utils/PlaceholdersUtils.java
similarity index 96%
rename from src/main/java/org/apache/aries/blueprint/ext/PlaceholdersUtils.java
rename to src/main/java/org/apache/aries/blueprint/utils/PlaceholdersUtils.java
index 1236a11..c647de8 100644
--- a/src/main/java/org/apache/aries/blueprint/ext/PlaceholdersUtils.java
+++ b/src/main/java/org/apache/aries/blueprint/utils/PlaceholdersUtils.java
@@ -16,10 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.aries.blueprint.ext;
+package org.apache.aries.blueprint.utils;
import org.apache.aries.blueprint.ComponentDefinitionRegistry;
import org.apache.aries.blueprint.ExtendedBeanMetadata;
+import org.apache.aries.blueprint.ext.AbstractPropertyPlaceholder;
import org.apache.aries.blueprint.mutable.MutableBeanMetadata;
import org.osgi.service.blueprint.container.ComponentDefinitionException;
import org.osgi.service.blueprint.reflect.BeanMetadata;
diff --git a/src/main/java/org/apache/aries/blueprint/ext/PropertyPlaceholder.java b/src/main/java/org/apache/aries/blueprint/utils/PropertyPlaceholder.java
similarity index 98%
rename from src/main/java/org/apache/aries/blueprint/ext/PropertyPlaceholder.java
rename to src/main/java/org/apache/aries/blueprint/utils/PropertyPlaceholder.java
index 1990986..c4ac094 100644
--- a/src/main/java/org/apache/aries/blueprint/ext/PropertyPlaceholder.java
+++ b/src/main/java/org/apache/aries/blueprint/utils/PropertyPlaceholder.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.aries.blueprint.ext;
+package org.apache.aries.blueprint.utils;
import java.io.IOException;
import java.io.InputStream;
@@ -27,6 +27,7 @@
import java.util.Map;
import java.util.Properties;
+import org.apache.aries.blueprint.ext.AbstractPropertyPlaceholder;
import org.apache.aries.blueprint.ext.evaluator.PropertyEvaluator;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/src/main/java/org/apache/aries/blueprint/container/ServiceListener.java b/src/main/java/org/apache/aries/blueprint/utils/ServiceListener.java
similarity index 97%
rename from src/main/java/org/apache/aries/blueprint/container/ServiceListener.java
rename to src/main/java/org/apache/aries/blueprint/utils/ServiceListener.java
index ba8a09e..97233b5 100644
--- a/src/main/java/org/apache/aries/blueprint/container/ServiceListener.java
+++ b/src/main/java/org/apache/aries/blueprint/utils/ServiceListener.java
@@ -14,14 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.aries.blueprint.container;
+package org.apache.aries.blueprint.utils;
import java.lang.reflect.Method;
import java.util.List;
import java.util.Map;
import org.apache.aries.blueprint.services.ExtendedBlueprintContainer;
-import org.apache.aries.blueprint.utils.ReflectionUtils;
import org.osgi.service.blueprint.container.ComponentDefinitionException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/src/main/java/org/apache/aries/blueprint/utils/packageinfo b/src/main/java/org/apache/aries/blueprint/utils/packageinfo
index e59dad3..db7285e 100644
--- a/src/main/java/org/apache/aries/blueprint/utils/packageinfo
+++ b/src/main/java/org/apache/aries/blueprint/utils/packageinfo
@@ -16,4 +16,4 @@
# specific language governing permissions and limitations
# under the License.
#
-version 0.3.2
+version 0.4.0
diff --git a/src/test/java/org/apache/aries/blueprint/ext/PropertyPlaceholderTest.java b/src/test/java/org/apache/aries/blueprint/ext/PropertyPlaceholderTest.java
index 12b79f3..fea3f39 100644
--- a/src/test/java/org/apache/aries/blueprint/ext/PropertyPlaceholderTest.java
+++ b/src/test/java/org/apache/aries/blueprint/ext/PropertyPlaceholderTest.java
@@ -23,6 +23,7 @@
import java.util.HashMap;
import java.util.Map;
+import org.apache.aries.blueprint.utils.PropertyPlaceholder;
import org.junit.Before;
import org.junit.Test;
import org.osgi.service.blueprint.reflect.ValueMetadata;
