This is an automated email from the ASF dual-hosted git repository. matthieu pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 22b747efb60eb1330adcd1d1726682a58b71084d Author: Matthieu Baechler <[email protected]> AuthorDate: Wed Aug 21 16:42:13 2019 +0200 JAMES-2870 remove karaf and osgi descriptions from the codebase --- .../META-INF/spring/mailbox-memory-osgi.xml | 39 --- .../META-INF/spring/mailbox-authenticator-osgi.xml | 33 -- .../META-INF/spring/mailbox-locker-osgi.xml | 33 -- .../resources/META-INF/spring/loaders-osgi.xml | 61 ---- .../main/resources/META-INF/spring/data-osgi.xml | 45 --- .../main/resources/META-INF/spring/dns-osgi.xml | 37 --- server/karaf/README.md | 85 ------ server/karaf/build.sh | 5 - server/karaf/distribution/pom.xml | 149 --------- .../karaf/distribution/src/main/assembly/unix.xml | 81 ----- .../main/filtered-resources/etc/custom.properties | 34 --- .../etc/org.apache.karaf.features.cfg | 28 -- server/karaf/features/pom.xml | 92 ------ .../karaf/features/src/main/resources/features.xml | 334 --------------------- server/karaf/integration/pom.xml | 167 ----------- .../features/CommonsConfigurationLiveTest.java | 0 .../features/CommonsConfigurationTestLive.java | 14 - .../james/karaf/features/DnsServiceLiveTest.java | 0 .../james/karaf/features/DnsServiceTestLive.java | 16 - .../james/karaf/features/FetchMailLiveTest.java | 0 .../james/karaf/features/FetchMailTestLive.java | 15 - .../james/karaf/features/KarafLiveTestSupport.java | 152 ---------- .../karaf/features/MailetContainerLiveTest.java | 0 .../karaf/features/MailetContainerTestLive.java | 21 -- .../james/karaf/features/Mime4jLiveTest.java | 0 .../james/karaf/features/Mime4jTestLive.java | 14 - .../META-INF/spring/mailetcontainer-osgi.xml | 50 --- .../resources/META-INF/spring/fetchmail-osgi.xml | 36 --- .../resources/META-INF/spring/imapserver-osgi.xml | 36 --- .../resources/META-INF/spring/lmtpserver-osgi.xml | 35 --- .../resources/META-INF/spring/pop3server-osgi.xml | 36 --- .../resources/META-INF/spring/smtpserver-osgi.xml | 35 --- .../META-INF/spring/activemq-queue-osgi.xml | 48 --- .../resources/META-INF/spring/file-queue-osgi.xml | 35 --- 34 files changed, 1766 deletions(-) diff --git a/mailbox/memory/src/main/resources/META-INF/spring/mailbox-memory-osgi.xml b/mailbox/memory/src/main/resources/META-INF/spring/mailbox-memory-osgi.xml deleted file mode 100644 index fc6b5d7..0000000 --- a/mailbox/memory/src/main/resources/META-INF/spring/mailbox-memory-osgi.xml +++ /dev/null @@ -1,39 +0,0 @@ -<?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. ---> -<beans:beans xmlns="http://www.springframework.org/schema/osgi"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xmlns:beans="http://www.springframework.org/schema/beans"; - xmlns:osgi="http://www.springframework.org/schema/osgi"; - xsi:schemaLocation="http://www.springframework.org/schema/osgi http://www.springframework.org/schema/osgi/spring-osgi-1.2.xsd - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd";> - - <osgi:service ref="memory-mailboxManager"> - <osgi:interfaces> - <beans:value>org.apache.james.mailbox.MailboxManager</beans:value> - </osgi:interfaces> - </osgi:service> - - <osgi:service ref="memory-subscriptionManager"> - <osgi:interfaces> - <beans:value>org.apache.james.mailbox.SubscriptionManager</beans:value> - </osgi:interfaces> - </osgi:service> - -</beans:beans> \ No newline at end of file diff --git a/mailbox/spring/src/main/resources/META-INF/spring/mailbox-authenticator-osgi.xml b/mailbox/spring/src/main/resources/META-INF/spring/mailbox-authenticator-osgi.xml deleted file mode 100644 index 445cff3..0000000 --- a/mailbox/spring/src/main/resources/META-INF/spring/mailbox-authenticator-osgi.xml +++ /dev/null @@ -1,33 +0,0 @@ -<?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. ---> -<beans:beans xmlns="http://www.springframework.org/schema/osgi"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xmlns:beans="http://www.springframework.org/schema/beans"; - xmlns:osgi="http://www.springframework.org/schema/osgi"; - xsi:schemaLocation="http://www.springframework.org/schema/osgi http://www.springframework.org/schema/osgi/spring-osgi-1.2.xsd - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd";> - - <osgi:service ref="authenticator"> - <osgi:interfaces> - <beans:value>org.apache.james.mailbox.store.Authenticator</beans:value> - </osgi:interfaces> - </osgi:service> - -</beans:beans> \ No newline at end of file diff --git a/mailbox/spring/src/main/resources/META-INF/spring/mailbox-locker-osgi.xml b/mailbox/spring/src/main/resources/META-INF/spring/mailbox-locker-osgi.xml deleted file mode 100644 index 2ad19d4..0000000 --- a/mailbox/spring/src/main/resources/META-INF/spring/mailbox-locker-osgi.xml +++ /dev/null @@ -1,33 +0,0 @@ -<?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. ---> -<beans:beans xmlns="http://www.springframework.org/schema/osgi"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xmlns:beans="http://www.springframework.org/schema/beans"; - xmlns:osgi="http://www.springframework.org/schema/osgi"; - xsi:schemaLocation="http://www.springframework.org/schema/osgi http://www.springframework.org/schema/osgi/spring-osgi-1.2.xsd - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd";> - - <osgi:service ref="jvm-locker"> - <osgi:interfaces> - <beans:value>org.apache.james.mailbox.store.AbstractMailboxPathLocker</beans:value> - </osgi:interfaces> - </osgi:service> - -</beans:beans> \ No newline at end of file diff --git a/server/container/spring/src/main/resources/META-INF/spring/loaders-osgi.xml b/server/container/spring/src/main/resources/META-INF/spring/loaders-osgi.xml deleted file mode 100644 index f966633..0000000 --- a/server/container/spring/src/main/resources/META-INF/spring/loaders-osgi.xml +++ /dev/null @@ -1,61 +0,0 @@ -<?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. ---> -<beans:beans - xmlns="http://www.springframework.org/schema/osgi"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xmlns:beans="http://www.springframework.org/schema/beans"; - xmlns:osgi="http://www.springframework.org/schema/osgi"; - xsi:schemaLocation="http://www.springframework.org/schema/osgi - http://www.springframework.org/schema/osgi/spring-osgi-1.2.xsd - http://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans-3.0.xsd";> - - - <beans:bean id="configurationprovider" - class="org.apache.james.container.spring.lifecycle.osgi.OSGIConfigurationProvider"/> - - <!-- Register the service trackers --> - <beans:bean id="usersrepositoryTracker" class="org.apache.james.container.spring.osgi.UsersRepositoryTracker"/> - <beans:bean id="domainlistTracker" class="org.apache.james.container.spring.osgi.DomainListTracker"/> - <beans:bean id="recipientrewritetableTracker" - class="org.apache.james.container.spring.osgi.RecipientRewriteTableTracker"/> - - <osgi:service ref="matcherloader"> - <osgi:interfaces> - <beans:value>org.apache.james.mailetcontainer.api.MatcherLoader</beans:value> - </osgi:interfaces> - </osgi:service> - <osgi:service ref="mailetloader"> - <osgi:interfaces> - <beans:value>org.apache.james.mailetcontainer.api.MailetLoader</beans:value> - </osgi:interfaces> - </osgi:service> - - <osgi:service ref="protocolhandlerloader"> - <osgi:interfaces> - <beans:value>org.apache.james.protocols.api.ProtocolHandlerLoader</beans:value> - </osgi:interfaces> - </osgi:service> - <osgi:service ref="filesystem"> - <osgi:interfaces> - <beans:value>org.apache.james.filesystem.api.FileSystem</beans:value> - </osgi:interfaces> - </osgi:service> -</beans:beans> diff --git a/server/data/data-library/src/main/resources/META-INF/spring/data-osgi.xml b/server/data/data-library/src/main/resources/META-INF/spring/data-osgi.xml deleted file mode 100644 index 99ca420..0000000 --- a/server/data/data-library/src/main/resources/META-INF/spring/data-osgi.xml +++ /dev/null @@ -1,45 +0,0 @@ -<?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. ! - --> -<beans:beans - xmlns="http://www.springframework.org/schema/osgi"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xmlns:beans="http://www.springframework.org/schema/beans"; - xmlns:osgi="http://www.springframework.org/schema/osgi"; - xsi:schemaLocation="http://www.springframework.org/schema/osgi - http://www.springframework.org/schema/osgi/spring-osgi-1.2.xsd - http://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans-3.0.xsd";> - - <osgi:service ref="domainlistmanagement"> - <osgi:interfaces> - <beans:value>org.apache.james.domainlist.lib.DomainListManagement</beans:value> - <beans:value>org.apache.james.domainlist.api.DomainListManagementMBean</beans:value> - </osgi:interfaces> - </osgi:service> - - <osgi:service ref="recipientrewritetablemanagement"> - <osgi:interfaces> - <beans:value>org.apache.james.rrt.lib.RecipientRewriteTableManagement</beans:value> - <beans:value>org.apache.james.rrt.api.RecipientRewriteTableManagementMBean</beans:value> - </osgi:interfaces> - </osgi:service> - <osgi:service ref="usersrepositorymanagement"> - <osgi:interfaces> - <beans:value>org.apache.james.user.lib.UsersRepositoryManagement</beans:value> - <beans:value>org.apache.james.user.api.UsersRepositoryManagementMBean</beans:value> - </osgi:interfaces> - </osgi:service> -</beans:beans> diff --git a/server/dns-service/dnsservice-dnsjava/src/main/resources/META-INF/spring/dns-osgi.xml b/server/dns-service/dnsservice-dnsjava/src/main/resources/META-INF/spring/dns-osgi.xml deleted file mode 100644 index d49368c..0000000 --- a/server/dns-service/dnsservice-dnsjava/src/main/resources/META-INF/spring/dns-osgi.xml +++ /dev/null @@ -1,37 +0,0 @@ -<?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. ---> -<beans:beans - xmlns="http://www.springframework.org/schema/osgi"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xmlns:beans="http://www.springframework.org/schema/beans"; - xmlns:osgi="http://www.springframework.org/schema/osgi"; - xsi:schemaLocation="http://www.springframework.org/schema/osgi - http://www.springframework.org/schema/osgi/spring-osgi-1.2.xsd - http://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans.xsd";> - - <!-- export the dnsserver as osgi service --> - <osgi:service ref="dnsservice"> - <osgi:interfaces> - <beans:value>org.apache.james.dnsservice.api.DNSService</beans:value> - <beans:value>org.apache.james.dnsservice.api.DNSServiceMBean</beans:value> - </osgi:interfaces> - </osgi:service> -</beans:beans> diff --git a/server/karaf/README.md b/server/karaf/README.md deleted file mode 100644 index b29a0ea..0000000 --- a/server/karaf/README.md +++ /dev/null @@ -1,85 +0,0 @@ -Apache James - Karaf integration -================================ - -This Maven project deploy Apache James inside Apache Karaf OSGi container. Since James is built with Spring, we will -use Spring-DM for creating OSGi services thus allowing the same James components be used unchanged in or outside OSGi. - -* http://karaf.apache.org/ -* http://james.apache.org/ -* http://static.springsource.org/osgi/docs/1.2.x/reference/html/ - -Why? -==== - -Apache Karaf provide a great container for deploying applications and managing their lifecycle. Read more about that on -the Karaf homepage. - -OSGi promotes the use of services and modules that drive the creation of components easy to reuse and integrate into -other projects. - -Running James inside Karaf container provides means for a secure administration console (over SSH). -This enable us to write commands to administer the server and do things like: - -* start/stop IMAP/POP3/SMTP components without bringing down the entire server. -* add/remove users manually -* much more - -Project structure -================= - -* karaf/features - Builds a Karaf features that match James components to easy provision the application - http://karaf.apache.org/manual/latest-2.3.x/users-guide/provisioning.html -* karaf/distribution - Builds a custom Karaf distribution bundled with James components. Uses the James features -* karaf/integration - Integration tests for deploying James inside Karaf - -Build and run -============= - -You can build the project by running the script provided in karaf folder: - $ ./build.sh - -You can also build each project individually by running **$ mvn clean install** inside each maven project. - -You might wish to build the whole James project to ensure all artifacts are available in the local Maven repo. You can -do that by running **$ mvn clean install** in the project top level directory. - -If everything goes well, look for a file called *distribution-VERSION-.tar.gz* under karaf/distribution/target. -Unpack, change the current directory to be inside the application and run **./bin/karaf**. This will start Karaf and -present you with a administration console. You are ready to install James features if not already installed and start -playing with James. - -Run **features:install james-server-dnsservice-dnsjava** to provision and start the DNSService that -James uses to resolve mail hosts. To see the state of things you can run **list**. An output like the following means -the DNSService has started successfully: - -~~~ - karaf@root> list - START LEVEL 100 , List Threshold: 50 - ID State Blueprint Spring Level Name - [ 97] [Active ] [ ] [ ] [ 80] Apache ServiceMix :: Bundles :: commons-configuration (1.9.0.1) - [ 98] [Active ] [ ] [ ] [ 80] Apache ServiceMix :: Bundles :: commons-beanutils (1.8.3.1) - [ 99] [Active ] [ ] [ ] [ 80] Commons JXPath (1.3) - [ 100] [Active ] [ ] [ ] [ 80] Apache ServiceMix :: Bundles :: xmlresolver (1.2.0.5) - [ 101] [Active ] [ ] [ ] [ 80] Apache ServiceMix :: Bundles :: commons-collections (3.2.1.3) - [ 102] [Active ] [ ] [ ] [ 80] Apache ServiceMix :: Bundles :: jdom (1.1.0.4) - [ 103] [Active ] [ ] [ ] [ 80] Commons Codec (1.7.0) - [ 104] [Active ] [ ] [ ] [ 80] Commons Lang (2.6) - [ 105] [Active ] [ ] [ ] [ 80] Commons Digester (1.8.1) - [ 106] [Active ] [ ] [ ] [ 80] Commons JEXL (2.1.1) - [ 107] [Active ] [ ] [ ] [ 80] dnsjava (2.1.1) - [ 108] [Active ] [ ] [ ] [ 80] Apache ServiceMix :: Bundles :: junit (4.11.0.1) - [ 109] [Active ] [ ] [ ] [ 80] Apache James :: Server :: DNS Service :: Library (3.0.0.beta5-SNAPSHOT) - [ 110] [Active ] [ ] [ ] [ 80] Apache James :: Server :: DNS Service :: API (3.0.0.beta5-SNAPSHOT) - [ 111] [Active ] [ ] [ ] [ 80] Apache James :: Mailet API (2.5.1.SNAPSHOT) - [ 112] [Active ] [ ] [ ] [ 80] Geronimo JavaMail 1.4 :: Mail (1.8.3) - [ 113] [Active ] [ ] [Started] [ 80] Apache James :: Server :: DNS Service :: Implementation (3.0.0.beta5-SNAPSHOT) - [ 114] [Active ] [ ] [ ] [ 80] Apache James :: Server :: Lifecycle API (3.0.0.beta5-SNAPSHOT) -~~~ - -If necessary, you can check the logs with **log:display**. You can also dynamically change the logging level via -**log:set**. These are all Karaf related things and you should check them out http://karaf.apache.org/manual/latest-2.3.x/commands/commands.html - - - - - diff --git a/server/karaf/build.sh b/server/karaf/build.sh deleted file mode 100755 index 6a44c08..0000000 --- a/server/karaf/build.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -(cd features && mvn clean install) -(cd integration && mvn clean install) -(cd distribution && mvn clean install) diff --git a/server/karaf/distribution/pom.xml b/server/karaf/distribution/pom.xml deleted file mode 100644 index cca4de2..0000000 --- a/server/karaf/distribution/pom.xml +++ /dev/null @@ -1,149 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<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/xsd/maven-4.0.0.xsd";> - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.apache.james</groupId> - <artifactId>james-server</artifactId> - <version>3.2.0-SNAPSHOT</version> - <relativePath>../../pom.xml</relativePath> - </parent> - - <artifactId>james-karaf-distribution</artifactId> - <packaging>pom</packaging> - - <name>Apache James :: Karaf :: James Server</name> - - <properties> - <karaf.version>2.3.0</karaf.version> - </properties> - - <dependencies> - <dependency> - <groupId>${james.groupId}</groupId> - <artifactId>james-karaf-features</artifactId> - <type>pom</type> - </dependency> - <dependency> - <groupId>org.apache.karaf</groupId> - <artifactId>apache-karaf</artifactId> - <version>${karaf.version}</version> - <type>tar.gz</type> - </dependency> - <dependency> - <groupId>org.apache.karaf.assemblies.features</groupId> - <artifactId>standard</artifactId> - <version>${karaf.version}</version> - <classifier>features</classifier> - <type>xml</type> - </dependency> - </dependencies> - - <build> - <resources> - <resource> - <filtering>true</filtering> - <directory>src/main/filtered-resources</directory> - <includes> - <include>**/*</include> - </includes> - </resource> - </resources> - <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> - <goals> - <goal>resources</goal> - </goals> - <phase>generate-resources</phase> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <!-- Uncompress the standard Karaf distribution --> - <id>unpack</id> - <goals> - <goal>unpack</goal> - </goals> - <phase>generate-resources</phase> - <configuration> - <artifactItems> - <artifactItem> - <groupId>org.apache.karaf</groupId> - <artifactId>apache-karaf</artifactId> - <version>${karaf.version}</version> - <type>tar.gz</type> - <outputDirectory>target/dependencies/unix</outputDirectory> - </artifactItem> - </artifactItems> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <id>bin</id> - <goals> - <goal>single</goal> - </goals> - <phase>package</phase> - <configuration> - <descriptors> - <descriptor>src/main/assembly/unix.xml</descriptor> - </descriptors> - <appendAssemblyId>false</appendAssemblyId> - <tarLongFileMode>gnu</tarLongFileMode> - </configuration> - </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> - <goals> - <goal>add-features-to-repo</goal> - </goals> - <phase>install</phase> - <inherited>false</inherited> - <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> - </execution> - </executions> - </plugin> - </plugins> - </build> - -</project> diff --git a/server/karaf/distribution/src/main/assembly/unix.xml b/server/karaf/distribution/src/main/assembly/unix.xml deleted file mode 100644 index 45d7636..0000000 --- a/server/karaf/distribution/src/main/assembly/unix.xml +++ /dev/null @@ -1,81 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - ~ Copyright (c) 2012 S.C. Axemblr Software Solutions S.R.L - ~ - ~ Licensed 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. - --> - -<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd";> - <id>james-karaf-assembly</id> - <formats> - <format>tar.gz</format> - </formats> - - <fileSets> - <!-- Strip the Karaf distribution --> - <fileSet> - <directory>target/dependencies/unix/apache-karaf-${karaf.version}</directory> - <outputDirectory>/</outputDirectory> - <excludes> - <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> - <exclude>NOTICE</exclude> - <exclude>README</exclude> - <exclude>RELEASE-NOTES</exclude> - <exclude>karaf-manual*</exclude> - </excludes> - </fileSet> - - <!-- Copy over bin/* scripts separately to get the correct file mode --> - <fileSet> - <directory>target/dependencies/unix/apache-karaf-${karaf.version}</directory> - <outputDirectory>/</outputDirectory> - <includes> - <include>bin/*</include> - </includes> - <fileMode>0755</fileMode> - </fileSet> - - <!-- Copy over resources --> - <fileSet> - <directory>target/classes/etc</directory> - <outputDirectory>/etc/</outputDirectory> - <includes> - <include>*.*</include> - </includes> - <lineEnding>unix</lineEnding> - <fileMode>0644</fileMode> - </fileSet> - - <!-- Add features to system repository --> - <fileSet> - <outputDirectory>system</outputDirectory> - <directory>target/features-repo</directory> - </fileSet> - </fileSets> - - <dependencySets> - <dependencySet> - <outputDirectory>/lib</outputDirectory> - <fileMode>0644</fileMode> - <useTransitiveDependencies>false</useTransitiveDependencies> - </dependencySet> - </dependencySets> -</assembly> \ No newline at end of file diff --git a/server/karaf/distribution/src/main/filtered-resources/etc/custom.properties b/server/karaf/distribution/src/main/filtered-resources/etc/custom.properties deleted file mode 100644 index 08d4c43..0000000 --- a/server/karaf/distribution/src/main/filtered-resources/etc/custom.properties +++ /dev/null @@ -1,34 +0,0 @@ -################################################################################ -# -# 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. -# -################################################################################ - -# -# All the values specified here will override the default values given -# in config.properties. -# - -karaf.systemBundlesStartLevel=50 - -# -# You can place any customized configuration here. -# - -# Package sun.net.spi.nameservice is needed for dnsjava -# -org.osgi.framework.system.packages.extra = \ - sun.net.spi.nameservice \ No newline at end of file diff --git a/server/karaf/distribution/src/main/filtered-resources/etc/org.apache.karaf.features.cfg b/server/karaf/distribution/src/main/filtered-resources/etc/org.apache.karaf.features.cfg deleted file mode 100644 index 3b10587..0000000 --- a/server/karaf/distribution/src/main/filtered-resources/etc/org.apache.karaf.features.cfg +++ /dev/null @@ -1,28 +0,0 @@ -################################################################################ -# -# 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. -# -################################################################################ - -# -# Comma separated list of features repositories to register by default -# -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,spring-dm,war diff --git a/server/karaf/features/pom.xml b/server/karaf/features/pom.xml deleted file mode 100644 index 39f1912..0000000 --- a/server/karaf/features/pom.xml +++ /dev/null @@ -1,92 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<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/xsd/maven-4.0.0.xsd";> - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.apache.james</groupId> - <artifactId>james-server</artifactId> - <version>3.2.0-SNAPSHOT</version> - <relativePath>../../pom.xml</relativePath> - </parent> - - <artifactId>james-karaf-features</artifactId> - <packaging>pom</packaging> - <name>Apache James :: Karaf :: Features</name> - - <properties> - <mime4j.version>0.7.2</mime4j.version> - <jutf7.version>1.0.0</jutf7.version> - <commons-dbcp-bundle.version>1.4_3</commons-dbcp-bundle.version> - <commons-configuration-osgi.version>1.9_1</commons-configuration-osgi.version> - <javax-inject-osgi.version>1_2</javax-inject-osgi.version> - </properties> - - <build> - <resources> - <resource> - <targetPath>${project.build.directory}</targetPath> - <filtering>true</filtering> - <directory>src/main/resources</directory> - </resource> - </resources> - - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-resources-plugin</artifactId> - <executions> - <execution> - <id>filter</id> - <goals> - <goal>resources</goal> - </goals> - <phase>generate-resources</phase> - </execution> - </executions> - </plugin> - - <!-- TODO: enable after we make sure all components are OSGi ready --> - <!--<plugin>--> - <!--<!– validate the feature –>--> - <!--<groupId>org.apache.karaf.tooling</groupId>--> - <!--<artifactId>features-maven-plugin</artifactId>--> - <!--<version>2.2.9</version>--> - <!--<executions>--> - <!--<execution>--> - <!--<id>validate</id>--> - <!--<phase>process-resources</phase>--> - <!--<goals>--> - <!--<goal>validate</goal>--> - <!--</goals>--> - <!--<configuration>--> - <!--<file>${project.build.directory}/features.xml</file>--> - <!--</configuration>--> - <!--</execution>--> - <!--</executions>--> - <!--</plugin>--> - - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <executions> - <execution> - <id>attach-artifacts</id> - <goals> - <goal>attach-artifact</goal> - </goals> - <phase>package</phase> - <configuration> - <artifacts> - <artifact> - <file>${project.build.directory}/features.xml</file> - <type>xml</type> - <classifier>features</classifier> - </artifact> - </artifacts> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> -</project> diff --git a/server/karaf/features/src/main/resources/features.xml b/server/karaf/features/src/main/resources/features.xml deleted file mode 100644 index e9dda48..0000000 --- a/server/karaf/features/src/main/resources/features.xml +++ /dev/null @@ -1,334 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<features name="apache-james-features-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.0.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.0.0 "> - - <feature name="apache-james-mime4j" version="${mime4j.version}"> - <bundle>mvn:org.apache.james/apache-mime4j-core/${mime4j.version}</bundle> - <bundle>mvn:org.apache.james/apache-mime4j-dom/${mime4j.version}</bundle> - </feature> - - <!-- james 3.0-beta5 features --> - <feature name="james-server-lifecycle-api" version="${project.version}"> - <bundle dependency="true">mvn:org.apache.james/james-server-lifecycle-api/${project.version}</bundle> - <feature version="${commons-configuration-osgi.version}">commons-configuration</feature> - </feature> - - <feature name="james-server-filesystem-api" version="${project.version}"> - <bundle>mvn:org.apache.james/james-server-filesystem-api/${project.version}</bundle> - <bundle>mvn:org.apache.james/apache-jsieve-manager-api/${jsieve.version}</bundle> - <bundle>mvn:commons-io/commons-io/${commons-io.version}</bundle> - </feature> - - <feature name="james-server-data-api" version="${project.version}"> - <bundle>mvn:org.apache.james/james-server-data-api/${project.version}</bundle> - <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> - </feature> - - <feature name="james-server-mailetcontainer-api" version="${project.version}"> - <bundle>mvn:org.apache.james/james-server-mailetcontainer-api/${project.version}</bundle> - <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> - </feature> - - <feature name="james-server-util" version="${project.version}"> - <bundle>mvn:org.apache.james/james-server-util/${project.version}</bundle> - <bundle>mvn:org.apache.geronimo.javamail/geronimo-javamail_1.4_mail/${geronimo-javamail.version}</bundle> - </feature> - - <feature name="james-server-protocols-library" version="${project.version}"> - <bundle>mvn:org.apache.james/james-server-protocols-library/${project.version}</bundle> - <feature version="${project.version}">james-server-lifecycle-api</feature> - <feature version="${project.version}">james-server-filesystem-api</feature> - <feature version="${project.version}">james-server-util</feature> - <feature version="${commons-configuration-osgi.version}">commons-configuration</feature> - <bundle>mvn:org.apache.james.protocols/protocols-api/${protocols.version}</bundle> - <bundle>mvn:org.apache.james.protocols/protocols-netty/${protocols.version}</bundle> - <bundle>mvn:io.netty/netty/${netty.version}</bundle> - </feature> - - <feature name="james-server-core" version="${project.version}"> - <bundle>mvn:org.apache.james/james-server-core/${project.version}</bundle> - <feature version="${project.version}">james-server-lifecycle-api</feature> - <bundle>mvn:org.apache.james/apache-mailet-api/${mailet.version}</bundle> - <bundle>mvn:org.apache.james/apache-mailet-base/${mailet.version}</bundle> - <bundle>mvn:commons-io/commons-io/${commons-io.version}</bundle> - <bundle>mvn:org.apache.geronimo.javamail/geronimo-javamail_1.4_mail/${geronimo-javamail.version}</bundle> - <bundle>mvn:org.apache.geronimo.specs/geronimo-activation_1.1_spec/${geronimo-activation-spec.version}</bundle> - </feature> - - <feature name="james-server-spring" version="${project.version}"> - <bundle>mvn:org.apache.james/james-server-spring/${project.version}</bundle> - <feature version="${project.version}">james-server-lifecycle-api</feature> - <feature version="${project.version}">james-server-filesystem-api</feature> - <feature version="${project.version}">james-server-mailetcontainer-api</feature> - <feature version="${project.version}">james-server-protocols-library</feature> - <feature version="${project.version}">james-server-core</feature> - <feature version="${project.version}">james-server-data-api</feature> - <bundle>mvn:org.apache.james/apache-james-mailbox-api/${mailbox.version}</bundle> - <bundle>mvn:org.apache.james/apache-james-mailbox-tool/${mailbox.version}</bundle> - <bundle>mvn:org.apache.james.protocols/protocols-api/${protocols.version}</bundle> - <bundle>mvn:org.apache.geronimo.javamail/geronimo-javamail_1.4_mail/${geronimo-javamail.version}</bundle> - <bundle>mvn:org.apache.james/apache-mailet-api/${mailet.version}</bundle> - <feature version="${spring.version}">spring31</feature> - </feature> - - <feature name="dnsjava-2.1.8" version="2.1.8"> - <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}"> - <feature>commons-configuration</feature> - <feature>dnsjava-2.1.8</feature> - <feature>james-server-dnsservice-library</feature> - <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}"> - <feature>dnsjava-2.1.8</feature> - <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.apache.geronimo.javamail/geronimo-javamail_1.4_mail/${geronimo-javamail.version} - </bundle> - </feature> - - <feature name="james-server-queue-api" version="${project.version}"> - <bundle>mvn:org.apache.james/james-server-queue-api/${project.version}</bundle> - <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> - </feature> - - <feature name="james-server-fetchmail" version="${project.version}"> - <bundle dependency="true">mvn:org.apache.james/james-server-fetchmail/${project.version}</bundle> - <feature version="${project.version}">james-server-queue-api</feature> - <feature version="${project.version}">james-server-lifecycle-api</feature> - <feature version="${project.version}">james-server-util</feature> - <feature version="${project.version}">james-server-data-api</feature> - <feature version="${project.version}">james-server-core</feature> - <feature version="${commons-configuration-osgi.version}">commons-configuration</feature> - <bundle dependency="true">mvn:org.apache.james/apache-mailet-api/${mailet.version}</bundle> - <bundle dependency="true"> - mvn:org.apache.geronimo.javamail/geronimo-javamail_1.4_mail/${geronimo-javamail.version} - </bundle> - <bundle dependency="true"> - mvn:org.apache.geronimo.specs/geronimo-annotation_1.1_spec/${geronimo-annotation-spec.version} - </bundle> - <bundle dependency="true">mvn:org.apache.james/james-server-dnsservice-api/${project.version}</bundle> - <bundle dependency="true"> - mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.javax-inject/${javax-inject-osgi.version} - </bundle> - </feature> - - <feature name="james-server-data-library" version="${project.version}"> - <bundle>mvn:org.apache.james/james-server-data-library/${project.version}</bundle> - <feature version="${project.version}">james-server-lifecycle-api</feature> - <feature version="${project.version}">james-server-data-api</feature> - <feature version="${project.version}">james-server-filesystem-api</feature> - <bundle>mvn:org.apache.james/apache-mailet-api/${mailet.version}</bundle> - <feature version="${commons-configuration-osgi.version}">commons-configuration</feature> - <bundle>mvn:org.apache.geronimo.javamail/geronimo-javamail_1.4_mail/${geronimo-javamail.version}</bundle> - </feature> - - <feature name="james-server-data-jpa" version="${project.version}"> - <bundle>mvn:org.apache.james/james-server-data-jpa/${project.version}</bundle> - <feature version="${project.version}">james-server-lifecycle-api</feature> - <feature version="${project.version}">james-server-data-api</feature> - <feature version="${project.version}">james-server-data-library</feature> - <feature version="${commons-configuration-osgi.version}">commons-configuration</feature> - <bundle dependency="true">mvn:commons-codec/commons-codec/${commons-codec.version}</bundle> - <bundle>mvn:org.apache.geronimo.javamail/geronimo-javamail_1.4_mail/${geronimo-javamail.version}</bundle> - <bundle>mvn:org.apache.geronimo.specs/geronimo-annotation_1.1_spec/${geronimo-annotation-spec.version} - </bundle> - </feature> - - <feature name="james-server-data-jdbc" version="${project.version}"> - <bundle>mvn:org.apache.james/james-server-data-jdbc/${project.version}</bundle> - <feature version="${project.version}">james-server-lifecycle-api</feature> - <feature version="${project.version}">james-server-util</feature> - <feature version="${project.version}">james-server-filesystem-api</feature> - <feature version="${project.version}">james-server-data-api</feature> - <feature version="${project.version}">james-server-data-library</feature> - <feature version="${project.version}">james-server-core</feature> - <feature version="${commons-configuration-osgi.version}">commons-configuration</feature> - <bundle>mvn:commons-codec/commons-codec/${commons-codec.version}</bundle> - <bundle>mvn:org.apache.geronimo.javamail/geronimo-javamail_1.4_mail/${geronimo-javamail.version}</bundle> - <bundle>mvn:org.apache.geronimo.specs/geronimo-annotation_1.1_spec/${geronimo-annotation-spec.version}</bundle> - <bundle> - mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-dbcp/${commons-dbcp-bundle.version} - </bundle> - <bundle>mvn:commons-pool/commons-pool/${commons-pool.version}</bundle> - <bundle>mvn:org.apache.derby/derby/${derby.version}</bundle> - </feature> - - <feature name="james-server-data-file" version="${project.version}"> - <bundle>mvn:org.apache.james/james-server-data-file/${project.version}</bundle> - <feature version="${project.version}">james-server-lifecycle-api</feature> - <feature version="${project.version}">james-server-filesystem-api</feature> - <feature version="${project.version}">james-server-data-api</feature> - <feature version="${project.version}">james-server-data-library</feature> - <feature version="${project.version}">james-server-core</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>mvn:org.apache.geronimo.specs/geronimo-annotation_1.1_spec/${geronimo-annotation-spec.version}</bundle> - </feature> - - <feature name="james-server-data-ldap" version="${project.version}"> - <bundle>mvn:org.apache.james/james-server-data-ldap/${project.version}</bundle> - <feature version="${project.version}">james-server-lifecycle-api</feature> - <feature version="${project.version}">james-server-data-api</feature> - <feature version="${project.version}">james-server-util</feature> - <feature version="${commons-configuration-osgi.version}">commons-configuration</feature> - <bundle>mvn:org.apache.geronimo.specs/geronimo-annotation_1.1_spec/${geronimo-annotation-spec.version}</bundle> - </feature> - - <feature name="james-server-mailbox-adapter" version="${project.version}"> - <bundle>mvn:org.apache.james/james-server-mailbox-adapter/${project.version}</bundle> - <feature version="${project.version}">james-server-data-api</feature> - <feature version="${project.version}">james-server-lifecycle-api</feature> - <feature version="${project.version}">james-server-filesystem-api</feature> - <bundle>mvn:org.apache.james/apache-james-mailbox-api/${mailbox.version}</bundle> - <bundle>mvn:org.apache.james/apache-james-mailbox-store/${mailbox.version}</bundle> - <feature version="${mime4j.version}">apache-james-mime4j</feature> - <feature version="${commons-configuration-osgi.version}">commons-configuration</feature> - <bundle>mvn:org.apache.james/apache-james-mailbox-maildir/${mailbox.version}</bundle> - </feature> - - <feature name="james-server-mailet-container-camel" version="${project.version}"> - <bundle dependency="true">mvn:org.apache.james/james-server-mailetcontainer-camel/${project.version}</bundle> - <feature version="${project.version}">james-server-mailetcontainer-api</feature> - <feature version="${project.version}">james-server-queue-api</feature> - <feature version="${project.version}">james-server-util</feature> - <feature version="${project.version}">james-server-dnsservice-library</feature> - <feature version="${project.version}">james-server-lifecycle-api</feature> - <feature version="${project.version}">james-server-data-api</feature> - <feature version="${project.version}">james-server-core</feature> - <bundle dependency="true">mvn:org.apache.james/apache-mailet-api/${mailet.version}</bundle> - <feature version="${project.version}">james-server-filesystem-api</feature> - <feature version="${project.version}">james-server-data-library</feature> - <feature version="${commons-configuration-osgi.version}">commons-configuration</feature> - <bundle dependency="true">mvn:org.apache.camel/camel-core/${camel.version}</bundle> - <bundle dependency="true"> - mvn:org.apache.geronimo.javamail/geronimo-javamail_1.4_mail/${geronimo-javamail.version} - </bundle> - <bundle dependency="true"> - mvn:org.apache.geronimo.specs/geronimo-annotation_1.1_spec/${geronimo-annotation-spec.version} - </bundle> - <bundle dependency="true"> - mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.javax-inject/${javax-inject-osgi.version} - </bundle> - </feature> - - <feature name="james-server-mailets" version="${project.version}"> - <bundle>mvn:org.apache.james/james-server-mailets/${project.version}</bundle> - <feature version="${project.version}">james-server-util</feature> - <feature version="${project.version}">james-server-dnsservice-library</feature> - <feature version="${project.version}">james-server-lifecycle-api</feature> - <feature version="${project.version}">james-server-filesystem-api</feature> - <feature version="${project.version}">james-server-queue-api</feature> - <feature version="${project.version}">james-server-data-api</feature> - <feature version="${project.version}">james-server-data-library</feature> - <feature version="${project.version}">james-server-core</feature> - <bundle>mvn:org.apache.james/apache-jsieve-mailet/${jsieve.version}</bundle> - <bundle>mvn:org.apache.james/apache-mailet-api/${mailet.version}</bundle> - <bundle>mvn:org.apache.james.jspf/apache-jspf-resolver/${apache-jspf-resolver.version}</bundle> - <bundle>mvn:org.apache.james/apache-james-mailbox-api/${mailbox.version}</bundle> - <bundle>mvn:org.apache.james.protocols/protocols-smtp/${protocols.version}</bundle> - <feature version="${commons-configuration-osgi.version}">commons-configuration</feature> - <bundle>mvn:org.apache.camel/camel-core/${camel.version}</bundle> - <bundle>mvn:org.apache.geronimo.javamail/geronimo-javamail_1.4_mail/${geronimo-javamail.version}</bundle> - <bundle>mvn:org.apache.geronimo.specs/geronimo-annotation_1.1_spec/${geronimo-annotation-spec.version}</bundle> - </feature> - - <feature name="james-protocols-imap" version="${protocols.version}"> - <bundle>mvn:org.apache.james.protocols/protocols-imap/${protocols.version}</bundle> - <bundle>mvn:org.apache.james/apache-james-mailbox-api/${mailbox.version}</bundle> - <feature version="${mime4j.version}">apache-james-mime4j</feature> - <bundle>mvn:org.apache.geronimo.javamail/geronimo-javamail_1.4_mail/${geronimo-javamail.version}</bundle> - <bundle>mvn:commons-codec/commons-codec/${commons-codec.version}</bundle> - <bundle>mvn:commons-lang/commons-lang/${commons-lang.version}</bundle> - <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jutf7/1.0.0_0-SNAPSHOT</bundle> - </feature> - - <feature name="james-server-protocols-imap" version="${project.version}"> - <bundle>mvn:org.apache.james/james-server-protocols-imap4/${project.version}</bundle> - <feature version="${project.version}">james-server-protocols-library</feature> - <feature version="${project.version}">james-server-filesystem-api</feature> - <feature version="${protocols.version}">james-protocols-imap</feature> - <feature version="${commons-configuration-osgi.version}">commons-configuration</feature> - <bundle>mvn:commons-io/commons-io/${commons-io.version}</bundle> - <bundle>mvn:org.apache.james.protocols/protocols-netty/${protocols.version}</bundle> - <bundle>mvn:io.netty/netty/${netty.version}</bundle> - <bundle>mvn:org.apache.geronimo.specs/geronimo-annotation_1.1_spec/${geronimo-annotation-spec.version}</bundle> - <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jutf7/1.0.0_0-SNAPSHOT</bundle> - </feature> - - <feature name="james-server-protocols-smtp" version="${project.version}"> - <bundle>mvn:org.apache.james/james-server-protocols-smtp/${project.version}</bundle> - <feature version="${project.version}">james-server-util</feature> - <feature version="${project.version}">james-server-dnsservice-library</feature> - <feature version="${project.version}">james-server-queue-api</feature> - <feature version="${project.version}">james-server-filesystem-api</feature> - <feature version="${project.version}">james-server-data-api</feature> - <feature version="${project.version}">james-server-lifecycle-api</feature> - <feature version="${project.version}">james-server-core</feature> - <feature version="${project.version}">james-server-protocols-library</feature> - <bundle>mvn:org.apache.james/apache-mailet-api/${mailet.version}</bundle> - - <bundle>mvn:org.apache.james.protocols/protocols-api/${protocols.version}</bundle> - <bundle>mvn:org.apache.james.protocols/protocols-smtp/${protocols.version}</bundle> - <bundle>mvn:org.apache.james.protocols/protocols-netty/${protocols.version}</bundle> - <bundle>mvn:org.apache.james.jspf/apache-jspf-resolver/${apache-jspf-resolver.version}</bundle> - <feature version="${commons-configuration-osgi.version}">commons-configuration</feature> - - <bundle>mvn:org.apache.geronimo.javamail/geronimo-javamail_1.4_mail/${geronimo-javamail.version}</bundle> - <bundle>mvn:org.apache.geronimo.specs/geronimo-annotation_1.1_spec/${geronimo-annotation-spec.version}</bundle> - <bundle>mvn:org.apache.geronimo.specs/geronimo-activation_1.1_spec/${geronimo-activation-spec.version}</bundle> - <bundle>mvn:io.netty/netty/${netty.version}</bundle> - </feature> - - <feature name="james-server-protocols-lmtp" version="${project.version}"> - <bundle>mvn:org.apache.james/james-server-protocols-lmtp/${project.version}</bundle> - <feature version="${project.version}">james-server-protocols-smtp</feature> - <feature version="${project.version}">james-server-lifecycle-api</feature> - <feature version="${project.version}">james-server-core</feature> - <feature version="${project.version}">james-server-protocols-library</feature> - <bundle>mvn:org.apache.james/apache-mailet-api/${mailet.version}</bundle> - <bundle>mvn:org.apache.james.protocols/protocols-api/${protocols.version}</bundle> - <bundle>mvn:org.apache.james.protocols/protocols-smtp/${protocols.version}</bundle> - <bundle>mvn:org.apache.james.protocols/protocols-lmtp/${protocols.version}</bundle> - <bundle>mvn:org.apache.james.protocols/protocols-netty/${protocols.version}</bundle> - <bundle>mvn:org.apache.james/apache-james-mailbox-api/${mailbox.version}</bundle> - <feature version="${commons-configuration-osgi.version}">commons-configuration</feature> - <bundle>mvn:org.apache.geronimo.javamail/geronimo-javamail_1.4_mail/${geronimo-javamail.version}</bundle> - <bundle>mvn:org.apache.geronimo.specs/geronimo-annotation_1.1_spec/${geronimo-annotation-spec.version}</bundle> - <bundle>mvn:io.netty/netty/${netty.version}</bundle> - </feature> - - <feature name="commons-configuration" version="${commons-configuration-osgi.version}"> - <bundle> - mvn:org.apache.servicemix.bundles/org.apache.servicemmix.bundles.commons-configuration/${commons-configuration-osgi.version} - </bundle> - <feature>war</feature> - <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-beanutils/1.8.3_1</bundle> - <bundle>mvn:commons-jxpath/commons-jxpath/1.3</bundle> - <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlresolver/1.2_5</bundle> - <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-collections/3.2.1_3</bundle> - <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/1.1_4</bundle> - <bundle>mvn:commons-codec/commons-codec/${commons-codec.version}</bundle> - <bundle>mvn:commons-lang/commons-lang/${commons-lang.version}</bundle> - <bundle>mvn:commons-digester/commons-digester/1.8.1</bundle> - <bundle>mvn:org.apache.commons/commons-jexl/2.1.1</bundle> - </feature> - -</features> diff --git a/server/karaf/integration/pom.xml b/server/karaf/integration/pom.xml deleted file mode 100644 index a8e0819..0000000 --- a/server/karaf/integration/pom.xml +++ /dev/null @@ -1,167 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<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/xsd/maven-4.0.0.xsd";> - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.apache.james</groupId> - <artifactId>james-server</artifactId> - <version>3.2.0-SNAPSHOT</version> - <relativePath>../../pom.xml</relativePath> - </parent> - - <artifactId>james-karaf-integration</artifactId> - <packaging>pom</packaging> - <name>Apache James :: Karaf :: Integration tests</name> - - <properties> - <exam.version>2.6.0</exam.version> - <karaf.tooling.exam.container.version>2.3.0</karaf.tooling.exam.container.version> - <pax-swissbox-tinybundles.version>1.3.1</pax-swissbox-tinybundles.version> - <url.version>1.4.0</url.version> - <felix.version>4.0.3</felix.version> - </properties> - - <dependencies> - <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.framework</artifactId> - <version>${felix.version}</version> - <scope>test</scope> - </dependency> - - <!-- Apache Felix Karaf integration --> - <dependency> - <groupId>${james.groupId}</groupId> - <artifactId>james-karaf-distribution</artifactId> - <type>tar.gz</type> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>org.apache.karaf</groupId> - <artifactId>org.apache.karaf.client</artifactId> - </exclusion> - <exclusion> - <groupId>org.eclipse.osgi</groupId> - <artifactId>org.eclipse.osgi</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>${james.groupId}</groupId> - <artifactId>james-karaf-features</artifactId> - <type>pom</type> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> - <artifactId>james-server-dnsservice-api</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> - <artifactId>james-server-dnsservice-dnsjava</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> - <artifactId>james-server-fetchmail</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> - <artifactId>james-server-mailetcontainer-camel</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.karaf.tooling.exam</groupId> - <artifactId>org.apache.karaf.tooling.exam.container</artifactId> - <scope>test</scope> - <version>${karaf.tooling.exam.container.version}</version> - </dependency> - - <!-- Pax-Exam dependencies --> - <dependency> - <groupId>org.ops4j.pax.exam</groupId> - <artifactId>pax-exam</artifactId> - <version>${exam.version}</version> - </dependency> - <dependency> - <groupId>org.ops4j.pax.exam</groupId> - <artifactId>pax-exam-junit4</artifactId> - <version>${exam.version}</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.ops4j.pax.exam</groupId> - <artifactId>pax-exam-link-mvn</artifactId> - <version>${exam.version}</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.ops4j.pax.swissbox</groupId> - <artifactId>pax-swissbox-tinybundles</artifactId> - <version>${pax-swissbox-tinybundles.version}</version> - </dependency> - - <dependency> - <groupId>org.ops4j.pax.url</groupId> - <artifactId>pax-url-aether</artifactId> - <version>${url.version}</version> - <scope>test</scope> - </dependency> - - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.ops4j.pax.exam</groupId> - <artifactId>maven-paxexam-plugin</artifactId> - <version>1.2.4</version> - <executions> - <execution> - <id>generate-config</id> - <goals> - <goal>generate-config</goal> - <goal>generate-depends-file</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - - <profiles> - <profile> - <!-- run live tests, ie. ones that do not run stably enough in - a CI environment (for example, karaf integration tests accessing external network - resources) --> - <id>livetests</id> - <build> - <plugins> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <includes> - <include>**/*TestLive.java</include> - </includes> - </configuration> - </plugin> - </plugins> - </build> - </profile> - </profiles> - -</project> diff --git a/server/karaf/integration/src/test/java/org/apache/james/karaf/features/CommonsConfigurationLiveTest.java b/server/karaf/integration/src/test/java/org/apache/james/karaf/features/CommonsConfigurationLiveTest.java deleted file mode 100644 index e69de29..0000000 diff --git a/server/karaf/integration/src/test/java/org/apache/james/karaf/features/CommonsConfigurationTestLive.java b/server/karaf/integration/src/test/java/org/apache/james/karaf/features/CommonsConfigurationTestLive.java deleted file mode 100644 index d862877..0000000 --- a/server/karaf/integration/src/test/java/org/apache/james/karaf/features/CommonsConfigurationTestLive.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.apache.james.karaf.features; - -import org.junit.Test; - -public class CommonsConfigurationTestLive extends KarafLiveTestSupport { - - @Test - public void testInstallCommonsConfigurationFeature() throws Exception { - addJamesFeaturesRepository(); - features.installFeature("commons-configuration"); - assertInstalled("commons-configuration"); - assertBundlesAreActive(); - } -} diff --git a/server/karaf/integration/src/test/java/org/apache/james/karaf/features/DnsServiceLiveTest.java b/server/karaf/integration/src/test/java/org/apache/james/karaf/features/DnsServiceLiveTest.java deleted file mode 100644 index e69de29..0000000 diff --git a/server/karaf/integration/src/test/java/org/apache/james/karaf/features/DnsServiceTestLive.java b/server/karaf/integration/src/test/java/org/apache/james/karaf/features/DnsServiceTestLive.java deleted file mode 100644 index ceb7263..0000000 --- a/server/karaf/integration/src/test/java/org/apache/james/karaf/features/DnsServiceTestLive.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.apache.james.karaf.features; - -import org.apache.james.dnsservice.api.DNSService; -import org.junit.Test; - -public class DnsServiceTestLive extends KarafLiveTestSupport { - - @Test - public void testInstallJamesDnsServiceDnsJava() throws Exception { - addJamesFeaturesRepository(); - features.installFeature("james-server-dnsservice-dnsjava"); - assertInstalled("james-server-dnsservice-dnsjava"); - assertBundlesAreActive(); - assertOSGiServiceStartsIn(DNSService.class, WAIT_30_SECONDS); - } -} diff --git a/server/karaf/integration/src/test/java/org/apache/james/karaf/features/FetchMailLiveTest.java b/server/karaf/integration/src/test/java/org/apache/james/karaf/features/FetchMailLiveTest.java deleted file mode 100644 index e69de29..0000000 diff --git a/server/karaf/integration/src/test/java/org/apache/james/karaf/features/FetchMailTestLive.java b/server/karaf/integration/src/test/java/org/apache/james/karaf/features/FetchMailTestLive.java deleted file mode 100644 index 8c44b42..0000000 --- a/server/karaf/integration/src/test/java/org/apache/james/karaf/features/FetchMailTestLive.java +++ /dev/null @@ -1,15 +0,0 @@ -package org.apache.james.karaf.features; - -import org.apache.james.fetchmail.FetchScheduler; -import org.junit.Test; - -public class FetchMailTestLive extends KarafLiveTestSupport { - @Test - public void testInstallJamesFetchMailFeature() throws Exception { - addJamesFeaturesRepository(); - features.installFeature("james-server-fetchmail"); - assertInstalled("james-server-fetchmail"); - assertBundlesAreActive(); - assertOSGiServiceStartsIn(FetchScheduler.class, WAIT_30_SECONDS); - } -} diff --git a/server/karaf/integration/src/test/java/org/apache/james/karaf/features/KarafLiveTestSupport.java b/server/karaf/integration/src/test/java/org/apache/james/karaf/features/KarafLiveTestSupport.java deleted file mode 100644 index c00c118..0000000 --- a/server/karaf/integration/src/test/java/org/apache/james/karaf/features/KarafLiveTestSupport.java +++ /dev/null @@ -1,152 +0,0 @@ -package org.apache.james.karaf.features; - -import static org.apache.karaf.tooling.exam.options.KarafDistributionOption.karafDistributionConfiguration; -import static org.apache.karaf.tooling.exam.options.KarafDistributionOption.keepRuntimeFolder; -import static org.apache.karaf.tooling.exam.options.KarafDistributionOption.logLevel; -import static org.assertj.core.api.Fail.fail; -import static org.ops4j.pax.exam.CoreOptions.maven; -import static org.ops4j.pax.exam.CoreOptions.systemProperty; - -import java.io.File; -import java.net.URI; -import java.util.concurrent.TimeUnit; - -import javax.inject.Inject; - -import org.apache.karaf.features.Feature; -import org.apache.karaf.features.FeaturesService; -import org.apache.karaf.tooling.exam.options.KarafDistributionConfigurationFilePutOption; -import org.apache.karaf.tooling.exam.options.LogLevelOption; -import org.junit.Before; -import org.junit.runner.RunWith; -import org.ops4j.pax.exam.MavenUtils; -import org.ops4j.pax.exam.Option; -import org.ops4j.pax.exam.junit.Configuration; -import org.ops4j.pax.exam.junit.ExamReactorStrategy; -import org.ops4j.pax.exam.junit.JUnit4TestRunner; -import org.ops4j.pax.exam.options.MavenArtifactProvisionOption; -import org.ops4j.pax.exam.options.MavenArtifactUrlReference; -import org.ops4j.pax.exam.spi.reactors.EagerSingleStagedReactorFactory; -import org.osgi.framework.Bundle; -import org.osgi.framework.BundleContext; -import org.osgi.util.tracker.ServiceTracker; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.google.common.base.Stopwatch; - -/** - * Base class for integration testing with Karaf. - */ -@RunWith(JUnit4TestRunner.class) -@ExamReactorStrategy(EagerSingleStagedReactorFactory.class) -public class KarafLiveTestSupport { - - private static final Logger LOG = LoggerFactory.getLogger(KarafLiveTestSupport.class); - public static final int WAIT_30_SECONDS = 30000; - - private static final String DISTRIBUTION_GROUP_ID = "org.apache.james.karaf"; - private static final String DISTRIBUTION_ARTIFACT_ID = "james-karaf-distribution"; - - @Inject - FeaturesService features; - - @Inject - BundleContext bundleContext; - - String featuresVersion; - - @Configuration - public static Option[] configuration() throws Exception { - - MavenArtifactUrlReference karafUrl = maven().groupId(DISTRIBUTION_GROUP_ID) - .artifactId(DISTRIBUTION_ARTIFACT_ID) - .versionAsInProject() - .type("tar.gz"); - - String jamesFeaturesVersion = MavenUtils.getArtifactVersion("org.apache.james.karaf", "james-karaf-features"); - - return new Option[]{ - karafDistributionConfiguration() - .frameworkUrl(karafUrl) - .karafVersion(getDistributionVersionAsInProject()) - .name("Apache Karaf") - .unpackDirectory(new File("target/exam")), - logLevel(LogLevelOption.LogLevel.INFO), - new KarafDistributionConfigurationFilePutOption("etc/custom.properties", - "org.osgi.framework.system.packages.extra", - "sun.net.spi.nameservice"), - keepRuntimeFolder(), - new MavenArtifactProvisionOption().groupId("com.google.guava").artifactId("guava").versionAsInProject(), - // use system property to provide project version for tests - systemProperty("james-karaf-features").value(jamesFeaturesVersion) - }; - } - - public static String getDistributionVersionAsInProject() { - return MavenUtils.asInProject().getVersion(DISTRIBUTION_GROUP_ID, DISTRIBUTION_ARTIFACT_ID); - } - - @Before - public void setUp() { - featuresVersion = System.getProperty("james-karaf-features"); - } - - void assertInstalled(String featureName) throws Exception { - Feature feature = features.getFeature(featureName); - assertTrue("Feature " + featureName + " should be installed", features.isInstalled(feature)); - } - - void assertBundlesAreActive() { - for (Bundle bundle : bundleContext.getBundles()) { - LOG.info("***** bundle {} is {}", bundle.getSymbolicName(), bundle.getState()); - assertThat(bundle.getState()).describedAs("Bundle " + bundle.getSymbolicName() + " is not active").isEqualTo(Bundle.ACTIVE); - } - } - - void addJamesFeaturesRepository() throws Exception { - String url = maven("org.apache.james.karaf", "james-karaf-features") - .version(featuresVersion) - .classifier("features") - .type("xml") - .getURL(); - - features.addRepository(new URI(url)); - features.installFeature("spring-dm"); - features.installFeature("war"); - } - - void assertOSGiServiceStartsIn(Class clazz, int timeoutInMilliseconds) throws InterruptedException { - final ServiceTracker tracker = new ServiceTracker(bundleContext, clazz, null); - tracker.open(true); - try { - final Stopwatch stopwatch = Stopwatch.createStarted(); - final int expectedCount = 1; - - while (true) { - Object[] services = tracker.getServices(); - if (services == null || services.length < expectedCount) { - final int actualCount = (services == null) ? 0 : services.length; - if (stopwatch.elapsed(TimeUnit.MILLISECONDS) > timeoutInMilliseconds) { - fail(String.format("Expected to find %d services of type %s. Found only %d in %d milliseconds", - expectedCount, clazz.getCanonicalName(), actualCount, timeoutInMilliseconds)); - } - - LOG.info("Found {} services implementing {}. Trying again in 1s.", - actualCount, clazz.getCanonicalName()); - TimeUnit.SECONDS.sleep(1); - - } else if (services.length > expectedCount) { - fail(String.format("Expected to find %d services implementing %s. Found %d (more than expected).", - expectedCount, clazz.getCanonicalName(), services.length)); - - } else if (services.length == expectedCount) { - break; /* done - the test was successful */ - } - } - - } finally { - tracker.close(); - } - } -} diff --git a/server/karaf/integration/src/test/java/org/apache/james/karaf/features/MailetContainerLiveTest.java b/server/karaf/integration/src/test/java/org/apache/james/karaf/features/MailetContainerLiveTest.java deleted file mode 100644 index e69de29..0000000 diff --git a/server/karaf/integration/src/test/java/org/apache/james/karaf/features/MailetContainerTestLive.java b/server/karaf/integration/src/test/java/org/apache/james/karaf/features/MailetContainerTestLive.java deleted file mode 100644 index 98cad79..0000000 --- a/server/karaf/integration/src/test/java/org/apache/james/karaf/features/MailetContainerTestLive.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.apache.james.karaf.features; - -import org.apache.james.mailetcontainer.api.MailProcessor; -import org.apache.james.mailetcontainer.api.jmx.MailSpoolerMBean; -import org.apache.mailet.MailetContext; -import org.junit.Test; - -public class MailetContainerTestLive extends KarafLiveTestSupport { - - @Test - public void testInstallMailetContainerFeature() throws Exception { - addJamesFeaturesRepository(); - String mailetContainerFeature = "james-server-mailet-container-camel"; - features.installFeature(mailetContainerFeature); - assertInstalled(mailetContainerFeature); - assertBundlesAreActive(); - assertOSGiServiceStartsIn(MailetContext.class, WAIT_30_SECONDS); - assertOSGiServiceStartsIn(MailProcessor.class, WAIT_30_SECONDS); - assertOSGiServiceStartsIn(MailSpoolerMBean.class, WAIT_30_SECONDS); - } -} diff --git a/server/karaf/integration/src/test/java/org/apache/james/karaf/features/Mime4jLiveTest.java b/server/karaf/integration/src/test/java/org/apache/james/karaf/features/Mime4jLiveTest.java deleted file mode 100644 index e69de29..0000000 diff --git a/server/karaf/integration/src/test/java/org/apache/james/karaf/features/Mime4jTestLive.java b/server/karaf/integration/src/test/java/org/apache/james/karaf/features/Mime4jTestLive.java deleted file mode 100644 index 2cb0263..0000000 --- a/server/karaf/integration/src/test/java/org/apache/james/karaf/features/Mime4jTestLive.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.apache.james.karaf.features; - -import org.junit.Test; - -public class Mime4jTestLive extends KarafLiveTestSupport { - - @Test - public void testInstallApacheMime4jFeature() throws Exception { - addJamesFeaturesRepository(); - features.installFeature("apache-james-mime4j"); - assertInstalled("apache-james-mime4j"); - assertBundlesAreActive(); - } -} diff --git a/server/mailet/mailetcontainer-camel/src/main/resources/META-INF/spring/mailetcontainer-osgi.xml b/server/mailet/mailetcontainer-camel/src/main/resources/META-INF/spring/mailetcontainer-osgi.xml deleted file mode 100644 index 7ce71be..0000000 --- a/server/mailet/mailetcontainer-camel/src/main/resources/META-INF/spring/mailetcontainer-osgi.xml +++ /dev/null @@ -1,50 +0,0 @@ -<?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. ---> -<beans:beans - xmlns="http://www.springframework.org/schema/osgi"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xmlns:beans="http://www.springframework.org/schema/beans"; - xmlns:osgi="http://www.springframework.org/schema/osgi"; - xsi:schemaLocation="http://www.springframework.org/schema/osgi - http://www.springframework.org/schema/osgi/spring-osgi-1.2.xsd - http://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans-3.0.xsd";> - - <osgi:service ref="mailetcontext"> - <osgi:interfaces> - <beans:value>org.apache.mailet.MailetContext</beans:value> - </osgi:interfaces> - </osgi:service> - - <osgi:service ref="mailspooler"> - <osgi:interfaces> - <!-- - TODO: must expose a public interface, because classes in .impl packages are not exported in OSGi - <beans:value>org.apache.james.mailetcontainer.impl.JamesMailSpooler</beans:value> - --> - <beans:value>org.apache.james.mailetcontainer.api.jmx.MailSpoolerMBean</beans:value> - </osgi:interfaces> - </osgi:service> - <osgi:service ref="mailprocessor"> - <osgi:interfaces> - <beans:value>org.apache.james.mailetcontainer.api.MailProcessor</beans:value> - </osgi:interfaces> - </osgi:service> -</beans:beans> diff --git a/server/protocols/fetchmail/src/main/resources/META-INF/spring/fetchmail-osgi.xml b/server/protocols/fetchmail/src/main/resources/META-INF/spring/fetchmail-osgi.xml deleted file mode 100644 index b6a0766..0000000 --- a/server/protocols/fetchmail/src/main/resources/META-INF/spring/fetchmail-osgi.xml +++ /dev/null @@ -1,36 +0,0 @@ -<?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. ---> -<beans:beans - xmlns="http://www.springframework.org/schema/osgi"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xmlns:beans="http://www.springframework.org/schema/beans"; - xmlns:osgi="http://www.springframework.org/schema/osgi"; - xsi:schemaLocation="http://www.springframework.org/schema/osgi - http://www.springframework.org/schema/osgi/spring-osgi-1.2.xsd - http://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans-3.0.xsd";> - - <osgi:service ref="fetchmail"> - <osgi:interfaces> - <beans:value>org.apache.james.fetchmail.FetchScheduler</beans:value> - <beans:value>org.apache.james.fetchmail.FetchSchedulerMBean</beans:value> - </osgi:interfaces> - </osgi:service> -</beans:beans> diff --git a/server/protocols/protocols-imap4/src/main/resources/META-INF/spring/imapserver-osgi.xml b/server/protocols/protocols-imap4/src/main/resources/META-INF/spring/imapserver-osgi.xml deleted file mode 100644 index bcaab44..0000000 --- a/server/protocols/protocols-imap4/src/main/resources/META-INF/spring/imapserver-osgi.xml +++ /dev/null @@ -1,36 +0,0 @@ -<?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. ---> -<beans:beans - xmlns="http://www.springframework.org/schema/osgi"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xmlns:beans="http://www.springframework.org/schema/beans"; - xmlns:osgi="http://www.springframework.org/schema/osgi"; - xsi:schemaLocation="http://www.springframework.org/schema/osgi - http://www.springframework.org/schema/osgi/spring-osgi-1.2.xsd - http://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans-3.0.xsd";> - - <osgi:service ref="imapserver"> - <osgi:interfaces> - <beans:value>org.apache.james.imapserver.netty.IMAPServerMBean</beans:value> - </osgi:interfaces> - </osgi:service> - -</beans:beans> diff --git a/server/protocols/protocols-lmtp/src/main/resources/META-INF/spring/lmtpserver-osgi.xml b/server/protocols/protocols-lmtp/src/main/resources/META-INF/spring/lmtpserver-osgi.xml deleted file mode 100644 index dab3d38..0000000 --- a/server/protocols/protocols-lmtp/src/main/resources/META-INF/spring/lmtpserver-osgi.xml +++ /dev/null @@ -1,35 +0,0 @@ -<?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. ---> -<beans:beans - xmlns="http://www.springframework.org/schema/osgi"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xmlns:beans="http://www.springframework.org/schema/beans"; - xmlns:osgi="http://www.springframework.org/schema/osgi"; - xsi:schemaLocation="http://www.springframework.org/schema/osgi - http://www.springframework.org/schema/osgi/spring-osgi-1.2.xsd - http://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans-3.0.xsd";> - - <osgi:service ref="lmtpserver"> - <osgi:interfaces> - <beans:value>org.apache.james.lmtpserver.netty.LMTPServerMBean</beans:value> - </osgi:interfaces> - </osgi:service> -</beans:beans> diff --git a/server/protocols/protocols-pop3/src/main/resources/META-INF/spring/pop3server-osgi.xml b/server/protocols/protocols-pop3/src/main/resources/META-INF/spring/pop3server-osgi.xml deleted file mode 100644 index 23d64ad..0000000 --- a/server/protocols/protocols-pop3/src/main/resources/META-INF/spring/pop3server-osgi.xml +++ /dev/null @@ -1,36 +0,0 @@ -<?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. ---> -<beans:beans - xmlns="http://www.springframework.org/schema/osgi"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xmlns:beans="http://www.springframework.org/schema/beans"; - xmlns:osgi="http://www.springframework.org/schema/osgi"; - xsi:schemaLocation="http://www.springframework.org/schema/osgi - http://www.springframework.org/schema/osgi/spring-osgi-1.2.xsd - http://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans-3.0.xsd";> - - <osgi:service ref="pop3server"> - <osgi:interfaces> - <beans:value>org.apache.james.pop3server.netty.POP3ServerMBean</beans:value> - </osgi:interfaces> - </osgi:service> - -</beans:beans> diff --git a/server/protocols/protocols-smtp/src/main/resources/META-INF/spring/smtpserver-osgi.xml b/server/protocols/protocols-smtp/src/main/resources/META-INF/spring/smtpserver-osgi.xml deleted file mode 100644 index 3ea2a5a..0000000 --- a/server/protocols/protocols-smtp/src/main/resources/META-INF/spring/smtpserver-osgi.xml +++ /dev/null @@ -1,35 +0,0 @@ -<?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. ---> -<beans:beans - xmlns="http://www.springframework.org/schema/osgi"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xmlns:beans="http://www.springframework.org/schema/beans"; - xmlns:osgi="http://www.springframework.org/schema/osgi"; - xsi:schemaLocation="http://www.springframework.org/schema/osgi - http://www.springframework.org/schema/osgi/spring-osgi-1.2.xsd - http://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans-3.0.xsd";> - - <osgi:service ref="smtpserver"> - <osgi:interfaces> - <beans:value>org.apache.james.smtpserver.netty.SMTPServerMBean</beans:value> - </osgi:interfaces> - </osgi:service> -</beans:beans> diff --git a/server/queue/queue-activemq/src/main/resources/META-INF/spring/activemq-queue-osgi.xml b/server/queue/queue-activemq/src/main/resources/META-INF/spring/activemq-queue-osgi.xml deleted file mode 100644 index 0415345..0000000 --- a/server/queue/queue-activemq/src/main/resources/META-INF/spring/activemq-queue-osgi.xml +++ /dev/null @@ -1,48 +0,0 @@ -<?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. ---> -<beans:beans - xmlns="http://www.springframework.org/schema/osgi"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xmlns:beans="http://www.springframework.org/schema/beans"; - xmlns:osgi="http://www.springframework.org/schema/osgi"; - xsi:schemaLocation="http://www.springframework.org/schema/osgi - http://www.springframework.org/schema/osgi/spring-osgi-1.2.xsd - http://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans-3.0.xsd";> - - <!-- Configuration Admin entries so the user can overwrite them if needed --> - <!--<osgix:cm-properties id="cmProps" persistent-id="org.apache.james.activemq">--> - <!--<prop key="brokerURL">vm://james?create=false</prop>--> - <!--<prop key="sessionCacheSize">10</prop>--> - <!--<prop key="baseDir">/var/store/activemq/</prop>--> - <!--<prop key="useBlobMessages">true</prop>--> - <!--</osgix:cm-properties>--> - - <!-- placeholder configurer --> - <!--<ctx:property-placeholder properties-ref="cmProps"/>--> - - - <osgi:service ref="mailqueuefactory"> - <osgi:interfaces> - <beans:value>org.apache.james.queue.api.MailQueueFactory</beans:value> - </osgi:interfaces> - </osgi:service> - -</beans:beans> diff --git a/server/queue/queue-file/src/main/resources/META-INF/spring/file-queue-osgi.xml b/server/queue/queue-file/src/main/resources/META-INF/spring/file-queue-osgi.xml deleted file mode 100644 index e41e8a0..0000000 --- a/server/queue/queue-file/src/main/resources/META-INF/spring/file-queue-osgi.xml +++ /dev/null @@ -1,35 +0,0 @@ -<?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. ---> -<beans:beans xmlns="http://www.springframework.org/schema/osgi"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xmlns:beans="http://www.springframework.org/schema/beans"; - xmlns:osgi="http://www.springframework.org/schema/osgi"; - xsi:schemaLocation="http://www.springframework.org/schema/osgi - http://www.springframework.org/schema/osgi/spring-osgi-1.2.xsd - http://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans-3.0.xsd";> - - <osgi:service ref="mailqueuefactory"> - <osgi:interfaces> - <beans:value>org.apache.james.queue.api.MailQueueFactory</beans:value> - </osgi:interfaces> - </osgi:service> - -</beans:beans> \ No newline at end of file --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
