You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by go...@apache.org on 2012/04/03 14:01:16 UTC
svn commit: r1308832 - in
/directory/studio/branches/studio-osgi/libraries/org.apache.felix.ipojo:
pom.xml src/ src/main/ src/main/resources/ src/main/resources/metadata.xml
Author: gokturk
Date: Tue Apr 3 12:01:16 2012
New Revision: 1308832
URL: http://svn.apache.org/viewvc?rev=1308832&view=rev
Log:
Fix for "IPojo not started properly in Studio" bug.
It fixes wrapper pom to correctly initialize IPojo headers and adds ipojo's core component declaration xml as resource
Added:
directory/studio/branches/studio-osgi/libraries/org.apache.felix.ipojo/src/
directory/studio/branches/studio-osgi/libraries/org.apache.felix.ipojo/src/main/
directory/studio/branches/studio-osgi/libraries/org.apache.felix.ipojo/src/main/resources/
directory/studio/branches/studio-osgi/libraries/org.apache.felix.ipojo/src/main/resources/metadata.xml
Modified:
directory/studio/branches/studio-osgi/libraries/org.apache.felix.ipojo/pom.xml
Modified: directory/studio/branches/studio-osgi/libraries/org.apache.felix.ipojo/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-osgi/libraries/org.apache.felix.ipojo/pom.xml?rev=1308832&r1=1308831&r2=1308832&view=diff
==============================================================================
--- directory/studio/branches/studio-osgi/libraries/org.apache.felix.ipojo/pom.xml (original)
+++ directory/studio/branches/studio-osgi/libraries/org.apache.felix.ipojo/pom.xml Tue Apr 3 12:01:16 2012
@@ -30,7 +30,7 @@
<version>${org.apache.felix.ipojo.version}</version>
<name>Apache Felix iPOJO (for Apache Directory Studio)</name>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<description />
@@ -86,12 +86,16 @@
<manifestLocation>META-INF</manifestLocation>
<instructions>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
- <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
- <Embed-Directory>lib</Embed-Directory>
+ <Embed-Dependency>*;scope=compile|runtime;inline=true</Embed-Dependency>
+
<Embed-StripGroup>true</Embed-StripGroup>
<Bundle-Localization>plugin</Bundle-Localization>
<Eclipse-LazyStart>true</Eclipse-LazyStart>
<Bundle-Activator>org.apache.felix.ipojo.Extender</Bundle-Activator>
+ <IPOJO-Extension>
+ component:org.apache.felix.ipojo.ComponentFactory,
+ handler:org.apache.felix.ipojo.HandlerManagerFactory
+ </IPOJO-Extension>
<Import-Package>
org.osgi.framework;version=1.3, <!-- To support KF 2 -->
org.osgi.service.cm,
@@ -129,6 +133,21 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-ipojo-plugin</artifactId>
+ <version>1.8.0</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>ipojo-bundle</goal>
+ </goals>
+ <configuration>
+ <ignoreAnnotations>true</ignoreAnnotations>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
<!-- No tests to run -->
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
Added: directory/studio/branches/studio-osgi/libraries/org.apache.felix.ipojo/src/main/resources/metadata.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-osgi/libraries/org.apache.felix.ipojo/src/main/resources/metadata.xml?rev=1308832&view=auto
==============================================================================
--- directory/studio/branches/studio-osgi/libraries/org.apache.felix.ipojo/src/main/resources/metadata.xml (added)
+++ directory/studio/branches/studio-osgi/libraries/org.apache.felix.ipojo/src/main/resources/metadata.xml Tue Apr 3 12:01:16 2012
@@ -0,0 +1,48 @@
+<!--
+ 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.
+-->
+<ipojo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="org.apache.felix.ipojo http://felix.apache.org/ipojo/schemas/CURRENT/core.xsd"
+ xmlns="org.apache.felix.ipojo">
+ <!-- Primitives handler -->
+ <handler
+ classname="org.apache.felix.ipojo.handlers.lifecycle.controller.ControllerHandler"
+ name="controller" architecture="false"/>
+ <handler
+ classname="org.apache.felix.ipojo.handlers.lifecycle.callback.LifecycleCallbackHandler"
+ name="callback" level="2" architecture="false"/>
+ <handler
+ classname="org.apache.felix.ipojo.handlers.dependency.DependencyHandler"
+ name="requires" level="0" architecture="false">
+ <!-- <controller field="m_state"/> -->
+ </handler>
+ <handler
+ classname="org.apache.felix.ipojo.handlers.providedservice.ProvidedServiceHandler"
+ name="provides" level="3" architecture="false"/>
+ <handler
+ classname="org.apache.felix.ipojo.handlers.configuration.ConfigurationHandler"
+ name="properties" level="1" architecture="false"/>
+ <handler
+ classname="org.apache.felix.ipojo.handlers.architecture.ArchitectureHandler"
+ name="architecture" architecture="false">
+ <provides specifications="org.apache.felix.ipojo.architecture.Architecture">
+ <property field="m_name" name="architecture.instance"/>
+ </provides>
+ </handler>
+
+</ipojo>