cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r576542 - in /incubator/cxf/tags/cxf-2.0.2-incubator: ./ distribution/src/main/release/ distribution/src/main/release/samples/ws_policy/ etc/eclipse/ rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/ tools/javato/ws/
Date Mon, 17 Sep 2007 17:44:55 GMT
Author: dkulp
Date: Mon Sep 17 10:44:54 2007
New Revision: 576542

URL: http://svn.apache.org/viewvc?rev=576542&view=rev
Log:
Merged revisions 573667-574161,574163-574834,574836-574886,574888-575212,575214-575221,575223-575253,575255-575515,575517-575528,575530-576516
via svnmerge from 
https://svn.apache.org/repos/asf/incubator/cxf/trunk

........
  r573667 | dkulp | 2007-09-07 14:45:26 -0400 (Fri, 07 Sep 2007) | 2 lines
  
  Forgot the export notice on trunk
........
  r574011 | ningjiang | 2007-09-09 09:24:05 -0400 (Sun, 09 Sep 2007) | 1 line
  
  CXF-982 applied Benson's patch for eclipse setup, thanks
........
  r574286 | eglynn | 2007-09-10 11:56:10 -0400 (Mon, 10 Sep 2007) | 3 lines
  
  Applying second patch for CXF-872 on behalf of Sergey Beryozkin, this time to fix a knock-on
issue with the ws_policy sample.
........
  r576516 | dkulp | 2007-09-17 12:50:16 -0400 (Mon, 17 Sep 2007) | 4 lines
  
  Fix issue if two ops have the same soapAction that is not "", it grabs a random operation.

  Add svn:ignore to javato/ws
........

Added:
    incubator/cxf/tags/cxf-2.0.2-incubator/etc/eclipse/xmltemplates.xml
      - copied unchanged from r574011, incubator/cxf/trunk/etc/eclipse/xmltemplates.xml
Modified:
    incubator/cxf/tags/cxf-2.0.2-incubator/   (props changed)
    incubator/cxf/tags/cxf-2.0.2-incubator/distribution/src/main/release/README
    incubator/cxf/tags/cxf-2.0.2-incubator/distribution/src/main/release/samples/ws_policy/addr-external.xml
    incubator/cxf/tags/cxf-2.0.2-incubator/etc/eclipse/codetemplates.xml
    incubator/cxf/tags/cxf-2.0.2-incubator/pom.xml
    incubator/cxf/tags/cxf-2.0.2-incubator/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapActionInInterceptor.java
    incubator/cxf/tags/cxf-2.0.2-incubator/tools/javato/ws/   (props changed)

Propchange: incubator/cxf/tags/cxf-2.0.2-incubator/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Sep 17 10:44:54 2007
@@ -1 +1 @@
-/incubator/cxf/trunk:1-573640
+/incubator/cxf/trunk:1-573640,573667-574161,574163-574834,574836-574886,574888-575212,575214-575221,575223-575253,575255-575515,575517-575528,575530-576516

Modified: incubator/cxf/tags/cxf-2.0.2-incubator/distribution/src/main/release/README
URL: http://svn.apache.org/viewvc/incubator/cxf/tags/cxf-2.0.2-incubator/distribution/src/main/release/README?rev=576542&r1=576541&r2=576542&view=diff
==============================================================================
--- incubator/cxf/tags/cxf-2.0.2-incubator/distribution/src/main/release/README (original)
+++ incubator/cxf/tags/cxf-2.0.2-incubator/distribution/src/main/release/README Mon Sep 17
10:44:54 2007
@@ -38,6 +38,7 @@
 stability of the code, it does indicate that the project has yet to be fully 
 endorsed by the ASF.
 
+
 Export Notice
 ============================
 This distribution includes cryptographic software.  The country in 

