You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by gn...@apache.org on 2011/11/12 15:56:15 UTC
svn commit: r1201275 - in /aries/trunk/blueprint: blueprint-bundle/
blueprint-cm/src/main/java/org/apache/aries/blueprint/compendium/cm/
blueprint-core/ blueprint-core/src/main/java/org/apache/aries/blueprint/ext/
blueprint-core/src/main/java/org/apach...
Author: gnodet
Date: Sat Nov 12 14:56:14 2011
New Revision: 1201275
URL: http://svn.apache.org/viewvc?rev=1201275&view=rev
Log:
[ARIES-779] AbstractPropertyPlaceHolder should be exported by blueprint-core
Move back PropertyPlaceHolder and PlacholderUtils to the ext package, move the ext namespace implementation to ext.impl private package, and export the ext package again
Added:
aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/PlaceholdersUtils.java
- copied, changed from r1201220, aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/utils/PlaceholdersUtils.java
aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/PropertyPlaceholder.java
- copied, changed from r1201220, aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/utils/PropertyPlaceholder.java
aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/impl/
aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/impl/ExtNamespaceHandler.java
- copied, changed from r1201220, aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/ExtNamespaceHandler.java
aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/impl/packageinfo
aries/trunk/blueprint/blueprint-core/src/main/resources/org/apache/aries/blueprint/ext/impl/
aries/trunk/blueprint/blueprint-core/src/main/resources/org/apache/aries/blueprint/ext/impl/blueprint-ext-1.1.xsd
- copied, changed from r1201220, aries/trunk/blueprint/blueprint-core/src/main/resources/org/apache/aries/blueprint/ext/blueprint-ext-1.1.xsd
aries/trunk/blueprint/blueprint-core/src/main/resources/org/apache/aries/blueprint/ext/impl/blueprint-ext-1.2.xsd
- copied, changed from r1201220, aries/trunk/blueprint/blueprint-core/src/main/resources/org/apache/aries/blueprint/ext/blueprint-ext-1.2.xsd
aries/trunk/blueprint/blueprint-core/src/main/resources/org/apache/aries/blueprint/ext/impl/blueprint-ext.xsd
- copied, changed from r1201220, aries/trunk/blueprint/blueprint-core/src/main/resources/org/apache/aries/blueprint/ext/blueprint-ext.xsd
Removed:
aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/ExtNamespaceHandler.java
aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/utils/PlaceholdersUtils.java
aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/utils/PropertyPlaceholder.java
aries/trunk/blueprint/blueprint-core/src/main/resources/org/apache/aries/blueprint/ext/blueprint-ext-1.1.xsd
aries/trunk/blueprint/blueprint-core/src/main/resources/org/apache/aries/blueprint/ext/blueprint-ext-1.2.xsd
aries/trunk/blueprint/blueprint-core/src/main/resources/org/apache/aries/blueprint/ext/blueprint-ext.xsd
Modified:
aries/trunk/blueprint/blueprint-bundle/pom.xml
aries/trunk/blueprint/blueprint-cm/src/main/java/org/apache/aries/blueprint/compendium/cm/CmNamespaceHandler.java
aries/trunk/blueprint/blueprint-cm/src/main/java/org/apache/aries/blueprint/compendium/cm/CmPropertyPlaceholder.java
aries/trunk/blueprint/blueprint-core/pom.xml
aries/trunk/blueprint/blueprint-core/src/main/resources/OSGI-INF/blueprint/blueprint-ext.xml
aries/trunk/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/AbstractBlueprintTest.java
aries/trunk/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/ext/PropertyPlaceholderTest.java
Modified: aries/trunk/blueprint/blueprint-bundle/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-bundle/pom.xml?rev=1201275&r1=1201274&r2=1201275&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-bundle/pom.xml (original)
+++ aries/trunk/blueprint/blueprint-bundle/pom.xml Sat Nov 12 14:56:14 2011
@@ -80,17 +80,19 @@
org.apache.aries.blueprint,
org.apache.aries.blueprint.services,
org.apache.aries.blueprint.mutable,
- org.apache.aries.blueprint.ext.evaluator
+ org.apache.aries.blueprint.ext,
+ org.apache.aries.blueprint.ext.evaluator,
+ org.apache.aries.blueprint.utils
</aries.osgi.export.pkg>
<aries.osgi.private.pkg>
org.apache.aries.blueprint.parser,
org.apache.aries.blueprint.reflect,
org.apache.aries.blueprint.container,
org.apache.aries.blueprint.di,
- org.apache.aries.blueprint.ext,
+ org.apache.aries.blueprint.ext.impl,
org.apache.aries.blueprint.namespace,
org.apache.aries.blueprint.proxy,
- org.apache.aries.blueprint.utils*,
+ org.apache.aries.blueprint.utils.*,
org.apache.aries.blueprint.compendium.cm,
OSGI-INF*
</aries.osgi.private.pkg>
Modified: aries/trunk/blueprint/blueprint-cm/src/main/java/org/apache/aries/blueprint/compendium/cm/CmNamespaceHandler.java
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-cm/src/main/java/org/apache/aries/blueprint/compendium/cm/CmNamespaceHandler.java?rev=1201275&r1=1201274&r2=1201275&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-cm/src/main/java/org/apache/aries/blueprint/compendium/cm/CmNamespaceHandler.java (original)
+++ aries/trunk/blueprint/blueprint-cm/src/main/java/org/apache/aries/blueprint/compendium/cm/CmNamespaceHandler.java Sat Nov 12 14:56:14 2011
@@ -26,6 +26,7 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
+import org.apache.aries.blueprint.ext.PlaceholdersUtils;
import org.w3c.dom.CharacterData;
import org.w3c.dom.Comment;
import org.w3c.dom.Element;
@@ -45,7 +46,6 @@ import org.apache.aries.blueprint.mutabl
import org.apache.aries.blueprint.mutable.MutableReferenceMetadata;
import org.apache.aries.blueprint.mutable.MutableValueMetadata;
import org.apache.aries.blueprint.reflect.PassThroughMetadataImpl;
-import org.apache.aries.blueprint.utils.PlaceholdersUtils;
import org.apache.aries.blueprint.utils.ServiceListener;
import org.osgi.framework.BundleContext;
import org.osgi.service.blueprint.container.ComponentDefinitionException;
Modified: aries/trunk/blueprint/blueprint-cm/src/main/java/org/apache/aries/blueprint/compendium/cm/CmPropertyPlaceholder.java
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-cm/src/main/java/org/apache/aries/blueprint/compendium/cm/CmPropertyPlaceholder.java?rev=1201275&r1=1201274&r2=1201275&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-cm/src/main/java/org/apache/aries/blueprint/compendium/cm/CmPropertyPlaceholder.java (original)
+++ aries/trunk/blueprint/blueprint-cm/src/main/java/org/apache/aries/blueprint/compendium/cm/CmPropertyPlaceholder.java Sat Nov 12 14:56:14 2011
@@ -22,8 +22,8 @@ import java.util.Dictionary;
import java.util.Enumeration;
import java.util.Properties;
+import org.apache.aries.blueprint.ext.PropertyPlaceholder;
import org.apache.aries.blueprint.services.ExtendedBlueprintContainer;
-import org.apache.aries.blueprint.utils.PropertyPlaceholder;
import org.osgi.framework.Bundle;
import org.osgi.framework.Constants;
import org.osgi.service.cm.Configuration;
Modified: aries/trunk/blueprint/blueprint-core/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-core/pom.xml?rev=1201275&r1=1201274&r2=1201275&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-core/pom.xml (original)
+++ aries/trunk/blueprint/blueprint-core/pom.xml Sat Nov 12 14:56:14 2011
@@ -49,6 +49,7 @@
!org.apache.aries.blueprint.annotation*,
org.apache.aries.blueprint,
org.apache.aries.blueprint.mutable,
+ org.apache.aries.blueprint.ext,
org.apache.aries.blueprint.ext.evaluator,
org.apache.aries.blueprint.services,
org.apache.aries.blueprint.utils,
@@ -76,11 +77,11 @@
org.apache.aries.blueprint.reflect,
org.apache.aries.blueprint.container,
org.apache.aries.blueprint.di,
- org.apache.aries.blueprint.ext,
+ org.apache.aries.blueprint.ext.impl,
org.apache.aries.blueprint.namespace,
org.apache.aries.blueprint.proxy,
org.apache.aries.blueprint.services,
- org.apache.aries.blueprint.utils*
+ org.apache.aries.blueprint.utils.*
</aries.osgi.private.pkg>
<aries.osgi.export.service>
org.apache.aries.blueprint.ParserService
Copied: aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/PlaceholdersUtils.java (from r1201220, aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/utils/PlaceholdersUtils.java)
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/PlaceholdersUtils.java?p2=aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/PlaceholdersUtils.java&p1=aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/utils/PlaceholdersUtils.java&r1=1201220&r2=1201275&rev=1201275&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/utils/PlaceholdersUtils.java (original)
+++ aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/PlaceholdersUtils.java Sat Nov 12 14:56:14 2011
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.aries.blueprint.utils;
+package org.apache.aries.blueprint.ext;
import org.apache.aries.blueprint.ComponentDefinitionRegistry;
import org.apache.aries.blueprint.ExtendedBeanMetadata;
Copied: aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/PropertyPlaceholder.java (from r1201220, aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/utils/PropertyPlaceholder.java)
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/PropertyPlaceholder.java?p2=aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/PropertyPlaceholder.java&p1=aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/utils/PropertyPlaceholder.java&r1=1201220&r2=1201275&rev=1201275&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/utils/PropertyPlaceholder.java (original)
+++ aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/PropertyPlaceholder.java Sat Nov 12 14:56:14 2011
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.aries.blueprint.utils;
+package org.apache.aries.blueprint.ext;
import java.io.IOException;
import java.io.InputStream;
@@ -27,7 +27,6 @@ import java.util.List;
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;
Copied: aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/impl/ExtNamespaceHandler.java (from r1201220, aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/ExtNamespaceHandler.java)
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/impl/ExtNamespaceHandler.java?p2=aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/impl/ExtNamespaceHandler.java&p1=aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/ExtNamespaceHandler.java&r1=1201220&r2=1201275&rev=1201275&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/ExtNamespaceHandler.java (original)
+++ aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/impl/ExtNamespaceHandler.java Sat Nov 12 14:56:14 2011
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.aries.blueprint.ext;
+package org.apache.aries.blueprint.ext.impl;
import java.net.URL;
import java.util.ArrayList;
@@ -27,6 +27,8 @@ import java.util.Set;
import org.apache.aries.blueprint.ExtendedReferenceListMetadata;
import org.apache.aries.blueprint.ParserContext;
+import org.apache.aries.blueprint.ext.PlaceholdersUtils;
+import org.apache.aries.blueprint.ext.PropertyPlaceholder;
import org.apache.aries.blueprint.ext.evaluator.PropertyEvaluator;
import org.apache.aries.blueprint.mutable.MutableBeanMetadata;
import org.apache.aries.blueprint.mutable.MutableCollectionMetadata;
@@ -37,8 +39,6 @@ import org.apache.aries.blueprint.mutabl
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;
Added: aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/impl/packageinfo
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/impl/packageinfo?rev=1201275&view=auto
==============================================================================
--- aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/impl/packageinfo (added)
+++ aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/impl/packageinfo Sat Nov 12 14:56:14 2011
@@ -0,0 +1,19 @@
+#
+# 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.
+#
+version 0.4.0
Modified: aries/trunk/blueprint/blueprint-core/src/main/resources/OSGI-INF/blueprint/blueprint-ext.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-core/src/main/resources/OSGI-INF/blueprint/blueprint-ext.xml?rev=1201275&r1=1201274&r2=1201275&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-core/src/main/resources/OSGI-INF/blueprint/blueprint-ext.xml (original)
+++ aries/trunk/blueprint/blueprint-core/src/main/resources/OSGI-INF/blueprint/blueprint-ext.xml Sat Nov 12 14:56:14 2011
@@ -29,7 +29,7 @@
</array>
</entry>
</service-properties>
- <bean class="org.apache.aries.blueprint.ext.ExtNamespaceHandler">
+ <bean class="org.apache.aries.blueprint.ext.impl.ExtNamespaceHandler">
<property name="bundleContext" ref="blueprintBundleContext"/>
</bean>
</service>
Copied: aries/trunk/blueprint/blueprint-core/src/main/resources/org/apache/aries/blueprint/ext/impl/blueprint-ext-1.1.xsd (from r1201220, aries/trunk/blueprint/blueprint-core/src/main/resources/org/apache/aries/blueprint/ext/blueprint-ext-1.1.xsd)
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-core/src/main/resources/org/apache/aries/blueprint/ext/impl/blueprint-ext-1.1.xsd?p2=aries/trunk/blueprint/blueprint-core/src/main/resources/org/apache/aries/blueprint/ext/impl/blueprint-ext-1.1.xsd&p1=aries/trunk/blueprint/blueprint-core/src/main/resources/org/apache/aries/blueprint/ext/blueprint-ext-1.1.xsd&r1=1201220&r2=1201275&rev=1201275&view=diff
==============================================================================
(empty)
Copied: aries/trunk/blueprint/blueprint-core/src/main/resources/org/apache/aries/blueprint/ext/impl/blueprint-ext-1.2.xsd (from r1201220, aries/trunk/blueprint/blueprint-core/src/main/resources/org/apache/aries/blueprint/ext/blueprint-ext-1.2.xsd)
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-core/src/main/resources/org/apache/aries/blueprint/ext/impl/blueprint-ext-1.2.xsd?p2=aries/trunk/blueprint/blueprint-core/src/main/resources/org/apache/aries/blueprint/ext/impl/blueprint-ext-1.2.xsd&p1=aries/trunk/blueprint/blueprint-core/src/main/resources/org/apache/aries/blueprint/ext/blueprint-ext-1.2.xsd&r1=1201220&r2=1201275&rev=1201275&view=diff
==============================================================================
(empty)
Copied: aries/trunk/blueprint/blueprint-core/src/main/resources/org/apache/aries/blueprint/ext/impl/blueprint-ext.xsd (from r1201220, aries/trunk/blueprint/blueprint-core/src/main/resources/org/apache/aries/blueprint/ext/blueprint-ext.xsd)
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-core/src/main/resources/org/apache/aries/blueprint/ext/impl/blueprint-ext.xsd?p2=aries/trunk/blueprint/blueprint-core/src/main/resources/org/apache/aries/blueprint/ext/impl/blueprint-ext.xsd&p1=aries/trunk/blueprint/blueprint-core/src/main/resources/org/apache/aries/blueprint/ext/blueprint-ext.xsd&r1=1201220&r2=1201275&rev=1201275&view=diff
==============================================================================
(empty)
Modified: aries/trunk/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/AbstractBlueprintTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/AbstractBlueprintTest.java?rev=1201275&r1=1201274&r2=1201275&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/AbstractBlueprintTest.java (original)
+++ aries/trunk/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/AbstractBlueprintTest.java Sat Nov 12 14:56:14 2011
@@ -27,7 +27,7 @@ import javax.xml.validation.Schema;
import junit.framework.TestCase;
-import org.apache.aries.blueprint.ext.ExtNamespaceHandler;
+import org.apache.aries.blueprint.ext.impl.ExtNamespaceHandler;
import org.apache.aries.blueprint.parser.ComponentDefinitionRegistryImpl;
import org.apache.aries.blueprint.parser.Parser;
import org.apache.aries.blueprint.parser.NamespaceHandlerSet;
Modified: aries/trunk/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/ext/PropertyPlaceholderTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/ext/PropertyPlaceholderTest.java?rev=1201275&r1=1201274&r2=1201275&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/ext/PropertyPlaceholderTest.java (original)
+++ aries/trunk/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/ext/PropertyPlaceholderTest.java Sat Nov 12 14:56:14 2011
@@ -23,7 +23,6 @@ import static org.junit.Assert.assertEqu
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;