Skip to content

Commit 9ed471f

Browse files
poutsmapoutsma
committed
SWS-233: OSGi bundles
1 parent 81da850 commit 9ed471f

File tree

9 files changed

+202
-12
lines changed

9 files changed

+202
-12
lines changed

‎core-tiger/pom.xml

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
</parent>
88
<modelVersion>4.0.0</modelVersion>
99
<artifactId>spring-ws-core-tiger</artifactId>
10+
<packaging>bundle</packaging>
1011
<name>Spring WS Core - Java 5</name>
1112
<build>
1213
<plugins>
@@ -18,6 +19,37 @@
1819
<target>1.5</target>
1920
</configuration>
2021
</plugin>
22+
<plugin>
23+
<groupId>org.apache.felix</groupId>
24+
<artifactId>maven-bundle-plugin</artifactId>
25+
<version>1.0.0</version>
26+
<extensions>true</extensions>
27+
<configuration>
28+
<instructions>
29+
<Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
30+
<Export-Package>org.springframework.ws*</Export-Package>
31+
<Import-Package>
32+
org.apache.commons.logging*,
33+
javax.xml.namespace*,
34+
javax.xml.parsers*,
35+
javax.xml.stream*,
36+
javax.xml.transform*,
37+
org.xml.sax*,
38+
org.w3c.dom*,
39+
org.springframework.beans*,
40+
org.springframework.core*,
41+
org.springframework.util*,
42+
org.springframework.oxm*,
43+
org.springframework.ws*,
44+
org.springframework.xml*,
45+
*;resolution:=optional
46+
</Import-Package>
47+
<Implementation-Title>${pom.name}</Implementation-Title>
48+
<Implementation-Version>${pom.version}</Implementation-Version>
49+
<Spring-WS-Version>${pom.version}</Spring-WS-Version>
50+
</instructions>
51+
</configuration>
52+
</plugin>
2153
</plugins>
2254
</build>
2355
<dependencies>

‎core/pom.xml

Lines changed: 38 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
</parent>
88
<modelVersion>4.0.0</modelVersion>
99
<artifactId>spring-ws-core</artifactId>
10-
<packaging>jar</packaging>
10+
<packaging>bundle</packaging>
1111
<name>Spring WS Core</name>
1212
<description>Spring Web Services Core package.</description>
1313
<profiles>
@@ -39,6 +39,43 @@
3939
</dependencies>
4040
</profile>
4141
</profiles>
42+
<build>
43+
<plugins>
44+
<plugin>
45+
<groupId>org.apache.felix</groupId>
46+
<artifactId>maven-bundle-plugin</artifactId>
47+
<version>1.0.0</version>
48+
<extensions>true</extensions>
49+
<configuration>
50+
<instructions>
51+
<Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
52+
<Export-Package>org.springframework.ws*</Export-Package>
53+
<Import-Package>
54+
org.apache.commons.logging*,
55+
javax.activation*,
56+
javax.servlet*,
57+
javax.wsdl*,
58+
javax.xml.namespace*,
59+
javax.xml.parsers*,
60+
javax.xml.stream*,
61+
javax.xml.transform*,
62+
org.xml.sax*,
63+
org.w3c.dom*,
64+
org.springframework.beans*,
65+
org.springframework.core*,
66+
org.springframework.util*,
67+
org.springframework.oxm*,
68+
org.springframework.xml*,
69+
*;resolution:=optional
70+
</Import-Package>
71+
<Implementation-Title>${pom.name}</Implementation-Title>
72+
<Implementation-Version>${pom.version}</Implementation-Version>
73+
<Spring-WS-Version>${pom.version}</Spring-WS-Version>
74+
</instructions>
75+
</configuration>
76+
</plugin>
77+
</plugins>
78+
</build>
4279
<dependencies>
4380
<!-- Spring-WS dependencies -->
4481
<dependency>

‎oxm-tiger/pom.xml

