Author: ieugen
Date: Thu Feb 7 11:00:15 2013
New Revision: 1443404
URL: http://svn.apache.org/viewvc?rev=1443404&view=rev
Log:
James-dns-service installs
Added:
james/server/trunk/karaf/distribution/src/main/filtered-resources/etc/custom.properties
- copied, changed from r1443402,
james/server/trunk/karaf/distribution/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
Modified:
james/server/trunk/app/pom.xml
james/server/trunk/cli/pom.xml
james/server/trunk/container-spring/pom.xml
james/server/trunk/core/pom.xml
james/server/trunk/data/data-api/pom.xml
james/server/trunk/data/data-file/pom.xml
james/server/trunk/data/data-hbase/pom.xml
james/server/trunk/data/data-jcr/pom.xml
james/server/trunk/data/data-jdbc/pom.xml
james/server/trunk/data/data-jpa/pom.xml
james/server/trunk/data/data-ldap/pom.xml
james/server/trunk/data/data-library/pom.xml
james/server/trunk/dns-service/dnsservice-api/pom.xml
james/server/trunk/dns-service/dnsservice-dnsjava/pom.xml
james/server/trunk/dns-service/dnsservice-library/pom.xml
james/server/trunk/fetchmail/pom.xml
james/server/trunk/filesystem-api/pom.xml
james/server/trunk/karaf/distribution/pom.xml
james/server/trunk/karaf/distribution/src/main/assembly/unix.xml
james/server/trunk/karaf/distribution/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
james/server/trunk/karaf/features/src/main/resources/features.xml
james/server/trunk/karaf/integration/pom.xml
james/server/trunk/lifecycle-api/pom.xml
james/server/trunk/lifecycle-spring/pom.xml
james/server/trunk/mailbox-adapter/pom.xml
james/server/trunk/mailetcontainer-api/pom.xml
james/server/trunk/mailetcontainer-camel/pom.xml
james/server/trunk/mailets/pom.xml
james/server/trunk/pom.xml
james/server/trunk/protocols/protocols-imap4/pom.xml
james/server/trunk/protocols/protocols-library/pom.xml
james/server/trunk/protocols/protocols-lmtp/pom.xml
james/server/trunk/protocols/protocols-pop3/pom.xml
james/server/trunk/protocols/protocols-smtp/pom.xml
james/server/trunk/queue/queue-activemq/pom.xml
james/server/trunk/queue/queue-api/pom.xml
james/server/trunk/queue/queue-file/pom.xml
james/server/trunk/queue/queue-jms/pom.xml
james/server/trunk/util/pom.xml
Modified: james/server/trunk/app/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/app/pom.xml?rev=1443404&r1=1443403&r2=1443404&view=diff
==============================================================================
--- james/server/trunk/app/pom.xml (original)
+++ james/server/trunk/app/pom.xml Thu Feb 7 11:00:15 2013
@@ -547,6 +547,15 @@
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+
<profiles>
<profile>
<id>with-assembly</id>
Modified: james/server/trunk/cli/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/cli/pom.xml?rev=1443404&r1=1443403&r2=1443404&view=diff
==============================================================================
--- james/server/trunk/cli/pom.xml (original)
+++ james/server/trunk/cli/pom.xml Thu Feb 7 11:00:15 2013
@@ -70,6 +70,10 @@
<mainClass>org.apache.james.cli.ServerCmd</mainClass>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ </plugin>
</plugins>
</build>
Modified: james/server/trunk/container-spring/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/container-spring/pom.xml?rev=1443404&r1=1443403&r2=1443404&view=diff
==============================================================================
--- james/server/trunk/container-spring/pom.xml (original)
+++ james/server/trunk/container-spring/pom.xml Thu Feb 7 11:00:15 2013
@@ -130,4 +130,13 @@
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
Modified: james/server/trunk/core/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/core/pom.xml?rev=1443404&r1=1443403&r2=1443404&view=diff
==============================================================================
--- james/server/trunk/core/pom.xml (original)
+++ james/server/trunk/core/pom.xml Thu Feb 7 11:00:15 2013
@@ -79,4 +79,13 @@
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
Modified: james/server/trunk/data/data-api/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/data/data-api/pom.xml?rev=1443404&r1=1443403&r2=1443404&view=diff
==============================================================================
--- james/server/trunk/data/data-api/pom.xml (original)
+++ james/server/trunk/data/data-api/pom.xml Thu Feb 7 11:00:15 2013
@@ -59,6 +59,10 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ </plugin>
</plugins>
</build>
</project>
Modified: james/server/trunk/data/data-file/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/data/data-file/pom.xml?rev=1443404&r1=1443403&r2=1443404&view=diff
==============================================================================
--- james/server/trunk/data/data-file/pom.xml (original)
+++ james/server/trunk/data/data-file/pom.xml Thu Feb 7 11:00:15 2013
@@ -102,4 +102,13 @@
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
Modified: james/server/trunk/data/data-hbase/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/data/data-hbase/pom.xml?rev=1443404&r1=1443403&r2=1443404&view=diff
==============================================================================
--- james/server/trunk/data/data-hbase/pom.xml (original)
+++ james/server/trunk/data/data-hbase/pom.xml Thu Feb 7 11:00:15 2013
@@ -155,8 +155,13 @@
<skip>false</skip>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ </plugin>
</plugins>
</build>
+
<profiles>
<profile>
<id>noTest</id>
Modified: james/server/trunk/data/data-jcr/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/data/data-jcr/pom.xml?rev=1443404&r1=1443403&r2=1443404&view=diff
==============================================================================
--- james/server/trunk/data/data-jcr/pom.xml (original)
+++ james/server/trunk/data/data-jcr/pom.xml Thu Feb 7 11:00:15 2013
@@ -95,4 +95,13 @@
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
Modified: james/server/trunk/data/data-jdbc/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/data/data-jdbc/pom.xml?rev=1443404&r1=1443403&r2=1443404&view=diff
==============================================================================
--- james/server/trunk/data/data-jdbc/pom.xml (original)
+++ james/server/trunk/data/data-jdbc/pom.xml Thu Feb 7 11:00:15 2013
@@ -117,4 +117,13 @@
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
Modified: james/server/trunk/data/data-jpa/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/data/data-jpa/pom.xml?rev=1443404&r1=1443403&r2=1443404&view=diff
==============================================================================
--- james/server/trunk/data/data-jpa/pom.xml (original)
+++ james/server/trunk/data/data-jpa/pom.xml Thu Feb 7 11:00:15 2013
@@ -152,6 +152,11 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ </plugin>
</plugins>
</build>
+
</project>
Modified: james/server/trunk/data/data-ldap/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/data/data-ldap/pom.xml?rev=1443404&r1=1443403&r2=1443404&view=diff
==============================================================================
--- james/server/trunk/data/data-ldap/pom.xml (original)
+++ james/server/trunk/data/data-ldap/pom.xml Thu Feb 7 11:00:15 2013
@@ -66,4 +66,13 @@
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
Modified: james/server/trunk/data/data-library/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/data/data-library/pom.xml?rev=1443404&r1=1443403&r2=1443404&view=diff
==============================================================================
--- james/server/trunk/data/data-library/pom.xml (original)
+++ james/server/trunk/data/data-library/pom.xml Thu Feb 7 11:00:15 2013
@@ -101,6 +101,11 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ </plugin>
</plugins>
</build>
+
</project>
Modified: james/server/trunk/dns-service/dnsservice-api/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/dns-service/dnsservice-api/pom.xml?rev=1443404&r1=1443403&r2=1443404&view=diff
==============================================================================
--- james/server/trunk/dns-service/dnsservice-api/pom.xml (original)
+++ james/server/trunk/dns-service/dnsservice-api/pom.xml Thu Feb 7 11:00:15
2013
@@ -54,6 +54,11 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ </plugin>
</plugins>
</build>
+
</project>
Modified: james/server/trunk/dns-service/dnsservice-dnsjava/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/dns-service/dnsservice-dnsjava/pom.xml?rev=1443404&r1=1443403&r2=1443404&view=diff
==============================================================================
--- james/server/trunk/dns-service/dnsservice-dnsjava/pom.xml (original)
+++ james/server/trunk/dns-service/dnsservice-dnsjava/pom.xml Thu Feb 7
11:00:15 2013
@@ -67,4 +67,13 @@
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
Modified: james/server/trunk/dns-service/dnsservice-library/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/dns-service/dnsservice-library/pom.xml?rev=1443404&r1=1443403&r2=1443404&view=diff
==============================================================================
--- james/server/trunk/dns-service/dnsservice-library/pom.xml (original)
+++ james/server/trunk/dns-service/dnsservice-library/pom.xml Thu Feb 7
11:00:15 2013
@@ -64,4 +64,13 @@
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
Modified: james/server/trunk/fetchmail/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/fetchmail/pom.xml?rev=1443404&r1=1443403&r2=1443404&view=diff
==============================================================================
--- james/server/trunk/fetchmail/pom.xml (original)
+++ james/server/trunk/fetchmail/pom.xml Thu Feb 7 11:00:15 2013
@@ -81,4 +81,13 @@
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
Modified: james/server/trunk/filesystem-api/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/filesystem-api/pom.xml?rev=1443404&r1=1443403&r2=1443404&view=diff
==============================================================================
--- james/server/trunk/filesystem-api/pom.xml (original)
+++ james/server/trunk/filesystem-api/pom.xml Thu Feb 7 11:00:15 2013
@@ -61,6 +61,10 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ </plugin>
</plugins>
</build>
Modified: james/server/trunk/karaf/distribution/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/karaf/distribution/pom.xml?rev=1443404&r1=1443403&r2=1443404&view=diff
==============================================================================
--- james/server/trunk/karaf/distribution/pom.xml (original)
+++ james/server/trunk/karaf/distribution/pom.xml Thu Feb 7 11:00:15 2013
@@ -20,13 +20,13 @@
<dependency>
<groupId>org.apache.karaf</groupId>
<artifactId>apache-karaf</artifactId>
- <version>${apache-karaf.version}</version>
+ <version>${karaf.version}</version>
<type>tar.gz</type>
</dependency>
<dependency>
<groupId>org.apache.karaf.assemblies.features</groupId>
<artifactId>standard</artifactId>
- <version>${apache-karaf.version}</version>
+ <version>${karaf.version}</version>
<type>xml</type>
<classifier>features</classifier>
</dependency>
@@ -36,7 +36,7 @@
<build>
<resources>
<resource>
-
<directory>/x1/asf/kar230/manual/src/main/filtered-resources</directory>
+ <directory>src/main/filtered-resources</directory>
<filtering>true</filtering>
<includes>
<include>**/*</include>
@@ -46,6 +46,25 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <configuration>
+ <useDefaultDelimiters>false</useDefaultDelimiters>
+ <delimiters>
+ <delimiter>${*}</delimiter>
+ </delimiters>
+ </configuration>
+ <executions>
+ <execution>
+ <id>filter</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>resources</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
@@ -60,9 +79,9 @@
<artifactItem>
<groupId>org.apache.karaf</groupId>
<artifactId>apache-karaf</artifactId>
- <version>${apache-karaf.version}</version>
+ <version>${karaf.version}</version>
<type>tar.gz</type>
-
<outputDirectory>target/dependencies</outputDirectory>
+
<outputDirectory>target/dependencies/unix</outputDirectory>
</artifactItem>
</artifactItems>
</configuration>
@@ -89,6 +108,41 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.karaf.tooling</groupId>
+ <artifactId>features-maven-plugin</artifactId>
+ <version>${karaf.version}</version>
+ <executions>
+ <execution>
+ <id>add-features-to-repo</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>add-features-to-repo</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+ <descriptor>
+
mvn:org.apache.karaf.assemblies.features/standard/${karaf.version}/xml/features
+ </descriptor>
+ <descriptor>
+
mvn:org.apache.karaf.assemblies.features/enterprise/${karaf.version}/xml/features
+ </descriptor>
+ <descriptor>
+
mvn:org.apache.james.karaf/james-karaf-features/${project.version}/xml/features
+ </descriptor>
+ </descriptors>
+ <features>
+ <feature>config</feature>
+ <feature>management</feature>
+ <feature>webconsole</feature>
+ </features>
+
<includeMvnBasedDescriptors>true</includeMvnBasedDescriptors>
+ <repository>target/features-repo</repository>
+ </configuration>
+ <inherited>false</inherited>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
Modified: james/server/trunk/karaf/distribution/src/main/assembly/unix.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/karaf/distribution/src/main/assembly/unix.xml?rev=1443404&r1=1443403&r2=1443404&view=diff
==============================================================================
--- james/server/trunk/karaf/distribution/src/main/assembly/unix.xml (original)
+++ james/server/trunk/karaf/distribution/src/main/assembly/unix.xml Thu Feb 7
11:00:15 2013
@@ -30,6 +30,7 @@
<exclude>**/demos/**</exclude>
<exclude>lib/karaf-version.jar</exclude>
<exclude>bin/**</exclude>
+ <exclude>etc/custom.properties</exclude>
<exclude>etc/org.apache.karaf.features.cfg</exclude>
<exclude>readme.txt</exclude>
<exclude>LICENSE</exclude>
@@ -68,20 +69,9 @@
</fileSet>
</fileSets>
- <files>
- <file>
-
<source>${basedir}/target/dependencies/unix/apache-karaf-${karaf.version}/bin/karaf</source>
- <outputDirectory>/bin/</outputDirectory>
- <destName>provisionr</destName>
- <fileMode>0755</fileMode>
- <lineEnding>unix</lineEnding>
- </file>
- </files>
-
<dependencySets>
<dependencySet>
<outputDirectory>/lib</outputDirectory>
- <outputFileNameMapping>james-version.jar</outputFileNameMapping>
<fileMode>0644</fileMode>
<useTransitiveDependencies>false</useTransitiveDependencies>
</dependencySet>
Copied:
james/server/trunk/karaf/distribution/src/main/filtered-resources/etc/custom.properties
(from r1443402,
james/server/trunk/karaf/distribution/src/main/filtered-resources/etc/org.apache.karaf.features.cfg)
URL:
http://svn.apache.org/viewvc/james/server/trunk/karaf/distribution/src/main/filtered-resources/etc/custom.properties?p2=james/server/trunk/karaf/distribution/src/main/filtered-resources/etc/custom.properties&p1=james/server/trunk/karaf/distribution/src/main/filtered-resources/etc/org.apache.karaf.features.cfg&r1=1443402&r2=1443404&rev=1443404&view=diff
==============================================================================
---
james/server/trunk/karaf/distribution/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
(original)
+++
james/server/trunk/karaf/distribution/src/main/filtered-resources/etc/custom.properties
Thu Feb 7 11:00:15 2013
@@ -18,11 +18,17 @@
################################################################################
#
-# Comma separated list of features repositories to register by default
+# All the values specified here will override the default values given
+# in config.properties.
#
-featuresRepositories=mvn:org.apache.james.karaf/james-karaf-features/${project.version}/xml/features
+karaf.systemBundlesStartLevel=50
+
+#
+# You can place any customized configuration here.
#
-# Comma separated list of features to install at startup
+
+# Package sun.net.spi.nameservice is needed for dnsjava
#
-featuresBoot=config,ssh,management,kar
+org.osgi.framework.system.packages.extra = \
+ sun.net.spi.nameservice
\ No newline at end of file
Modified:
james/server/trunk/karaf/distribution/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
URL:
http://svn.apache.org/viewvc/james/server/trunk/karaf/distribution/src/main/filtered-resources/etc/org.apache.karaf.features.cfg?rev=1443404&r1=1443403&r2=1443404&view=diff
==============================================================================
---
james/server/trunk/karaf/distribution/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
(original)
+++
james/server/trunk/karaf/distribution/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
Thu Feb 7 11:00:15 2013
@@ -20,9 +20,9 @@
#
# Comma separated list of features repositories to register by default
#
-featuresRepositories=mvn:org.apache.james.karaf/james-karaf-features/${project.version}/xml/features
+featuresRepositories=mvn:org.apache.james.karaf/james-karaf-features/${project.version}/xml/features,mvn:org.apache.karaf.assemblies.features/enterprise/${karaf.version}/xml/features,mvn:org.apache.karaf.assemblies.features/standard/${karaf.version}/xml/features
#
# Comma separated list of features to install at startup
#
-featuresBoot=config,ssh,management,kar
+featuresBoot=config,ssh,management,kar,war
Modified: james/server/trunk/karaf/features/src/main/resources/features.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/karaf/features/src/main/resources/features.xml?rev=1443404&r1=1443403&r2=1443404&view=diff
==============================================================================
--- james/server/trunk/karaf/features/src/main/resources/features.xml (original)
+++ james/server/trunk/karaf/features/src/main/resources/features.xml Thu Feb
7 11:00:15 2013
@@ -86,24 +86,30 @@
<feature version="${spring.version}">spring31</feature>
</feature>
- <feature name="james-server-dnsservice-api" version="${project.version}">
-
<bundle>mvn:org.apache.james/james-server-dnsservice-api/${project.version}</bundle>
+ <feature name="dnsjava-2.1.1" version="2.1.1">
+ <bundle
dependency="true">mvn:dnsjava/dnsjava/${dnsjava.version}</bundle>
+ <bundle
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.junit/4.11_1</bundle>
</feature>
<feature name="james-server-dnsservice-dnsjava"
version="${project.version}">
-
<bundle>mvn:org.apache.james/james-server-dnsservice-dnsjava/${project.version}</bundle>
- <feature
version="${project.version}">james-server-dnsservice-api</feature>
<feature
version="${commons-configuration-osgi.version}">commons-configuration</feature>
-
<bundle>mvn:org.apache.james/apache-mailet-api/${mailet.version}</bundle>
-
<bundle>mvn:org.apache.geronimo.javamail/geronimo-javamail_1.4_mail/${geronimo-javamail.version}</bundle>
+ <bundle
dependency="true">mvn:org.apache.james/james-server-dnsservice-api/${project.version}</bundle>
+ <bundle
dependency="true">mvn:org.apache.james/james-server-dnsservice-dnsjava/${project.version}</bundle>
+ <bundle
dependency="true">mvn:org.apache.james/apache-mailet-api/${mailet.version}</bundle>
+ <bundle
dependency="true">mvn:org.apache.james/james-server-lifecycle-api/${project.version}</bundle>
+ <bundle dependency="true">
+
mvn:org.apache.geronimo.javamail/geronimo-javamail_1.4_mail/${geronimo-javamail.version}
+ </bundle>
</feature>
<feature name="james-server-dnsservice-library"
version="${project.version}">
-
<bundle>mvn:org.apache.james/james-server-dnsservice-library/${project.version}</bundle>
- <feature
version="${project.version}">james-server-dnsservice-api</feature>
-
<bundle>mvn:org.apache.james/apache-mailet-api/${mailet.version}</bundle>
- <bundle>mvn:org.slf4j/slf4j-api/${slf4j.version}</bundle>
-
<bundle>mvn:org.apache.geronimo.javamail/geronimo-javamail_1.4_mail/${geronimo-javamail.version}</bundle>
+ <bundle
dependency="true">mvn:org.apache.james/james-server-dnsservice-library/${project.version}</bundle>
+ <bundle
dependency="true">mvn:org.apache.james/james-server-dnsservice-api/${project.version}</bundle>
+ <bundle
dependency="true">mvn:org.apache.james/apache-mailet-api/${mailet.version}</bundle>
+ <bundle
dependency="true">mvn:org.slf4j/slf4j-api/${slf4j.version}</bundle>
+ <bundle dependency="true">
+
mvn:org.apache.geronimo.javamail/geronimo-javamail_1.4_mail/${geronimo-javamail.version}
+ </bundle>
</feature>
<feature name="james-server-queue-api" version="${project.version}">
@@ -323,7 +329,9 @@
</feature>
<feature name="commons-configuration"
version="${commons-configuration-osgi.version}">
-
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-configuration/1.8_1</bundle>
+ <bundle>
+
mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-configuration/${commons-configuration-osgi.version}
+ </bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-beanutils/1.8.3_1</bundle>
<!--<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-jxpath/1.2_5</bundle>-->
<bundle>mvn:commons-jxpath/commons-jxpath/1.3</bundle>
Modified: james/server/trunk/karaf/integration/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/karaf/integration/pom.xml?rev=1443404&r1=1443403&r2=1443404&view=diff
==============================================================================
--- james/server/trunk/karaf/integration/pom.xml (original)
+++ james/server/trunk/karaf/integration/pom.xml Thu Feb 7 11:00:15 2013
@@ -59,7 +59,7 @@
<dependency>
<groupId>org.apache.karaf</groupId>
<artifactId>apache-karaf</artifactId>
- <version>${apache-karaf.version}</version>
+ <version>${karaf.version}</version>
<scope>test</scope>
<type>tar.gz</type>
<exclusions>
Modified: james/server/trunk/lifecycle-api/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/lifecycle-api/pom.xml?rev=1443404&r1=1443403&r2=1443404&view=diff
==============================================================================
--- james/server/trunk/lifecycle-api/pom.xml (original)
+++ james/server/trunk/lifecycle-api/pom.xml Thu Feb 7 11:00:15 2013
@@ -45,4 +45,13 @@
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
Modified: james/server/trunk/lifecycle-spring/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/lifecycle-spring/pom.xml?rev=1443404&r1=1443403&r2=1443404&view=diff
==============================================================================
--- james/server/trunk/lifecycle-spring/pom.xml (original)
+++ james/server/trunk/lifecycle-spring/pom.xml Thu Feb 7 11:00:15 2013
@@ -89,4 +89,13 @@
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
Modified: james/server/trunk/mailbox-adapter/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/mailbox-adapter/pom.xml?rev=1443404&r1=1443403&r2=1443404&view=diff
==============================================================================
--- james/server/trunk/mailbox-adapter/pom.xml (original)
+++ james/server/trunk/mailbox-adapter/pom.xml Thu Feb 7 11:00:15 2013
@@ -65,4 +65,13 @@
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
Modified: james/server/trunk/mailetcontainer-api/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-api/pom.xml?rev=1443404&r1=1443403&r2=1443404&view=diff
==============================================================================
--- james/server/trunk/mailetcontainer-api/pom.xml (original)
+++ james/server/trunk/mailetcontainer-api/pom.xml Thu Feb 7 11:00:15 2013
@@ -58,6 +58,10 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ </plugin>
</plugins>
</build>
Modified: james/server/trunk/mailetcontainer-camel/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-camel/pom.xml?rev=1443404&r1=1443403&r2=1443404&view=diff
==============================================================================
--- james/server/trunk/mailetcontainer-camel/pom.xml (original)
+++ james/server/trunk/mailetcontainer-camel/pom.xml Thu Feb 7 11:00:15 2013
@@ -122,4 +122,13 @@
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
Modified: james/server/trunk/mailets/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/mailets/pom.xml?rev=1443404&r1=1443403&r2=1443404&view=diff
==============================================================================
--- james/server/trunk/mailets/pom.xml (original)
+++ james/server/trunk/mailets/pom.xml Thu Feb 7 11:00:15 2013
@@ -158,6 +158,11 @@
<outputDirectory>target/mailetdocs</outputDirectory>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ </plugin>
</plugins>
</build>
+
</project>
Modified: james/server/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/pom.xml?rev=1443404&r1=1443403&r2=1443404&view=diff
==============================================================================
--- james/server/trunk/pom.xml (original)
+++ james/server/trunk/pom.xml Thu Feb 7 11:00:15 2013
@@ -41,15 +41,15 @@
<inceptionYear>2002</inceptionYear>
<repositories>
- <!-- apache.snapshot is needed for james-project SNAPSHOT, see
JAMES-1470 -->
- <repository>
- <id>apache.snapshots</id>
- <name>Apache Snapshot Repository</name>
- <url>http://repository.apache.org/snapshots</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- </repository>
+ <!-- apache.snapshot is needed for james-project SNAPSHOT, see
JAMES-1470 -->
+ <repository>
+ <id>apache.snapshots</id>
+ <name>Apache Snapshot Repository</name>
+ <url>http://repository.apache.org/snapshots</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ </repository>
</repositories>
<modules>
@@ -171,7 +171,7 @@
<url.version>1.4.0</url.version>
<felix.version>4.0.3</felix.version>
<pax-swissbox-tinybundles.version>1.3.1</pax-swissbox-tinybundles.version>
- <apache-karaf.version>2.3.0</apache-karaf.version>
+ <karaf.version>2.3.0</karaf.version>
<karaf.tooling.exam.container.version>2.3.0</karaf.tooling.exam.container.version>
<pax-logging-api.version>1.6.4</pax-logging-api.version>
</properties>
@@ -1143,7 +1143,7 @@
<dependency>
<groupId>org.apache.karaf</groupId>
<artifactId>apache-karaf</artifactId>
- <version>${apache-karaf.version}</version>
+ <version>${karaf.version}</version>
<scope>test</scope>
<type>tar.gz</type>
<exclusions>
Modified: james/server/trunk/protocols/protocols-imap4/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/protocols/protocols-imap4/pom.xml?rev=1443404&r1=1443403&r2=1443404&view=diff
==============================================================================
--- james/server/trunk/protocols/protocols-imap4/pom.xml (original)
+++ james/server/trunk/protocols/protocols-imap4/pom.xml Thu Feb 7 11:00:15
2013
@@ -81,4 +81,13 @@
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
Modified: james/server/trunk/protocols/protocols-library/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/protocols/protocols-library/pom.xml?rev=1443404&r1=1443403&r2=1443404&view=diff
==============================================================================
--- james/server/trunk/protocols/protocols-library/pom.xml (original)
+++ james/server/trunk/protocols/protocols-library/pom.xml Thu Feb 7 11:00:15
2013
@@ -98,6 +98,11 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ </plugin>
</plugins>
</build>
+
</project>
Modified: james/server/trunk/protocols/protocols-lmtp/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/protocols/protocols-lmtp/pom.xml?rev=1443404&r1=1443403&r2=1443404&view=diff
==============================================================================
--- james/server/trunk/protocols/protocols-lmtp/pom.xml (original)
+++ james/server/trunk/protocols/protocols-lmtp/pom.xml Thu Feb 7 11:00:15 2013
@@ -124,4 +124,13 @@
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
Modified: james/server/trunk/protocols/protocols-pop3/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/protocols/protocols-pop3/pom.xml?rev=1443404&r1=1443403&r2=1443404&view=diff
==============================================================================
--- james/server/trunk/protocols/protocols-pop3/pom.xml (original)
+++ james/server/trunk/protocols/protocols-pop3/pom.xml Thu Feb 7 11:00:15 2013
@@ -134,4 +134,13 @@
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
Modified: james/server/trunk/protocols/protocols-smtp/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/protocols/protocols-smtp/pom.xml?rev=1443404&r1=1443403&r2=1443404&view=diff
==============================================================================
--- james/server/trunk/protocols/protocols-smtp/pom.xml (original)
+++ james/server/trunk/protocols/protocols-smtp/pom.xml Thu Feb 7 11:00:15 2013
@@ -205,4 +205,13 @@
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
Modified: james/server/trunk/queue/queue-activemq/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/queue/queue-activemq/pom.xml?rev=1443404&r1=1443403&r2=1443404&view=diff
==============================================================================
--- james/server/trunk/queue/queue-activemq/pom.xml (original)
+++ james/server/trunk/queue/queue-activemq/pom.xml Thu Feb 7 11:00:15 2013
@@ -118,4 +118,13 @@
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
Modified: james/server/trunk/queue/queue-api/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/queue/queue-api/pom.xml?rev=1443404&r1=1443403&r2=1443404&view=diff
==============================================================================
--- james/server/trunk/queue/queue-api/pom.xml (original)
+++ james/server/trunk/queue/queue-api/pom.xml Thu Feb 7 11:00:15 2013
@@ -58,6 +58,10 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ </plugin>
</plugins>
</build>
Modified: james/server/trunk/queue/queue-file/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/queue/queue-file/pom.xml?rev=1443404&r1=1443403&r2=1443404&view=diff
==============================================================================
--- james/server/trunk/queue/queue-file/pom.xml (original)
+++ james/server/trunk/queue/queue-file/pom.xml Thu Feb 7 11:00:15 2013
@@ -61,4 +61,13 @@
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
Modified: james/server/trunk/queue/queue-jms/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/queue/queue-jms/pom.xml?rev=1443404&r1=1443403&r2=1443404&view=diff
==============================================================================
--- james/server/trunk/queue/queue-jms/pom.xml (original)
+++ james/server/trunk/queue/queue-jms/pom.xml Thu Feb 7 11:00:15 2013
@@ -108,6 +108,10 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ </plugin>
</plugins>
</build>
</project>
Modified: james/server/trunk/util/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/util/pom.xml?rev=1443404&r1=1443403&r2=1443404&view=diff
==============================================================================
--- james/server/trunk/util/pom.xml (original)
+++ james/server/trunk/util/pom.xml Thu Feb 7 11:00:15 2013
@@ -50,4 +50,13 @@
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
