You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ri...@apache.org on 2010/04/09 15:11:16 UTC
svn commit: r932397 - in /geronimo/server/trunk:
framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/
framework/configs/karaf-framework/src/main/filtered-resources/etc/
plugins/j2ee/geronimo-j2ee-builder/ plugins/...
Author: rickmcguire
Date: Fri Apr 9 13:11:15 2010
New Revision: 932397
URL: http://svn.apache.org/viewvc?rev=932397&view=rev
Log:
remove activation and saaj packages from the system bundle
Modified:
geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java
geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/config.properties
geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/pom.xml
geronimo/server/trunk/plugins/j2ee/jsr88-ear-configurer/src/main/history/dependencies.xml
Modified: geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java?rev=932397&r1=932396&r2=932397&view=diff
==============================================================================
--- geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java (original)
+++ geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java Fri Apr 9 13:11:15 2010
@@ -644,7 +644,6 @@ public abstract class AbstractCarMojo
"org.osgi.service.url;version=1.0.0," +
"org.osgi.util.tracker;version=1.4.0," +
"javax.accessibility," +
- "javax.activation;version=1.1," +
"javax.activity," +
"javax.annotation;version=1.0," +
"javax.annotation.processing;version=1.0," +
@@ -735,7 +734,6 @@ public abstract class AbstractCarMojo
"javax.xml.crypto.dsig.spec," +
"javax.xml.datatype," +
"javax.xml.parsers," +
- "javax.xml.soap;version=1.3," +
"javax.xml.transform," +
"javax.xml.transform.dom," +
"javax.xml.transform.sax," +
Modified: geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/config.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/config.properties?rev=932397&r1=932396&r2=932397&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/config.properties (original)
+++ geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/config.properties Fri Apr 9 13:11:15 2010
@@ -80,7 +80,6 @@ karaf.cm.dir=${karaf.base}/etc
# - javax.transaction* is exported with a mandatory attribute
jre-1.6=, \
javax.accessibility, \
- javax.activation;version=1.1, \
javax.activity, \
javax.annotation;version=1.0, \
javax.annotation.processing;version=1.0, \
@@ -172,7 +171,6 @@ jre-1.6=, \
javax.xml.datatype, \
javax.xml.namespace, \
javax.xml.parsers, \
- javax.xml.soap;version=1.3, \
javax.xml.transform, \
javax.xml.transform.dom, \
javax.xml.transform.sax, \
Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/pom.xml?rev=932397&r1=932396&r2=932397&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/pom.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/pom.xml Fri Apr 9 13:11:15 2010
@@ -82,6 +82,11 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-saaj_1.3_spec</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jaxws_2.2_spec</artifactId>
</dependency>
Modified: geronimo/server/trunk/plugins/j2ee/jsr88-ear-configurer/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/jsr88-ear-configurer/src/main/history/dependencies.xml?rev=932397&r1=932396&r2=932397&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/jsr88-ear-configurer/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/jsr88-ear-configurer/src/main/history/dependencies.xml Fri Apr 9 13:11:15 2010
@@ -118,6 +118,11 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-saaj_1.3_spec</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-servlet_3.0_spec</artifactId>
<type>jar</type>
</dependency>