You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2007/10/22 23:17:10 UTC
svn commit: r587263 - in /incubator/cxf/branches/2.0.x-fixes: ./
rt/core/src/main/java/org/apache/cxf/endpoint/ServerImpl.java
rt/ws/security/src/test/java/META-INF/cxf/request.xml
rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/in_enc.xml
Author: dkulp
Date: Mon Oct 22 14:17:10 2007
New Revision: 587263
URL: http://svn.apache.org/viewvc?rev=587263&view=rev
Log:
Merged revisions 586999 via svnmerge from
https://svn.apache.org/repos/asf/incubator/cxf/trunk
........
r586999 | ningjiang | 2007-10-22 01:18:56 -0400 (Mon, 22 Oct 2007) | 1 line
Added the endpoint address information message in the ServerImpl and the ASF comments in the soap message's xml
........
Modified:
incubator/cxf/branches/2.0.x-fixes/ (props changed)
incubator/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/endpoint/ServerImpl.java
incubator/cxf/branches/2.0.x-fixes/rt/ws/security/src/test/java/META-INF/cxf/request.xml
incubator/cxf/branches/2.0.x-fixes/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/in_enc.xml
Propchange: incubator/cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: incubator/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/endpoint/ServerImpl.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/endpoint/ServerImpl.java?rev=587263&r1=587262&r2=587263&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/endpoint/ServerImpl.java (original)
+++ incubator/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/endpoint/ServerImpl.java Mon Oct 22 14:17:10 2007
@@ -88,6 +88,7 @@
}
destination = destinationFactory.getDestination(ei);
+ LOG.info("Setting the server's publish address to be " + ei.getAddress());
serverRegistry = bus.getExtension(ServerRegistry.class);
ManagedEndpoint mep = new ManagedEndpoint(bus, endpoint, this);
Modified: incubator/cxf/branches/2.0.x-fixes/rt/ws/security/src/test/java/META-INF/cxf/request.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/ws/security/src/test/java/META-INF/cxf/request.xml?rev=587263&r1=587262&r2=587263&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/rt/ws/security/src/test/java/META-INF/cxf/request.xml (original)
+++ incubator/cxf/branches/2.0.x-fixes/rt/ws/security/src/test/java/META-INF/cxf/request.xml Mon Oct 22 14:17:10 2007
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
<soapenv:Envelope xmlns="http://somenamespace.pl"
xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
Modified: incubator/cxf/branches/2.0.x-fixes/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/in_enc.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/in_enc.xml?rev=587263&r1=587262&r2=587263&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/in_enc.xml (original)
+++ incubator/cxf/branches/2.0.x-fixes/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/in_enc.xml Mon Oct 22 14:17:10 2007
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<soap:Header>
<wsse:Security soap:mustUnderstand="1" xmlns:wsse="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd">