You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by jb...@apache.org on 2010/11/15 10:39:02 UTC

svn commit: r1035199 - in /servicemix/components/bindings/servicemix-rmi/trunk: .gitignore pom.xml src/main/java/org/apache/servicemix/rmi/RmiProviderEndpoint.java

Author: jbonofre
Date: Mon Nov 15 09:39:01 2010
New Revision: 1035199

URL: http://svn.apache.org/viewvc?rev=1035199&view=rev
Log:
Cleanup POM and fix compilation issue.

Added:
    servicemix/components/bindings/servicemix-rmi/trunk/.gitignore
Modified:
    servicemix/components/bindings/servicemix-rmi/trunk/pom.xml
    servicemix/components/bindings/servicemix-rmi/trunk/src/main/java/org/apache/servicemix/rmi/RmiProviderEndpoint.java

Added: servicemix/components/bindings/servicemix-rmi/trunk/.gitignore
URL: http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-rmi/trunk/.gitignore?rev=1035199&view=auto
==============================================================================
--- servicemix/components/bindings/servicemix-rmi/trunk/.gitignore (added)
+++ servicemix/components/bindings/servicemix-rmi/trunk/.gitignore Mon Nov 15 09:39:01 2010
@@ -0,0 +1,4 @@
+*.i??
+target
+.project
+.classpath
\ No newline at end of file

Modified: servicemix/components/bindings/servicemix-rmi/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-rmi/trunk/pom.xml?rev=1035199&r1=1035198&r2=1035199&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-rmi/trunk/pom.xml (original)
+++ servicemix/components/bindings/servicemix-rmi/trunk/pom.xml Mon Nov 15 09:39:01 2010
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4_0_0.xsd">
-         
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
     <!--
 
         Licensed to the Apache Software Foundation (ASF) under one or more
@@ -17,28 +17,28 @@
         the specific language governing permissions and limitations under the
         License.
     -->
-    
+
     <modelVersion>4.0.0</modelVersion>
-    
+
     <parent>
         <groupId>org.apache.servicemix</groupId>
         <artifactId>components-pom</artifactId>
         <version>6-SNAPSHOT</version>
-    </parent>         
-    
+    </parent>
+
     <groupId>org.apache.servicemix</groupId>
     <artifactId>servicemix-rmi</artifactId>
     <version>2010.02-SNAPSHOT</version>
     <packaging>jbi-component</packaging>
-    
+
     <name>ServiceMix :: RMI</name>
     <description>
         A RMI binding component allowing to work with RMI to communicate with other java components.
     </description>
-    
+
     <properties>
-        <cxf-version>2.2.8</cxf-version>
-        
+        <cxf.version>2.2.11</cxf.version>
+
         <servicemix.osgi.import>
             !org.apache.servicemix.rmi*,
             org.apache.servicemix;resolution:=optional,
@@ -64,33 +64,40 @@
             org.springframework.context,
         </servicemix.osgi.bundles>
     </properties>
-    
+
     <scm>
         <connection>scm:svn:http://svn.apache.org/repos/asf/servicemix/components/engines/servicemix-rmi/trunk</connection>
         <developerConnection>scm:svn:https://svn.apache.org/repos/asf/servicemix/components/engines/servicemix-rmi/trunk</developerConnection>
         <url>http://svn.apache.org/viewcvs.cgi/servicemix/components/engines/servicemix-rmi/trunk</url>
     </scm>
-    
+
     <dependencies>
         <dependency>
-            <groupId>org.apache.servicemix</groupId>
-            <artifactId>servicemix-shared</artifactId>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-core</artifactId>
+            <version>${cxf.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-rt-frontend-simple</artifactId>
-            <version>${cxf-version}</version>
-        </dependency>
+            <artifactId>cxf-rt-databinding-aegis</artifactId>
+            <version>${cxf.version}</version>
+        </dependency>        
         <dependency>
             <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-rt-core</artifactId>
-            <version>${cxf-version}</version>
+            <artifactId>cxf-rt-frontend-simple</artifactId>
+            <version>${cxf.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-rt-databinding-aegis</artifactId>
-            <version>${cxf-version}</version>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+        </dependency>        
+        <dependency>
+            <groupId>org.apache.servicemix</groupId>
+            <artifactId>servicemix-shared</artifactId>
         </dependency>
+
+
+        <!-- provided -->
         <dependency>
             <groupId>org.apache.servicemix.specs</groupId>
             <artifactId>org.apache.servicemix.specs.jbi-api-1.0</artifactId>
@@ -101,11 +108,8 @@
             <artifactId>geronimo-jta_1.1_spec</artifactId>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-        </dependency>
-        <!-- Testing stuff -->
+
+        <!-- test -->
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
@@ -123,7 +127,7 @@
             </exclusions>
         </dependency>
     </dependencies>
-    
+
     <build>
         <plugins>
             <plugin>
@@ -158,5 +162,5 @@
             </plugin>
         </plugins>
     </build>
-         
+
 </project>         

Modified: servicemix/components/bindings/servicemix-rmi/trunk/src/main/java/org/apache/servicemix/rmi/RmiProviderEndpoint.java
URL: http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-rmi/trunk/src/main/java/org/apache/servicemix/rmi/RmiProviderEndpoint.java?rev=1035199&r1=1035198&r2=1035199&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-rmi/trunk/src/main/java/org/apache/servicemix/rmi/RmiProviderEndpoint.java (original)
+++ servicemix/components/bindings/servicemix-rmi/trunk/src/main/java/org/apache/servicemix/rmi/RmiProviderEndpoint.java Mon Nov 15 09:39:01 2010
@@ -36,8 +36,6 @@ import org.apache.servicemix.rmi.marshal
 import org.apache.servicemix.rmi.util.WsdlHelper;
 import org.springframework.core.io.Resource;
 
-import sun.text.CompactShortArray.Iterator;
-
 /**
  * <p>
  * A {@link org.apache.servicemix.common.endpoints.ProviderEndpoint ProviderEndpoint} that call an external RMI remote object.