Lines changed: 32 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
</parent>
88
<modelVersion>4.0.0</modelVersion>
99
<artifactId>spring-oxm-tiger</artifactId>
10+
<packaging>bundle</packaging>
1011
<name>Spring O/X Mapping - Java 5</name>
1112
<build>
1213
<plugins>
@@ -39,6 +40,36 @@
3940
</execution>
4041
</executions>
4142
</plugin>
43+
<plugin>
44+
<groupId>org.apache.felix</groupId>
45+
<artifactId>maven-bundle-plugin</artifactId>
46+
<version>1.0.0</version>
47+
<extensions>true</extensions>
48+
<configuration>
49+
<instructions>
50+
<Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
51+
<Export-Package>org.springframework.oxm*</Export-Package>
52+
<Import-Package>
53+
org.apache.commons.logging*,
54+
javax.xml.namespace*,
55+
javax.xml.parsers*,
56+
javax.xml.stream*,
57+
javax.xml.transform*,
58+
org.xml.sax*,
59+
org.w3c.dom*,
60+
org.springframework.beans*,
61+
org.springframework.core*,
62+
org.springframework.util*,
63+
org.springframework.oxm*,
64+
*;resolution:=optional
65+
</Import-Package>
66+
<Implementation-Title>${pom.name}</Implementation-Title>
67+
<Implementation-Version>${pom.version}</Implementation-Version>
68+
<Spring-WS-Version>${pom.version}</Spring-WS-Version>
69+
</instructions>
70+
</configuration>
71+
</plugin>
72+
4273
</plugins>
4374
</build>
4475
<dependencies>
@@ -96,7 +127,7 @@
96127
<exclusions>
97128
<exclusion>
98129
<groupId>javax.xml.stream</groupId>
99-
<artifactId>stax-api</artifactId>
130+
<artifactId>stax-api</artifactId>
100131
</exclusion>
101132
<exclusion>
102133
<groupId>javax.activation</groupId>

‎oxm/pom.xml

Lines changed: 31 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
</parent>
88
<modelVersion>4.0.0</modelVersion>
99
<artifactId>spring-oxm</artifactId>
10-
<packaging>jar</packaging>
10+
<packaging>bundle</packaging>
1111
<name>Spring O/X Mapping</name>
1212
<description>Spring Object/XML Mapping abstraction</description>
1313
<build>
@@ -56,6 +56,35 @@
5656
</dependency>
5757
</dependencies>
5858
</plugin>
59+
<plugin>
60+
<groupId>org.apache.felix</groupId>
61+
<artifactId>maven-bundle-plugin</artifactId>
62+
<version>1.0.0</version>
63+
<extensions>true</extensions>
64+
<configuration>
65+
<instructions>
66+
<Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
67+
<Export-Package>org.springframework.oxm*</Export-Package>
68+
<Import-Package>
69+
org.apache.commons.logging*,
70+
javax.xml.namespace*,
71+
javax.xml.parsers*,
72+
javax.xml.stream*,
73+
javax.xml.transform*,
74+
org.xml.sax*,
75+
org.w3c.dom*,
76+
org.springframework.beans*,
77+
org.springframework.core*,
78+
org.springframework.util*,
79+
org.springframework.xml*,
80+
*;resolution:=optional
81+
</Import-Package>
82+
<Implementation-Title>${pom.name}</Implementation-Title>
83+
<Implementation-Version>${pom.version}</Implementation-Version>
84+
<Spring-WS-Version>${pom.version}</Spring-WS-Version>
85+
</instructions>
86+
</configuration>
87+
</plugin>
5988
</plugins>
6089
</build>
6190
<dependencies>
@@ -185,6 +214,6 @@
185214
<artifactId>jettison</artifactId>
186215
<version>1.0-RC2</version>
187216
<scope>test</scope>
188-
</dependency>
217+
</dependency>
189218
</dependencies>
190219
</project>

‎parent/pom.xml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
</scm>
3434
<properties>
3535
<spring.version>2.0.7</spring.version>
36+
<osgi.version>1.5.0.m1</osgi.version>
3637
</properties>
3738
<repositories>
3839
<repository>
@@ -311,7 +312,7 @@
311312
<groupId>xerces</groupId>
312313
<artifactId>xercesImpl</artifactId>
313314
</exclusion>
314-
</exclusions>
315+
</exclusions>
315316
</dependency>
316317
<dependency>
317318
<groupId>org.codehaus.woodstox</groupId>
@@ -542,7 +543,7 @@
542543
<exclusion>
543544
<groupId>javax.mail</groupId>
544545
<artifactId>mail</artifactId>
545-
</exclusion>
546+
</exclusion>
546547
</exclusions>
547548
</dependency>
548549
<dependency>
@@ -635,7 +636,7 @@
635636
<exclusions>
636637
<exclusion>
637638
<groupId>javax.activation</groupId>
638-
<artifactId>activation</artifactId>
639+
<artifactId>activation</artifactId>
639640
</exclusion>
640641
</exclusions>
641642
</dependency>
@@ -683,7 +684,7 @@
683684
<dependency>
684685
<groupId>commons-logging</groupId>
685686
<artifactId>commons-logging</artifactId>
686-
<version>1.1</version>
687+
<version>1.1.1</version>
687688
<exclusions>
688689
<exclusion>
689690
<groupId>log4j</groupId>

