You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by er...@apache.org on 2010/10/21 14:05:39 UTC
svn commit: r1025965 - in /james/server/trunk: spring-common/
spring-deployment/
spring-deployment/src/main/java/org/apache/james/container/spring/
spring-deployment/src/main/java/org/apache/james/container/spring/lifecycle/
spring-deployment/src/main/...
Author: eric
Date: Thu Oct 21 12:05:38 2010
New Revision: 1025965
URL: http://svn.apache.org/viewvc?rev=1025965&view=rev
Log:
Merge spring-common and spring-deployment (JAMES-1080)
Added:
james/server/trunk/spring-deployment/src/main/java/org/apache/james/container/spring/FileSystemResolver.java
- copied unchanged from r1025861, james/server/trunk/spring-common/src/main/java/org/apache/james/container/spring/FileSystemResolver.java
james/server/trunk/spring-deployment/src/main/java/org/apache/james/container/spring/JamesResourceLoader.java
- copied unchanged from r1025861, james/server/trunk/spring-common/src/main/java/org/apache/james/container/spring/JamesResourceLoader.java
james/server/trunk/spring-deployment/src/main/java/org/apache/james/container/spring/SpringFileSystem.java
- copied unchanged from r1025861, james/server/trunk/spring-common/src/main/java/org/apache/james/container/spring/SpringFileSystem.java
james/server/trunk/spring-deployment/src/main/java/org/apache/james/container/spring/SpringInstanceFactory.java
- copied unchanged from r1025861, james/server/trunk/spring-common/src/main/java/org/apache/james/container/spring/SpringInstanceFactory.java
james/server/trunk/spring-deployment/src/main/java/org/apache/james/container/spring/lifecycle/
- copied from r1025861, james/server/trunk/spring-common/src/main/java/org/apache/james/container/spring/lifecycle/
james/server/trunk/spring-deployment/src/main/resources/
- copied from r1025861, james/server/trunk/spring-common/src/main/resources/
Removed:
james/server/trunk/spring-common/
Modified:
james/server/trunk/spring-deployment/pom.xml
Modified: james/server/trunk/spring-deployment/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/spring-deployment/pom.xml?rev=1025965&r1=1025964&r2=1025965&view=diff
==============================================================================
--- james/server/trunk/spring-deployment/pom.xml (original)
+++ james/server/trunk/spring-deployment/pom.xml Thu Oct 21 12:05:38 2010
@@ -316,6 +316,49 @@
<version>2.4</version>
</plugin>
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+ <manifest>
+ <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+ <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+ </manifest>
+ <manifestEntries>
+ <Fragment-Host>org.springframework.osgi.extender</Fragment-Host>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>jar</goal>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>bundle-manifest</id>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>manifest</goal>
+ </goals>
+ </execution>
+ </executions>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Export-Package>org.apache.james.container.spring.*</Export-Package>
+ <Embed-Dependency>*;scope=runtime</Embed-Dependency>
+ </instructions>
+ </configuration>
+ </plugin>
</plugins>
</build>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org