Modified: incubator/cxf/tags/cxf-2.0.2-incubator/distribution/src/main/release/samples/ws_policy/addr-external.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/tags/cxf-2.0.2-incubator/distribution/src/main/release/samples/ws_policy/addr-external.xml?rev=576542&r1=576541&r2=576542&view=diff
==============================================================================
--- incubator/cxf/tags/cxf-2.0.2-incubator/distribution/src/main/release/samples/ws_policy/addr-external.xml
(original)
+++ incubator/cxf/tags/cxf-2.0.2-incubator/distribution/src/main/release/samples/ws_policy/addr-external.xml
Mon Sep 17 10:44:54 2007
@@ -17,7 +17,7 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<attachments xmlns:wsp="http://www.w3.org/2006/07/ws-policy" xmlns:wsa="http://www.w3.org/2005/08/addressing">
+<attachments xmlns:wsp="http://www.w3.org/ns/ws-policy" xmlns:wsa="http://www.w3.org/2005/08/addressing">
     <wsp:PolicyAttachment>
         <wsp:AppliesTo>
             <wsa:EndpointReference>

Modified: incubator/cxf/tags/cxf-2.0.2-incubator/etc/eclipse/codetemplates.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/tags/cxf-2.0.2-incubator/etc/eclipse/codetemplates.xml?rev=576542&r1=576541&r2=576542&view=diff
==============================================================================
--- incubator/cxf/tags/cxf-2.0.2-incubator/etc/eclipse/codetemplates.xml (original)
+++ incubator/cxf/tags/cxf-2.0.2-incubator/etc/eclipse/codetemplates.xml Mon Sep 17 10:44:54
2007
@@ -44,9 +44,7 @@
  * ${tags}
  */</template><template autoinsert="false" context="fieldcomment_context" deleted="false"
description="Comment for fields" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.fieldcomment"
name="fieldcomment"></template><template autoinsert="true" context="methodcomment_context"
deleted="false" description="Comment for non-overriding methods" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.methodcomment"
name="methodcomment">/**
  * ${tags}
- */</template><template autoinsert="true" context="overridecomment_context" deleted="false"
description="Comment for overriding methods" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.overridecomment"
name="overridecomment">/* (non-Javadoc)
- * ${see_to_overridden}
- */</template><template autoinsert="true" context="delegatecomment_context" deleted="false"
description="Comment for delegate methods" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.delegatecomment"
name="delegatecomment">/**
+ */</template><template autoinsert="true" context="overridecomment_context" deleted="false"
description="Comment for overriding methods" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.overridecomment"
name="overridecomment">/** {@inheritDoc}*/</template><template autoinsert="true"
context="delegatecomment_context" deleted="false" description="Comment for delegate methods"
enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name="delegatecomment">/**
  * ${tags}
  * ${see_to_target}
  */</template><template autoinsert="true" context="newtype_context" deleted="false"
description="Newly created files" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.newtype"
name="newtype">${filecomment}
@@ -60,4 +58,4 @@
 </template><template autoinsert="true" context="catchblock_context" deleted="false"
description="Code in new catch blocks" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.catchblock"
name="catchblock">// ${todo} Auto-generated catch block
 ${exception_var}.printStackTrace();</template><template autoinsert="true" context="methodbody_context"
deleted="false" description="Code in created method stubs" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.methodbody"
name="methodbody">// ${todo} Auto-generated method stub
 ${body_statement}</template><template autoinsert="true" context="constructorbody_context"
deleted="false" description="Code in created constructor stubs" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.constructorbody"
name="constructorbody">${body_statement}
-// ${todo} Auto-generated constructor stub</template><template autoinsert="true"
context="getterbody_context" deleted="false" description="Code in created getters" enabled="true"
id="org.eclipse.jdt.ui.text.codetemplates.getterbody" name="getterbody">return ${field};</template><template
autoinsert="true" context="setterbody_context" deleted="false" description="Code in created
setters" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.setterbody" name="setterbody">${field}
= ${param};</template></templates>
\ No newline at end of file
+// ${todo} Auto-generated constructor stub</template><template autoinsert="true"
context="getterbody_context" deleted="false" description="Code in created getters" enabled="true"
id="org.eclipse.jdt.ui.text.codetemplates.getterbody" name="getterbody">return ${field};</template><template
autoinsert="true" context="setterbody_context" deleted="false" description="Code in created
setters" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.setterbody" name="setterbody">${field}
= ${param};</template></templates>

Modified: incubator/cxf/tags/cxf-2.0.2-incubator/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/tags/cxf-2.0.2-incubator/pom.xml?rev=576542&r1=576541&r2=576542&view=diff
==============================================================================
--- incubator/cxf/tags/cxf-2.0.2-incubator/pom.xml (original)
+++ incubator/cxf/tags/cxf-2.0.2-incubator/pom.xml Mon Sep 17 10:44:54 2007
@@ -248,18 +248,23 @@
                                         </concat>
                                         <loadfile property="eclipse.code.format" srcFile="${basedir}/etc/eclipse/CXFCodeFormatter.xml"
/>
                                         <loadfile property="eclipse.code.templates" srcFile="${basedir}/etc/eclipse/codetemplates.xml"
/>
+					<loadfile property="eclipse.xml.templates" srcFile="${basedir}/etc/eclipse/xmltemplates.xml"
/>
                                         <propertyfile file="${full.eclipse.workspace}/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs">
                                             <entry key="formatter_profile" value="_CXF
Java Conventions" />
                                             <entry key="org.eclipse.jdt.ui.formatterprofiles"
value="${eclipse.code.format}" />
                                             <entry key="org.eclipse.jdt.ui.text.custom_code_templates"
value="${eclipse.code.templates}" />
 
                                             <!-- Add import order -->
-                                            <entry key="org.eclipse.jdt.ui.importorder"
value="java;javax;org.w3c;org.xml;w3c;" />
+                                            <entry key="org.eclipse.jdt.ui.importorder"
value="java;javax;org.w3c;org.xml;junit" />
                                             <!-- Sort order -->
                                             <entry key="org.eclipse.jdt.ui.visibility.order"
value="B,R,D,V," />
                                             <entry key="outlinesortoption" value="T,SF,F,SI,I,C,SM,M,"
/>
                                             <entry key="org.eclipse.jdt.ui.enable.visibility.order"
value="true" />
                                         </propertyfile>
+					<propertyfile file="${full.eclipse.workspace}/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.wst.xml.ui.prefs">
+					    <entry key="eclipse.preferences.version" value="1"/>
+					    <entry key="org.eclipse.wst.sse.ui.custom_templates" value="${eclipse.xml.templates}"
/>
+					</propertyfile>
                                     </tasks>
                                 </configuration>
                                 <goals>

Modified: incubator/cxf/tags/cxf-2.0.2-incubator/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapActionInInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/tags/cxf-2.0.2-incubator/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapActionInInterceptor.java?rev=576542&r1=576541&r2=576542&view=diff
==============================================================================
--- incubator/cxf/tags/cxf-2.0.2-incubator/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapActionInInterceptor.java
(original)
+++ incubator/cxf/tags/cxf-2.0.2-incubator/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapActionInInterceptor.java
Mon Sep 17 10:44:54 2007
@@ -91,14 +91,22 @@
         Exchange ex = message.getExchange();
         Endpoint ep = ex.get(Endpoint.class);
         
+        BindingOperationInfo bindingOp = null;
+        
         Collection<BindingOperationInfo> bops = ep.getBinding().getBindingInfo().getOperations();
         for (BindingOperationInfo boi : bops) {
             SoapOperationInfo soi = (SoapOperationInfo) boi.getExtensor(SoapOperationInfo.class);
             if (soi != null && soi.getAction().equals(action)) {
-                ex.put(BindingOperationInfo.class, boi);
-                ex.put(OperationInfo.class, boi.getOperationInfo());
-                return;
+                if (bindingOp != null) {
+                    //more than one op with the same action, will need to parse normally
+                    return;
+                }
+                bindingOp = boi;
             }
+        }
+        if (bindingOp != null) {
+            ex.put(BindingOperationInfo.class, bindingOp);
+            ex.put(OperationInfo.class, bindingOp.getOperationInfo());
         }
     }
 

Propchange: incubator/cxf/tags/cxf-2.0.2-incubator/tools/javato/ws/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Sep 17 10:44:54 2007
@@ -0,0 +1,10 @@
+.pmd
+.checkstyle
+.ruleset
+target
+.settings
+.classpath
+.project
+.wtpmodules
+
+



Mime
View raw message