cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1177030 - in /cxf/trunk: osgi/karaf/commands/pom.xml osgi/karaf/features/src/main/resources/features.xml parent/pom.xml services/sts/sts-core/pom.xml
Date Wed, 28 Sep 2011 19:46:14 GMT
Author: dkulp
Date: Wed Sep 28 19:46:14 2011
New Revision: 1177030

URL: http://svn.apache.org/viewvc?rev=1177030&view=rev
Log:
Turn the sts into an OSGi bundle, add it to the features

Modified:
    cxf/trunk/osgi/karaf/commands/pom.xml
    cxf/trunk/osgi/karaf/features/src/main/resources/features.xml
    cxf/trunk/parent/pom.xml
    cxf/trunk/services/sts/sts-core/pom.xml

Modified: cxf/trunk/osgi/karaf/commands/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/osgi/karaf/commands/pom.xml?rev=1177030&r1=1177029&r2=1177030&view=diff
==============================================================================
--- cxf/trunk/osgi/karaf/commands/pom.xml (original)
+++ cxf/trunk/osgi/karaf/commands/pom.xml Wed Sep 28 19:46:14 2011
@@ -74,6 +74,8 @@
               org.apache.karaf.shell.console,
               *
                         </Import-Package>
+                        <_nouses>true</_nouses>
+                        <_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
                     </instructions>
                 </configuration>
             </plugin>

Modified: cxf/trunk/osgi/karaf/features/src/main/resources/features.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/osgi/karaf/features/src/main/resources/features.xml?rev=1177030&r1=1177029&r2=1177030&view=diff
==============================================================================
--- cxf/trunk/osgi/karaf/features/src/main/resources/features.xml (original)
+++ cxf/trunk/osgi/karaf/features/src/main/resources/features.xml Wed Sep 28 19:46:14 2011
@@ -106,4 +106,12 @@
         <bundle>mvn:org.apache.cxf.karaf/cxf-karaf-commands/${project.version}</bundle>
     </feature>
 
+    <feature name="cxf-sts" version="${project.version}" resolver='(obr)'>
+        <feature version="${project.version}">cxf</feature>
+
+        <bundle dependency="true">mvn:com.hazelcast/hazelcast/${cxf.hazelcast.version}</bundle>
+        <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ehcache/${cxf.ehcache.bundle.version}</bundle>
+
+        <bundle>mvn:org.apache.cxf.services.sts/cxf-services-sts-core/${project.version}</bundle>
+    </feature>
 </features>

Modified: cxf/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/parent/pom.xml?rev=1177030&r1=1177029&r2=1177030&view=diff
==============================================================================
--- cxf/trunk/parent/pom.xml (original)
+++ cxf/trunk/parent/pom.xml Wed Sep 28 19:46:14 2011
@@ -85,6 +85,7 @@
         <cxf.servlet-api-2.5.version>1.1.2</cxf.servlet-api-2.5.version>
         <cxf.spring.version>3.0.6.RELEASE</cxf.spring.version>
         <cxf.spring.osgi.version>1.2.1</cxf.spring.osgi.version>
+        <cxf.spring.ldap.version>1.3.1.RELEASE</cxf.spring.ldap.version>
         <cxf.spring.mock>spring-test</cxf.spring.mock>
         <cxf.stax.impl.groupId>org.codehaus.woodstox</cxf.stax.impl.groupId>
         <cxf.stax.impl.artifactId>woodstox-core-asl</cxf.stax.impl.artifactId>
@@ -119,12 +120,15 @@
 
         <cxf.cglib.bundle.version>2.2_1</cxf.cglib.bundle.version>
         <cxf.fastinfoset.bundle.version>1.2.7_3</cxf.fastinfoset.bundle.version>
-
+        <cxf.hazelcast.version>1.9.4</cxf.hazelcast.version>
+        <cxf.ehcache.version>2.4.4</cxf.ehcache.version>
+        
         <!-- various OSGi related versions -->
         <cxf.aries.version>0.3.1</cxf.aries.version>
         <cxf.osgi.version>4.2.0</cxf.osgi.version>
         <cxf.karaf.version>2.2.4-SNAPSHOT</cxf.karaf.version>
 
+        <cxf.ehcache.bundle.version>2.4.3_1</cxf.ehcache.bundle.version>
         <cxf.pax.logging.version>1.6.0</cxf.pax.logging.version>
         <cxf.felix.framework.version>2.0.5</cxf.felix.framework.version>
         <cxf.felix.configadmin.version>1.2.4</cxf.felix.configadmin.version>

