You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by gn...@apache.org on 2009/09/07 16:16:02 UTC
svn commit: r812149 - in /geronimo/sandbox/blueprint: ./ blueprint-bundle/
blueprint-cm/src/main/java/org/apache/geronimo/blueprint/compendium/cm/
blueprint-cm/src/main/resources/OSGI-INF/blueprint/
blueprint-cm/src/main/resources/org/apache/geronimo/b...
Author: gnodet
Date: Mon Sep 7 14:16:01 2009
New Revision: 812149
URL: http://svn.apache.org/viewvc?rev=812149&view=rev
Log:
Rename the cm schema, as it's not an OSGi official schema, fix osgi metadata for the bundle
Modified:
geronimo/sandbox/blueprint/blueprint-bundle/pom.xml
geronimo/sandbox/blueprint/blueprint-cm/src/main/java/org/apache/geronimo/blueprint/compendium/cm/CmNamespaceHandler.java
geronimo/sandbox/blueprint/blueprint-cm/src/main/resources/OSGI-INF/blueprint/blueprint-cm.xml
geronimo/sandbox/blueprint/blueprint-cm/src/main/resources/org/apache/geronimo/blueprint/compendium/cm/blueprint-cm.xsd
geronimo/sandbox/blueprint/blueprint-sample/src/main/resources/OSGI-INF/blueprint/config.xml
geronimo/sandbox/blueprint/pom.xml
Modified: geronimo/sandbox/blueprint/blueprint-bundle/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-bundle/pom.xml?rev=812149&r1=812148&r2=812149&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-bundle/pom.xml (original)
+++ geronimo/sandbox/blueprint/blueprint-bundle/pom.xml Mon Sep 7 14:16:01 2009
@@ -53,8 +53,8 @@
<Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
<Bundle-Activator>org.apache.geronimo.blueprint.container.BlueprintExtender</Bundle-Activator>
<Import-Package>
- org.apache.geronimo.blueprint*;version="${pom.version}",
- org.osgi.service.blueprint*;version="1.0",
+ !org.apache.geronimo.blueprint*,
+ org.osgi.service.blueprint*,
org.osgi.service.event*;resolution:=optional,
net.sf.cglib*;resolution:=optional,
*
Modified: geronimo/sandbox/blueprint/blueprint-cm/src/main/java/org/apache/geronimo/blueprint/compendium/cm/CmNamespaceHandler.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-cm/src/main/java/org/apache/geronimo/blueprint/compendium/cm/CmNamespaceHandler.java?rev=812149&r1=812148&r2=812149&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-cm/src/main/java/org/apache/geronimo/blueprint/compendium/cm/CmNamespaceHandler.java (original)
+++ geronimo/sandbox/blueprint/blueprint-cm/src/main/java/org/apache/geronimo/blueprint/compendium/cm/CmNamespaceHandler.java Mon Sep 7 14:16:01 2009
@@ -77,7 +77,7 @@
public class CmNamespaceHandler implements NamespaceHandler {
public static final String BLUEPRINT_NAMESPACE = "http://www.osgi.org/xmlns/blueprint/v1.0.0";
- public static final String BLUEPRINT_CM_NAMESPACE = "http://www.osgi.org/xmlns/blueprint-cm/v1.0.0";
+ public static final String BLUEPRINT_CM_NAMESPACE = "http://geronimo.apache.org/blueprint/xmlns/blueprint-cm/v1.0.0";
public static final String PROPERTY_PLACEHOLDER_ELEMENT = "property-placeholder";
public static final String MANAGED_PROPERTIES_ELEMENT = "managed-properties";
Modified: geronimo/sandbox/blueprint/blueprint-cm/src/main/resources/OSGI-INF/blueprint/blueprint-cm.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-cm/src/main/resources/OSGI-INF/blueprint/blueprint-cm.xml?rev=812149&r1=812148&r2=812149&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-cm/src/main/resources/OSGI-INF/blueprint/blueprint-cm.xml (original)
+++ geronimo/sandbox/blueprint/blueprint-cm/src/main/resources/OSGI-INF/blueprint/blueprint-cm.xml Mon Sep 7 14:16:01 2009
@@ -3,7 +3,7 @@
<service interface="org.apache.geronimo.blueprint.NamespaceHandler">
<service-properties>
- <entry key="osgi.service.blueprint.namespace" value="http://www.osgi.org/xmlns/blueprint-cm/v1.0.0"/>
+ <entry key="osgi.service.blueprint.namespace" value="http://geronimo.apache.org/blueprint/xmlns/blueprint-cm/v1.0.0"/>
</service-properties>
<bean class="org.apache.geronimo.blueprint.compendium.cm.CmNamespaceHandler">
<property name="configAdmin">
Modified: geronimo/sandbox/blueprint/blueprint-cm/src/main/resources/org/apache/geronimo/blueprint/compendium/cm/blueprint-cm.xsd
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-cm/src/main/resources/org/apache/geronimo/blueprint/compendium/cm/blueprint-cm.xsd?rev=812149&r1=812148&r2=812149&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-cm/src/main/resources/org/apache/geronimo/blueprint/compendium/cm/blueprint-cm.xsd (original)
+++ geronimo/sandbox/blueprint/blueprint-cm/src/main/resources/org/apache/geronimo/blueprint/compendium/cm/blueprint-cm.xsd Mon Sep 7 14:16:01 2009
@@ -18,10 +18,10 @@
* limitations under the License.
*/
-->
-<xsd:schema xmlns="http://www.osgi.org/xmlns/blueprint-cm/v1.0.0"
+<xsd:schema xmlns="http://geronimo.apache.org/blueprint/xmlns/blueprint-cm/v1.0.0"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:bp="http://www.osgi.org/xmlns/blueprint/v1.0.0"
- targetNamespace="http://www.osgi.org/xmlns/blueprint-cm/v1.0.0"
+ targetNamespace="http://geronimo.apache.org/blueprint/xmlns/blueprint-cm/v1.0.0"
elementFormDefault="qualified"
attributeFormDefault="unqualified"
version="1.0.0">
Modified: geronimo/sandbox/blueprint/blueprint-sample/src/main/resources/OSGI-INF/blueprint/config.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-sample/src/main/resources/OSGI-INF/blueprint/config.xml?rev=812149&r1=812148&r2=812149&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-sample/src/main/resources/OSGI-INF/blueprint/config.xml (original)
+++ geronimo/sandbox/blueprint/blueprint-sample/src/main/resources/OSGI-INF/blueprint/config.xml Mon Sep 7 14:16:01 2009
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
- xmlns:cm="http://www.osgi.org/xmlns/blueprint-cm/v1.0.0"
+ xmlns:cm="http://geronimo.apache.org/blueprint/xmlns/blueprint-cm/v1.0.0"
xmlns:ext="http://geronimo.apache.org/blueprint/xmlns/blueprint-ext/v1.0.0"
default-availability="optional">
Modified: geronimo/sandbox/blueprint/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/pom.xml?rev=812149&r1=812148&r2=812149&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/pom.xml (original)
+++ geronimo/sandbox/blueprint/pom.xml Mon Sep 7 14:16:01 2009
@@ -172,18 +172,6 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
<modules>
<module>blueprint-api</module>
<module>blueprint-core</module>