cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r635743 - in /incubator/cxf/trunk: distribution/ distribution/bundle/ distribution/manifest/ distribution/src/main/release/lib/ distribution/src/main/release/samples/ parent/ rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/ rt/...
Date Mon, 10 Mar 2008 22:44:11 GMT
Author: dkulp
Date: Mon Mar 10 15:44:00 2008
New Revision: 635743

URL: http://svn.apache.org/viewvc?rev=635743&view=rev
Log:
Fix a bunch of unwanted jars in the distribution
Fix some corba issues (still not working with Sun orb though)
Update WHICH_JARS

Modified:
    incubator/cxf/trunk/distribution/bundle/pom.xml
    incubator/cxf/trunk/distribution/manifest/pom.xml
    incubator/cxf/trunk/distribution/pom.xml
    incubator/cxf/trunk/distribution/src/main/release/lib/WHICH_JARS
    incubator/cxf/trunk/distribution/src/main/release/samples/common_build.xml
    incubator/cxf/trunk/parent/pom.xml
    incubator/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaConduit.java
    incubator/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaDestination.java
    incubator/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaStreamable.java
    incubator/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/TypeMapCache.java
    incubator/cxf/trunk/rt/frontend/jaxrs/pom.xml
    incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/CXFServlet.java

Modified: incubator/cxf/trunk/distribution/bundle/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/bundle/pom.xml?rev=635743&r1=635742&r2=635743&view=diff
==============================================================================
--- incubator/cxf/trunk/distribution/bundle/pom.xml (original)
+++ incubator/cxf/trunk/distribution/bundle/pom.xml Mon Mar 10 15:44:00 2008
@@ -78,6 +78,11 @@
         </dependency>
         <dependency>
             <groupId>${pom.groupId}</groupId>
+            <artifactId>cxf-tools-corba</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
             <artifactId>cxf-rt-databinding-xmlbeans</artifactId>
             <version>${pom.version}</version>
         </dependency>
@@ -154,6 +159,11 @@
         <dependency>
             <groupId>${pom.groupId}</groupId>
             <artifactId>cxf-rt-bindings-soap</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>cxf-rt-bindings-corba</artifactId>
             <version>${pom.version}</version>
         </dependency>
 

Modified: incubator/cxf/trunk/distribution/manifest/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/manifest/pom.xml?rev=635743&r1=635742&r2=635743&view=diff
==============================================================================
--- incubator/cxf/trunk/distribution/manifest/pom.xml (original)
+++ incubator/cxf/trunk/distribution/manifest/pom.xml Mon Mar 10 15:44:00 2008
@@ -74,6 +74,11 @@
             <artifactId>cxf-tools-wsdlto-databinding-jaxb</artifactId>
             <version>${pom.version}</version>
         </dependency>
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>cxf-tools-corba</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
         
         <dependency>
             <groupId>${pom.groupId}</groupId>
@@ -162,6 +167,11 @@
             <artifactId>cxf-rt-bindings-object</artifactId>
             <version>${pom.version}</version>
         </dependency>
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>cxf-rt-bindings-corba</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
 
         <dependency>
             <groupId>${pom.groupId}</groupId>
@@ -204,6 +214,12 @@
             <groupId>${pom.groupId}</groupId>
             <artifactId>cxf-rt-ws-security</artifactId>
             <version>${pom.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>bouncycastle</groupId>
+                    <artifactId>bcprov-jdk14</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>${pom.groupId}</groupId>

Modified: incubator/cxf/trunk/distribution/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/pom.xml?rev=635743&r1=635742&r2=635743&view=diff
==============================================================================
--- incubator/cxf/trunk/distribution/pom.xml (original)
+++ incubator/cxf/trunk/distribution/pom.xml Mon Mar 10 15:44:00 2008
@@ -82,6 +82,11 @@
         </dependency>
         <dependency>
             <groupId>${pom.groupId}</groupId>
+            <artifactId>cxf-tools-corba</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
             <artifactId>cxf-tools-wsdlto-databinding-jaxb</artifactId>
             <version>${pom.version}</version>
         </dependency>
@@ -152,6 +157,11 @@
         <dependency>
             <groupId>${pom.groupId}</groupId>
             <artifactId>cxf-rt-bindings-soap</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>cxf-rt-bindings-corba</artifactId>
             <version>${pom.version}</version>
         </dependency>
 

Modified: incubator/cxf/trunk/distribution/src/main/release/lib/WHICH_JARS
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/lib/WHICH_JARS?rev=635743&r1=635742&r2=635743&view=diff
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/lib/WHICH_JARS (original)
+++ incubator/cxf/trunk/distribution/src/main/release/lib/WHICH_JARS Mon Mar 10 15:44:00 2008
@@ -3,31 +3,40 @@
 contains the cxf.jar split up into smaller pieces if you wish to use only
 specific parts of CXF.
 
+Jars marked with a [6] at the end are optional for Java 6 (update 4 or 
+later is supported) as the functionality provided by those jars are 
+provided in the JDK
+
 The following jars are required for all CXF usage:
 - cxf.jar
 - commons-logging.jar
-- geronimo-activation.jar (Or the Sun equivalent)
-- geronimo-annotation.jar (Or the Sun equivalent)
-- geronimo-javamail.jar (Or the Sun equivalent)
+- geronimo-activation.jar (Or the Sun equivalent) [6]
+- geronimo-annotation.jar (Or the Sun equivalent) [6]
+- geronimo-javamail.jar (Or the Sun equivalent) [6]
+- geronimo-stax-api.jar (Or the Sun equivalent) [6]
 - neethi.jar
-- jaxb-api.jar
+- jaxb-api.jar  [6]
 - jaxb-impl.jar
-- stax-api.jar
+- stax-utils.jar
 - XmlSchema.jar
-- wstx-asl.jar
+- wstx-asl.jar  [6]
+- wsdl4j.jar
 - xml-resolver.jar 
 
 For Java2WSDL and WSDL2Java:
 - The above jars
 - jaxb-xjc.jar
-- veliocity.jar
+- velocity.jar
 - velocity-dep.jar
 
 For JAX-WS support:
-- jaxws-api.jar
-- saaj-api.jar
-- saaj-impl.jar
-- asm.jar (optional, but helps with performance of wrapper types)
+- geronimo-ws-metadata.jar [6]
+- jaxws-api.jar [6]
+- saaj-api.jar [6]
+- saaj-impl.jar [6]
+- asm.jar (semi-optional, helps with performance of wrapper types and is 
+        required when adding JAXB annotations onto the SEI methods and 
+	parameters.)
 
 For XML Configuration support:
 - aopalliance.jar
@@ -50,10 +59,23 @@
 
 For WS-Security support:
 - bcprov-jdk14.jar
+- xalan.jar (version 2.7.1 preferred)
 - wss4j.jar
-- xalan.jar
 - xmlsec.jar
 
 For HTTP Binding support:
 - jra.jar
 - jettison.jar (Needed for JSON services only)
+
+For JAX-RS support:
+- abdera*
+- axiom*
+- jsr311-api.jar
+- jettison.jar (Needed for JSON services only)
+
+For JMS transport
+- geronimo-jms.jar (Or the Sun equivalent)
+
+For CORBA support:
+- antlr.jar
+

Modified: incubator/cxf/trunk/distribution/src/main/release/samples/common_build.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/common_build.xml?rev=635743&r1=635742&r2=635743&view=diff
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/common_build.xml (original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/common_build.xml Mon Mar 10
15:44:00 2008
@@ -40,6 +40,10 @@
         value="../../../../../target/srcbuild_env.ant"
         file="target/srcbuild_env.ant"
         filepath="../../../../.."/>
+     <available property="srcbuild_paths.file"
+        value="../../../../../../target/srcbuild_env.ant"
+        file="target/srcbuild_env.ant"
+        filepath="../../../../../.."/>
     <property name="srcbuild_paths.file" value="${build.dir}/notsrcbuildpath"/>
     <mkdir dir="${build.dir}"/>
     <touch file="${build.dir}/notsrcbuildpath" verbose="false"/>

Modified: incubator/cxf/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/parent/pom.xml?rev=635743&r1=635742&r2=635743&view=diff
==============================================================================
--- incubator/cxf/trunk/parent/pom.xml (original)
+++ incubator/cxf/trunk/parent/pom.xml Mon Mar 10 15:44:00 2008
@@ -832,6 +832,75 @@
                 <artifactId>bcprov-jdk14</artifactId>
                 <version>136</version>
             </dependency>
+
+            <dependency>
+                <groupId>org.apache.abdera</groupId>
+                <artifactId>abdera-core</artifactId>
+                <version>0.3.0-incubating</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.apache.geronimo.specs</groupId>
+                        <artifactId>geronimo-activation_1.0.2_spec</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.abdera</groupId>
+                <artifactId>abdera-parser</artifactId>
+                <version>0.3.0-incubating</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>javax.mail</groupId>
+                        <artifactId>mail</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>xml-apis</groupId>
+                        <artifactId>xml-apis</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>stax</groupId>
+                        <artifactId>stax-api</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.ws.commons.axiom</groupId>
+                <artifactId>axiom-api</artifactId>
+                <version>1.2.5</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>javax.mail</groupId>
+                        <artifactId>mail</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>xml-apis</groupId>
+                        <artifactId>xml-apis</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>stax</groupId>
+                        <artifactId>stax-api</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.ws.commons.axiom</groupId>
+                <artifactId>axiom-impl</artifactId>
+                <version>1.2.5</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>javax.mail</groupId>
+                        <artifactId>mail</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>xml-apis</groupId>
+                        <artifactId>xml-apis</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>stax</groupId>
+                        <artifactId>stax-api</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
@@ -1045,7 +1114,7 @@
         <profile>
             <id>spring2.5</id>
             <properties>
-                <spring.version>2.5</spring.version>
+                <spring.version>2.5.2</spring.version>
                 <spring.mock>spring-test</spring.mock>
             </properties>
         </profile>

Modified: incubator/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaConduit.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaConduit.java?rev=635743&r1=635742&r2=635743&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaConduit.java
(original)
+++ incubator/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaConduit.java
Mon Mar 10 15:44:00 2008
@@ -31,6 +31,7 @@
 
 import org.apache.cxf.binding.corba.types.CorbaHandlerUtils;
 import org.apache.cxf.binding.corba.types.CorbaObjectHandler;
+import org.apache.cxf.binding.corba.types.CorbaPrimitiveHandler;
 import org.apache.cxf.binding.corba.utils.ContextUtils;
 import org.apache.cxf.binding.corba.utils.CorbaBindingHelper;
 import org.apache.cxf.binding.corba.utils.CorbaUtils;
@@ -62,6 +63,7 @@
 import org.omg.CORBA.ORB;
 import org.omg.CORBA.Request;
 import org.omg.CORBA.SystemException;
+import org.omg.CORBA.TCKind;
 import org.omg.CORBA.TypeCode;
 import org.omg.CORBA.UnknownUserException;
 
@@ -218,10 +220,10 @@
             CorbaStreamable[] arguments = message.getStreamableArguments();
             list = orb.create_list(arguments.length);
 
-            for (int i = 0; i < arguments.length; ++i) {
+            for (CorbaStreamable argument : arguments) {
                 Any value = orb.create_any();
-                value.insert_Streamable(arguments[i]);
-                list.add_value(arguments[i].getName(), value, arguments[i].getMode());
+                setIntoAny(value, argument);
+                list.add_value(argument.getName(), value, argument.getMode());
             }
         } else {
             list = orb.create_list(0);
@@ -230,6 +232,17 @@
         return list;        
     }
     
+    private void setIntoAny(Any value, CorbaStreamable argument) {
+        switch (argument._type().kind().value()) {
+        case TCKind._tk_string:
+            value.insert_string((String)((CorbaPrimitiveHandler)argument.getObject()).getValue());
+            break;
+            //FIXME - other primatives that the Sun ORB apparently cannot handle
+        default:
+            value.insert_Streamable(argument);
+        }
+    }
+
     protected NamedValue getReturn(CorbaMessage message) {
         CorbaStreamable retVal = message.getStreamableReturn();
         NamedValue ret = null;

Modified: incubator/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaDestination.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaDestination.java?rev=635743&r1=635742&r2=635743&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaDestination.java
(original)
+++ incubator/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaDestination.java
Mon Mar 10 15:44:00 2008
@@ -185,16 +185,19 @@
             } catch (org.omg.PortableServer.POAPackage.AdapterNonExistent ex) {
                 // An AdapterNonExistent exception will be thrown if the POA does not exist.
 If
                 // this is the case, then we'll create one.
-                Policy[] policies = new Policy[3];
+                Policy[] policies = new Policy[2];
                 policies[0] = rootPOA
-                        .create_lifespan_policy(
-                            org.omg.PortableServer.LifespanPolicyValue.PERSISTENT);
+                .create_id_uniqueness_policy(
+                    org.omg.PortableServer.IdUniquenessPolicyValue.UNIQUE_ID);
                 policies[1] = rootPOA
                         .create_implicit_activation_policy(
                             org.omg.PortableServer.ImplicitActivationPolicyValue.NO_IMPLICIT_ACTIVATION);
+                /*
+                REVISIT - PERSISTENT POA with Sun ORB?
                 policies[2] = rootPOA
-                        .create_id_uniqueness_policy(
-                            org.omg.PortableServer.IdUniquenessPolicyValue.UNIQUE_ID);
+                    .create_lifespan_policy(org.omg.PortableServer.LifespanPolicyValue.PERSISTENT);
+                policies[3] = rootPOA.create_id_assignment_policy(IdAssignmentPolicyValue.USER_ID);
+                */
 
                 bindingPOA = rootPOA.create_POA("BindingPOA", poaManager, policies);
             }

Modified: incubator/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaStreamable.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaStreamable.java?rev=635743&r1=635742&r2=635743&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaStreamable.java
(original)
+++ incubator/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaStreamable.java
Mon Mar 10 15:44:00 2008
@@ -20,12 +20,10 @@
 
 import org.apache.cxf.binding.corba.types.CorbaObjectHandler;
 
-import org.omg.CORBA.TypeCode;
 import org.omg.CORBA.portable.Streamable;
 
 public interface CorbaStreamable extends Streamable {
 
-    TypeCode _type();
     CorbaObjectHandler getObject();
     void setObject(CorbaObjectHandler obj);
     int getMode();

Modified: incubator/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/TypeMapCache.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/TypeMapCache.java?rev=635743&r1=635742&r2=635743&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/TypeMapCache.java
(original)
+++ incubator/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/TypeMapCache.java
Mon Mar 10 15:44:00 2008
@@ -40,8 +40,9 @@
                     List<TypeMappingType> corbaTypes = service.getDescription()
                             .getExtensors(TypeMappingType.class);
                     if (corbaTypes != null) {
-                        service.setProperty(KEY, CorbaUtils.createCorbaTypeMap(corbaTypes));
-                    }                   
+                        map = CorbaUtils.createCorbaTypeMap(corbaTypes);
+                        service.setProperty(KEY, map);
+                    }
                 }
                 return map; 
             }

