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/19 01:54:47 UTC
svn commit: r1327746 - in /directory: apacheds/branches/apacheds-osgi/
apacheds/branches/apacheds-osgi/apache-felix/ shared/branches/shared-osgi/
shared/branches/shared-osgi/ipojo-manager/
shared/branches/shared-osgi/ipojo-manager/buildSupport/ shared/...
Author: gokturk
Date: Wed Apr 18 23:54:46 2012
New Revision: 1327746
URL: http://svn.apache.org/viewvc?rev=1327746&view=rev
Log:
* IPojo managed shared projects are now managed by bnd.ipojo.plugin for simplicity and project folder synchronization.
* ipojo-manager is reverted from its builder nature
* Project structure is made ready for ow2 ipojo-builder
Removed:
directory/shared/branches/shared-osgi/ipojo-manager/buildSupport/
directory/shared/branches/shared-osgi/ldap/extras/aci/.externalToolBuilders/
directory/shared/branches/shared-osgi/ldap/model/.externalToolBuilders/
Modified:
directory/apacheds/branches/apacheds-osgi/apache-felix/ApacheDS-OSGI.launch
directory/apacheds/branches/apacheds-osgi/pom.xml
directory/shared/branches/shared-osgi/ipojo-manager/pom.xml
directory/shared/branches/shared-osgi/ldap/extras/aci/pom.xml
directory/shared/branches/shared-osgi/ldap/model/pom.xml
directory/shared/branches/shared-osgi/pom.xml
Modified: directory/apacheds/branches/apacheds-osgi/apache-felix/ApacheDS-OSGI.launch
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/apache-felix/ApacheDS-OSGI.launch?rev=1327746&r1=1327745&r2=1327746&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/apache-felix/ApacheDS-OSGI.launch (original)
+++ directory/apacheds/branches/apacheds-osgi/apache-felix/ApacheDS-OSGI.launch Wed Apr 18 23:54:46 2012
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/apache-felix/bin/felix.jar"/>
+<listEntry value="/apache-felix"/>
</listAttribute>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
+<listEntry value="4"/>
</listAttribute>
<stringAttribute key="org.eclipse.debug.core.source_locator_id" value="org.eclipse.jdt.launching.sourceLocator.JavaSourceLookupDirector"/>
<stringAttribute key="org.eclipse.debug.core.source_locator_memento" value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <sourceLookupDirector> <sourceContainers duplicates="false"> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;archive detectRoot=&quot;true&quot; path=&quot;/Users/pajbam/.m2/repository/org/apache/felix/org.apache.felix.ipojo/1.8.0/org.apache.felix.ipojo-1.8.0-sources.jar&quot;/&gt;&#10;" typeId="org.eclipse.debug.core.containerType.externalArchive"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;folder nest=&quot;false&quot; path=&quot;/shared-ldap-extras-codec/src/main/java/org/apache
/directory/shared/ldap/extras&quot;/&gt;&#10;" typeId="org.eclipse.debug.core.containerType.folder"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;default/&gt;&#10;" typeId="org.eclipse.debug.core.containerType.default"/> </sourceContainers> </sourceLookupDirector> "/>
Modified: directory/apacheds/branches/apacheds-osgi/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/pom.xml?rev=1327746&r1=1327745&r2=1327746&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/pom.xml (original)
+++ directory/apacheds/branches/apacheds-osgi/pom.xml Wed Apr 18 23:54:46 2012
@@ -75,6 +75,7 @@
<maven.plugin.api.version>3.0.3</maven.plugin.api.version>
<maven.project.version>3.0-alpha-2</maven.project.version>
<maven.ipojo.version>1.8.0</maven.ipojo.version>
+ <bnd.ipojo.version>1.8.4</bnd.ipojo.version>
<mina.core.version>2.0.4</mina.core.version>
<plexus.utils.version>3.0</plexus.utils.version>
<quartz.version>1.6.3</quartz.version>
@@ -153,6 +154,7 @@
<module>installers</module>
<module>apache-felix</module>
<module>dependencies</module>
+ <module>directorycomponent-handler</module>
</modules>
<build>
@@ -871,6 +873,12 @@
<dependency>
<groupId>${project.groupId}</groupId>
+ <artifactId>apacheds-directorycomponent-handler</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
<artifactId>apacheds-component-hub</artifactId>
<version>${project.version}</version>
</dependency>
Modified: directory/shared/branches/shared-osgi/ipojo-manager/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/ipojo-manager/pom.xml?rev=1327746&r1=1327745&r2=1327746&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/ipojo-manager/pom.xml (original)
+++ directory/shared/branches/shared-osgi/ipojo-manager/pom.xml Wed Apr 18 23:54:46 2012
@@ -75,85 +75,6 @@
</instructions>
</configuration>
</plugin>
-
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-ipojo-plugin</artifactId>
- <version>${maven.ipojo.version}</version>
- <executions>
- <execution>
- <goals>
- <goal>ipojo-bundle</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <!-- For ipojo builder generation -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>copy</id>
- <phase>package</phase>
- <goals>
- <goal>copy</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.ipojo.ant</artifactId>
- <version>1.8.0</version>
- <overWrite>true</overWrite>
- <outputDirectory>buildSupport/bundles</outputDirectory>
- <destFileName>ipojo-ant.jar</destFileName>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.ipojo</artifactId>
- <version>1.8.0</version>
- <overWrite>true</overWrite>
- <outputDirectory>buildSupport/bundles</outputDirectory>
- <destFileName>ipojo.jar</destFileName>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.gogo.shell</artifactId>
- <version>0.10.0</version>
- <overWrite>true</overWrite>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.gogo.command</artifactId>
- <version>0.12.0</version>
- <overWrite>true</overWrite>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.gogo.runtime</artifactId>
- <version>0.10.0</version>
- <overWrite>true</overWrite>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.ipojo.arch.gogo</artifactId>
- <version>1.0.1</version>
- <overWrite>true</overWrite>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.ipojo.annotations</artifactId>
- <version>1.8.0</version>
- <overWrite>true</overWrite>
- </artifactItem>
- </artifactItems>
- <outputDirectory>buildSupport/bundles</outputDirectory>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
Modified: directory/shared/branches/shared-osgi/ldap/extras/aci/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/ldap/extras/aci/pom.xml?rev=1327746&r1=1327745&r2=1327746&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/ldap/extras/aci/pom.xml (original)
+++ directory/shared/branches/shared-osgi/ldap/extras/aci/pom.xml Wed Apr 18 23:54:46 2012
@@ -82,42 +82,24 @@
<extensions>true</extensions>
<configuration>
<manifestLocation>META-INF</manifestLocation>
+ <unpackBundle>true</unpackBundle>
<instructions>
- <Bundle-SymbolicName>${project.groupId}.ldap.extras.aci</Bundle-SymbolicName>
+ <Bundle-ActivationPolicy>lazy</Bundle-ActivationPolicy>
+ <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
+ <Bundle-Activator>org.apache.directory.shared.ipojo.helpers.OSGIHelpersActivator</Bundle-Activator>
<Export-Package>
{local-packages};version=${project.version};-noimport:=true
</Export-Package>
+ <_plugin>org.apache.felix.ipojo.bnd.PojoizationPlugin;use-local-schemas=true</_plugin>
</instructions>
</configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-eclipse-plugin</artifactId>
- <configuration>
- <additionalBuildcommands>
- <buildCommand>
- <name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
- <triggers>auto,incremental,</triggers>
- <arguments>
- <LaunchConfigHandle><project>./.externalToolBuilders/IPojo Builder.launch</LaunchConfigHandle>
- </arguments>
- </buildCommand>
- </additionalBuildcommands>
- </configuration>
- </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>
- </execution>
- </executions>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>bnd-ipojo-plugin</artifactId>
+ <version>${bnd.ipojo.version}</version>
+ </dependency>
+ </dependencies>
</plugin>
</plugins>
</build>
Modified: directory/shared/branches/shared-osgi/ldap/model/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/ldap/model/pom.xml?rev=1327746&r1=1327745&r2=1327746&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/ldap/model/pom.xml (original)
+++ directory/shared/branches/shared-osgi/ldap/model/pom.xml Wed Apr 18 23:54:46 2012
@@ -133,22 +133,6 @@
</archive>
</configuration>
</plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-eclipse-plugin</artifactId>
- <configuration>
- <additionalBuildcommands>
- <buildCommand>
- <name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
- <triggers>auto,incremental,</triggers>
- <arguments>
- <LaunchConfigHandle><project>./.externalToolBuilders/IPojo Builder.launch</LaunchConfigHandle>
- </arguments>
- </buildCommand>
- </additionalBuildcommands>
- </configuration>
- </plugin>
<plugin>
<groupId>org.apache.felix</groupId>
@@ -157,26 +141,24 @@
<extensions>true</extensions>
<configuration>
<manifestLocation>META-INF</manifestLocation>
+ <unpackBundle>true</unpackBundle>
<instructions>
- <Bundle-SymbolicName>${project.groupId}.ldap.model</Bundle-SymbolicName>
+ <Bundle-ActivationPolicy>lazy</Bundle-ActivationPolicy>
+ <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
+ <Bundle-Activator>org.apache.directory.shared.ipojo.helpers.OSGIHelpersActivator</Bundle-Activator>
<Export-Package>
{local-packages};version=${project.version};-noimport:=true
</Export-Package>
+ <_plugin>org.apache.felix.ipojo.bnd.PojoizationPlugin;use-local-schemas=true</_plugin>
</instructions>
</configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-ipojo-plugin</artifactId>
- <version>${maven.ipojo.version}</version>
- <executions>
- <execution>
- <goals>
- <goal>ipojo-bundle</goal>
- </goals>
- </execution>
- </executions>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>bnd-ipojo-plugin</artifactId>
+ <version>${bnd.ipojo.version}</version>
+ </dependency>
+ </dependencies>
</plugin>
</plugins>
</build>
Modified: directory/shared/branches/shared-osgi/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/pom.xml?rev=1327746&r1=1327745&r2=1327746&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/pom.xml (original)
+++ directory/shared/branches/shared-osgi/pom.xml Wed Apr 18 23:54:46 2012
@@ -63,6 +63,7 @@
<pax-exam-junit.version>1.2.4</pax-exam-junit.version>
<findbugs.annotations.version>1.0.0</findbugs.annotations.version>
<maven.ipojo.version>1.8.0</maven.ipojo.version>
+ <bnd.ipojo.version>1.8.4</bnd.ipojo.version>
<ipojo.version>1.8.0</ipojo.version>
<ipojo.annotations.version>1.8.0</ipojo.annotations.version>
</properties>