Author: dkulp
Date: Fri Mar 13 20:20:27 2009
New Revision: 753380
URL: http://svn.apache.org/viewvc?rev=753380&view=rev
Log:
Update various versions of stuff, update release notes, update legal muck,
etc....
Modified:
cxf/trunk/buildtools/src/main/resources/notice-supplements.xml
cxf/trunk/distribution/bundle/all/pom.xml
cxf/trunk/distribution/src/main/release/BUILDING.txt
cxf/trunk/distribution/src/main/release/README
cxf/trunk/distribution/src/main/release/release_notes.txt
cxf/trunk/parent/pom.xml
cxf/trunk/rt/javascript/pom.xml
cxf/trunk/rt/ws/security/pom.xml
Modified: cxf/trunk/buildtools/src/main/resources/notice-supplements.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/buildtools/src/main/resources/notice-supplements.xml?rev=753380&r1=753379&r2=753380&view=diff
==============================================================================
--- cxf/trunk/buildtools/src/main/resources/notice-supplements.xml (original)
+++ cxf/trunk/buildtools/src/main/resources/notice-supplements.xml Fri Mar 13
20:20:27 2009
@@ -139,6 +139,74 @@
</supplement>
<supplement>
<project>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <licenses>
+ <license>
+ <name>MIT License</name>
+ <url>http://www.slf4j.org/license.html</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-jdk14</artifactId>
+ <licenses>
+ <license>
+ <name>MIT License</name>
+ <url>http://www.slf4j.org/license.html</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+
+ <supplement>
+ <project>
+ <groupId>jaxen</groupId>
+ <artifactId>jaxen</artifactId>
+ <licenses>
+ <license>
+ <name>BSD</name>
+ <url>http://jaxen.codehaus.org/license.html</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>asm</groupId>
+ <artifactId>asm</artifactId>
+ <licenses>
+ <license>
+ <name>BSD</name>
+ <url>http://asm.objectweb.org/license.html</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+
+
+ <supplement>
+ <project>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <name>Apache Commons - collections</name>
+ <organization>
+ <name>The Apache Software Foundation</name>
+ <url>http://www.apache.org</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
<groupId>net.java.dev.stax-utils</groupId>
<artifactId>stax-utils</artifactId>
<name>StAX Utilities</name>
Modified: cxf/trunk/distribution/bundle/all/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/distribution/bundle/all/pom.xml?rev=753380&r1=753379&r2=753380&view=diff
==============================================================================
--- cxf/trunk/distribution/bundle/all/pom.xml (original)
+++ cxf/trunk/distribution/bundle/all/pom.xml Fri Mar 13 20:20:27 2009
@@ -351,10 +351,10 @@
</transformer>
<transformer
implementation="org.apache.maven.plugins.shade.resource.XmlAppendingTransformer">
<resource>META-INF/wsdl.plugin.xml</resource>
- </transformer>
+ </transformer>
<transformer
implementation="org.apache.maven.plugins.shade.resource.XmlAppendingTransformer">
<resource>META-INF/tools.service.validator.xml</resource>
- </transformer>
+ </transformer>
<transformer
implementation="org.apache.cxf.maven.PluginTransformer">
<resource>META-INF/tools-plugin.xml</resource>
</transformer>
@@ -373,7 +373,39 @@
</plugin>
</plugins>
</build>
-
+ <profiles>
+ <profile>
+ <id>deploy</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>unpack-plugin-sources</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.cxf</groupId>
+
<artifactId>cxf-codegen-plugin</artifactId>
+
<version>${project.version}</version>
+ <classifier>sources</classifier>
+ </artifactItem>
+ </artifactItems>
+
<outputDirectory>${project.build.directory}/sources</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/cxf/trunk/distribution/bundle/all</connection>
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/cxf/trunk/distribution/bundle/all</developerConnection>
Modified: cxf/trunk/distribution/src/main/release/BUILDING.txt
URL:
http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/BUILDING.txt?rev=753380&r1=753379&r2=753380&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/BUILDING.txt (original)
+++ cxf/trunk/distribution/src/main/release/BUILDING.txt Fri Mar 13 20:20:27
2009
@@ -6,14 +6,14 @@
1) Install J2SE 5.0 SDK, which can be downloaded from
http://java.sun.com/j2se/1.5.0/download.jsp. Use version of 1.5.0_13 JDK.
- Note: CXF 2.1 does build on Java 6 update 4 and later. It will not build
on
+ Note: CXF >=2.1 does build on Java 6 update 4 and later. It will not build
on
updates prior to update 4.
2) Make sure that your JAVA_HOME environment variable is set to the newly
installed
JDK location, and that your PATH includes %JAVA_HOME%\bin (windows) or
$JAVA_HOME$/bin (unix).
-3) Install Maven 2.0.6, which can be downloaded from
+3) Install Maven 2.0.9 or newer, which can be downloaded from
http://maven.apache.org/download.html. Make sure that your PATH includes
the MVN_HOME/bin directory.
@@ -29,7 +29,7 @@
$> mvn -Pfastinstall.
This will compile Apache CXF without running the tests and takes less
time to build.
- Depending on the load of remote Maven 2.0 repositories, you may have
+ Depending on the load of remote Maven repositories, you may have
to run "mvn" several times utill the required dependencies are
all located in your local maven repository. It usually takes some time for
maven to download required dependencies in the first build.
Modified: cxf/trunk/distribution/src/main/release/README
URL:
http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/README?rev=753380&r1=753379&r2=753380&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/README (original)
+++ cxf/trunk/distribution/src/main/release/README Fri Mar 13 20:20:27 2009
@@ -10,7 +10,8 @@
* Web Services Standards Support: CXF supports a variety of web service
standards including SOAP, the Basic Profile, WSDL, WS-Addressing,
- WS-Policy, WS-ReliableMessaging, and WS-Security.
+ WS-Policy, WS-ReliableMessaging, WS-Security, WS-SecurityPolicy,
+ WS-SecureConversation, and WS-Trust.
* Frontends: CXF supports a variety of "frontend" programming models. CXF
implements the JAX-WS APIs. It also includes a "simple frontend" which
allows creation of clients and endpoints without annotations. CXF
supports
@@ -19,7 +20,7 @@
providing REST support.
* Ease of use: CXF is designed to be intuitive and easy to use. There
are simple APIs to quickly build code-first services, Maven plug-ins to
- make tooling integration easy, JAX-WS API support, Spring 2.0 XML
support
+ make tooling integration easy, JAX-WS API support, Spring 2.x XML
support
to make configuration a snap, and much more.
* Binary and Legacy Protocol Support: CXF has been designed to provide a
pluggable architecture that supports not only XML but also non-XML type
Modified: cxf/trunk/distribution/src/main/release/release_notes.txt
URL:
http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/release_notes.txt?rev=753380&r1=753379&r2=753380&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/release_notes.txt (original)
+++ cxf/trunk/distribution/src/main/release/release_notes.txt Fri Mar 13
20:20:27 2009
@@ -1,9 +1,18 @@
-Apache CXF 2.1.2 Release Notes
+Apache CXF 2.2 Release Notes
1. Overview
+
+Apache CXF 2.2 delivers the third major version of
+the Celtix project (http://celtix.objectweb.org) and the XFire project
+(http://xfire.codehaus.org) merge. This release is a major update from
+the 2.1.x series. The major new additions include:
+
+ * WS-SecurityPolicy
+ * WS-SecureConversation
+ * Partial support for WS-Trust
+ * Initial support for JAX-RS 1.0 (not TCK compliant yet) including a
+ client API for accessing REST services
-Apache CXF 2.1.2 delivers the latest set of patches and bug fixes for Apache
-CXF. This release fixes 67 JIRA issues that have been reported by users.
2. Installation Prerequisites
@@ -42,20 +51,13 @@
For more details, see the Installation Guide.
-
3. Building the Samples
Building the samples included in the binary distribution is easy. Change to
the samples directory and follow the build instructions in the README.txt file
included with each sample.
-4. Errata
-
-4.1 WS-Security
-The WS-Security configuration mechanisms may change between this release and
-the next one as we add in support for WS-SecurityPolicy and WS-Trust.
-
-5. Reporting Problems
+4. Reporting Problems
If you have any problems or want to send feedback of any kind, please e-mail
the
cxf dev list, cxf-...@incubator.apache.org. You can also file issues in JIRA
at:
@@ -63,91 +65,12 @@
http://issues.apache.org/jira/browse/CXF
-6. JAX-RS/JSR-311
+5. Migration notes:
+
+See the migration guide at:
+http://cxf.apache.org/22-migration-guide.html
+for caveats when upgrading from CXF 2.1.x to 2.2.
-2.1.2 upgrades the JAX-RS/JSR-311 support level to 0.8 from 0.6. This may
cause
-existing JAX-RS applications to fail. JAX-RS/JSR-311 is a work in progress
and as
-the specification changes, we'll be updating the implementation to keep track
with
-the specification.
-
-
-7. Specific issues, features, and improvements fixed in this version
-
-Release Notes - CXF - Version 2.1.2
-
-** Sub-task
- * [CXF-1016] - Context injection - Preconditions
- * [CXF-1018] - Transfer encoding
-
-** Bug
- * [CXF-1406] - CXF JAX-RS implementation creates a new JAXBContext for
each top level type.
- * [CXF-1572] - @Path is not mapping to required methods
- * [CXF-1578] - Json marshall/unmarshall error
- * [CXF-1617] - Basic Authentication failure
- * [CXF-1620] - wsdl2java ignores jaxb2 xjc globalBindings with namespace
xjc
- * [CXF-1652] - CXF Decoupled Endpoints are not getting cleaned up properly
even after bus.Shutdown() in org.apache.cxf.systest.ws.rm.SequenceTest.
- * [CXF-1653] - Deviation from spec: unnecessary check for @ProduceMime of
sub-resource locators
- * [CXF-1655] - NPE when no sub-resource method found that matches to the
request
- * [CXF-1657] - CheckFaultInterceptor causes XMLStreamReader to throw
IllegalState at doc end
- * [CXF-1658] - The jbi transport should honor the sendSync flag so that xa
transactions are handled correctly in smx3
- * [CXF-1659] - Eclipse plugin has ${cxf.version} in directory name
- * [CXF-1660] - Nested namespace defined spring beans aren't properly unique
- * [CXF-1661] - style="rpc" in soapBinging configuration is not honored
- * [CXF-1663] - Attempting to use a Spring configured HTTPConduit causing
compatability problems with Spring 2.5.4 testing framework
- * [CXF-1665] - org.apache.cxf.jaxws.interceptors.SwAOutInterceptor:197 |
Unreachable Code
- * [CXF-1667] - WsdlLocation can't not be set from <simple:server> or
<jaxws:server>
- * [CXF-1669] - MTOM does not work when add WSS4J
interceptors(UsernameToken and Timestamp)
- * [CXF-1674] - JAXB unmarshalling cannot be configured to use the
ObjectFactory
- * [CXF-1675] - @QueryParam is not following reference javadoc for
primitive types
- * [CXF-1676] - oneway request followed by two-way request fails while
using JMS Transport.
- * [CXF-1678] - wsdl2java does not generate impl stubs when only logical
wsdl is present
- * [CXF-1681] - Base URL caching in ServletController avoids needed
updateDests() call on republishing endpoints
- * [CXF-1682] - Generated Web service Client fails for
http://demo.aws.air-worldwide.com/aws/passporttogo.asmx?wsdl
- * [CXF-1683] - ExtendedURIResolver returns relative paths after resolving
a URI relative to another one.
- * [CXF-1687] - Lots of NPE when parsing documents at start time
- * [CXF-1689] - CXF assumes class.getPackage() is never null
- * [CXF-1691] - Potential for NPE in AbstractResourceInfo.clearProxies
- * [CXF-1696] - wsdl2java issues with implicit headers
- * [CXF-1699] - Content type not set on http response
- * [CXF-1700] - XMLBeans - XmlBeansSchemaInitializer (Lline #177) can't
handle xs:include
- * [CXF-1707] - Security Exception when using java2ws via the
cxf-java2ws-plugin in Netbeans
- * [CXF-1709] - "No service was found." after refresh of Spring's
ApplicationContext
- * [CXF-1711] - Server failed to start and receieved
IllegalAnnotationExceptions
- * [CXF-1712] - ObjectFactory cache doesn't take classloaders into accout
- * [CXF-1713] - Generated Javascript does not handle simultaneous soap
requests correctly
- * [CXF-1716] - Wrong namespace for faultcode
- * [CXF-1719] - RPC/Lit not honoring namespace in soap:body wsdl extensor
- * [CXF-1720] - RPC/Lit soap 1.2 not processing the soap-rpc:result element
- * [CXF-1721] - Generated WS-Addressing action uses wrong separator for urns
- * [CXF-1722] - CXF does not write out PIs at the root of the WSDL file
- * [CXF-1723] - wsdl2java generates errorneous code
- * [CXF-1724] - Nullpointer error in DOMUtils
- * [CXF-1726] - Upgrade from CXF 2.1 to CXF 2.1.1 results in two
BouncyCastle JARs being used
- * [CXF-1727] - I guess there is an error in the ProviderFactory of jaxrs
component.
- * [CXF-1728] - wsdl2java does not generate properly formatted javadoc when
jaxws:javadoc tags are used
- * [CXF-1733] - SoapPreProtocolOutInterceptor overrides
SoapActionOutInterceptor
- * [CXF-1736] - Error in finding the DestinationFactory when using Soap/JMS
with configuration
- * [CXF-1737] - NPE in ClientProxyFactoryBean on void methods
- * [CXF-1741] - NPE is thrown when publish the code first service in
NoSpringServlet
- * [CXF-1742] - JMS Conduit Pooled Session Recycling
- * [CXF-1743] - Temporary files are not deleted
-
-** Improvement
- * [CXF-341] - Display user supplied wsdl in HTTP transports
- * [CXF-1634] - Add XMLBean data provider to JAX-RS front end
- * [CXF-1671] - Add a setter to JSONProvider to set the XML Namespace to
Jettison prefix map
- * [CXF-1677] - Support Unmarshaller.Listener and Marshaller.Listener
- * [CXF-1680] - Map ws-security principals into
WebServiceContext.getUserPrincipal() call
- * [CXF-1684] - URIResolver cannot resolve relative paths with with zip:
scheme
- * [CXF-1685] - Not possible to pass empty parameter to the
maven-codegen-plugin
- * [CXF-1686] - maven-codegen-plugin: Add ability to specify a default set
of options for all wsdls in a project.
- * [CXF-1688] - Make the JBI binding and transport OSGi bundles
- * [CXF-1692] - cfx-codegen-plugin: Should be possible to configure using
named parameters.
- * [CXF-1705] - Servlet 2.3 compliance
- * [CXF-1734] - AutomaticWorkQueue not configurable
- * [CXF-1738] - AbstractWSDLBasedEndpointFactory should setTransportId for
local and camel transport according to the publish address
-** New Feature
- * [CXF-1387] - Support for GZIP compression of HTTP payloads
Modified: cxf/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/parent/pom.xml?rev=753380&r1=753379&r2=753380&view=diff
==============================================================================
--- cxf/trunk/parent/pom.xml (original)
+++ cxf/trunk/parent/pom.xml Fri Mar 13 20:20:27 2009
@@ -51,17 +51,17 @@
<jaxb.impl.version>2.1.9</jaxb.impl.version>
<jaxb.xjc.version>2.1.9</jaxb.xjc.version>
<jdom.version>1.0</jdom.version>
- <jetty.version>6.1.11</jetty.version>
+ <jetty.version>6.1.15</jetty.version>
<rhino.version>1.7R1</rhino.version>
<saaj.version>1.3</saaj.version>
<spring.version>2.5.5</spring.version>
<spring.mock>spring-test</spring.mock>
- <stax.impl.groupId>org.codehaus.woodstox</stax.impl.groupId>
- <stax.impl.artifactId>wstx-asl</stax.impl.artifactId>
- <stax.impl.version>3.2.6</stax.impl.version>
+ <stax.impl.groupId>org.codehaus.woodstox</stax.impl.groupId>
+ <stax.impl.artifactId>wstx-asl</stax.impl.artifactId>
+ <stax.impl.version>3.2.6</stax.impl.version>
<wsdl4j.version>1.6.2</wsdl4j.version>
<xmlbeans.version>2.3.0</xmlbeans.version>
- <xmlschema.version>1.4.3</xmlschema.version>
+ <xmlschema.version>1.4.3</xmlschema.version>
<checkstyle.extension />
<spring.validation.mode>VALIDATION_AUTO</spring.validation.mode>
Modified: cxf/trunk/rt/javascript/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/javascript/pom.xml?rev=753380&r1=753379&r2=753380&view=diff
==============================================================================
--- cxf/trunk/rt/javascript/pom.xml (original)
+++ cxf/trunk/rt/javascript/pom.xml Fri Mar 13 20:20:27 2009
@@ -67,6 +67,7 @@
<groupId>jdom</groupId>
<artifactId>jdom</artifactId>
<version>${jdom.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
Modified: cxf/trunk/rt/ws/security/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/pom.xml?rev=753380&r1=753379&r2=753380&view=diff
==============================================================================
--- cxf/trunk/rt/ws/security/pom.xml (original)
+++ cxf/trunk/rt/ws/security/pom.xml Fri Mar 13 20:20:27 2009
@@ -86,11 +86,6 @@
<artifactId>saaj-api</artifactId>
</dependency>
<dependency>
- <groupId>org.opensaml</groupId>
- <artifactId>opensaml</artifactId>
- <version>1.1</version>
- </dependency>
- <dependency>
<groupId>org.apache.ws.security</groupId>
<artifactId>wss4j</artifactId>
<version>1.5.6-SNAPSHOT</version>
