JBossWS SVN: r14796 - common/branches/jbossws-common-1.4.1.SP1/src/main/java/org/jboss/wsf/common/injection.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-08-09 18:54:28 -0400 (Tue, 09 Aug 2011)
New Revision: 14796
Modified:
common/branches/jbossws-common-1.4.1.SP1/src/main/java/org/jboss/wsf/common/injection/ThreadLocalAwareWebServiceContext.java
Log:
[JBWS-3337] fixing singleton serialization
Modified: common/branches/jbossws-common-1.4.1.SP1/src/main/java/org/jboss/wsf/common/injection/ThreadLocalAwareWebServiceContext.java
===================================================================
--- common/branches/jbossws-common-1.4.1.SP1/src/main/java/org/jboss/wsf/common/injection/ThreadLocalAwareWebServiceContext.java 2011-08-09 20:04:04 UTC (rev 14795)
+++ common/branches/jbossws-common-1.4.1.SP1/src/main/java/org/jboss/wsf/common/injection/ThreadLocalAwareWebServiceContext.java 2011-08-09 22:54:28 UTC (rev 14796)
@@ -40,10 +40,10 @@
private static final long serialVersionUID = 126557512266764152L;
- private static final transient ThreadLocalAwareWebServiceContext SINGLETON = new ThreadLocalAwareWebServiceContext();
+ private static final ThreadLocalAwareWebServiceContext SINGLETON = new ThreadLocalAwareWebServiceContext();
private final transient ThreadLocal<WebServiceContext> contexts = new InheritableThreadLocal<WebServiceContext>();
-
+
public static ThreadLocalAwareWebServiceContext getInstance()
{
return SINGLETON;
@@ -115,4 +115,9 @@
return delegee.isUserInRole(role);
}
+ protected Object readResolve()
+ {
+ return SINGLETON;
+ }
+
}
13 years, 4 months
JBossWS SVN: r14794 - common/branches.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-08-09 16:01:31 -0400 (Tue, 09 Aug 2011)
New Revision: 14794
Added:
common/branches/jbossws-common-1.4.1.SP1/
Log:
creating new branch
13 years, 4 months
JBossWS SVN: r14793 - in thirdparty/cxf/branches/cxf-2.2.12-patch-01_JBPAPP-6834: rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj and 2 other directories.
by jbossws-commits@lists.jboss.org
Author: bmaxwell
Date: 2011-08-08 15:40:25 -0400 (Mon, 08 Aug 2011)
New Revision: 14793
Added:
thirdparty/cxf/branches/cxf-2.2.12-patch-01_JBPAPP-6834/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/
thirdparty/cxf/branches/cxf-2.2.12-patch-01_JBPAPP-6834/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/Client_Encrypt.properties
thirdparty/cxf/branches/cxf-2.2.12-patch-01_JBPAPP-6834/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/Client_Sign.properties
thirdparty/cxf/branches/cxf-2.2.12-patch-01_JBPAPP-6834/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/HelloWorld.java
thirdparty/cxf/branches/cxf-2.2.12-patch-01_JBPAPP-6834/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/HelloWorldImpl.java
thirdparty/cxf/branches/cxf-2.2.12-patch-01_JBPAPP-6834/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/JAXWSHandler.java
thirdparty/cxf/branches/cxf-2.2.12-patch-01_JBPAPP-6834/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/Server.java
thirdparty/cxf/branches/cxf-2.2.12-patch-01_JBPAPP-6834/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/Server_Decrypt.properties
thirdparty/cxf/branches/cxf-2.2.12-patch-01_JBPAPP-6834/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/Server_SignVerf.properties
thirdparty/cxf/branches/cxf-2.2.12-patch-01_JBPAPP-6834/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/UsernamePasswordCallback.java
thirdparty/cxf/branches/cxf-2.2.12-patch-01_JBPAPP-6834/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/WSSecTest.java
thirdparty/cxf/branches/cxf-2.2.12-patch-01_JBPAPP-6834/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/client-keystore.jks
thirdparty/cxf/branches/cxf-2.2.12-patch-01_JBPAPP-6834/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/client-truststore.jks
thirdparty/cxf/branches/cxf-2.2.12-patch-01_JBPAPP-6834/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/client.xml
thirdparty/cxf/branches/cxf-2.2.12-patch-01_JBPAPP-6834/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/server-keystore.jks
thirdparty/cxf/branches/cxf-2.2.12-patch-01_JBPAPP-6834/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/server-truststore.jks
thirdparty/cxf/branches/cxf-2.2.12-patch-01_JBPAPP-6834/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/server.xml
Removed:
thirdparty/cxf/branches/cxf-2.2.12-patch-01_JBPAPP-6834/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/Client_Encrypt.properties
thirdparty/cxf/branches/cxf-2.2.12-patch-01_JBPAPP-6834/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/Client_Sign.properties
thirdparty/cxf/branches/cxf-2.2.12-patch-01_JBPAPP-6834/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/HelloWorld.java
thirdparty/cxf/branches/cxf-2.2.12-patch-01_JBPAPP-6834/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/HelloWorldImpl.java
thirdparty/cxf/branches/cxf-2.2.12-patch-01_JBPAPP-6834/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/JAXWSHandler.java
thirdparty/cxf/branches/cxf-2.2.12-patch-01_JBPAPP-6834/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/Server.java
thirdparty/cxf/branches/cxf-2.2.12-patch-01_JBPAPP-6834/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/Server_Decrypt.properties
thirdparty/cxf/branches/cxf-2.2.12-patch-01_JBPAPP-6834/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/Server_SignVerf.properties
thirdparty/cxf/branches/cxf-2.2.12-patch-01_JBPAPP-6834/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/UsernamePasswordCallback.java
thirdparty/cxf/branches/cxf-2.2.12-patch-01_JBPAPP-6834/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/WSSecTest.java
thirdparty/cxf/branches/cxf-2.2.12-patch-01_JBPAPP-6834/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/client-keystore.jks
thirdparty/cxf/branches/cxf-2.2.12-patch-01_JBPAPP-6834/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/client-truststore.jks
thirdparty/cxf/branches/cxf-2.2.12-patch-01_JBPAPP-6834/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/client.xml
thirdparty/cxf/branches/cxf-2.2.12-patch-01_JBPAPP-6834/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/server-keystore.jks
thirdparty/cxf/branches/cxf-2.2.12-patch-01_JBPAPP-6834/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/server-truststore.jks
thirdparty/cxf/branches/cxf-2.2.12-patch-01_JBPAPP-6834/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/server.xml
Modified:
thirdparty/cxf/branches/cxf-2.2.12-patch-01_JBPAPP-6834/
thirdparty/cxf/branches/cxf-2.2.12-patch-01_JBPAPP-6834/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJInInterceptor.java
Log:
[JBPAPP-6834] Remove the duplicate soap body element when wsse and handler chain are enabled
Property changes on: thirdparty/cxf/branches/cxf-2.2.12-patch-01_JBPAPP-6834
___________________________________________________________________
Added: svn:mergeinfo
+ /thirdparty/cxf/branches/cxf-2.2.12:14671
Modified: thirdparty/cxf/branches/cxf-2.2.12-patch-01_JBPAPP-6834/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJInInterceptor.java
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12-patch-01_JBPAPP-6834/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJInInterceptor.java 2011-08-08 19:30:34 UTC (rev 14792)
+++ thirdparty/cxf/branches/cxf-2.2.12-patch-01_JBPAPP-6834/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJInInterceptor.java 2011-08-08 19:40:25 UTC (rev 14793)
@@ -70,6 +70,7 @@
*/
public class SAAJInInterceptor extends AbstractSoapInterceptor {
private static final ResourceBundle BUNDLE = BundleUtils.getBundle(SAAJInInterceptor.class);
+ private static final String BODY_FILLED_IN = SAAJInInterceptor.class.getName() + ".BODY_DONE";
private MessageFactory factory11;
private MessageFactory factory12;
@@ -96,6 +97,11 @@
}
public void handleMessage(SoapMessage message) throws Fault {
+ Boolean bodySet = (Boolean)message.get(BODY_FILLED_IN);
+ if (bodySet != null && bodySet == Boolean.TRUE) {
+ return;
+ }
+ message.put(BODY_FILLED_IN, Boolean.TRUE);
try {
MessageFactory factory = getFactory(message);
SOAPMessage soapMessage = factory.createMessage();
Deleted: thirdparty/cxf/branches/cxf-2.2.12-patch-01_JBPAPP-6834/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/Client_Encrypt.properties
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/Client_Encrypt.properties 2011-07-10 14:57:59 UTC (rev 14671)
+++ thirdparty/cxf/branches/cxf-2.2.12-patch-01_JBPAPP-6834/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/Client_Encrypt.properties 2011-08-08 19:40:25 UTC (rev 14793)
@@ -1,23 +0,0 @@
-#
-# 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.
-#
-org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin
-org.apache.ws.security.crypto.merlin.keystore.type=jks
-org.apache.ws.security.crypto.merlin.keystore.password=storepassword
-org.apache.ws.security.crypto.merlin.keystore.alias=serverx509v1
-org.apache.ws.security.crypto.merlin.file=org/apache/cxf/systest/ws/security/handler/client-truststore.jks
\ No newline at end of file
Copied: thirdparty/cxf/branches/cxf-2.2.12-patch-01_JBPAPP-6834/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/Client_Encrypt.properties (from rev 14671, thirdparty/cxf/branches/cxf-2.2.12/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/Client_Encrypt.properties)
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12-patch-01_JBPAPP-6834/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/Client_Encrypt.properties (rev 0)
+++ thirdparty/cxf/branches/cxf-2.2.12-patch-01_JBPAPP-6834/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/Client_Encrypt.properties 2011-08-08 19:40:25 UTC (rev 14793)
@@ -0,0 +1,23 @@
+#
+# 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.
+#
+org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin
+org.apache.ws.security.crypto.merlin.keystore.type=jks
+org.apache.ws.security.crypto.merlin.keystore.password=storepassword
+org.apache.ws.security.crypto.merlin.keystore.alias=serverx509v1
+org.apache.ws.security.crypto.merlin.file=org/apache/cxf/systest/ws/security/handler/client-truststore.jks
\ No newline at end of file
Deleted: thirdparty/cxf/branches/cxf-2.2.12-patch-01_JBPAPP-6834/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/Client_Sign.properties
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/Client_Sign.properties 2011-07-10 14:57:59 UTC (rev 14671)
+++ thirdparty/cxf/branches/cxf-2.2.12-patch-01_JBPAPP-6834/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/Client_Sign.properties 2011-08-08 19:40:25 UTC (rev 14793)
@@ -1,24 +0,0 @@
-#
-# 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.
-#
-org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin
-org.apache.ws.security.crypto.merlin.keystore.type=jks
-org.apache.ws.security.crypto.merlin.keystore.password=storepassword
-org.apache.ws.security.crypto.merlin.keystore.alias=clientx509v1
-org.apache.ws.security.crypto.merlin.file=org/apache/cxf/systest/ws/security/handler/client-keystore.jks
-
Copied: thirdparty/cxf/branches/cxf-2.2.12-patch-01_JBPAPP-6834/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/Client_Sign.properties (from rev 14671, thirdparty/cxf/branches/cxf-2.2.12/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/Client_Sign.properties)
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12-patch-01_JBPAPP-6834/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/Client_Sign.properties (rev 0)
+++ thirdparty/cxf/branches/cxf-2.2.12-patch-01_JBPAPP-6834/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/Client_Sign.properties 2011-08-08 19:40:25 UTC (rev 14793)
@@ -0,0 +1,24 @@
+#
+# 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.
+#
+org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin
+org.apache.ws.security.crypto.merlin.keystore.type=jks
+org.apache.ws.security.crypto.merlin.keystore.password=storepassword
+org.apache.ws.security.crypto.merlin.keystore.alias=clientx509v1
+org.apache.ws.security.crypto.merlin.file=org/apache/cxf/systest/ws/security/handler/client-keystore.jks
+
Deleted: thirdparty/cxf/branches/cxf-2.2.12-patch-01_JBPAPP-6834/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/HelloWorld.java
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/HelloWorld.java 2011-07-10 14:57:59 UTC (rev 14671)
+++ thirdparty/cxf/branches/cxf-2.2.12-patch-01_JBPAPP-6834/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/HelloWorld.java 2011-08-08 19:40:25 UTC (rev 14793)
@@ -1,30 +0,0 @@
-/**
- * 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.
- */
-package org.apache.cxf.systest.ws.security.handler;
-
-import javax.jws.WebMethod;
-import javax.jws.WebParam;
-import javax.jws.WebService;
-
-@WebService(name = "HelloWorld", targetNamespace = "http://cxf.apache.org/wsse/handler/helloworld")
-public interface HelloWorld {
- @WebMethod
- String sayHello(@WebParam(name = "toWhom") String to);
-
-}
Copied: thirdparty/cxf/branches/cxf-2.2.12-patch-01_JBPAPP-6834/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/HelloWorld.java (from rev 14671, thirdparty/cxf/branches/cxf-2.2.12/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/HelloWorld.java)
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12-patch-01_JBPAPP-6834/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/HelloWorld.java (rev 0)
+++ thirdparty/cxf/branches/cxf-2.2.12-patch-01_JBPAPP-6834/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/HelloWorld.java 2011-08-08 19:40:25 UTC (rev 14793)
@@ -0,0 +1,30 @@
+/**
+ * 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.
+ */
+package org.apache.cxf.systest.ws.security.handler;
+
+import javax.jws.WebMethod;
+import javax.jws.WebParam;
+import javax.jws.WebService;
+
+@WebService(name = "HelloWorld", targetNamespace = "http://cxf.apache.org/wsse/handler/helloworld")
+public interface HelloWorld {
+ @WebMethod
+ String sayHello(@WebParam(name = "toWhom") String to);
+
+}
Deleted: thirdparty/cxf/branches/cxf-2.2.12-patch-01_JBPAPP-6834/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/HelloWorldImpl.java
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/HelloWorldImpl.java 2011-07-10 14:57:59 UTC (rev 14671)
+++ thirdparty/cxf/branches/cxf-2.2.12-patch-01_JBPAPP-6834/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/HelloWorldImpl.java 2011-08-08 19:40:25 UTC (rev 14793)
@@ -1,33 +0,0 @@
-/**
- * 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.
- */
-package org.apache.cxf.systest.ws.security.handler;
-
-import javax.jws.WebMethod;
-import javax.jws.WebParam;
-import javax.jws.WebService;
-
-@WebService(name = "HelloWorld", targetNamespace = "http://cxf.apache.org/wsse/handler/helloworld",
- endpointInterface = "org.apache.cxf.systest.ws.security.handler.HelloWorld")
-public class HelloWorldImpl implements HelloWorld {
- @WebMethod
- public String sayHello(@WebParam(name = "toWhom") String toWhom) {
- return "Hello " + toWhom;
-
- }
-}
Copied: thirdparty/cxf/branches/cxf-2.2.12-patch-01_JBPAPP-6834/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/HelloWorldImpl.java (from rev 14671, thirdparty/cxf/branches/cxf-2.2.12/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/HelloWorldImpl.java)
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12-patch-01_JBPAPP-6834/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/HelloWorldImpl.java (rev 0)
+++ thirdparty/cxf/branches/cxf-2.2.12-patch-01_JBPAPP-6834/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/HelloWorldImpl.java 2011-08-08 19:40:25 UTC (rev 14793)
@@ -0,0 +1,33 @@
+/**
+ * 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.
+ */
+package org.apache.cxf.systest.ws.security.handler;
+
+import javax.jws.WebMethod;
+import javax.jws.WebParam;
+import javax.jws.WebService;
+
+@WebService(name = "HelloWorld", targetNamespace = "http://cxf.apache.org/wsse/handler/helloworld",
+ endpointInterface = "org.apache.cxf.systest.ws.security.handler.HelloWorld")
+public class HelloWorldImpl implements HelloWorld {
+ @WebMethod
+ public String sayHello(@WebParam(name = "toWhom") String toWhom) {
+ return "Hello " + toWhom;
+
+ }
+}
Deleted: thirdparty/cxf/branches/cxf-2.2.12-patch-01_JBPAPP-6834/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/JAXWSHandler.java
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/JAXWSHandler.java 2011-07-10 14:57:59 UTC (rev 14671)
+++ thirdparty/cxf/branches/cxf-2.2.12-patch-01_JBPAPP-6834/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/JAXWSHandler.java 2011-08-08 19:40:25 UTC (rev 14793)
@@ -1,91 +0,0 @@
-/**
- * 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.
- */
-package org.apache.cxf.systest.ws.security.handler;
-
-import java.io.PrintStream;
-import java.util.Map;
-import java.util.Set;
-
-import javax.xml.namespace.QName;
-import javax.xml.soap.SOAPMessage;
-import javax.xml.ws.handler.MessageContext;
-import javax.xml.ws.handler.soap.SOAPHandler;
-import javax.xml.ws.handler.soap.SOAPMessageContext;
-
-public class JAXWSHandler implements SOAPHandler<SOAPMessageContext> {
-
- private PrintStream out;
-
- public JAXWSHandler() {
- setLogStream(System.out);
- }
-
- protected final void setLogStream(PrintStream ps) {
- out = ps;
- }
-
- @SuppressWarnings("rawtypes")
- public void init(Map c) {
- }
-
- public Set<QName> getHeaders() {
- return null;
- }
-
- public boolean handleMessage(SOAPMessageContext smc) {
- logToSystemOut(smc);
- return true;
- }
-
- public boolean handleFault(SOAPMessageContext smc) {
- logToSystemOut(smc);
- return true;
- }
-
- public void close(MessageContext messageContext) {
-
- }
-
- public void destroy() {
-
- }
-
- protected void logToSystemOut(SOAPMessageContext smc) {
- Boolean outboundProperty = (Boolean)smc.get(MessageContext.MESSAGE_OUTBOUND_PROPERTY);
-
- if (outboundProperty.booleanValue()) {
- out.println("\nOutbound message:");
- } else {
- out.println("\nInbound message:");
- }
-
- SOAPMessage message = smc.getMessage();
- try {
- message.writeTo(out);
- out.println();
- } catch (Exception e) {
- out.println("Exception in handler: " + e);
- }
-
- out.println("WSDL_SERVICE = " + smc.get(MessageContext.WSDL_SERVICE));
- out.println("WSDL_INTERFACE = " + smc.get(MessageContext.WSDL_INTERFACE));
- out.println("WSDL_PORT = " + smc.get(MessageContext.WSDL_PORT));
- out.println("WSDL_OPERATION = " + smc.get(MessageContext.WSDL_OPERATION));
- }
-}
Copied: thirdparty/cxf/branches/cxf-2.2.12-patch-01_JBPAPP-6834/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/JAXWSHandler.java (from rev 14671, thirdparty/cxf/branches/cxf-2.2.12/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/JAXWSHandler.java)
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12-patch-01_JBPAPP-6834/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/JAXWSHandler.java (rev 0)
+++ thirdparty/cxf/branches/cxf-2.2.12-patch-01_JBPAPP-6834/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/JAXWSHandler.java 2011-08-08 19:40:25 UTC (rev 14793)
@@ -0,0 +1,91 @@
+/**
+ * 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.
+ */
+package org.apache.cxf.systest.ws.security.handler;
+
+import java.io.PrintStream;
+import java.util.Map;
+import java.util.Set;
+
+import javax.xml.namespace.QName;
+import javax.xml.soap.SOAPMessage;
+import javax.xml.ws.handler.MessageContext;
+import javax.xml.ws.handler.soap.SOAPHandler;
+import javax.xml.ws.handler.soap.SOAPMessageContext;
+
+public class JAXWSHandler implements SOAPHandler<SOAPMessageContext> {
+
+ private PrintStream out;
+
+ public JAXWSHandler() {
+ setLogStream(System.out);
+ }
+
+ protected final void setLogStream(PrintStream ps) {
+ out = ps;
+ }
+
+ @SuppressWarnings("rawtypes")
+ public void init(Map c) {
+ }
+
+ public Set<QName> getHeaders() {
+ return null;
+ }
+
+ public boolean handleMessage(SOAPMessageContext smc) {
+ logToSystemOut(smc);
+ return true;
+ }
+
+ public boolean handleFault(SOAPMessageContext smc) {
+ logToSystemOut(smc);
+ return true;
+ }
+
+ public void close(MessageContext messageContext) {
+
+ }
+
+ public void destroy() {
+
+ }
+
+ protected void logToSystemOut(SOAPMessageContext smc) {
+ Boolean outboundProperty = (Boolean)smc.get(MessageContext.MESSAGE_OUTBOUND_PROPERTY);
+
+ if (outboundProperty.booleanValue()) {
+ out.println("\nOutbound message:");
+ } else {
+ out.println("\nInbound message:");
+ }
+
+ SOAPMessage message = smc.getMessage();
+ try {
+ message.writeTo(out);
+ out.println();
+ } catch (Exception e) {
+ out.println("Exception in handler: " + e);
+ }
+
+ out.println("WSDL_SERVICE = " + smc.get(MessageContext.WSDL_SERVICE));
+ out.println("WSDL_INTERFACE = " + smc.get(MessageContext.WSDL_INTERFACE));
+ out.println("WSDL_PORT = " + smc.get(MessageContext.WSDL_PORT));
+ out.println("WSDL_OPERATION = " + smc.get(MessageContext.WSDL_OPERATION));
+ }
+}
Deleted: thirdparty/cxf/branches/cxf-2.2.12-patch-01_JBPAPP-6834/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/Server.java
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/Server.java 2011-07-10 14:57:59 UTC (rev 14671)
+++ thirdparty/cxf/branches/cxf-2.2.12-patch-01_JBPAPP-6834/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/Server.java 2011-08-08 19:40:25 UTC (rev 14793)
@@ -1,47 +0,0 @@
-/**
- * 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.
- */
-package org.apache.cxf.systest.ws.security.handler;
-
-import org.apache.cxf.Bus;
-import org.apache.cxf.BusFactory;
-import org.apache.cxf.bus.spring.SpringBusFactory;
-import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
-
-public class Server extends AbstractBusTestServerBase {
- public static final String PORT = allocatePort(Server.class);
-
- protected void run() {
- SpringBusFactory factory = new SpringBusFactory();
- Bus bus = factory.createBus("org/apache/cxf/systest/ws/security/handler/server.xml");
- BusFactory.setDefaultBus(bus);
- setBus(bus);
- }
-
- public static void main(String[] args) {
- try {
- Server s = new Server();
- s.start();
- } catch (Exception ex) {
- ex.printStackTrace();
- System.exit(-1);
- } finally {
- System.out.println("done!");
- }
- }
-}
Copied: thirdparty/cxf/branches/cxf-2.2.12-patch-01_JBPAPP-6834/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/Server.java (from rev 14671, thirdparty/cxf/branches/cxf-2.2.12/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/Server.java)
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12-patch-01_JBPAPP-6834/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/Server.java (rev 0)
+++ thirdparty/cxf/branches/cxf-2.2.12-patch-01_JBPAPP-6834/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/Server.java 2011-08-08 19:40:25 UTC (rev 14793)
@@ -0,0 +1,47 @@
+/**
+ * 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.
+ */
+package org.apache.cxf.systest.ws.security.handler;
+
+import org.apache.cxf.Bus;
+import org.apache.cxf.BusFactory;
+import org.apache.cxf.bus.spring.SpringBusFactory;
+import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
+
+public class Server extends AbstractBusTestServerBase {
+ public static final String PORT = allocatePort(Server.class);
+
+ protected void run() {
+ SpringBusFactory factory = new SpringBusFactory();
+ Bus bus = factory.createBus("org/apache/cxf/systest/ws/security/handler/server.xml");
+ BusFactory.setDefaultBus(bus);
+ setBus(bus);
+ }
+
+ public static void main(String[] args) {
+ try {
+ Server s = new Server();
+ s.start();
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ System.exit(-1);
+ } finally {
+ System.out.println("done!");
+ }
+ }
+}
Deleted: thirdparty/cxf/branches/cxf-2.2.12-patch-01_JBPAPP-6834/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/Server_Decrypt.properties
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/Server_Decrypt.properties 2011-07-10 14:57:59 UTC (rev 14671)
+++ thirdparty/cxf/branches/cxf-2.2.12-patch-01_JBPAPP-6834/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/Server_Decrypt.properties 2011-08-08 19:40:25 UTC (rev 14793)
@@ -1,23 +0,0 @@
-#
-# 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.
-#
-org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin
-org.apache.ws.security.crypto.merlin.keystore.type=jks
-org.apache.ws.security.crypto.merlin.keystore.password=storepassword
-org.apache.ws.security.crypto.merlin.keystore.alias=serverx509v1
-org.apache.ws.security.crypto.merlin.file=org/apache/cxf/systest/ws/security/handler/server-keystore.jks
Copied: thirdparty/cxf/branches/cxf-2.2.12-patch-01_JBPAPP-6834/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/Server_Decrypt.properties (from rev 14671, thirdparty/cxf/branches/cxf-2.2.12/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/Server_Decrypt.properties)
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12-patch-01_JBPAPP-6834/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/Server_Decrypt.properties (rev 0)
+++ thirdparty/cxf/branches/cxf-2.2.12-patch-01_JBPAPP-6834/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/Server_Decrypt.properties 2011-08-08 19:40:25 UTC (rev 14793)
@@ -0,0 +1,23 @@
+#
+# 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.
+#
+org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin
+org.apache.ws.security.crypto.merlin.keystore.type=jks
+org.apache.ws.security.crypto.merlin.keystore.password=storepassword
+org.apache.ws.security.crypto.merlin.keystore.alias=serverx509v1
+org.apache.ws.security.crypto.merlin.file=org/apache/cxf/systest/ws/security/handler/server-keystore.jks
Deleted: thirdparty/cxf/branches/cxf-2.2.12-patch-01_JBPAPP-6834/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/Server_SignVerf.properties
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/Server_SignVerf.properties 2011-07-10 14:57:59 UTC (rev 14671)
+++ thirdparty/cxf/branches/cxf-2.2.12-patch-01_JBPAPP-6834/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/Server_SignVerf.properties 2011-08-08 19:40:25 UTC (rev 14793)
@@ -1,23 +0,0 @@
-#
-# 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.
-#
-org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin
-org.apache.ws.security.crypto.merlin.keystore.type=jks
-org.apache.ws.security.crypto.merlin.keystore.password=storepassword
-org.apache.ws.security.crypto.merlin.keystore.alias=clientx509v1
-org.apache.ws.security.crypto.merlin.file=org/apache/cxf/systest/ws/security/handler/server-truststore.jks
Copied: thirdparty/cxf/branches/cxf-2.2.12-patch-01_JBPAPP-6834/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/Server_SignVerf.properties (from rev 14671, thirdparty/cxf/branches/cxf-2.2.12/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/Server_SignVerf.properties)
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12-patch-01_JBPAPP-6834/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/Server_SignVerf.properties (rev 0)
+++ thirdparty/cxf/branches/cxf-2.2.12-patch-01_JBPAPP-6834/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/Server_SignVerf.properties 2011-08-08 19:40:25 UTC (rev 14793)
@@ -0,0 +1,23 @@
+#
+# 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.
+#
+org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin
+org.apache.ws.security.crypto.merlin.keystore.type=jks
+org.apache.ws.security.crypto.merlin.keystore.password=storepassword
+org.apache.ws.security.crypto.merlin.keystore.alias=clientx509v1
+org.apache.ws.security.crypto.merlin.file=org/apache/cxf/systest/ws/security/handler/server-truststore.jks
Deleted: thirdparty/cxf/branches/cxf-2.2.12-patch-01_JBPAPP-6834/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/UsernamePasswordCallback.java
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/UsernamePasswordCallback.java 2011-07-10 14:57:59 UTC (rev 14671)
+++ thirdparty/cxf/branches/cxf-2.2.12-patch-01_JBPAPP-6834/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/UsernamePasswordCallback.java 2011-08-08 19:40:25 UTC (rev 14793)
@@ -1,62 +0,0 @@
-/**
- * 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.
- */
-package org.apache.cxf.systest.ws.security.handler;
-
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.security.auth.callback.Callback;
-import javax.security.auth.callback.CallbackHandler;
-import javax.security.auth.callback.UnsupportedCallbackException;
-
-import org.apache.ws.security.WSPasswordCallback;
-
-public class UsernamePasswordCallback implements CallbackHandler {
- private Map<String, String> passwords = new HashMap<String, String>();
-
- public UsernamePasswordCallback() {
- passwords.put("Alice", "ecilA");
- passwords.put("abcd", "dcba");
- passwords.put("clientx509v1", "storepassword");
- passwords.put("serverx509v1", "storepassword");
- }
-
- /**
- * Here, we attempt to get the password from the private alias/passwords map.
- */
- public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException {
- for (int i = 0; i < callbacks.length; i++) {
- WSPasswordCallback pc = (WSPasswordCallback)callbacks[i];
- String pass = passwords.get(pc.getIdentifier());
- if (pass != null) {
- pc.setPassword(pass);
- return;
- }
- }
- throw new IOException();
- }
-
- /**
- * Add an alias/password pair to the callback mechanism.
- */
- public void setAliasPassword(String alias, String password) {
- passwords.put(alias, password);
- }
-}
Copied: thirdparty/cxf/branches/cxf-2.2.12-patch-01_JBPAPP-6834/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/UsernamePasswordCallback.java (from rev 14671, thirdparty/cxf/branches/cxf-2.2.12/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/UsernamePasswordCallback.java)
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12-patch-01_JBPAPP-6834/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/UsernamePasswordCallback.java (rev 0)
+++ thirdparty/cxf/branches/cxf-2.2.12-patch-01_JBPAPP-6834/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/UsernamePasswordCallback.java 2011-08-08 19:40:25 UTC (rev 14793)
@@ -0,0 +1,62 @@
+/**
+ * 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.
+ */
+package org.apache.cxf.systest.ws.security.handler;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.security.auth.callback.Callback;
+import javax.security.auth.callback.CallbackHandler;
+import javax.security.auth.callback.UnsupportedCallbackException;
+
+import org.apache.ws.security.WSPasswordCallback;
+
+public class UsernamePasswordCallback implements CallbackHandler {
+ private Map<String, String> passwords = new HashMap<String, String>();
+
+ public UsernamePasswordCallback() {
+ passwords.put("Alice", "ecilA");
+ passwords.put("abcd", "dcba");
+ passwords.put("clientx509v1", "storepassword");
+ passwords.put("serverx509v1", "storepassword");
+ }
+
+ /**
+ * Here, we attempt to get the password from the private alias/passwords map.
+ */
+ public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException {
+ for (int i = 0; i < callbacks.length; i++) {
+ WSPasswordCallback pc = (WSPasswordCallback)callbacks[i];
+ String pass = passwords.get(pc.getIdentifier());
+ if (pass != null) {
+ pc.setPassword(pass);
+ return;
+ }
+ }
+ throw new IOException();
+ }
+
+ /**
+ * Add an alias/password pair to the callback mechanism.
+ */
+ public void setAliasPassword(String alias, String password) {
+ passwords.put(alias, password);
+ }
+}
Deleted: thirdparty/cxf/branches/cxf-2.2.12-patch-01_JBPAPP-6834/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/WSSecTest.java
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/WSSecTest.java 2011-07-10 14:57:59 UTC (rev 14671)
+++ thirdparty/cxf/branches/cxf-2.2.12-patch-01_JBPAPP-6834/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/WSSecTest.java 2011-08-08 19:40:25 UTC (rev 14793)
@@ -1,58 +0,0 @@
-/**
- * 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.
- */
-package org.apache.cxf.systest.ws.security.handler;
-
-import java.net.URL;
-
-import javax.xml.namespace.QName;
-import javax.xml.ws.Service;
-
-import org.apache.cxf.Bus;
-import org.apache.cxf.BusFactory;
-import org.apache.cxf.bus.spring.SpringBusFactory;
-import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-public class WSSecTest extends AbstractBusClientServerTestBase {
- public static final String PORT = allocatePort(Server.class);
-
- @BeforeClass
- public static void startServers() throws Exception {
- assertTrue("Server failed to launch", launchServer(Server.class));
- }
-
- @Test
- public void testClientServer() throws Exception {
-
- Bus bus = new SpringBusFactory().createBus("org/apache/cxf/systest/ws/security/handler/client.xml");
-
- BusFactory.setDefaultBus(bus);
- BusFactory.setThreadDefaultBus(bus);
- Service service = Service.create(new URL("http://localhost:" + PORT + "/wsse/HelloWorldWS?wsdl"),
- new QName("http://cxf.apache.org/wsse/handler/helloworld",
- "HelloWorldImplService"));
- QName portName = new QName("http://cxf.apache.org/wsse/handler/helloworld", "HelloWorldPort");
-
- HelloWorld port = service.getPort(portName, HelloWorld.class);
- updateAddressPort(port, PORT);
- assertEquals("Hello CXF", port.sayHello("CXF"));
- }
-
-}
Copied: thirdparty/cxf/branches/cxf-2.2.12-patch-01_JBPAPP-6834/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/WSSecTest.java (from rev 14671, thirdparty/cxf/branches/cxf-2.2.12/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/WSSecTest.java)
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12-patch-01_JBPAPP-6834/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/WSSecTest.java (rev 0)
+++ thirdparty/cxf/branches/cxf-2.2.12-patch-01_JBPAPP-6834/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/WSSecTest.java 2011-08-08 19:40:25 UTC (rev 14793)
@@ -0,0 +1,58 @@
+/**
+ * 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.
+ */
+package org.apache.cxf.systest.ws.security.handler;
+
+import java.net.URL;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.Service;
+
+import org.apache.cxf.Bus;
+import org.apache.cxf.BusFactory;
+import org.apache.cxf.bus.spring.SpringBusFactory;
+import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+public class WSSecTest extends AbstractBusClientServerTestBase {
+ public static final String PORT = allocatePort(Server.class);
+
+ @BeforeClass
+ public static void startServers() throws Exception {
+ assertTrue("Server failed to launch", launchServer(Server.class));
+ }
+
+ @Test
+ public void testClientServer() throws Exception {
+
+ Bus bus = new SpringBusFactory().createBus("org/apache/cxf/systest/ws/security/handler/client.xml");
+
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
+ Service service = Service.create(new URL("http://localhost:" + PORT + "/wsse/HelloWorldWS?wsdl"),
+ new QName("http://cxf.apache.org/wsse/handler/helloworld",
+ "HelloWorldImplService"));
+ QName portName = new QName("http://cxf.apache.org/wsse/handler/helloworld", "HelloWorldPort");
+
+ HelloWorld port = service.getPort(portName, HelloWorld.class);
+ updateAddressPort(port, PORT);
+ assertEquals("Hello CXF", port.sayHello("CXF"));
+ }
+
+}
Deleted: thirdparty/cxf/branches/cxf-2.2.12-patch-01_JBPAPP-6834/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/client-keystore.jks
===================================================================
(Binary files differ)
Copied: thirdparty/cxf/branches/cxf-2.2.12-patch-01_JBPAPP-6834/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/client-keystore.jks (from rev 14671, thirdparty/cxf/branches/cxf-2.2.12/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/client-keystore.jks)
===================================================================
(Binary files differ)
Deleted: thirdparty/cxf/branches/cxf-2.2.12-patch-01_JBPAPP-6834/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/client-truststore.jks
===================================================================
(Binary files differ)
Copied: thirdparty/cxf/branches/cxf-2.2.12-patch-01_JBPAPP-6834/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/client-truststore.jks (from rev 14671, thirdparty/cxf/branches/cxf-2.2.12/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/client-truststore.jks)
===================================================================
(Binary files differ)
Deleted: thirdparty/cxf/branches/cxf-2.2.12-patch-01_JBPAPP-6834/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/client.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/client.xml 2011-07-10 14:57:59 UTC (rev 14671)
+++ thirdparty/cxf/branches/cxf-2.2.12-patch-01_JBPAPP-6834/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/client.xml 2011-08-08 19:40:25 UTC (rev 14793)
@@ -1,79 +0,0 @@
-<?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.
--->
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:cxf="http://cxf.apache.org/core"
- xmlns:wsa="http://cxf.apache.org/ws/addressing"
- xmlns:http="http://cxf.apache.org/transports/http/configuration"
- xmlns:wsrm-policy="http://schemas.xmlsoap.org/ws/2005/02/rm/policy"
- xmlns:wsrm-mgr="http://cxf.apache.org/ws/rm/manager"
- xmlns:beans='http://www.springframework.org/schema/beans'
- xmlns:jaxws='http://cxf.apache.org/jaxws'
- xmlns:ns1='http://secure_invoke/helloworld'
- xsi:schemaLocation="
- http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd
- http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd
- http://schemas.xmlsoap.org/ws/2005/02/rm/policy http://schemas.xmlsoap.org/ws/2005/02/rm/wsrm-policy.xsd
- http://cxf.apache.org/ws/rm/manager http://cxf.apache.org/schemas/configuration/wsrm-manager.xsd
- http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
- http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd">
-
- <bean id="UsernameTokenSign_Request" class="org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor"
- name="http://cxf.apache.org/wsse/handler/helloworld}HelloWorldPort.Request" >
- <constructor-arg>
- <map>
- <entry key="action" value="UsernameToken Timestamp Signature"/>
- <entry key="passwordType" value="PasswordDigest"/>
- <entry key="user" value="clientx509v1"/>
- <entry key="passwordCallbackClass" value="org.apache.cxf.systest.ws.security.handler.UsernamePasswordCallback"/>
- <entry key="signaturePropFile" value="org/apache/cxf/systest/ws/security/handler/Client_Sign.properties"/>
- <entry key="signatureKeyIdentifier" value="DirectReference"/>
- <entry key="signatureParts" value="{Element}{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd}Timestamp;{Element}{http://schemas.xmlsoap.org/soap/envelope/}Body"/>
- </map>
- </constructor-arg>
- </bean>
-
- <bean id="UsernameTokenSign_Response" class="org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor"
- name="{http://cxf.apache.org/wsse/handler/helloworld}HelloWorldPort.Response" >
- <constructor-arg>
- <map>
- <entry key="action" value="UsernameToken Timestamp Signature"/>
- <entry key="passwordType" value="PasswordText"/>
- <entry key="user" value="serverx509v1"/>
- <entry key="passwordCallbackClass" value="org.apache.cxf.systest.ws.security.handler.UsernamePasswordCallback"/>
- <entry key="signaturePropFile" value="org/apache/cxf/systest/ws/security/handler/Client_Encrypt.properties"/>
- <entry key="signatureKeyIdentifier" value="DirectReference"/>
- </map>
- </constructor-arg>
- </bean>
-
-
- <cxf:bus>
- <cxf:outInterceptors>
- <ref bean="UsernameTokenSign_Request"/>
- <bean class="org.apache.cxf.binding.soap.saaj.SAAJOutInterceptor"/>
- </cxf:outInterceptors>
- <cxf:inInterceptors>
- <ref bean="UsernameTokenSign_Response"/>
- <bean class="org.apache.cxf.binding.soap.saaj.SAAJInInterceptor"/>
- </cxf:inInterceptors>
- </cxf:bus>
-
-</beans>
Copied: thirdparty/cxf/branches/cxf-2.2.12-patch-01_JBPAPP-6834/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/client.xml (from rev 14671, thirdparty/cxf/branches/cxf-2.2.12/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/client.xml)
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12-patch-01_JBPAPP-6834/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/client.xml (rev 0)
+++ thirdparty/cxf/branches/cxf-2.2.12-patch-01_JBPAPP-6834/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/client.xml 2011-08-08 19:40:25 UTC (rev 14793)
@@ -0,0 +1,79 @@
+<?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.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:wsa="http://cxf.apache.org/ws/addressing"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:wsrm-policy="http://schemas.xmlsoap.org/ws/2005/02/rm/policy"
+ xmlns:wsrm-mgr="http://cxf.apache.org/ws/rm/manager"
+ xmlns:beans='http://www.springframework.org/schema/beans'
+ xmlns:jaxws='http://cxf.apache.org/jaxws'
+ xmlns:ns1='http://secure_invoke/helloworld'
+ xsi:schemaLocation="
+ http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd
+ http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd
+ http://schemas.xmlsoap.org/ws/2005/02/rm/policy http://schemas.xmlsoap.org/ws/2005/02/rm/wsrm-policy.xsd
+ http://cxf.apache.org/ws/rm/manager http://cxf.apache.org/schemas/configuration/wsrm-manager.xsd
+ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd">
+
+ <bean id="UsernameTokenSign_Request" class="org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor"
+ name="http://cxf.apache.org/wsse/handler/helloworld}HelloWorldPort.Request" >
+ <constructor-arg>
+ <map>
+ <entry key="action" value="UsernameToken Timestamp Signature"/>
+ <entry key="passwordType" value="PasswordDigest"/>
+ <entry key="user" value="clientx509v1"/>
+ <entry key="passwordCallbackClass" value="org.apache.cxf.systest.ws.security.handler.UsernamePasswordCallback"/>
+ <entry key="signaturePropFile" value="org/apache/cxf/systest/ws/security/handler/Client_Sign.properties"/>
+ <entry key="signatureKeyIdentifier" value="DirectReference"/>
+ <entry key="signatureParts" value="{Element}{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd}Timestamp;{Element}{http://schemas.xmlsoap.org/soap/envelope/}Body"/>
+ </map>
+ </constructor-arg>
+ </bean>
+
+ <bean id="UsernameTokenSign_Response" class="org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor"
+ name="{http://cxf.apache.org/wsse/handler/helloworld}HelloWorldPort.Response" >
+ <constructor-arg>
+ <map>
+ <entry key="action" value="UsernameToken Timestamp Signature"/>
+ <entry key="passwordType" value="PasswordText"/>
+ <entry key="user" value="serverx509v1"/>
+ <entry key="passwordCallbackClass" value="org.apache.cxf.systest.ws.security.handler.UsernamePasswordCallback"/>
+ <entry key="signaturePropFile" value="org/apache/cxf/systest/ws/security/handler/Client_Encrypt.properties"/>
+ <entry key="signatureKeyIdentifier" value="DirectReference"/>
+ </map>
+ </constructor-arg>
+ </bean>
+
+
+ <cxf:bus>
+ <cxf:outInterceptors>
+ <ref bean="UsernameTokenSign_Request"/>
+ <bean class="org.apache.cxf.binding.soap.saaj.SAAJOutInterceptor"/>
+ </cxf:outInterceptors>
+ <cxf:inInterceptors>
+ <ref bean="UsernameTokenSign_Response"/>
+ <bean class="org.apache.cxf.binding.soap.saaj.SAAJInInterceptor"/>
+ </cxf:inInterceptors>
+ </cxf:bus>
+
+</beans>
Deleted: thirdparty/cxf/branches/cxf-2.2.12-patch-01_JBPAPP-6834/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/server-keystore.jks
===================================================================
(Binary files differ)
Copied: thirdparty/cxf/branches/cxf-2.2.12-patch-01_JBPAPP-6834/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/server-keystore.jks (from rev 14671, thirdparty/cxf/branches/cxf-2.2.12/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/server-keystore.jks)
===================================================================
(Binary files differ)
Deleted: thirdparty/cxf/branches/cxf-2.2.12-patch-01_JBPAPP-6834/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/server-truststore.jks
===================================================================
(Binary files differ)
Copied: thirdparty/cxf/branches/cxf-2.2.12-patch-01_JBPAPP-6834/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/server-truststore.jks (from rev 14671, thirdparty/cxf/branches/cxf-2.2.12/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/server-truststore.jks)
===================================================================
(Binary files differ)
Deleted: thirdparty/cxf/branches/cxf-2.2.12-patch-01_JBPAPP-6834/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/server.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/server.xml 2011-07-10 14:57:59 UTC (rev 14671)
+++ thirdparty/cxf/branches/cxf-2.2.12-patch-01_JBPAPP-6834/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/server.xml 2011-08-08 19:40:25 UTC (rev 14793)
@@ -1,82 +0,0 @@
-<?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.
--->
-<beans xmlns='http://www.springframework.org/schema/beans'
- xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xmlns:beans='http://www.springframework.org/schema/beans'
- xmlns:jaxws='http://cxf.apache.org/jaxws'
- xsi:schemaLocation='http://cxf.apache.org/core
- http://cxf.apache.org/schemas/core.xsd
- http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
- http://cxf.apache.org/jaxws
- http://cxf.apache.org/schemas/jaxws.xsd'>
- <bean
- class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer" />
-
- <bean id="UsernameTokenSign_Request" class="org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor">
- <constructor-arg>
- <map>
- <entry key="action" value="UsernameToken Timestamp Signature" />
- <entry key="passwordType" value="PasswordDigest" />
- <entry key="user" value="serverx509v1" />
- <entry key="passwordCallbackClass"
- value="org.apache.cxf.systest.ws.security.handler.UsernamePasswordCallback" />
- <entry key="signaturePropFile"
- value="org/apache/cxf/systest/ws/security/handler/Server_SignVerf.properties" />
- <entry key="signatureKeyIdentifier" value="DirectReference" />
- </map>
- </constructor-arg>
- </bean>
-
- <bean id="UsernameTokenSign_Response" class="org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor">
- <constructor-arg>
- <map>
- <entry key="action" value="UsernameToken Timestamp Signature" />
- <entry key="passwordType" value="PasswordText" />
- <entry key="user" value="serverx509v1" />
- <entry key="passwordCallbackClass"
- value="org.apache.cxf.systest.ws.security.handler.UsernamePasswordCallback" />
- <entry key="signaturePropFile"
- value="org/apache/cxf/systest/ws/security/handler/Server_Decrypt.properties" />
- <entry key="signatureKeyIdentifier" value="DirectReference" />
- <entry key="signatureParts"
- value="{Element}{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd}Timestamp;{Element}{http://schemas.xmlsoap.org/soap/envelope/}Body" />
- </map>
- </constructor-arg>
- </bean>
-
- <jaxws:endpoint id='HelloWorldWS'
- address="http://localhost:${testutil.ports.Server}/wsse/HelloWorldWS"
- wsdlLocation=""
- implementor='org.apache.cxf.systest.ws.security.handler.HelloWorldImpl'>
- <jaxws:inInterceptors>
- <ref bean="UsernameTokenSign_Request" />
- <bean class="org.apache.cxf.binding.soap.saaj.SAAJInInterceptor" />
- </jaxws:inInterceptors>
- <jaxws:outInterceptors>
- <ref bean="UsernameTokenSign_Response" />
- <bean class="org.apache.cxf.binding.soap.saaj.SAAJOutInterceptor" />
- </jaxws:outInterceptors>
- <jaxws:handlers>
- <bean class="org.apache.cxf.systest.ws.security.handler.JAXWSHandler" />
- </jaxws:handlers>
- </jaxws:endpoint>
-
-
-</beans>
Copied: thirdparty/cxf/branches/cxf-2.2.12-patch-01_JBPAPP-6834/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/server.xml (from rev 14671, thirdparty/cxf/branches/cxf-2.2.12/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/server.xml)
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12-patch-01_JBPAPP-6834/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/server.xml (rev 0)
+++ thirdparty/cxf/branches/cxf-2.2.12-patch-01_JBPAPP-6834/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/server.xml 2011-08-08 19:40:25 UTC (rev 14793)
@@ -0,0 +1,82 @@
+<?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.
+-->
+<beans xmlns='http://www.springframework.org/schema/beans'
+ xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xmlns:beans='http://www.springframework.org/schema/beans'
+ xmlns:jaxws='http://cxf.apache.org/jaxws'
+ xsi:schemaLocation='http://cxf.apache.org/core
+ http://cxf.apache.org/schemas/core.xsd
+ http://www.springframework.org/schema/beans
+ http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+ http://cxf.apache.org/jaxws
+ http://cxf.apache.org/schemas/jaxws.xsd'>
+ <bean
+ class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer" />
+
+ <bean id="UsernameTokenSign_Request" class="org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor">
+ <constructor-arg>
+ <map>
+ <entry key="action" value="UsernameToken Timestamp Signature" />
+ <entry key="passwordType" value="PasswordDigest" />
+ <entry key="user" value="serverx509v1" />
+ <entry key="passwordCallbackClass"
+ value="org.apache.cxf.systest.ws.security.handler.UsernamePasswordCallback" />
+ <entry key="signaturePropFile"
+ value="org/apache/cxf/systest/ws/security/handler/Server_SignVerf.properties" />
+ <entry key="signatureKeyIdentifier" value="DirectReference" />
+ </map>
+ </constructor-arg>
+ </bean>
+
+ <bean id="UsernameTokenSign_Response" class="org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor">
+ <constructor-arg>
+ <map>
+ <entry key="action" value="UsernameToken Timestamp Signature" />
+ <entry key="passwordType" value="PasswordText" />
+ <entry key="user" value="serverx509v1" />
+ <entry key="passwordCallbackClass"
+ value="org.apache.cxf.systest.ws.security.handler.UsernamePasswordCallback" />
+ <entry key="signaturePropFile"
+ value="org/apache/cxf/systest/ws/security/handler/Server_Decrypt.properties" />
+ <entry key="signatureKeyIdentifier" value="DirectReference" />
+ <entry key="signatureParts"
+ value="{Element}{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd}Timestamp;{Element}{http://schemas.xmlsoap.org/soap/envelope/}Body" />
+ </map>
+ </constructor-arg>
+ </bean>
+
+ <jaxws:endpoint id='HelloWorldWS'
+ address="http://localhost:${testutil.ports.Server}/wsse/HelloWorldWS"
+ wsdlLocation=""
+ implementor='org.apache.cxf.systest.ws.security.handler.HelloWorldImpl'>
+ <jaxws:inInterceptors>
+ <ref bean="UsernameTokenSign_Request" />
+ <bean class="org.apache.cxf.binding.soap.saaj.SAAJInInterceptor" />
+ </jaxws:inInterceptors>
+ <jaxws:outInterceptors>
+ <ref bean="UsernameTokenSign_Response" />
+ <bean class="org.apache.cxf.binding.soap.saaj.SAAJOutInterceptor" />
+ </jaxws:outInterceptors>
+ <jaxws:handlers>
+ <bean class="org.apache.cxf.systest.ws.security.handler.JAXWSHandler" />
+ </jaxws:handlers>
+ </jaxws:endpoint>
+
+
+</beans>
13 years, 4 months
JBossWS SVN: r14792 - thirdparty/cxf/branches.
by jbossws-commits@lists.jboss.org
Author: bmaxwell
Date: 2011-08-08 15:30:34 -0400 (Mon, 08 Aug 2011)
New Revision: 14792
Added:
thirdparty/cxf/branches/cxf-2.2.12-patch-01_JBPAPP-6834/
Log:
[JBPAPP-6834] one off patch branch
13 years, 4 months
JBossWS SVN: r14791 - in stack/cxf/branches/jbossws-cxf-3.4.1.SP1: modules/client and 1 other directories.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-08-08 14:02:35 -0400 (Mon, 08 Aug 2011)
New Revision: 14791
Modified:
stack/cxf/branches/jbossws-cxf-3.4.1.SP1/modules/client/pom.xml
stack/cxf/branches/jbossws-cxf-3.4.1.SP1/modules/testsuite/pom.xml
stack/cxf/branches/jbossws-cxf-3.4.1.SP1/pom.xml
Log:
updating dependencies
Modified: stack/cxf/branches/jbossws-cxf-3.4.1.SP1/modules/client/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.4.1.SP1/modules/client/pom.xml 2011-08-08 17:11:38 UTC (rev 14790)
+++ stack/cxf/branches/jbossws-cxf-3.4.1.SP1/modules/client/pom.xml 2011-08-08 18:02:35 UTC (rev 14791)
@@ -220,12 +220,8 @@
</dependency>
<dependency>
<groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-log4j</artifactId>
+ <artifactId>jboss-logging</artifactId>
</dependency>
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-spi</artifactId>
- </dependency>
</dependencies>
<build>
@@ -277,7 +273,7 @@
<classpathLayoutType>custom</classpathLayoutType>
<!--a bug in http://jira.codehaus.org/browse/MJAR-118, this needs to be reviewed(remove one $) when maven jar plugin is updated-->
<customClasspathLayout>$${artifact.artifactId}.$${artifact.extension}</customClasspathLayout>
- </manifest>
+ </manifest>
<manifestEntries>
<Class-Path>jbossws-framework.jar jaxws-api.jar jboss-logging.jar jboss-logging-spi.jar jboss-logging-log4j.jar jcl-over-slf4j.jar slf4j-api.jar slf4j-jboss-logging.jar stax-api.jar wstx.jar wstx-lgpl.jar</Class-Path>
</manifestEntries>
Modified: stack/cxf/branches/jbossws-cxf-3.4.1.SP1/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.4.1.SP1/modules/testsuite/pom.xml 2011-08-08 17:11:38 UTC (rev 14790)
+++ stack/cxf/branches/jbossws-cxf-3.4.1.SP1/modules/testsuite/pom.xml 2011-08-08 18:02:35 UTC (rev 14791)
@@ -631,8 +631,11 @@
<argLine>${surefire.jvm.args} ${surefire.jvm.management.args} -Djava.endorsed.dirs=${jboss600.home}/lib/endorsed</argLine>
<!-- TODO: replace with maven dependencies -->
<additionalClasspathElements>
- <!-- Lib below required just for jaxrpc tests; listed here to prevent CXF stack from depending on Native stack -->
+ <additionalClasspathElement>${jboss.home}/client/jbossall-client.jar</additionalClasspathElement>
+ <additionalClasspathElement>${jboss.home}/common/lib/jboss-ejb3-core.jar</additionalClasspathElement>
+ <!-- Libs below required just for jaxrpc tests; listed here to prevent CXF stack from depending on Native stack -->
<additionalClasspathElement>${jboss.home}/common/lib/jbossws-native-core.jar</additionalClasspathElement>
+ <additionalClasspathElement>${jboss.home}/common/lib/netty.jar</additionalClasspathElement>
</additionalClasspathElements>
</configuration>
</plugin>
Modified: stack/cxf/branches/jbossws-cxf-3.4.1.SP1/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.4.1.SP1/pom.xml 2011-08-08 17:11:38 UTC (rev 14790)
+++ stack/cxf/branches/jbossws-cxf-3.4.1.SP1/pom.xml 2011-08-08 18:02:35 UTC (rev 14791)
@@ -64,7 +64,7 @@
<cxf.xjcplugins.version>2.3.0</cxf.xjcplugins.version>
<fastinfoset.api.version>1.2.7</fastinfoset.api.version>
<jboss.common.core.version>2.2.16.GA</jboss.common.core.version>
- <jboss.logging.version>2.2.0.CR1</jboss.logging.version>
+ <jboss.logging.version>3.0.0.GA</jboss.logging.version>
<jboss.security.spi.version>2.0.4.SP4</jboss.security.spi.version>
<jboss.security.sx.version>2.0.4</jboss.security.sx.version>
<jboss.xb.version>2.0.2.Beta7</jboss.xb.version>
@@ -1170,15 +1170,10 @@
</dependency>
<dependency>
<groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-log4j</artifactId>
+ <artifactId>jboss-logging</artifactId>
<version>${jboss.logging.version}</version>
</dependency>
<dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-spi</artifactId>
- <version>${jboss.logging.version}</version>
- </dependency>
- <dependency>
<groupId>org.jboss.spec.javax.jms</groupId>
<artifactId>jboss-jms-api_1.1_spec</artifactId>
<version>${jms.api.version}</version>
13 years, 4 months
JBossWS SVN: r14790 - in stack/cxf/branches/jbossws-cxf-3.4.1.SP1: modules/server and 4 other directories.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-08-08 13:11:38 -0400 (Mon, 08 Aug 2011)
New Revision: 14790
Added:
stack/cxf/branches/jbossws-cxf-3.4.1.SP1/modules/testsuite/test-excludes-jboss610.txt
Removed:
stack/cxf/branches/jbossws-cxf-3.4.1.SP1/modules/testsuite/test-excludes-jboss601.txt
Modified:
stack/cxf/branches/jbossws-cxf-3.4.1.SP1/build.xml
stack/cxf/branches/jbossws-cxf-3.4.1.SP1/modules/server/pom.xml
stack/cxf/branches/jbossws-cxf-3.4.1.SP1/modules/server/src/main/scripts/antrun-beans-config.xml
stack/cxf/branches/jbossws-cxf-3.4.1.SP1/modules/testsuite/pom.xml
stack/cxf/branches/jbossws-cxf-3.4.1.SP1/pom.xml
stack/cxf/branches/jbossws-cxf-3.4.1.SP1/src/main/distro/ant.properties.example
stack/cxf/branches/jbossws-cxf-3.4.1.SP1/src/main/distro/build-deploy.xml
stack/cxf/branches/jbossws-cxf-3.4.1.SP1/src/main/distro/build-setup.xml
stack/cxf/branches/jbossws-cxf-3.4.1.SP1/src/main/distro/build.xml
stack/cxf/branches/jbossws-cxf-3.4.1.SP1/src/main/scripts/assembly-deploy-artifacts.xml
Log:
adding support for AS 6.1.0
Modified: stack/cxf/branches/jbossws-cxf-3.4.1.SP1/build.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.4.1.SP1/build.xml 2011-08-08 16:36:12 UTC (rev 14789)
+++ stack/cxf/branches/jbossws-cxf-3.4.1.SP1/build.xml 2011-08-08 17:11:38 UTC (rev 14790)
@@ -65,8 +65,8 @@
<condition property="jboss600.home" value="${profiles.profile.properties.jboss600.home}">
<isset property="profiles.profile.properties.jboss600.home"/>
</condition>
- <condition property="jboss601.home" value="${profiles.profile.properties.jboss601.home}">
- <isset property="profiles.profile.properties.jboss601.home"/>
+ <condition property="jboss610.home" value="${profiles.profile.properties.jboss610.home}">
+ <isset property="profiles.profile.properties.jboss610.home"/>
</condition>
<!-- Loads the properties from the user profile -->
@@ -74,13 +74,13 @@
<property name="jboss501.home" value="${profiles.profile.properties.jboss501.home}"/>
<property name="jboss510.home" value="${profiles.profile.properties.jboss510.home}"/>
<property name="jboss600.home" value="${profiles.profile.properties.jboss600.home}"/>
- <property name="jboss601.home" value="${profiles.profile.properties.jboss601.home}"/>
+ <property name="jboss610.home" value="${profiles.profile.properties.jboss610.home}"/>
<echo/>
<echo message="jboss501.home=${jboss501.home}"/>
<echo message="jboss510.home=${jboss510.home}"/>
<echo message="jboss600.home=${jboss600.home}"/>
- <echo message="jboss601.home=${jboss601.home}"/>
+ <echo message="jboss610.home=${jboss610.home}"/>
</target>
<target name="init" depends="mvn-settings,prepare,os-init">
Modified: stack/cxf/branches/jbossws-cxf-3.4.1.SP1/modules/server/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.4.1.SP1/modules/server/pom.xml 2011-08-08 16:36:12 UTC (rev 14789)
+++ stack/cxf/branches/jbossws-cxf-3.4.1.SP1/modules/server/pom.xml 2011-08-08 17:11:38 UTC (rev 14790)
@@ -310,10 +310,10 @@
<artifactItem>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss600x</artifactId>
- <version>${jbossws.jboss601.version}</version>
+ <version>${jbossws.jboss610.version}</version>
<classifier>resources</classifier>
<type>zip</type>
- <outputDirectory>${project.build.directory}/resources/jbossws-jboss601</outputDirectory>
+ <outputDirectory>${project.build.directory}/resources/jbossws-jboss610</outputDirectory>
</artifactItem>
-->
<!-- END -->
Modified: stack/cxf/branches/jbossws-cxf-3.4.1.SP1/modules/server/src/main/scripts/antrun-beans-config.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.4.1.SP1/modules/server/src/main/scripts/antrun-beans-config.xml 2011-08-08 16:36:12 UTC (rev 14789)
+++ stack/cxf/branches/jbossws-cxf-3.4.1.SP1/modules/server/src/main/scripts/antrun-beans-config.xml 2011-08-08 17:11:38 UTC (rev 14790)
@@ -33,7 +33,7 @@
<copy
file="${src.dir}/jbossws-cxf-config-as6.xml"
- tofile="${dest.dir}/jbossws-jboss601/jbossws.beans/META-INF/stack-specific-jboss-beans.xml"
+ tofile="${dest.dir}/jbossws-jboss610/jbossws.beans/META-INF/stack-specific-jboss-beans.xml"
/>
<copy
@@ -43,7 +43,7 @@
<copy
file="${src.dir}/jbossws-jaxrpc-config-as6.xml"
- tofile="${dest.dir}/jbossws-jaxrpc-jboss601/jbossws.beans/META-INF/stack-specific-jboss-beans.xml"
+ tofile="${dest.dir}/jbossws-jaxrpc-jboss610/jbossws.beans/META-INF/stack-specific-jboss-beans.xml"
/>
</target>
Modified: stack/cxf/branches/jbossws-cxf-3.4.1.SP1/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.4.1.SP1/modules/testsuite/pom.xml 2011-08-08 16:36:12 UTC (rev 14789)
+++ stack/cxf/branches/jbossws-cxf-3.4.1.SP1/modules/testsuite/pom.xml 2011-08-08 17:11:38 UTC (rev 14790)
@@ -641,14 +641,14 @@
</profile>
<!--
- Name: jboss601
- Descr: JBoss-6.0.1 specific options
+ Name: jboss610
+ Descr: JBoss-6.1.0 specific options
-->
<profile>
- <id>jboss601</id>
+ <id>jboss610</id>
<properties>
- <jboss.version>6.0.0-SNAPSHOT</jboss.version>
- <jbossws.integration.target>jboss601</jbossws.integration.target>
+ <jboss.version>6.1.0-SNAPSHOT</jboss.version>
+ <jbossws.integration.target>jboss610</jbossws.integration.target>
</properties>
<dependencies>
<dependency>
@@ -731,14 +731,14 @@
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<!-- http://jira.codehaus.org/browse/MCOMPILER-72 -->
- <testExcludeFile>../test-excludes-jboss601.txt</testExcludeFile>
- <compilerArgument>-Djava.endorsed.dirs=${jboss601.home}/lib/endorsed</compilerArgument>
+ <testExcludeFile>../test-excludes-jboss610.txt</testExcludeFile>
+ <compilerArgument>-Djava.endorsed.dirs=${jboss610.home}/lib/endorsed</compilerArgument>
</configuration>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <argLine>${surefire.jvm.args} ${surefire.jvm.management.args} -Djava.endorsed.dirs=${jboss601.home}/lib/endorsed</argLine>
+ <argLine>${surefire.jvm.args} ${surefire.jvm.management.args} -Djava.endorsed.dirs=${jboss610.home}/lib/endorsed</argLine>
<!-- TODO: replace with maven dependencies -->
<additionalClasspathElements>
<!-- Lib below required just for jaxrpc tests; listed here to prevent CXF stack from depending on Native stack -->
Deleted: stack/cxf/branches/jbossws-cxf-3.4.1.SP1/modules/testsuite/test-excludes-jboss601.txt
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.4.1.SP1/modules/testsuite/test-excludes-jboss601.txt 2011-08-08 16:36:12 UTC (rev 14789)
+++ stack/cxf/branches/jbossws-cxf-3.4.1.SP1/modules/testsuite/test-excludes-jboss601.txt 2011-08-08 17:11:38 UTC (rev 14790)
@@ -1,26 +0,0 @@
-# UsernameTestCase requires trustore in jboss-web tomcat configuration
-org/jboss/test/ws/jaxws/samples/wssePolicy/UsernameTestCase.*
-
-# [CXF-1519] Explicitly set the namespace of a WebFault
-org/jboss/test/ws/jaxws/jbws1904/**
-
-# [CXF-2006] RespectBinding feature and not understood required extensibility elements
-org/jboss/test/ws/jaxws/jbws2449/**
-
-# [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored
-org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.*
-
-# [JBWS-2561] XOP request not properly inlined
-org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.*
-
-# [JBWS-2480] Soap attachments are dropped on server response
-org/jboss/test/ws/jaxws/jbws1283/**
-
-# [JBWS-2397] Fix jbws1797 testcase
-org/jboss/test/ws/jaxws/jbws1797/**
-
-# [JBAS-8363] Virtual host issue in JBossWeb
-org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.*
-
-# Seems MSFT interop. endpoints are down :(
-org/jboss/test/ws/jaxws/cxf/interop/wstrust10/**
Added: stack/cxf/branches/jbossws-cxf-3.4.1.SP1/modules/testsuite/test-excludes-jboss610.txt
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.4.1.SP1/modules/testsuite/test-excludes-jboss610.txt (rev 0)
+++ stack/cxf/branches/jbossws-cxf-3.4.1.SP1/modules/testsuite/test-excludes-jboss610.txt 2011-08-08 17:11:38 UTC (rev 14790)
@@ -0,0 +1,26 @@
+# UsernameTestCase requires trustore in jboss-web tomcat configuration
+org/jboss/test/ws/jaxws/samples/wssePolicy/UsernameTestCase.*
+
+# [CXF-1519] Explicitly set the namespace of a WebFault
+org/jboss/test/ws/jaxws/jbws1904/**
+
+# [CXF-2006] RespectBinding feature and not understood required extensibility elements
+org/jboss/test/ws/jaxws/jbws2449/**
+
+# [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored
+org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.*
+
+# [JBWS-2561] XOP request not properly inlined
+org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.*
+
+# [JBWS-2480] Soap attachments are dropped on server response
+org/jboss/test/ws/jaxws/jbws1283/**
+
+# [JBWS-2397] Fix jbws1797 testcase
+org/jboss/test/ws/jaxws/jbws1797/**
+
+# [JBAS-8363] Virtual host issue in JBossWeb
+org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.*
+
+# Seems MSFT interop. endpoints are down :(
+org/jboss/test/ws/jaxws/cxf/interop/wstrust10/**
Property changes on: stack/cxf/branches/jbossws-cxf-3.4.1.SP1/modules/testsuite/test-excludes-jboss610.txt
___________________________________________________________________
Added: svn:executable
+ *
Modified: stack/cxf/branches/jbossws-cxf-3.4.1.SP1/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.4.1.SP1/pom.xml 2011-08-08 16:36:12 UTC (rev 14789)
+++ stack/cxf/branches/jbossws-cxf-3.4.1.SP1/pom.xml 2011-08-08 17:11:38 UTC (rev 14790)
@@ -48,14 +48,14 @@
<properties>
<jbossws.spi.version>1.4.1.GA</jbossws.spi.version>
<jbossws.common.version>1.4.1.GA</jbossws.common.version>
- <jbossws.framework.version>3.4.1.SP1-SNAPSHOT</jbossws.framework.version>
+ <jbossws.framework.version>3.4.1.GA</jbossws.framework.version>
<jbossws.jboss501.version>3.4.0.GA</jbossws.jboss501.version>
<jbossws.jboss510.version>3.4.0.GA</jbossws.jboss510.version>
<!-- JBWS-2505 -->
<!-- START -->
<!--
<jbossws.jboss600M5.version>3.4.1.GA</jbossws.jboss600M5.version>
- <jbossws.jboss601.version>3.2.1.GA</jbossws.jboss601.version>
+ <jbossws.jboss610.version>3.4.1.GA</jbossws.jboss610.version>
-->
<!-- END -->
<cxf.version>2.3.1</cxf.version>
@@ -172,12 +172,12 @@
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss600x</artifactId>
- <version>${jbossws.jboss601.version}</version>
+ <version>${jbossws.jboss610.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss600x</artifactId>
- <version>${jbossws.jboss601.version}</version>
+ <version>${jbossws.jboss610.version}</version>
<classifier>resources</classifier>
<type>zip</type>
</dependency>
@@ -1416,14 +1416,14 @@
</profile>
<!--
- Name: jboss601
- Descr: JBoss-6.0.1 specific options
+ Name: jboss610
+ Descr: JBoss-6.1.0 specific options
-->
<profile>
- <id>jboss601</id>
+ <id>jboss610</id>
<properties>
- <jbossws.integration.target>jboss601</jbossws.integration.target>
- <jboss.home>${jboss601.home}</jboss.home>
+ <jbossws.integration.target>jboss610</jbossws.integration.target>
+ <jboss.home>${jboss610.home}</jboss.home>
</properties>
</profile>
Modified: stack/cxf/branches/jbossws-cxf-3.4.1.SP1/src/main/distro/ant.properties.example
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.4.1.SP1/src/main/distro/ant.properties.example 2011-08-08 16:36:12 UTC (rev 14789)
+++ stack/cxf/branches/jbossws-cxf-3.4.1.SP1/src/main/distro/ant.properties.example 2011-08-08 17:11:38 UTC (rev 14790)
@@ -3,9 +3,9 @@
#
# Optional JBoss Home
-jboss600.home=(a)jboss601.home@
+jboss610.home=(a)jboss610.home@
-jbossws.integration.target=jboss600
+jbossws.integration.target=jboss610
# The JBoss settings
jboss.server.instance=default
Modified: stack/cxf/branches/jbossws-cxf-3.4.1.SP1/src/main/distro/build-deploy.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.4.1.SP1/src/main/distro/build-deploy.xml 2011-08-08 16:36:12 UTC (rev 14789)
+++ stack/cxf/branches/jbossws-cxf-3.4.1.SP1/src/main/distro/build-deploy.xml 2011-08-08 17:11:38 UTC (rev 14790)
@@ -138,10 +138,10 @@
</target>
<!-- ================================================================== -->
- <!-- Prepare Deployment Structure JBoss-6.0.1 -->
+ <!-- Prepare Deployment Structure JBoss-6.1.0 -->
<!-- ================================================================== -->
- <target name="deploy-structure-jboss601" depends="prepare-deploy">
+ <target name="deploy-structure-jboss610" depends="prepare-deploy">
<delete dir="${deploy.structure}"/>
<antcall target="deploy-jbossws-cxf-with-jaxrpc" inheritall="false">
<param name="installserver" value="${deploy.structure}/server/${jboss.server.instance}"/>
@@ -153,26 +153,26 @@
</target>
<!-- ================================================================== -->
- <!-- Deployment JBoss601 -->
+ <!-- Deployment JBoss610 -->
<!-- ================================================================== -->
- <target name="target-jboss601">
- <property name="jbossws.integration.target" value="jboss601"/>
+ <target name="target-jboss610">
+ <property name="jbossws.integration.target" value="jboss610"/>
<echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/>
</target>
- <target name="deploy-jboss601" depends="undeploy-jboss601,deploy-structure-jboss601,check-spring,install-spring" description="Deploy jbossws to jboss601">
+ <target name="deploy-jboss610" depends="undeploy-jboss610,deploy-structure-jboss610,check-spring,install-spring" description="Deploy jbossws to jboss610">
<macro-create-deploy-conf deploystructure="${deploy.structure}"/>
- <fail message="Not available: ${jboss601.available.file}" unless="jboss601.available"/>
- <copy todir="${jboss601.home}" overwrite="true" verbose="true">
+ <fail message="Not available: ${jboss610.available.file}" unless="jboss610.available"/>
+ <copy todir="${jboss610.home}" overwrite="true" verbose="true">
<fileset dir="${deploy.structure}"/>
</copy>
- <chmod dir="${jboss601.home}/bin" perm="+x" includes="*.sh"/>
+ <chmod dir="${jboss610.home}/bin" perm="+x" includes="*.sh"/>
</target>
- <target name="undeploy-jboss601" depends="target-jboss601,init" description="Remove jbossws from jboss601">
- <fail message="Not available: ${jboss601.available.file}" unless="jboss601.available"/>
- <macro-undeploy-jbossws targetdir="${jboss601.server}"
+ <target name="undeploy-jboss610" depends="target-jboss610,init" description="Remove jbossws from jboss610">
+ <fail message="Not available: ${jboss610.available.file}" unless="jboss610.available"/>
+ <macro-undeploy-jbossws targetdir="${jboss610.server}"
defaultconf="${jbossws.default.deploy.conf}"
defaultserverconf="${jbossws.default.server.deploy.conf}"
modifyjbossintegration="false"
Modified: stack/cxf/branches/jbossws-cxf-3.4.1.SP1/src/main/distro/build-setup.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.4.1.SP1/src/main/distro/build-setup.xml 2011-08-08 16:36:12 UTC (rev 14789)
+++ stack/cxf/branches/jbossws-cxf-3.4.1.SP1/src/main/distro/build-setup.xml 2011-08-08 17:11:38 UTC (rev 14790)
@@ -42,22 +42,22 @@
<property name="jboss600.server.deploy" value="${jboss600.server}/deploy"/>
<property name="jboss600.server.deployers" value="${jboss600.server}/deployers"/>
- <property name="jboss601.lib" value="${jboss601.home}/lib"/>
- <property name="jboss601.client" value="${jboss601.home}/client"/>
- <property name="jboss601.server" value="${jboss601.home}/server/${jboss.server.instance}"/>
- <property name="jboss601.server.lib" value="${jboss601.home}/common/lib"/>
- <property name="jboss601.server.deploy" value="${jboss601.server}/deploy"/>
- <property name="jboss601.server.deployers" value="${jboss601.server}/deployers"/>
+ <property name="jboss610.lib" value="${jboss610.home}/lib"/>
+ <property name="jboss610.client" value="${jboss610.home}/client"/>
+ <property name="jboss610.server" value="${jboss610.home}/server/${jboss.server.instance}"/>
+ <property name="jboss610.server.lib" value="${jboss610.home}/common/lib"/>
+ <property name="jboss610.server.deploy" value="${jboss610.server}/deploy"/>
+ <property name="jboss610.server.deployers" value="${jboss610.server}/deployers"/>
<property name="jboss501.available.file" value="${jboss501.client}/jboss-client.jar"/>
<property name="jboss510.available.file" value="${jboss510.client}/jboss-client.jar"/>
<property name="jboss600.available.file" value="${jboss600.client}/jboss-client.jar"/>
- <property name="jboss601.available.file" value="${jboss601.client}/jboss-client.jar"/>
+ <property name="jboss610.available.file" value="${jboss610.client}/jboss-client.jar"/>
<available property="jboss501.available" file="${jboss501.available.file}"/>
<available property="jboss510.available" file="${jboss510.available.file}"/>
<available property="jboss600.available" file="${jboss600.available.file}"/>
- <available property="jboss601.available" file="${jboss601.available.file}"/>
+ <available property="jboss610.available" file="${jboss610.available.file}"/>
<tstamp>
<format property="build.id" pattern="yyyyMMddHHmm"/>
Modified: stack/cxf/branches/jbossws-cxf-3.4.1.SP1/src/main/distro/build.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.4.1.SP1/src/main/distro/build.xml 2011-08-08 16:36:12 UTC (rev 14789)
+++ stack/cxf/branches/jbossws-cxf-3.4.1.SP1/src/main/distro/build.xml 2011-08-08 17:11:38 UTC (rev 14790)
@@ -59,9 +59,13 @@
<condition property="jbossws.integration.jboss60" value="true">
<or>
<equals arg1="${jbossws.integration.target}" arg2="jboss600"/>
- <equals arg1="${jbossws.integration.target}" arg2="jboss601"/>
</or>
</condition>
+ <condition property="jbossws.integration.jboss61" value="true">
+ <or>
+ <equals arg1="${jbossws.integration.target}" arg2="jboss610"/>
+ </or>
+ </condition>
<property name="deploy.structure" value="${output.dir}/deploy-${jbossws.integration.target}"/>
<property name="excludesfile" value="${tests.dir}/resources/test-excludes-${jbossws.integration.target}.txt"/>
Modified: stack/cxf/branches/jbossws-cxf-3.4.1.SP1/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.4.1.SP1/src/main/scripts/assembly-deploy-artifacts.xml 2011-08-08 16:36:12 UTC (rev 14789)
+++ stack/cxf/branches/jbossws-cxf-3.4.1.SP1/src/main/scripts/assembly-deploy-artifacts.xml 2011-08-08 17:11:38 UTC (rev 14790)
@@ -185,7 +185,7 @@
</dependencySet>
<dependencySet>
<outputDirectory>deploy-artifacts/lib</outputDirectory>
- <outputFileNameMapping>jbossws-jboss601.${module.extension}</outputFileNameMapping>
+ <outputFileNameMapping>jbossws-jboss610.${module.extension}</outputFileNameMapping>
<useStrictFiltering>true</useStrictFiltering>
<scope>provided</scope>
<unpack>false</unpack>
13 years, 4 months
JBossWS SVN: r14789 - in stack/cxf/branches/jbossws-cxf-3.4.1.SP1: modules/addons and 10 other directories.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-08-08 12:36:12 -0400 (Mon, 08 Aug 2011)
New Revision: 14789
Modified:
stack/cxf/branches/jbossws-cxf-3.4.1.SP1/modules/addons/pom.xml
stack/cxf/branches/jbossws-cxf-3.4.1.SP1/modules/addons/transports/http/httpserver/pom.xml
stack/cxf/branches/jbossws-cxf-3.4.1.SP1/modules/client/pom.xml
stack/cxf/branches/jbossws-cxf-3.4.1.SP1/modules/endorsed/pom.xml
stack/cxf/branches/jbossws-cxf-3.4.1.SP1/modules/management/pom.xml
stack/cxf/branches/jbossws-cxf-3.4.1.SP1/modules/resources/pom.xml
stack/cxf/branches/jbossws-cxf-3.4.1.SP1/modules/server/pom.xml
stack/cxf/branches/jbossws-cxf-3.4.1.SP1/modules/testsuite/cxf-spring-tests/pom.xml
stack/cxf/branches/jbossws-cxf-3.4.1.SP1/modules/testsuite/cxf-tests/pom.xml
stack/cxf/branches/jbossws-cxf-3.4.1.SP1/modules/testsuite/framework-tests/pom.xml
stack/cxf/branches/jbossws-cxf-3.4.1.SP1/modules/testsuite/pom.xml
stack/cxf/branches/jbossws-cxf-3.4.1.SP1/pom.xml
Log:
changing version
Modified: stack/cxf/branches/jbossws-cxf-3.4.1.SP1/modules/addons/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.4.1.SP1/modules/addons/pom.xml 2011-08-08 16:31:28 UTC (rev 14788)
+++ stack/cxf/branches/jbossws-cxf-3.4.1.SP1/modules/addons/pom.xml 2011-08-08 16:36:12 UTC (rev 14789)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>3.4.1.GA</version>
+ <version>3.4.1.SP1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/branches/jbossws-cxf-3.4.1.SP1/modules/addons/transports/http/httpserver/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.4.1.SP1/modules/addons/transports/http/httpserver/pom.xml 2011-08-08 16:31:28 UTC (rev 14788)
+++ stack/cxf/branches/jbossws-cxf-3.4.1.SP1/modules/addons/transports/http/httpserver/pom.xml 2011-08-08 16:36:12 UTC (rev 14789)
@@ -8,7 +8,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-addons</artifactId>
- <version>3.4.1.GA</version>
+ <version>3.4.1.SP1-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/branches/jbossws-cxf-3.4.1.SP1/modules/client/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.4.1.SP1/modules/client/pom.xml 2011-08-08 16:31:28 UTC (rev 14788)
+++ stack/cxf/branches/jbossws-cxf-3.4.1.SP1/modules/client/pom.xml 2011-08-08 16:36:12 UTC (rev 14789)
@@ -8,7 +8,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>3.4.1.GA</version>
+ <version>3.4.1.SP1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/branches/jbossws-cxf-3.4.1.SP1/modules/endorsed/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.4.1.SP1/modules/endorsed/pom.xml 2011-08-08 16:31:28 UTC (rev 14788)
+++ stack/cxf/branches/jbossws-cxf-3.4.1.SP1/modules/endorsed/pom.xml 2011-08-08 16:36:12 UTC (rev 14789)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>3.4.1.GA</version>
+ <version>3.4.1.SP1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/branches/jbossws-cxf-3.4.1.SP1/modules/management/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.4.1.SP1/modules/management/pom.xml 2011-08-08 16:31:28 UTC (rev 14788)
+++ stack/cxf/branches/jbossws-cxf-3.4.1.SP1/modules/management/pom.xml 2011-08-08 16:36:12 UTC (rev 14789)
@@ -8,7 +8,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>3.4.1.GA</version>
+ <version>3.4.1.SP1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/branches/jbossws-cxf-3.4.1.SP1/modules/resources/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.4.1.SP1/modules/resources/pom.xml 2011-08-08 16:31:28 UTC (rev 14788)
+++ stack/cxf/branches/jbossws-cxf-3.4.1.SP1/modules/resources/pom.xml 2011-08-08 16:36:12 UTC (rev 14789)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>3.4.1.GA</version>
+ <version>3.4.1.SP1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/branches/jbossws-cxf-3.4.1.SP1/modules/server/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.4.1.SP1/modules/server/pom.xml 2011-08-08 16:31:28 UTC (rev 14788)
+++ stack/cxf/branches/jbossws-cxf-3.4.1.SP1/modules/server/pom.xml 2011-08-08 16:36:12 UTC (rev 14789)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>3.4.1.GA</version>
+ <version>3.4.1.SP1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/branches/jbossws-cxf-3.4.1.SP1/modules/testsuite/cxf-spring-tests/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.4.1.SP1/modules/testsuite/cxf-spring-tests/pom.xml 2011-08-08 16:31:28 UTC (rev 14788)
+++ stack/cxf/branches/jbossws-cxf-3.4.1.SP1/modules/testsuite/cxf-spring-tests/pom.xml 2011-08-08 16:36:12 UTC (rev 14789)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-testsuite</artifactId>
- <version>3.4.1.GA</version>
+ <version>3.4.1.SP1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: stack/cxf/branches/jbossws-cxf-3.4.1.SP1/modules/testsuite/cxf-tests/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.4.1.SP1/modules/testsuite/cxf-tests/pom.xml 2011-08-08 16:31:28 UTC (rev 14788)
+++ stack/cxf/branches/jbossws-cxf-3.4.1.SP1/modules/testsuite/cxf-tests/pom.xml 2011-08-08 16:36:12 UTC (rev 14789)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-testsuite</artifactId>
- <version>3.4.1.GA</version>
+ <version>3.4.1.SP1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: stack/cxf/branches/jbossws-cxf-3.4.1.SP1/modules/testsuite/framework-tests/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.4.1.SP1/modules/testsuite/framework-tests/pom.xml 2011-08-08 16:31:28 UTC (rev 14788)
+++ stack/cxf/branches/jbossws-cxf-3.4.1.SP1/modules/testsuite/framework-tests/pom.xml 2011-08-08 16:36:12 UTC (rev 14789)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-testsuite</artifactId>
- <version>3.4.1.GA</version>
+ <version>3.4.1.SP1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: stack/cxf/branches/jbossws-cxf-3.4.1.SP1/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.4.1.SP1/modules/testsuite/pom.xml 2011-08-08 16:31:28 UTC (rev 14788)
+++ stack/cxf/branches/jbossws-cxf-3.4.1.SP1/modules/testsuite/pom.xml 2011-08-08 16:36:12 UTC (rev 14789)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>3.4.1.GA</version>
+ <version>3.4.1.SP1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/branches/jbossws-cxf-3.4.1.SP1/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.4.1.SP1/pom.xml 2011-08-08 16:31:28 UTC (rev 14788)
+++ stack/cxf/branches/jbossws-cxf-3.4.1.SP1/pom.xml 2011-08-08 16:36:12 UTC (rev 14789)
@@ -18,7 +18,7 @@
<packaging>pom</packaging>
<description>JBossWS CXF stack</description>
- <version>3.4.1.GA</version>
+ <version>3.4.1.SP1-SNAPSHOT</version>
<!-- Parent -->
<parent>
@@ -29,9 +29,9 @@
<!-- Source Control Management -->
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/stack/cxf/tags/jbossws-cxf...</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/stack/cxf/tags/jbossws-cxf-3....</developerConnection>
- <url>http://fisheye.jboss.com/viewrep/JBossWS/stack/cxf/tags/jbossws-cxf-3.4.1.GA</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/stack/cxf/tags/jbossws-cxf...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/stack/cxf/tags/jbossws-cxf-3....</developerConnection>
+ <url>http://fisheye.jboss.com/viewrep/JBossWS/stack/cxf/tags/jbossws-cxf-3.4.1...</url>
</scm>
<!-- Modules -->
@@ -48,7 +48,7 @@
<properties>
<jbossws.spi.version>1.4.1.GA</jbossws.spi.version>
<jbossws.common.version>1.4.1.GA</jbossws.common.version>
- <jbossws.framework.version>3.4.1.GA</jbossws.framework.version>
+ <jbossws.framework.version>3.4.1.SP1-SNAPSHOT</jbossws.framework.version>
<jbossws.jboss501.version>3.4.0.GA</jbossws.jboss501.version>
<jbossws.jboss510.version>3.4.0.GA</jbossws.jboss510.version>
<!-- JBWS-2505 -->
13 years, 4 months
JBossWS SVN: r14788 - stack/cxf/branches.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-08-08 12:31:28 -0400 (Mon, 08 Aug 2011)
New Revision: 14788
Added:
stack/cxf/branches/jbossws-cxf-3.4.1.SP1/
Log:
creating 3.4.1.SP1 branch
13 years, 4 months
JBossWS SVN: r14787 - in stack/native/branches/jbossws-native-3.4.1.SP2: modules/client and 2 other directories.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-08-08 12:26:28 -0400 (Mon, 08 Aug 2011)
New Revision: 14787
Modified:
stack/native/branches/jbossws-native-3.4.1.SP2/modules/client/pom.xml
stack/native/branches/jbossws-native-3.4.1.SP2/modules/core/pom.xml
stack/native/branches/jbossws-native-3.4.1.SP2/modules/testsuite/pom.xml
stack/native/branches/jbossws-native-3.4.1.SP2/pom.xml
Log:
updating maven depenencies
Modified: stack/native/branches/jbossws-native-3.4.1.SP2/modules/client/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-3.4.1.SP2/modules/client/pom.xml 2011-08-08 14:32:53 UTC (rev 14786)
+++ stack/native/branches/jbossws-native-3.4.1.SP2/modules/client/pom.xml 2011-08-08 16:26:28 UTC (rev 14787)
@@ -36,12 +36,8 @@
</dependency>
<dependency>
<groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-log4j</artifactId>
+ <artifactId>jboss-logging</artifactId>
</dependency>
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-spi</artifactId>
- </dependency>
</dependencies>
<build>
Modified: stack/native/branches/jbossws-native-3.4.1.SP2/modules/core/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-3.4.1.SP2/modules/core/pom.xml 2011-08-08 14:32:53 UTC (rev 14786)
+++ stack/native/branches/jbossws-native-3.4.1.SP2/modules/core/pom.xml 2011-08-08 16:26:28 UTC (rev 14787)
@@ -16,7 +16,7 @@
<properties>
<jboss.jbosssx.version>2.0.2.SP3</jboss.jbosssx.version>
<jboss.microcontainer.version>2.0.2.GA</jboss.microcontainer.version>
- <jboss.jbossxb.version>2.0.1.GA</jboss.jbossxb.version>
+ <jboss.jbossxb.version>2.0.3.GA</jboss.jbossxb.version>
</properties>
<!-- Dependencies -->
@@ -86,6 +86,12 @@
<artifactId>jbossxb</artifactId>
<scope>provided</scope>
<version>${jboss.jbossxb.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>xerces</groupId>
@@ -106,6 +112,10 @@
<artifactId>commons-logging</artifactId>
</dependency>
<dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging</artifactId>
+ </dependency>
+ <dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
</dependency>
Modified: stack/native/branches/jbossws-native-3.4.1.SP2/modules/testsuite/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-3.4.1.SP2/modules/testsuite/pom.xml 2011-08-08 14:32:53 UTC (rev 14786)
+++ stack/native/branches/jbossws-native-3.4.1.SP2/modules/testsuite/pom.xml 2011-08-08 16:26:28 UTC (rev 14787)
@@ -549,6 +549,10 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>${surefire.jvm.args} ${surefire.jvm.management.args} -Djava.endorsed.dirs=${jboss600.home}/lib/endorsed</argLine>
+ <additionalClasspathElements>
+ <additionalClasspathElement>${jboss.home}/client/jbossall-client.jar</additionalClasspathElement>
+ <additionalClasspathElement>${jboss.home}/common/lib/jboss-ejb3-core.jar</additionalClasspathElement>
+ </additionalClasspathElements>
</configuration>
</plugin>
</plugins>
Modified: stack/native/branches/jbossws-native-3.4.1.SP2/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-3.4.1.SP2/pom.xml 2011-08-08 14:32:53 UTC (rev 14786)
+++ stack/native/branches/jbossws-native-3.4.1.SP2/pom.xml 2011-08-08 16:26:28 UTC (rev 14787)
@@ -67,7 +67,7 @@
<jsr181.api.version>1.0-MR1</jsr181.api.version>
<jaxb.api.version>1.0.0.Final</jaxb.api.version>
<jaxb.impl.version>2.2</jaxb.impl.version>
- <jboss.logging.version>2.2.0.CR1</jboss.logging.version>
+ <jboss.logging.version>3.0.0.GA</jboss.logging.version>
<jboss.jaxr.version>2.0.2</jboss.jaxr.version>
<apache.scout.version>1.1.1</apache.scout.version>
<juddi.version>0.9RC4</juddi.version>
@@ -355,15 +355,10 @@
</dependency>
<dependency>
<groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-log4j</artifactId>
+ <artifactId>jboss-logging</artifactId>
<version>${jboss.logging.version}</version>
</dependency>
<dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-spi</artifactId>
- <version>${jboss.logging.version}</version>
- </dependency>
- <dependency>
<groupId>ws-commons</groupId>
<artifactId>policy</artifactId>
<version>${wscommons.policy.version}</version>
13 years, 4 months