You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ff...@apache.org on 2012/09/17 09:04:18 UTC
svn commit: r1386489 - in /servicemix/smx4/features/trunk:
assemblies/shared/pom.xml assemblies/shared/src/main/resources/common-bin.xml
assemblies/shared/src/main/resources/etc/jre.properties parent/pom.xml
Author: ffang
Date: Mon Sep 17 07:04:18 2012
New Revision: 1386489
URL: http://svn.apache.org/viewvc?rev=1386489&view=rev
Log:
[SMX4-1242]endorse the smx spec api jar
Modified:
servicemix/smx4/features/trunk/assemblies/shared/pom.xml
servicemix/smx4/features/trunk/assemblies/shared/src/main/resources/common-bin.xml
servicemix/smx4/features/trunk/assemblies/shared/src/main/resources/etc/jre.properties
servicemix/smx4/features/trunk/parent/pom.xml
Modified: servicemix/smx4/features/trunk/assemblies/shared/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assemblies/shared/pom.xml?rev=1386489&r1=1386488&r2=1386489&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assemblies/shared/pom.xml (original)
+++ servicemix/smx4/features/trunk/assemblies/shared/pom.xml Mon Sep 17 07:04:18 2012
@@ -31,7 +31,34 @@
<artifactId>shared</artifactId>
<packaging>jar</packaging>
<name>Apache ServiceMix :: Features :: Assemblies :: Shared files</name>
-
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.servicemix.specs</groupId>
+ <artifactId>org.apache.servicemix.specs.jaxp-api-1.4</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.specs</groupId>
+ <artifactId>org.apache.servicemix.specs.jaxb-api-2.2</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.specs</groupId>
+ <artifactId>org.apache.servicemix.specs.jaxws-api-2.2</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.specs</groupId>
+ <artifactId>org.apache.servicemix.specs.saaj-api-1.3</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.specs</groupId>
+ <artifactId>org.apache.servicemix.specs.saaj-api-1.3</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.specs</groupId>
+ <artifactId>org.apache.servicemix.specs.activator</artifactId>
+ </dependency>
+ </dependencies>
+
<build>
<resources>
<resource>
@@ -45,4 +72,4 @@
</resources>
</build>
-</project>
\ No newline at end of file
+</project>
Modified: servicemix/smx4/features/trunk/assemblies/shared/src/main/resources/common-bin.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assemblies/shared/src/main/resources/common-bin.xml?rev=1386489&r1=1386488&r2=1386489&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assemblies/shared/src/main/resources/common-bin.xml (original)
+++ servicemix/smx4/features/trunk/assemblies/shared/src/main/resources/common-bin.xml Mon Sep 17 07:04:18 2012
@@ -33,15 +33,26 @@
</includes>
<useTransitiveDependencies>false</useTransitiveDependencies>
</dependencySet>
+ <dependencySet>
+ <outputDirectory>/lib</outputDirectory>
+ <unpack>false</unpack>
+ <useProjectArtifact>false</useProjectArtifact>
+ <includes>
+ <include>org.apache.servicemix.specs:org.apache.servicemix.specs.activator</include>
+ </includes>
+ </dependencySet>
<dependencySet>
<outputDirectory>/lib/endorsed</outputDirectory>
<fileMode>0644</fileMode>
<includes>
<include>org.apache.xerces:xercesImpl</include>
- <include>org.apache.xerces:xml-apis</include>
+ <include>org.apache.servicemix.specs:org.apache.servicemix.specs.jaxp-api-1.4</include>
+ <include>org.apache.servicemix.specs:org.apache.servicemix.specs.jaxb-api-2.2</include>
+ <include>org.apache.servicemix.specs:org.apache.servicemix.specs.jaxws-api-2.2</include>
+ <include>org.apache.servicemix.specs:org.apache.servicemix.specs.saaj-api-1.3</include>
<include>xalan:xalan</include>
<include>xalan:serializer</include>
</includes>
</dependencySet>
</dependencySets>
-</component>
\ No newline at end of file
+</component>
Modified: servicemix/smx4/features/trunk/assemblies/shared/src/main/resources/etc/jre.properties
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assemblies/shared/src/main/resources/etc/jre.properties?rev=1386489&r1=1386488&r2=1386489&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assemblies/shared/src/main/resources/etc/jre.properties (original)
+++ servicemix/smx4/features/trunk/assemblies/shared/src/main/resources/etc/jre.properties Mon Sep 17 07:04:18 2012
@@ -21,12 +21,14 @@
# Java platform package export properties.
#
-
# Standard package set. Note that:
-# - javax.transaction* is exported with a mandatory attribute
-jre-1.5= \
+# - javax.transaction* is exported with a mandatory attribute
+jre-1.6= \
javax.accessibility, \
+ #javax.activation;version="1.1", \
javax.activity, \
+ javax.annotation;version="1.1", \
+ javax.annotation.processing;version="1.1", \
javax.crypto, \
javax.crypto.interfaces, \
javax.crypto.spec, \
@@ -37,6 +39,12 @@ jre-1.5= \
javax.imageio.plugins.jpeg, \
javax.imageio.spi, \
javax.imageio.stream, \
+ javax.jws;version="2.0", \
+ javax.jws.soap;version="2.0", \
+ javax.lang.model, \
+ javax.lang.model.element, \
+ javax.lang.model.type, \
+ javax.lang.model.util, \
javax.management, \
javax.management.loading, \
javax.management.modelmbean, \
@@ -60,6 +68,7 @@ jre-1.5= \
javax.rmi, \
javax.rmi.CORBA, \
javax.rmi.ssl, \
+ javax.script, \
javax.security.auth, \
javax.security.auth.callback, \
javax.security.auth.kerberos, \
@@ -93,16 +102,42 @@ jre-1.5= \
javax.swing.text.rtf, \
javax.swing.tree, \
javax.swing.undo, \
+ javax.tools, \
javax.transaction; javax.transaction.xa; partial=true; mandatory:=partial, \
javax.xml, \
+ javax.xml.bind;version="2.2.1", \
+ javax.xml.bind.annotation;version="2.2.1", \
+ javax.xml.bind.annotation.adapters;version="2.2.1", \
+ javax.xml.bind.attachment;version="2.2.1", \
+ javax.xml.bind.helpers;version="2.2.1", \
+ javax.xml.bind.util;version="2.2.1", \
+ javax.xml.crypto, \
+ javax.xml.crypto.dom, \
+ javax.xml.crypto.dsig, \
+ javax.xml.crypto.dsig.dom, \
+ javax.xml.crypto.dsig.keyinfo, \
+ javax.xml.crypto.dsig.spec, \
javax.xml.datatype, \
javax.xml.namespace, \
javax.xml.parsers, \
+ javax.xml.soap;version="1.3", \
+ javax.xml.stream;version="1.2", \
+ javax.xml.stream.events;version="1.2", \
+ javax.xml.stream.util;version="1.2", \
javax.xml.transform, \
javax.xml.transform.dom, \
javax.xml.transform.sax, \
+ javax.xml.transform.stax, \
javax.xml.transform.stream, \
javax.xml.validation, \
+ javax.xml.ws;version="2.2", \
+ javax.xml.ws.handler;version="2.2", \
+ javax.xml.ws.handler.soap;version="2.2", \
+ javax.xml.ws.http;version="2.2", \
+ javax.xml.ws.soap;version="2.2", \
+ javax.xml.ws.spi;version="2.2", \
+ javax.xml.ws.spi.http;version="2.2", \
+ javax.xml.ws.wsaddressing;version="2.2", \
javax.xml.xpath, \
org.ietf.jgss, \
org.omg.CORBA, \
@@ -144,21 +179,16 @@ jre-1.5= \
org.w3c.dom.stylesheets, \
org.w3c.dom.traversal, \
org.w3c.dom.views, \
+ org.w3c.dom.xpath, \
org.xml.sax, \
org.xml.sax.ext, \
org.xml.sax.helpers
# Standard package set. Note that:
-# - javax.transaction* is exported with a mandatory attribute
-# - javax.activation, javax.annotation*, javax.jws*, javax.script*, javax.xml.bind*, javax.xml.soap, javax.xml.ws* packages are not exported
-jre-1.6= \
- com.sun.org.apache.xalan.internal.xsltc.trax, \
- com.sun.org.apache.xerces.internal.dom, \
- com.sun.org.apache.xerces.internal.jaxp, \
- com.sun.org.apache.xerces.internal.xni, \
- com.sun.jndi.ldap, \
+# - javax.transaction* is exported with a mandatory attribute
+jre-1.7= \
javax.accessibility, \
-# javax.activation, \
+ #javax.activation;version="1.1", \
javax.activity, \
javax.annotation;version="1.1", \
javax.annotation.processing;version="1.1", \
@@ -172,8 +202,8 @@ jre-1.6= \
javax.imageio.plugins.jpeg, \
javax.imageio.spi, \
javax.imageio.stream, \
-# javax.jws, \
-# javax.jws.soap, \
+ javax.jws;version="2.0", \
+ javax.jws.soap;version="2.0", \
javax.lang.model, \
javax.lang.model.element, \
javax.lang.model.type, \
@@ -201,6 +231,7 @@ jre-1.6= \
javax.rmi, \
javax.rmi.CORBA, \
javax.rmi.ssl, \
+ javax.script, \
javax.security.auth, \
javax.security.auth.callback, \
javax.security.auth.kerberos, \
@@ -237,12 +268,12 @@ jre-1.6= \
javax.tools, \
javax.transaction; javax.transaction.xa; partial=true; mandatory:=partial, \
javax.xml, \
-# javax.xml.bind, \
-# javax.xml.bind.annotation, \
-# javax.xml.bind.annotation.adapters, \
-# javax.xml.bind.attachment, \
-# javax.xml.bind.helpers, \
-# javax.xml.bind.util, \
+ javax.xml.bind;version="2.2.1", \
+ javax.xml.bind.annotation;version="2.2.1", \
+ javax.xml.bind.annotation.adapters;version="2.2.1", \
+ javax.xml.bind.attachment;version="2.2.1", \
+ javax.xml.bind.helpers;version="2.2.1", \
+ javax.xml.bind.util;version="2.2.1", \
javax.xml.crypto, \
javax.xml.crypto.dom, \
javax.xml.crypto.dsig, \
@@ -252,22 +283,23 @@ jre-1.6= \
javax.xml.datatype, \
javax.xml.namespace, \
javax.xml.parsers, \
-# javax.xml.soap, \
-# javax.xml.stream, \
-# javax.xml.stream.events, \
-# javax.xml.stream.util, \
+ javax.xml.soap;version="1.3", \
+ javax.xml.stream;version="1.2", \
+ javax.xml.stream.events;version="1.2", \
+ javax.xml.stream.util;version="1.2", \
javax.xml.transform, \
javax.xml.transform.dom, \
javax.xml.transform.sax, \
javax.xml.transform.stax, \
javax.xml.transform.stream, \
javax.xml.validation, \
-# javax.xml.ws, \
-# javax.xml.ws.handler, \
-# javax.xml.ws.handler.soap, \
-# javax.xml.ws.http, \
-# javax.xml.ws.soap, \
-# javax.xml.ws.spi, \
+ javax.xml.ws;version="2.2", \
+ javax.xml.ws.handler;version="2.2", \
+ javax.xml.ws.handler.soap;version="2.2", \
+ javax.xml.ws.http;version="2.2", \
+ javax.xml.ws.soap;version="2.2", \
+ javax.xml.ws.spi;version="2.2", \
+ javax.xml.ws.wsaddressing;version="2.2", \
javax.xml.xpath, \
org.ietf.jgss, \
org.omg.CORBA, \
Modified: servicemix/smx4/features/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/parent/pom.xml?rev=1386489&r1=1386488&r2=1386489&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/parent/pom.xml (original)
+++ servicemix/smx4/features/trunk/parent/pom.xml Mon Sep 17 07:04:18 2012
@@ -50,7 +50,7 @@
<servicemix.components.version>2012.01-SNAPSHOT</servicemix.components.version>
<servicemix.nmr.version>1.6.0-SNAPSHOT</servicemix.nmr.version>
- <servicemix.specs.version>1.9.0</servicemix.specs.version>
+ <servicemix.specs.version>2.0.0</servicemix.specs.version>
<servicemix.utils.version>1.5.0</servicemix.utils.version>
</properties>
@@ -613,6 +613,26 @@
<artifactId>org.apache.servicemix.specs.jaxb-api-${jaxb.api.version}</artifactId>
<version>${servicemix.specs.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.specs</groupId>
+ <artifactId>org.apache.servicemix.specs.jaxp-api-1.4</artifactId>
+ <version>${servicemix.specs.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.specs</groupId>
+ <artifactId>org.apache.servicemix.specs.jaxws-api-2.2</artifactId>
+ <version>${servicemix.specs.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.specs</groupId>
+ <artifactId>org.apache.servicemix.specs.activator</artifactId>
+ <version>${servicemix.specs.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.specs</groupId>
+ <artifactId>org.apache.servicemix.specs.saaj-api-1.3</artifactId>
+ <version>${servicemix.specs.version}</version>
+ </dependency>
</dependencies>
</dependencyManagement>
</project>