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 2011/11/02 16:49:35 UTC
svn commit: r1196651 - in /directory: apacheds/branches/apacheds-osgi/
apacheds/branches/apacheds-osgi/component-annotations/
apacheds/branches/apacheds-osgi/component-annotations/src/
apacheds/branches/apacheds-osgi/component-annotations/src/main/ apa...
Author: gokturk
Date: Wed Nov 2 15:49:34 2011
New Revision: 1196651
URL: http://svn.apache.org/viewvc?rev=1196651&view=rev
Log:
Added initial project directories for future IPojo related projects.
Moved IPojo dependencies to the parent projects.
Added:
directory/apacheds/branches/apacheds-osgi/component-annotations/
directory/apacheds/branches/apacheds-osgi/component-annotations/pom.xml
directory/apacheds/branches/apacheds-osgi/component-annotations/src/
directory/apacheds/branches/apacheds-osgi/component-annotations/src/main/
directory/apacheds/branches/apacheds-osgi/component-annotations/src/main/java/
directory/apacheds/branches/apacheds-osgi/component-annotations/src/main/java/org/
directory/apacheds/branches/apacheds-osgi/component-annotations/src/main/java/org/apache/
directory/apacheds/branches/apacheds-osgi/component-annotations/src/main/java/org/apache/directory/
directory/apacheds/branches/apacheds-osgi/component-annotations/src/main/java/org/apache/directory/server/
directory/apacheds/branches/apacheds-osgi/component-annotations/src/main/java/org/apache/directory/server/component/
directory/apacheds/branches/apacheds-osgi/component-annotations/src/main/java/org/apache/directory/server/component/handler/
directory/apacheds/branches/apacheds-osgi/component-annotations/src/main/java/org/apache/directory/server/component/handler/ADSInterceptor.java
directory/apacheds/branches/apacheds-osgi/component-ipojo-handlers/
directory/apacheds/branches/apacheds-osgi/component-ipojo-handlers/pom.xml
directory/apacheds/branches/apacheds-osgi/component-ipojo-handlers/src/
directory/apacheds/branches/apacheds-osgi/component-ipojo-handlers/src/main/
directory/apacheds/branches/apacheds-osgi/component-ipojo-handlers/src/main/java/
directory/apacheds/branches/apacheds-osgi/component-ipojo-handlers/src/main/java/org/
directory/apacheds/branches/apacheds-osgi/component-ipojo-handlers/src/main/java/org/apache/
directory/apacheds/branches/apacheds-osgi/component-ipojo-handlers/src/main/java/org/apache/directory/
directory/apacheds/branches/apacheds-osgi/component-ipojo-handlers/src/main/java/org/apache/directory/server/
directory/apacheds/branches/apacheds-osgi/component-ipojo-handlers/src/main/java/org/apache/directory/server/component/
directory/apacheds/branches/apacheds-osgi/component-ipojo-handlers/src/main/java/org/apache/directory/server/component/handler/
Modified:
directory/apacheds/branches/apacheds-osgi/pom.xml
directory/apacheds/branches/apacheds-osgi/xdbm-partition/pom.xml
directory/shared/branches/shared-osgi/ipojo-manager/pom.xml
directory/shared/branches/shared-osgi/ldap/model/pom.xml
directory/shared/branches/shared-osgi/pom.xml
Added: directory/apacheds/branches/apacheds-osgi/component-annotations/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/component-annotations/pom.xml?rev=1196651&view=auto
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/component-annotations/pom.xml (added)
+++ directory/apacheds/branches/apacheds-osgi/component-annotations/pom.xml Wed Nov 2 15:49:34 2011
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.directory.server</groupId>
+ <artifactId>apacheds-parent</artifactId>
+ <version>2.0.0-M4-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>apacheds-component-annotations</artifactId>
+ <name>Apacheds Component Annotations</name>
+ <packaging>bundle</packaging>
+
+ <description>IPojo annotations used to define extendible components of ApacheDS</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.ipojo.annotations</artifactId>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <inherited>true</inherited>
+ <extensions>true</extensions>
+ <configuration>
+ <manifestLocation>META-INF</manifestLocation>
+ <instructions>
+ <Bundle-SymbolicName>${project.groupId}.component.annotations</Bundle-SymbolicName>
+ <Export-Package>
+ {local-packages};version=${project.version};-noimport:=true
+ </Export-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Added: directory/apacheds/branches/apacheds-osgi/component-annotations/src/main/java/org/apache/directory/server/component/handler/ADSInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/component-annotations/src/main/java/org/apache/directory/server/component/handler/ADSInterceptor.java?rev=1196651&view=auto
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/component-annotations/src/main/java/org/apache/directory/server/component/handler/ADSInterceptor.java (added)
+++ directory/apacheds/branches/apacheds-osgi/component-annotations/src/main/java/org/apache/directory/server/component/handler/ADSInterceptor.java Wed Nov 2 15:49:34 2011
@@ -0,0 +1,42 @@
+/*
+ * 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.
+ *
+ */
+package org.apache.directory.server.component.handler;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Target;
+
+/**
+ * This annotation declares an ApacheDS Interceptor.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ */
+@Target(ElementType.TYPE)
+public @interface ADSInterceptor
+{
+ /*
+ * ordering will be used to sort this interceptor
+ * among other isntalled ones.
+ *
+ * Default value, "relax", will cause it be sorted with
+ * the other relexed ones at the end of the interceptor list
+ * by alphabetical order.
+ */
+ String ordering() default "relax";
+}
Added: directory/apacheds/branches/apacheds-osgi/component-ipojo-handlers/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/component-ipojo-handlers/pom.xml?rev=1196651&view=auto
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/component-ipojo-handlers/pom.xml (added)
+++ directory/apacheds/branches/apacheds-osgi/component-ipojo-handlers/pom.xml Wed Nov 2 15:49:34 2011
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.directory.server</groupId>
+ <artifactId>apacheds-parent</artifactId>
+ <version>2.0.0-M4-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>apacheds-component-ipojo-handlers</artifactId>
+ <name>Apacheds Component Annotations</name>
+ <packaging>bundle</packaging>
+
+ <description>IPojo handlers for extendible components of ApacheDS</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.ipojo.annotations</artifactId>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <inherited>true</inherited>
+ <extensions>true</extensions>
+ <configuration>
+ <manifestLocation>META-INF</manifestLocation>
+ <instructions>
+ <Bundle-SymbolicName>${project.groupId}.component.ipojo.handlers</Bundle-SymbolicName>
+ <Export-Package>
+ {local-packages};version=${project.version};-noimport:=true
+ </Export-Package>
+ </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>
+ </plugins>
+ </build>
+</project>
Modified: directory/apacheds/branches/apacheds-osgi/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/pom.xml?rev=1196651&r1=1196650&r2=1196651&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/pom.xml (original)
+++ directory/apacheds/branches/apacheds-osgi/pom.xml Wed Nov 2 15:49:34 2011
@@ -74,6 +74,7 @@
<maven.artifact.version>3.0.3</maven.artifact.version>
<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>
<mina.core.version>2.0.4</mina.core.version>
<plexus.utils.version>3.0</plexus.utils.version>
<quartz.version>1.6.3</quartz.version>
@@ -83,6 +84,8 @@
<wrapper.version>3.2.3</wrapper.version>
<xercesImpl.version>2.10.0</xercesImpl.version>
<findbugs.annotations.version>1.0.0</findbugs.annotations.version>
+ <ipojo.version>1.8.0</ipojo.version>
+ <ipojo.annotations.version>1.8.0</ipojo.annotations.version>
</properties>
<url>http://directory.apache.org/apacheds/1.5</url>
@@ -151,6 +154,8 @@
<module>apache-felix</module>
<module>dependencies</module>
<module>service-osgi</module>
+ <module>component-annotations</module>
+ <module>component-ipojo-handlers</module>
</modules>
<build>
@@ -1190,6 +1195,18 @@
<artifactId>ehcache-core</artifactId>
<version>${ehcache.version}</version>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.ipojo</artifactId>
+ <version>${ipojo.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.ipojo.annotations</artifactId>
+ <version>${ipojo.annotations.version}</version>
+ </dependency>
</dependencies>
</dependencyManagement>
Modified: directory/apacheds/branches/apacheds-osgi/xdbm-partition/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/xdbm-partition/pom.xml?rev=1196651&r1=1196650&r2=1196651&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/xdbm-partition/pom.xml (original)
+++ directory/apacheds/branches/apacheds-osgi/xdbm-partition/pom.xml Wed Nov 2 15:49:34 2011
@@ -85,7 +85,6 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.ipojo.annotations</artifactId>
- <version>1.8.0</version>
</dependency>
</dependencies>
@@ -138,7 +137,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-ipojo-plugin</artifactId>
- <version>1.8.0</version>
+ <version>${maven.ipojo.version}</version>
<executions>
<execution>
<goals>
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=1196651&r1=1196650&r2=1196651&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/ipojo-manager/pom.xml (original)
+++ directory/shared/branches/shared-osgi/ipojo-manager/pom.xml Wed Nov 2 15:49:34 2011
@@ -36,14 +36,7 @@
<dependencies>
<dependency>
<groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.ipojo.annotations</artifactId>
- <version>1.8.0</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.ipojo.handler.whiteboard</artifactId>
- <version>1.6.0</version>
+ <artifactId>org.apache.felix.ipojo</artifactId>
</dependency>
<dependency>
@@ -85,7 +78,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-ipojo-plugin</artifactId>
- <version>1.8.0</version>
+ <version>${maven.ipojo.version}</version>
<executions>
<execution>
<goals>
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=1196651&r1=1196650&r2=1196651&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/ldap/model/pom.xml (original)
+++ directory/shared/branches/shared-osgi/ldap/model/pom.xml Wed Nov 2 15:49:34 2011
@@ -80,7 +80,6 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.ipojo.annotations</artifactId>
- <version>1.8.0</version>
</dependency>
</dependencies>
@@ -154,7 +153,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-ipojo-plugin</artifactId>
- <version>1.8.0</version>
+ <version>${maven.ipojo.version}</version>
<executions>
<execution>
<goals>
Modified: directory/shared/branches/shared-osgi/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/pom.xml?rev=1196651&r1=1196650&r2=1196651&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/pom.xml (original)
+++ directory/shared/branches/shared-osgi/pom.xml Wed Nov 2 15:49:34 2011
@@ -62,6 +62,9 @@
<pax-exam-container-default.version>1.2.4</pax-exam-container-default.version>
<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>
+ <ipojo.version>1.8.0</ipojo.version>
+ <ipojo.annotations.version>1.8.0</ipojo.annotations.version>
</properties>
<distributionManagement>
@@ -659,6 +662,18 @@
<artifactId>xpp3</artifactId>
<version>${xpp3.version}</version>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.ipojo</artifactId>
+ <version>${ipojo.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.ipojo.annotations</artifactId>
+ <version>${ipojo.annotations.version}</version>
+ </dependency>
</dependencies>
</dependencyManagement>