Modified: cxf/trunk/services/sts/sts-core/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/services/sts/sts-core/pom.xml?rev=1177030&r1=1177029&r2=1177030&view=diff
==============================================================================
--- cxf/trunk/services/sts/sts-core/pom.xml (original)
+++ cxf/trunk/services/sts/sts-core/pom.xml Wed Sep 28 19:46:14 2011
@@ -19,9 +19,10 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
+    <groupId>org.apache.cxf.services.sts</groupId>
     <artifactId>cxf-services-sts-core</artifactId>
-    <packaging>jar</packaging>
-    <name>Apache CXF STS core</name>
+    <packaging>bundle</packaging>
+    <name>Apache CXF STS Core</name>
     <url>http://cxf.apache.org</url>
 
     <parent>
@@ -30,6 +31,9 @@
         <version>2.5.0-SNAPSHOT</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
+    <properties>
+        <cxf.surefire.fork.mode>pertest</cxf.surefire.fork.mode>
+    </properties>
 
     <dependencies>
         <dependency>
@@ -47,19 +51,19 @@
         <dependency>
             <groupId>net.sf.ehcache</groupId>
             <artifactId>ehcache-core</artifactId>
-            <version>2.4.4</version>
+            <version>${cxf.ehcache.version}</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
            <groupId>org.springframework.ldap</groupId>
            <artifactId>spring-ldap-core</artifactId>
-           <version>1.3.1.RELEASE</version>
+           <version>${cxf.spring.ldap.version}</version>
            <scope>compile</scope>
         </dependency>
         <dependency>
            <groupId>com.hazelcast</groupId>
            <artifactId>hazelcast</artifactId>
-           <version>1.9.4</version>
+           <version>${cxf.hazelcast.version}</version>
            <scope>compile</scope>
         </dependency> 
         <dependency>
@@ -81,54 +85,35 @@
    </dependencies>
 
    <build>
-        <testSourceDirectory>${basedir}/src/test/java</testSourceDirectory>
-        <testResources>
-            <testResource>
-                <directory>src/test/java</directory>
-                <excludes>
-                    <exclude>**/*.java</exclude>
-                </excludes>
-            </testResource>
-            <testResource>
-                <directory>src/test/resources</directory>
-                <includes>
-                    <include>**/*</include>
-                </includes>
-            </testResource>
-        </testResources>
-        
         <plugins>
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.6</version>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <extensions>true</extensions>
                 <configuration>
-                    <reportFormat>brief</reportFormat>
-                    <useFile>false</useFile>
-                    <forkMode>always</forkMode>
-                    <childDelegation>false</childDelegation>
-                    <includes>
-                        <include>**/*Test.java</include>
-                    </includes>
-                    <systemPropertyVariables>
-		        <java.util.logging.config.file>${basedir}/src/test/resources/logging.properties</java.util.logging.config.file>
-                    </systemPropertyVariables>
+                    <instructions>
+                        <_nouses>true</_nouses>
+                        <_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
+                        <Implementation-Title>${project.name}</Implementation-Title>
+                        <Implementation-Vendor>The Apache Software Foundation</Implementation-Vendor>
+                        <Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
+                        <Specification-Title>${project.name}</Specification-Title>
+                        <Specification-Vendor>The Apache Software Foundation</Specification-Vendor>
+                        <Export-Package>
+                            org.apache.cxf.sts.*;version=${project.version}
+                        </Export-Package>
+                        <Import-Package>
+                            org.apache.cxf.sts.provider.*;version=${project.version},
+                            !org.apache.cxf.sts.*,
+                            org.apache.cxf.*;version=${project.version},
+                            javax.xml.ws*;version="[0.0,3)",
+                            org.springframework.ldap*;resolution:=optional,
+                            *
+                        </Import-Package>
+                        <Bundle-SymbolicName>org.apache.cxf.services.sts.core</Bundle-SymbolicName>
+                    </instructions>
                 </configuration>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-source-plugin</artifactId>
-                <version>2.1.2</version>
-                <executions>
-                    <execution>
-                        <id>attach-sources</id>
-                        <phase>verify</phase>
-                        <goals>
-                            <goal>jar-no-fork</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
     <profiles>



Mime
View raw message