‎security/pom.xml

Lines changed: 31 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
</parent>
88
<modelVersion>4.0.0</modelVersion>
99
<artifactId>spring-ws-security</artifactId>
10-
<packaging>jar</packaging>
10+
<packaging>bundle</packaging>
1111
<name>Spring WS Security</name>
1212
<description>Spring-WS WS-Security implementation</description>
1313
<repositories>
@@ -52,6 +52,36 @@
5252
</dependencies>
5353
</profile>
5454
</profiles>
55+
<build>
56+
<plugins>
57+
<plugin>
58+
<groupId>org.apache.felix</groupId>
59+
<artifactId>maven-bundle-plugin</artifactId>
60+
<version>1.0.0</version>
61+
<extensions>true</extensions>
62+
<configuration>
63+
<instructions>
64+
<Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
65+
<Export-Package>org.springframework.ws*</Export-Package>
66+
<Import-Package>
67+
org.apache.commons.logging*,
68+
javax.xml.crypto*,
69+
javax.xml.soap*,
70+
com.sun.xml.wss*,
71+
org.springframework.beans*,
72+
org.springframework.core*,
73+
org.springframework.util*,
74+
org.springframework.ws*,
75+
*;resolution:=optional
76+
</Import-Package>
77+
<Implementation-Title>${pom.name}</Implementation-Title>
78+
<Implementation-Version>${pom.version}</Implementation-Version>
79+
<Spring-WS-Version>${pom.version}</Spring-WS-Version>
80+
</instructions>
81+
</configuration>
82+
</plugin>
83+
</plugins>
84+
</build>
5585
<dependencies>
5686
<!-- Spring-WS dependencies -->
5787
<dependency>
@@ -94,7 +124,6 @@
94124
<dependency>
95125
<groupId>xml-security</groupId>
96126
<artifactId>xmlsec</artifactId>
97-
<version>1.3.0</version>
98127
</dependency>
99128
<dependency>
100129
<groupId>org.acegisecurity</groupId>

‎src/main/resources/META-INF/spring.handlers

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
http\://www.springframework.org/spring-ws/schema/oxm=org.springframework.oxm.config.OxmNamespaceHandler
2-
http\://www.springframework.org/spring-ws/schema/sws=org.springframework.ws.config.SwsNamespaceHandler
2+
http\://www.springframework.org/spring-ws/schema/sws=org.springframework.ws.config.WebServicesNamespaceHandler

‎support/pom.xml

Lines changed: 31 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<modelVersion>4.0.0</modelVersion>
99
<groupId>org.springframework.ws</groupId>
1010
<artifactId>spring-ws-support</artifactId>
11-
<packaging>jar</packaging>
11+
<packaging>bundle</packaging>
1212
<name>Spring WS Support</name>
1313
<description>Spring Web Services Support package.</description>
1414
<repositories>
@@ -57,6 +57,36 @@
5757
</dependencies>
5858
</profile>
5959
</profiles>
60+
<build>
61+
<plugins>
62+
<plugin>
63+
<groupId>org.apache.felix</groupId>
64+
<artifactId>maven-bundle-plugin</artifactId>
65+
<version>1.0.0</version>
66+
<extensions>true</extensions>
67+
<configuration>
68+
<instructions>
69+
<Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
70+
<Export-Package>org.springframework.ws*</Export-Package>
71+
<Import-Package>
72+
org.apache.commons.logging*,
73+
javax.activation*,
74+
javax.jms*,
75+
javax.mail*,
76+
org.springframework.beans*,
77+
org.springframework.core*,
78+
org.springframework.util*,
79+
org.springframework.ws.transport*,
80+
*;resolution:=optional
81+
</Import-Package>
82+
<Implementation-Title>${pom.name}</Implementation-Title>
83+
<Implementation-Version>${pom.version}</Implementation-Version>
84+
<Spring-WS-Version>${pom.version}</Spring-WS-Version>
85+
</instructions>
86+
</configuration>
87+
</plugin>
88+
</plugins>
89+
</build>
6090
<dependencies>
6191
<!-- Spring-WS dependencies -->
6292
<dependency>

‎xml/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
<Export-Package>org.springframework.xml*</Export-Package>
2424
<Import-Package>
2525
org.apache.commons.logging*,
26+
javax.xml.namespace*,
2627
javax.xml.parsers*,
2728
javax.xml.transform*,
2829
org.xml.sax*,

0 commit comments

Comments
 (0)