chemistry-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From f...@apache.org
Subject svn commit: r1593411 - in /chemistry/opencmis/trunk: ./ chemistry-opencmis-client/chemistry-opencmis-client-bindings/ chemistry-opencmis-commons/chemistry-opencmis-commons-impl/ chemistry-opencmis-osgi/chemistry-opencmis-osgi-client/ chemistry-opencmis...
Date Thu, 08 May 2014 20:43:28 GMT
Author: fmui
Date: Thu May  8 20:43:28 2014
New Revision: 1593411

URL: http://svn.apache.org/r1593411
Log:
reverting to JAX-WS 21. for Java 6

Modified:
    chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/pom.xml
    chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/pom.xml
    chemistry/opencmis/trunk/chemistry-opencmis-osgi/chemistry-opencmis-osgi-client/pom.xml
    chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/pom.xml
    chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/webservices/CmisWebServicesServlet.java
    chemistry/opencmis/trunk/pom.xml

Modified: chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/pom.xml
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/pom.xml?rev=1593411&r1=1593410&r2=1593411&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/pom.xml
(original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/pom.xml
Thu May  8 20:43:28 2014
@@ -76,7 +76,7 @@
                           org.apache.chemistry.opencmis.client.bindings.spi.*;version=${project.version}
                         </Export-Package>
                         <Import-Package>
-                          com.sun.xml.ws.*;version="[2.2,3.0)";resolution:=optional,
+                          com.sun.xml.ws.*;version="[2.1,3.0)";resolution:=optional,
                           org.apache.cxf.*;resolution:=optional,
                           org.apache.http.*;resolution:=optional,
                           org.apache.axis2.*;resolution:=optional,

Modified: chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/pom.xml
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/pom.xml?rev=1593411&r1=1593410&r2=1593411&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/pom.xml
(original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/pom.xml
Thu May  8 20:43:28 2014
@@ -97,7 +97,7 @@
                             <destdir />
                             <sourceDestDir>${project.basedir}/target/generated</sourceDestDir>
                             <extension>true</extension>
-                            <target>2.2</target>
+                            <target>2.1</target>
                         </configuration>
                     </execution>
                 </executions>
@@ -131,7 +131,7 @@
                         </Export-Package>
                         <Import-Package>
                           org.apache.chemistry.opencmis.commons.*,
-                          com.sun.xml.ws.*;version="[2.2,3.0)";resolution:=optional,
+                          com.sun.xml.ws.*;version="[2.1,3.0)";resolution:=optional,
                           *
                         </Import-Package>
                         <Bundle-DocURL>${project.url}</Bundle-DocURL>

Modified: chemistry/opencmis/trunk/chemistry-opencmis-osgi/chemistry-opencmis-osgi-client/pom.xml
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-osgi/chemistry-opencmis-osgi-client/pom.xml?rev=1593411&r1=1593410&r2=1593411&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-osgi/chemistry-opencmis-osgi-client/pom.xml
(original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-osgi/chemistry-opencmis-osgi-client/pom.xml
Thu May  8 20:43:28 2014
@@ -56,7 +56,7 @@
                         <Import-Package>
                             org.slf4j;resolution:=optional,
                             org.slf4j.impl;resolution:=optional,
-                            com.sun.xml.ws.*;version="[2.2,3.0)";resolution:=optional,
+                            com.sun.xml.ws.*;version="[2.1,3.0)";resolution:=optional,
                             com.sun.xml.internal.*;resolution:=optional,
                             org.apache.cxf.*;resolution:=optional,
                             org.apache.http.*;resolution:=optional,
@@ -70,7 +70,7 @@
                             org.apache.chemistry.opencmis.client.bindings.spi.*;version=${project.version},
                             org.apache.chemistry.opencmis.commons.impl.*;version=${project.version};-noimport:=true,
                             org.apache.chemistry.opencmis.commons.*;version=${project.version};-noimport:=true,
-                            com.sun.xml.ws.*;version="[2.2,3.0)";resolution:=optional
+                            com.sun.xml.ws.*;version="[2.1,3.0)";resolution:=optional
                         </_exportcontents>
                         <Bundle-DocURL>${project.url}</Bundle-DocURL>
                         <Bundle-Activator>org.apache.chemistry.opencmis.client.osgi.Activator</Bundle-Activator>

Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/pom.xml
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/pom.xml?rev=1593411&r1=1593410&r2=1593411&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/pom.xml
(original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/pom.xml
Thu May  8 20:43:28 2014
@@ -50,9 +50,32 @@
             <version>${project.version}</version>
         </dependency>
         <dependency>
+            <groupId>org.jvnet.mimepull</groupId>
+            <artifactId>mimepull</artifactId>
+            <version>1.9.4</version>
+        </dependency> 
+        <dependency>
             <groupId>com.sun.xml.ws</groupId>
             <artifactId>jaxws-rt</artifactId>
             <version>${jaxws-rt.version}</version>
+            <exclusions>
+                <exclusion>	 
+                    <groupId>stax</groupId>	 
+                    <artifactId>stax-api</artifactId>	 
+                </exclusion>	 
+                <exclusion>	 
+                    <groupId>org.codehaus.woodstox</groupId>	 
+                    <artifactId>wstx-asl</artifactId>	 
+                </exclusion>	 
+                <exclusion>	 
+                    <groupId>junit</groupId>	 
+                    <artifactId>junit</artifactId>	 
+                </exclusion>	 
+                <exclusion>	 
+                    <groupId>org.jvnet</groupId>	 
+                    <artifactId>mimepull</artifactId>	 
+                </exclusion>	 
+            </exclusions>
         </dependency>
         <!-- server-support is not a *runtime* dependency but it's added for commodity
in the WAR -->
         <dependency>

Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/webservices/CmisWebServicesServlet.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/webservices/CmisWebServicesServlet.java?rev=1593411&r1=1593410&r2=1593411&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/webservices/CmisWebServicesServlet.java
(original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/webservices/CmisWebServicesServlet.java
Thu May  8 20:43:28 2014
@@ -21,6 +21,7 @@ package org.apache.chemistry.opencmis.se
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.PrintWriter;
+import java.lang.reflect.Method;
 import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
@@ -271,6 +272,18 @@ public class CmisWebServicesServlet exte
     }
 
     private void setMemoryThreshold(CmisServiceFactory factory, StreamingAttachmentFeature
ft) {
-        ft.setMemoryThreshold(factory.getMemoryThreshold());
+        try {
+            // JAX-WS RI 2.1
+            ft.setMemoryThreshold(factory.getMemoryThreshold());
+        } catch (NoSuchMethodError e) {
+            // JAX-WS RI 2.2
+            // see CMIS-626
+            try {
+                Method m = ft.getClass().getMethod("setMemoryThreshold", long.class);
+                m.invoke(ft, (long) factory.getMemoryThreshold());
+            } catch (Exception e2) {
+                LOG.warn("Could not set memory threshold for streaming");
+            }
+        }
     }
 }

Modified: chemistry/opencmis/trunk/pom.xml
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/pom.xml?rev=1593411&r1=1593410&r2=1593411&view=diff
==============================================================================
--- chemistry/opencmis/trunk/pom.xml (original)
+++ chemistry/opencmis/trunk/pom.xml Thu May  8 20:43:28 2014
@@ -235,7 +235,7 @@
         <slf4j.version>1.7.5</slf4j.version>
         <log4j.version>1.2.17</log4j.version>
         <apacheclient.version>4.2.6</apacheclient.version>
-        <jaxws-rt.version>2.2.8</jaxws-rt.version>
+        <jaxws-rt.version>2.1.7</jaxws-rt.version>
         <cxf.version>2.7.11</cxf.version>
         <axis2.version>1.6.2</axis2.version>
     </properties>
@@ -477,6 +477,31 @@
         </extensions>
     </build>
 
+    <repositories>
+        <repository>
+            <id>jboss.public</id>
+            <name>JBoss repository (for JAX-WS 2.1.7)</name>
+            <url>http://repository.jboss.org/nexus/content/groups/public/</url>
+        </repository>
+        <repository>
+            <id>maven2-repository.dev.java.net</id>
+            <name>Java.net Repository for Maven 2</name>
+            <url>http://download.java.net/maven/2/</url>
+        </repository>
+    </repositories>
+
+    <pluginRepositories>
+        <pluginRepository>
+            <id>maven2-repository.dev.java.net</id>
+            <url>http://download.java.net/maven/2/</url>
+        </pluginRepository>
+        <pluginRepository>
+            <id>jboss-public</id>
+            <name>Jboss Repository for Maven 2</name>
+            <url>http://repository.jboss.org/nexus/content/groups/public/</url>
+        </pluginRepository>
+    </pluginRepositories>
+
     <dependencies>
         <dependency>
             <groupId>org.slf4j</groupId>



Mime
View raw message