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 2010/02/23 14:59:12 UTC
svn commit: r915350 - in /incubator/aries/trunk:
application/application-converters/ application/application-install/
application/application-management/ application/application-obr-resolver/
application/application-runtime/ application/application-uti...
Author: gnodet
Date: Tue Feb 23 13:59:11 2010
New Revision: 915350
URL: http://svn.apache.org/viewvc?rev=915350&view=rev
Log:
ARIES-197: Use obr.xml snippets to make sure we capture all the constraints for imported and exported services
Added:
incubator/aries/trunk/application/application-converters/obr.xml
incubator/aries/trunk/application/application-install/obr.xml
incubator/aries/trunk/application/application-management/obr.xml
incubator/aries/trunk/application/application-obr-resolver/obr.xml
incubator/aries/trunk/application/application-runtime/obr.xml
incubator/aries/trunk/application/application-utils/obr.xml
incubator/aries/trunk/blueprint/blueprint-bundle/obr.xml
incubator/aries/trunk/transaction/transaction-blueprint/obr.xml
incubator/aries/trunk/transaction/transaction-manager/obr.xml
incubator/aries/trunk/web/web-urlhandler/obr.xml
Modified:
incubator/aries/trunk/application/application-converters/pom.xml
incubator/aries/trunk/application/application-utils/pom.xml
incubator/aries/trunk/parent/default-parent/pom.xml
incubator/aries/trunk/transaction/transaction-blueprint/pom.xml
Added: incubator/aries/trunk/application/application-converters/obr.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-converters/obr.xml?rev=915350&view=auto
==============================================================================
--- incubator/aries/trunk/application/application-converters/obr.xml (added)
+++ incubator/aries/trunk/application/application-converters/obr.xml Tue Feb 23 13:59:11 2010
@@ -0,0 +1,24 @@
+<!--
+ 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.
+-->
+<obr>
+ <require extend="false" filter="(service=org.apache.aries.web.converter.WarToWabConverter)" multiple="true" name="service" optional="false">Import Service org.apache.aries.web.converter.WarToWabConverter</require>
+ <capability name="service">
+ <p n="service" v="org.apache.aries.application.management.BundleConverter"/>
+ </capability>
+</obr>
Modified: incubator/aries/trunk/application/application-converters/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-converters/pom.xml?rev=915350&r1=915349&r2=915350&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-converters/pom.xml (original)
+++ incubator/aries/trunk/application/application-converters/pom.xml Tue Feb 23 13:59:11 2010
@@ -72,7 +72,6 @@
<configuration>
<instructions>
<Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
- <Bundle-Activator>org.apache.aries.application.converters.Activator</Bundle-Activator>
<_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
<_removeheaders>Ignore-Package,Include-Resource,Private-Package,Bundle-DocURL</_removeheaders>
</instructions>
Added: incubator/aries/trunk/application/application-install/obr.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-install/obr.xml?rev=915350&view=auto
==============================================================================
--- incubator/aries/trunk/application/application-install/obr.xml (added)
+++ incubator/aries/trunk/application/application-install/obr.xml Tue Feb 23 13:59:11 2010
@@ -0,0 +1,24 @@
+<!--
+ 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.
+-->
+<obr>
+ <require extend="false" filter="(service=org.apache.aries.application.management.AriesApplicationManager)" multiple="true" name="service" optional="false">Import Service org.apache.aries.application.management.AriesApplicationManager</require>
+ <capability name="service">
+ <p n="service" v="org.apache.felix.fileinstall.ArtifactInstaller"/>
+ </capability>
+</obr>
Added: incubator/aries/trunk/application/application-management/obr.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-management/obr.xml?rev=915350&view=auto
==============================================================================
--- incubator/aries/trunk/application/application-management/obr.xml (added)
+++ incubator/aries/trunk/application/application-management/obr.xml Tue Feb 23 13:59:11 2010
@@ -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.
+-->
+<obr>
+ <require extend="false" filter="(service=org.apache.aries.application.ApplicationMetadataFactory)" multiple="true" name="service" optional="false">Import Service org.apache.aries.application.ApplicationMetadataFactory</require>
+ <require extend="false" filter="(service=org.apache.aries.application.DeploymentMetadataFactory)" multiple="true" name="service" optional="false">Import Service org.apache.aries.application.DeploymentMetadataFactory</require>
+ <require extend="false" filter="(service=org.apache.aries.application.management.AriesApplicationResolver)" multiple="true" name="service" optional="false">Import Service org.apache.aries.application.management.AriesApplicationResolver</require>
+ <require extend="false" filter="(service=org.apache.aries.application.management.LocalPlatform)" multiple="true" name="service" optional="false">Import Service org.apache.aries.application.management.LocalPlatform</require>
+ <require extend="false" filter="(service=org.apache.aries.application.management.ApplicationContextManager)" multiple="true" name="service" optional="false">Import Service org.apache.aries.application.management.ApplicationContextManager</require>
+ <capability name="service">
+ <p n="service" v="org.apache.aries.application.management.AriesApplicationManager"/>
+ </capability>
+</obr>
Added: incubator/aries/trunk/application/application-obr-resolver/obr.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-obr-resolver/obr.xml?rev=915350&view=auto
==============================================================================
--- incubator/aries/trunk/application/application-obr-resolver/obr.xml (added)
+++ incubator/aries/trunk/application/application-obr-resolver/obr.xml Tue Feb 23 13:59:11 2010
@@ -0,0 +1,24 @@
+<!--
+ 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.
+-->
+<obr>
+ <require extend="false" filter="(service=org.osgi.service.obr.RepositoryAdmin)" multiple="true" name="service" optional="false">Import Service org.osgi.service.obr.RepositoryAdmin</require>
+ <capability name="service">
+ <p n="service" v="org.apache.aries.application.management.AriesApplicationResolver"/>
+ </capability>
+</obr>
Added: incubator/aries/trunk/application/application-runtime/obr.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-runtime/obr.xml?rev=915350&view=auto
==============================================================================
--- incubator/aries/trunk/application/application-runtime/obr.xml (added)
+++ incubator/aries/trunk/application/application-runtime/obr.xml Tue Feb 23 13:59:11 2010
@@ -0,0 +1,29 @@
+<!--
+ 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.
+-->
+<obr>
+ <capability name="service">
+ <p n="service" v="org.apache.aries.application.management.ApplicationContextManager"/>
+ </capability>
+ <capability name="service">
+ <p n="service" v="org.apache.aries.application.management.LocalPlatform"/>
+ </capability>
+ <capability name="service">
+ <p n="service" v="org.apache.aries.application.management.AriesApplicationResolver"/>
+ </capability>
+</obr>
Added: incubator/aries/trunk/application/application-utils/obr.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-utils/obr.xml?rev=915350&view=auto
==============================================================================
--- incubator/aries/trunk/application/application-utils/obr.xml (added)
+++ incubator/aries/trunk/application/application-utils/obr.xml Tue Feb 23 13:59:11 2010
@@ -0,0 +1,26 @@
+<!--
+ 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.
+-->
+<obr>
+ <capability name="service">
+ <p n="service" v="org.apache.aries.application.ApplicationMetadataFactory"/>
+ </capability>
+ <capability name="service">
+ <p n="service" v="org.apache.aries.application.DeploymentMetadataFactory"/>
+ </capability>
+</obr>
Modified: incubator/aries/trunk/application/application-utils/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-utils/pom.xml?rev=915350&r1=915349&r2=915350&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-utils/pom.xml (original)
+++ incubator/aries/trunk/application/application-utils/pom.xml Tue Feb 23 13:59:11 2010
@@ -67,6 +67,12 @@
<build>
<resources>
<resource>
+ <directory>${basedir}</directory>
+ <includes>
+ <include>obr.xml</include>
+ </includes>
+ </resource>
+ <resource>
<targetPath>OSGI-INF/blueprint</targetPath>
<filtering>false</filtering>
<directory>${basedir}/src/main/resources/OSGI-INF/blueprint</directory>
Added: incubator/aries/trunk/blueprint/blueprint-bundle/obr.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/blueprint/blueprint-bundle/obr.xml?rev=915350&view=auto
==============================================================================
--- incubator/aries/trunk/blueprint/blueprint-bundle/obr.xml (added)
+++ incubator/aries/trunk/blueprint/blueprint-bundle/obr.xml Tue Feb 23 13:59:11 2010
@@ -0,0 +1,32 @@
+<!--
+ 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.
+-->
+<obr>
+ <require extend="false" filter="(service=org.osgi.service.cm.ConfigurationAdmin)" multiple="true" name="service" optional="true">Import Service org.osgi.service.cm.ConfigurationAdmin</require>
+ <capability name="service">
+ <p n="service" v="org.apache.aries.blueprint.ParserService"/>
+ </capability>
+ <capability name="service">
+ <p n="service" v="org.apache.aries.blueprint.NamespaceHandler"/>
+ <p n="osgi.service.blueprint.namespace" v="http://aries.apache.org/blueprint/xmlns/blueprint-ext/v1.0.0"/>
+ </capability>
+ <capability name="service">
+ <p n="service" v="org.apache.aries.blueprint.NamespaceHandler"/>
+ <p n="osgi.service.blueprint.namespace" v="http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.0.0"/>
+ </capability>
+</obr>
Modified: incubator/aries/trunk/parent/default-parent/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/parent/default-parent/pom.xml?rev=915350&r1=915349&r2=915350&view=diff
==============================================================================
--- incubator/aries/trunk/parent/default-parent/pom.xml (original)
+++ incubator/aries/trunk/parent/default-parent/pom.xml Tue Feb 23 13:59:11 2010
@@ -36,6 +36,14 @@
<build>
<resources>
<resource>
+ <directory>${project.basedir}</directory>
+ <filtering>false</filtering>
+ <includes>
+ <include>obr.xml</include>
+ </includes>
+ </resource>
+
+ <resource>
<directory>${project.basedir}/src/main/resources</directory>
<filtering>false</filtering>
<includes>
Added: incubator/aries/trunk/transaction/transaction-blueprint/obr.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/transaction/transaction-blueprint/obr.xml?rev=915350&view=auto
==============================================================================
--- incubator/aries/trunk/transaction/transaction-blueprint/obr.xml (added)
+++ incubator/aries/trunk/transaction/transaction-blueprint/obr.xml Tue Feb 23 13:59:11 2010
@@ -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.
+-->
+<obr>
+ <require extend="false" filter="(service=javax.transaction.TransactionManager)" multiple="true" name="service" optional="false">Import Service javax.transaction.TransactionManager</require>
+ <capability name="service">
+ <p n="service" v="org.apache.aries.blueprint.Interceptor"/>
+ </capability>
+ <capability name="service">
+ <p n="service" v="org.apache.aries.blueprint.NamespaceHandler"/>
+ <p n="osgi.service.blueprint.namespace" v="http://aries.apache.org/xmlns/transactions/v1.0.0"/>
+ </capability>
+</obr>
Modified: incubator/aries/trunk/transaction/transaction-blueprint/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/transaction/transaction-blueprint/pom.xml?rev=915350&r1=915349&r2=915350&view=diff
==============================================================================
--- incubator/aries/trunk/transaction/transaction-blueprint/pom.xml (original)
+++ incubator/aries/trunk/transaction/transaction-blueprint/pom.xml Tue Feb 23 13:59:11 2010
@@ -111,7 +111,7 @@
</Import-Service>
<Export-Service>
org.apache.aries.blueprint.Interceptor,
- org.apache.aries.blueprint.NamespaceHandler;osgi.service.blueprint.namespace=http://aries.apache.org/xmlns/transactions/v1.0.0
+ org.apache.aries.blueprint.NamespaceHandler
</Export-Service>
</instructions>
</configuration>
Added: incubator/aries/trunk/transaction/transaction-manager/obr.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/transaction/transaction-manager/obr.xml?rev=915350&view=auto
==============================================================================
--- incubator/aries/trunk/transaction/transaction-manager/obr.xml (added)
+++ incubator/aries/trunk/transaction/transaction-manager/obr.xml Tue Feb 23 13:59:11 2010
@@ -0,0 +1,32 @@
+<!--
+ 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.
+-->
+<obr>
+ <capability name="service">
+ <p n="service" v="javax.transaction.TransactionManager"/>
+ </capability>
+ <capability name="service">
+ <p n="service" v="javax.transaction.TransactionSynchronizationRegistry"/>
+ </capability>
+ <capability name="service">
+ <p n="service" v="javax.transaction.UserTransaction"/>
+ </capability>
+ <capability name="service">
+ <p n="service" v="org.apache.geronimo.transaction.manager.RecoverableTransactionManager"/>
+ </capability>
+</obr>
Added: incubator/aries/trunk/web/web-urlhandler/obr.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/web/web-urlhandler/obr.xml?rev=915350&view=auto
==============================================================================
--- incubator/aries/trunk/web/web-urlhandler/obr.xml (added)
+++ incubator/aries/trunk/web/web-urlhandler/obr.xml Tue Feb 23 13:59:11 2010
@@ -0,0 +1,27 @@
+<!--
+ 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.
+-->
+<obr>
+ <capability name="service">
+ <p n="service" v="org.osgi.service.url.URLStreamHandlerService"/>
+ <p n="url.handler.protocol" v="webbundle"/>
+ </capability>
+ <capability name="service">
+ <p n="service" v="org.apache.aries.web.converter.WarToWabConverter"/>
+ </capability>
+</obr>