Modified: incubator/cxf/trunk/rt/frontend/jaxrs/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxrs/pom.xml?rev=635743&r1=635742&r2=635743&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxrs/pom.xml (original)
+++ incubator/cxf/trunk/rt/frontend/jaxrs/pom.xml Mon Mar 10 15:44:00 2008
@@ -74,12 +74,10 @@
         <dependency>
             <groupId>org.apache.abdera</groupId>
             <artifactId>abdera-core</artifactId>
-            <version>0.3.0-incubating</version>
         </dependency>
         <dependency>
             <groupId>org.apache.abdera</groupId>
             <artifactId>abdera-parser</artifactId>
-            <version>0.3.0-incubating</version>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>

Modified: incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/CXFServlet.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/CXFServlet.java?rev=635743&r1=635742&r2=635743&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/CXFServlet.java
(original)
+++ incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/CXFServlet.java
Mon Mar 10 15:44:00 2008
@@ -30,6 +30,7 @@
 import javax.servlet.ServletException;
 
 
+import org.apache.cxf.bus.spring.BusApplicationContext;
 import org.apache.cxf.bus.spring.SpringBusFactory;
 import org.apache.cxf.common.classloader.ClassLoaderUtils;
 import org.apache.cxf.common.logging.LogUtils;
@@ -96,6 +97,7 @@
         if (ctx == null) {            
             LOG.info("LOAD_BUS_WITHOUT_APPLICATION_CONTEXT");
             bus = new SpringBusFactory().createBus();
+            ctx = bus.getExtension(BusApplicationContext.class);
         } else {
             LOG.info("LOAD_BUS_WITH_APPLICATION_CONTEXT");
             bus = new SpringBusFactory(ctx).createBus();



Mime
View raw message