You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by th...@apache.org on 2007/03/27 21:15:30 UTC
svn commit: r523036 - in /webservices/axis2/trunk/java:
etc/project.properties modules/fastinfoset/README.txt
modules/fastinfoset/maven.xml modules/fastinfoset/project.xml
modules/fastinfoset/test/org/apache/axis2/fastinfoset/SimpleAddServiceClient.java
Author: thilina
Date: Tue Mar 27 12:15:29 2007
New Revision: 523036
URL: http://svn.apache.org/viewvc?view=rev&rev=523036
Log:
Applying the patch given at https://issues.apache.org/jira/browse/AXIS2-2405..
Thanx Sanjaya..
Added:
webservices/axis2/trunk/java/modules/fastinfoset/README.txt
Modified:
webservices/axis2/trunk/java/etc/project.properties
webservices/axis2/trunk/java/modules/fastinfoset/maven.xml
webservices/axis2/trunk/java/modules/fastinfoset/project.xml
webservices/axis2/trunk/java/modules/fastinfoset/test/org/apache/axis2/fastinfoset/SimpleAddServiceClient.java
Modified: webservices/axis2/trunk/java/etc/project.properties
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/etc/project.properties?view=diff&rev=523036&r1=523035&r2=523036
==============================================================================
--- webservices/axis2/trunk/java/etc/project.properties (original)
+++ webservices/axis2/trunk/java/etc/project.properties Tue Mar 27 12:15:29 2007
@@ -37,7 +37,7 @@
http://ws.zones.apache.org/repository/,\
http://people.apache.org/repo/m1-ibiblio-rsync-repository/,\
http://jibx.sourceforge.net/maven/,\
-https://maven-repository.dev.java.net/nonav/repository/
+http://fisheye5.cenqua.com/browse/fi/repo
# -------------------------------------------------------------------
# Multiproject includes and excludes
Added: webservices/axis2/trunk/java/modules/fastinfoset/README.txt
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/fastinfoset/README.txt?view=auto&rev=523036
==============================================================================
--- webservices/axis2/trunk/java/modules/fastinfoset/README.txt (added)
+++ webservices/axis2/trunk/java/modules/fastinfoset/README.txt Tue Mar 27 12:15:29 2007
@@ -0,0 +1,8 @@
+This module handles Fast Infoset (FI) binary serialization for Axis2.
+
+The fast infoset parser used here is from Fast Infoset Project @ https://fi.dev.java.net/
+
+FI 1.1.x is targeted to JDK1.4 and is used in JAX-WS 2.0, JAXB 2.0.
+FI 1.2.x is targeted to JDK1.5 and is used in JAX-WS 2.1, JAXB 2.1.
+
+The maven script automatically detects the JDK version and use the appropriate FI jar file.
Modified: webservices/axis2/trunk/java/modules/fastinfoset/maven.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/fastinfoset/maven.xml?view=diff&rev=523036&r1=523035&r2=523036
==============================================================================
--- webservices/axis2/trunk/java/modules/fastinfoset/maven.xml (original)
+++ webservices/axis2/trunk/java/modules/fastinfoset/maven.xml Tue Mar 27 12:15:29 2007
@@ -6,9 +6,18 @@
xmlns:maven="jelly:maven"
xmlns:deploy="deploy"
xmlns:ant="jelly:ant">
+ <preGoal name="build:start">
+ <!-- Set the Fast Infoset jar to version 1.1.x if the JVM version is 1.4.x -->
+ <j:set var="javaVersion" value="${java.specification.version}"/>
+ <j:if test="${javaVersion != 1.5}">
+ <j:set var="fastinfoset.version" value="1.1.1"/>
+ </j:if>
+ <echo message="Current Java Version is: ${java.specification.version}"/>
+ <echo message="Hence, including fastinfoset.${fastinfoset.version}.jar"/>
+ </preGoal>
<preGoal name="test:compile">
<!-- copy the required mars so that they are available on the test path -->
- <copy file="../addressing/target/addressing-${addressing_version}.mar"
- tofile="target/test-classes/modules/addressing-${addressing_version}.mar"/>
+ <copy file="../addressing/target/addressing-${addressing_version}.mar"
+ tofile="target/test-classes/modules/addressing-${addressing_version}.mar"/>
</preGoal>
</project>
Modified: webservices/axis2/trunk/java/modules/fastinfoset/project.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/fastinfoset/project.xml?view=diff&rev=523036&r1=523035&r2=523036
==============================================================================
--- webservices/axis2/trunk/java/modules/fastinfoset/project.xml (original)
+++ webservices/axis2/trunk/java/modules/fastinfoset/project.xml Tue Mar 27 12:15:29 2007
@@ -24,12 +24,22 @@
<name>Apache Axis 2.0 - Fast Infoset</name>
<groupId>org.apache.axis2</groupId>
<description>Axis2 Fast Infoset module</description>
-
+
<dependencies>
<dependency>
<groupId>com.sun.xml.fastinfoset</groupId>
<artifactId>FastInfoset</artifactId>
<version>${fastinfoset.version}</version>
+ <type>jar</type>
+ <properties>
+ <module>true</module>
+ </properties>
+ <url>https://maven-repository.dev.java.net/nonav/repository/</url>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.fastinfoset</groupId>
+ <artifactId>FastInfoset</artifactId>
+ <version>1.1.1</version><!-- Version for JVM 1.4.x -->
<type>jar</type>
<properties>
<module>true</module>
Modified: webservices/axis2/trunk/java/modules/fastinfoset/test/org/apache/axis2/fastinfoset/SimpleAddServiceClient.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/fastinfoset/test/org/apache/axis2/fastinfoset/SimpleAddServiceClient.java?view=diff&rev=523036&r1=523035&r2=523036
==============================================================================
--- webservices/axis2/trunk/java/modules/fastinfoset/test/org/apache/axis2/fastinfoset/SimpleAddServiceClient.java (original)
+++ webservices/axis2/trunk/java/modules/fastinfoset/test/org/apache/axis2/fastinfoset/SimpleAddServiceClient.java Tue Mar 27 12:15:29 2007
@@ -32,7 +32,6 @@
import org.apache.axis2.fastinfoset.xsd.SimpleAddServiceStub.AddIntsResponse;
import org.apache.axis2.fastinfoset.xsd.SimpleAddServiceStub.AddStrings;
import org.apache.axis2.fastinfoset.xsd.SimpleAddServiceStub.AddStringsResponse;
-import org.apache.axis2.transport.http.HTTPConstants;
public class SimpleAddServiceClient {
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org