July 2011 - jbossws-commits - Jboss List Archives

by jbossws-commits＠lists.jboss.org

Author: jim.ma Date: 2011-07-12 00:57:50 -0400 (Tue, 12 Jul 2011) New Revision: 14674 Added: common/tags/jbossws-common-1.0.0.GA_CP07/ Log: [JBPAPP-6827]:tag jbossws-common 1.0.0.GA_CP07

12 years, 9 months

1
0
0 / 0

JBossWS SVN: r14673 - common/branches/jbossws-common-1.0.0.GA_CP.

by jbossws-commits＠lists.jboss.org

Author: jim.ma Date: 2011-07-12 00:54:01 -0400 (Tue, 12 Jul 2011) New Revision: 14673 Modified: common/branches/jbossws-common-1.0.0.GA_CP/version.properties Log: [JBPAPP-6559]:upgrade JBossWS SPI to 1.0.0.GA_CP03 Modified: common/branches/jbossws-common-1.0.0.GA_CP/version.properties =================================================================== --- common/branches/jbossws-common-1.0.0.GA_CP/version.properties 2011-07-12 04:43:17 UTC (rev 14672) +++ common/branches/jbossws-common-1.0.0.GA_CP/version.properties 2011-07-12 04:54:01 UTC (rev 14673) @@ -14,7 +14,7 @@ implementation.vendor.id=http://www.jboss.org # Thirdparty library versions -jbossws-spi=1.0.0.GA_CP02-brew +jbossws-spi=1.0.0.GA_CP03-brew jboss-common-core=2.0.2.GA jboss-common-logging-spi=2.0.2.GA

12 years, 9 months

1
0
0 / 0

JBossWS SVN: r14672 - common/branches/jbossws-common-1.0.0.GA_CP/src/main/java/org/jboss/wsf/common.

by jbossws-commits＠lists.jboss.org

Author: jim.ma Date: 2011-07-12 00:43:17 -0400 (Tue, 12 Jul 2011) New Revision: 14672 Modified: common/branches/jbossws-common-1.0.0.GA_CP/src/main/java/org/jboss/wsf/common/DOMUtils.java Log: [JBPAPP-6247]:Disable DOCTYPEs by default for SOAP messages as well as WSDLs Modified: common/branches/jbossws-common-1.0.0.GA_CP/src/main/java/org/jboss/wsf/common/DOMUtils.java =================================================================== --- common/branches/jbossws-common-1.0.0.GA_CP/src/main/java/org/jboss/wsf/common/DOMUtils.java 2011-07-10 14:57:59 UTC (rev 14671) +++ common/branches/jbossws-common-1.0.0.GA_CP/src/main/java/org/jboss/wsf/common/DOMUtils.java 2011-07-12 04:43:17 UTC (rev 14672) @@ -74,6 +74,8 @@ private static final String DISABLE_DEFERRED_NODE_EXPANSION = "org.jboss.ws.disable_deferred_node_expansion"; private static final String DEFER_NODE_EXPANSION_FEATURE = "http://apache.org/xml/features/dom/defer-node-expansion"; + private static final String ENABLE_DOCTYPE_DECL = "org.jboss.ws.enable_doctype_decl"; + private static final String DISALLOW_DOCTYPE_DECL_FEATURE = "http://apache.org/xml/features/disallow-doctype-decl"; // All elements created by the same thread are created by the same builder and belong to the same doc private static ThreadLocal<Document> documentThreadLocal = new ThreadLocal<Document>(); @@ -94,6 +96,11 @@ { factory.setFeature(DEFER_NODE_EXPANSION_FEATURE, false); } + + if (Boolean.getBoolean(ENABLE_DOCTYPE_DECL)) + { + factory.setFeature(DISALLOW_DOCTYPE_DECL_FEATURE, true); + } } catch (ParserConfigurationException pce) {

12 years, 9 months

1
0
0 / 0

JBossWS SVN: r14671 - in thirdparty/cxf/branches/cxf-2.2.12: systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security and 1 other directories.

by jbossws-commits＠lists.jboss.org

Author: jim.ma Date: 2011-07-10 10:57:59 -0400 (Sun, 10 Jul 2011) New Revision: 14671 Added: thirdparty/cxf/branches/cxf-2.2.12/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/ 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/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/HelloWorld.java 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/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/Server.java 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/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/UsernamePasswordCallback.java 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/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/client-keystore.jks thirdparty/cxf/branches/cxf-2.2.12/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/client-truststore.jks 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/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/server-keystore.jks thirdparty/cxf/branches/cxf-2.2.12/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/server-truststore.jks thirdparty/cxf/branches/cxf-2.2.12/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/server.xml Modified: thirdparty/cxf/branches/cxf-2.2.12/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJInInterceptor.java Log: [JBPAPP-6822]:Remove the duplicate soap body element when wsse and handler chain are enabled Modified: thirdparty/cxf/branches/cxf-2.2.12/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJInInterceptor.java =================================================================== --- thirdparty/cxf/branches/cxf-2.2.12/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJInInterceptor.java 2011-07-08 13:20:24 UTC (rev 14670) +++ thirdparty/cxf/branches/cxf-2.2.12/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJInInterceptor.java 2011-07-10 14:57:59 UTC (rev 14671) @@ -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(); Added: 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/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/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) @@ -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 Added: 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/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/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) @@ -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 + Added: 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/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/HelloWorld.java (rev 0) +++ 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) @@ -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); + +} Added: 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/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/HelloWorldImpl.java (rev 0) +++ 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) @@ -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; + + } +} Added: 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/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/JAXWSHandler.java (rev 0) +++ 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) @@ -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)); + } +} Added: 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/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/Server.java (rev 0) +++ 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) @@ -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!"); + } + } +} Added: 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/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/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) @@ -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 Added: 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/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/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) @@ -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 Added: 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/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/UsernamePasswordCallback.java (rev 0) +++ 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) @@ -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); + } +} Added: 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/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/WSSecTest.java (rev 0) +++ 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) @@ -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")); + } + +} Added: 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) Property changes on: thirdparty/cxf/branches/cxf-2.2.12/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/client-keystore.jks ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: 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) Property changes on: thirdparty/cxf/branches/cxf-2.2.12/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/client-truststore.jks ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: 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/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/client.xml (rev 0) +++ 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) @@ -0,0 +1,79 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<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> Added: 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) Property changes on: thirdparty/cxf/branches/cxf-2.2.12/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/server-keystore.jks ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: 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) Property changes on: thirdparty/cxf/branches/cxf-2.2.12/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/server-truststore.jks ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: 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/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/handler/server.xml (rev 0) +++ 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) @@ -0,0 +1,82 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<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>

12 years, 10 months

1
0
0 / 0

JBossWS SVN: r14670 - stack/native/trunk/modules/dist/src/main/distro.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2011-07-08 09:20:24 -0400 (Fri, 08 Jul 2011) New Revision: 14670 Modified: stack/native/trunk/modules/dist/src/main/distro/build-project-gen.xml stack/native/trunk/modules/dist/src/main/distro/user-project-build.xml Log: [JBWS-3326] Fixing scripts Modified: stack/native/trunk/modules/dist/src/main/distro/build-project-gen.xml =================================================================== --- stack/native/trunk/modules/dist/src/main/distro/build-project-gen.xml 2011-07-08 10:50:42 UTC (rev 14669) +++ stack/native/trunk/modules/dist/src/main/distro/build-project-gen.xml 2011-07-08 13:20:24 UTC (rev 14670) @@ -101,7 +101,10 @@ </fail> </target> - <target name="configure-project"> + <target name="configure-project" depends="configure-project-6,configure-project-7"> + </target> + + <target name="configure-project-7" if="jbossws.integration.jboss70"> <mkdir dir="${project.home}/src/main/java"/> <mkdir dir="${project.home}/src/main/resources"/> <copy tofile="${project.home}/build.xml" file="${basedir}/build/user-project-build.xml"> @@ -109,6 +112,33 @@ </copy> <copy tofile="${project.home}/build.properties" file="${basedir}/user-project.properties"/> <path id="project.classpath"> + <fileset dir="${jboss.home}/modules/javax/xml/bind/api/main/"> + <include name="*.jar"/> + </fileset> + <fileset dir="${jboss.home}/modules/com/sun/xml/bind/main/"> + <include name="*.jar"/> + </fileset> + <fileset dir="${jboss.home}/modules/org/jboss/ws"> + <include name="**/*.jar"/> + </fileset> + <fileset dir="${jboss.home}/modules/javax/jws/api/main/"> + <include name="*.jar"/> + </fileset> + <path refid="integration.target.javac.classpath" /> + </path> + <eclipseClasspathGenerator pathId="project.classpath" outputFile="${project.home}/.classpath" srcPath="src/main/java" srcOutput="bin/main" /> + <eclipseProjectGenerator projectName="${project.name}" outputFile="${project.home}/.project" /> + <pathWriter pathId="project.classpath" outputFile="${project.home}/libraries.xml" variables="project.jboss.home" /> + </target> + + <target name="configure-project-6" if="jbossws.integration.jboss60"> + <mkdir dir="${project.home}/src/main/java"/> + <mkdir dir="${project.home}/src/main/resources"/> + <copy tofile="${project.home}/build.xml" file="${basedir}/build/user-project-build.xml"> + <filterset refid="project"/> + </copy> + <copy tofile="${project.home}/build.properties" file="${basedir}/user-project.properties"/> + <path id="project.classpath"> <pathelement location="${jboss.client}/jaxws-api.jar"/> <pathelement location="${jboss.client}/jsr181-api.jar"/> <pathelement location="${jboss.client}/jaxb-api.jar"/> Modified: stack/native/trunk/modules/dist/src/main/distro/user-project-build.xml =================================================================== --- stack/native/trunk/modules/dist/src/main/distro/user-project-build.xml 2011-07-08 10:50:42 UTC (rev 14669) +++ stack/native/trunk/modules/dist/src/main/distro/user-project-build.xml 2011-07-08 13:20:24 UTC (rev 14670) @@ -7,7 +7,12 @@  <property name="project.name" value="@projectName@" /> <property name="dist.dir" value="dist" /> - <property name="deploy.dir" value="${project.jboss.home}/server/${project.jboss.conf}/deploy" /> + <condition property="deploy.dir" value="${project.jboss.home}/server/${project.jboss.conf}/deploy"> + <available file="${project.jboss.home}/server" type="dir"/> + </condition> + <condition property="deploy.dir" value="${project.jboss.home}/${project.jboss.conf}/deployments"> + <available file="${project.jboss.home}/${project.jboss.conf}" type="dir"/> + </condition> <property name="output.dir" value="output" /> <property name="src.main.dir" value="src/main/java" /> <property name="resources.main.dir" value="src/main/resources" />

12 years, 10 months

1
0
0 / 0

JBossWS SVN: r14669 - stack/cxf/trunk/modules/dist/src/main/distro.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2011-07-08 06:50:42 -0400 (Fri, 08 Jul 2011) New Revision: 14669 Modified: stack/cxf/trunk/modules/dist/src/main/distro/build-project-gen.xml stack/cxf/trunk/modules/dist/src/main/distro/user-project-build.xml Log: [JBWS-3326] Fixing scripts Modified: stack/cxf/trunk/modules/dist/src/main/distro/build-project-gen.xml =================================================================== --- stack/cxf/trunk/modules/dist/src/main/distro/build-project-gen.xml 2011-07-08 10:47:26 UTC (rev 14668) +++ stack/cxf/trunk/modules/dist/src/main/distro/build-project-gen.xml 2011-07-08 10:50:42 UTC (rev 14669) @@ -97,8 +97,11 @@ </condition> </fail> </target> + + <target name="configure-project" depends="configure-project-6,configure-project-7"> + </target> - <target name="configure-project"> + <target name="configure-project-7" if="jbossws.integration.jboss70"> <mkdir dir="${project.home}/src/main/java"/> <mkdir dir="${project.home}/src/main/resources"/> <copy tofile="${project.home}/build.xml" file="${basedir}/build/user-project-build.xml"> @@ -106,6 +109,36 @@ </copy> <copy tofile="${project.home}/build.properties" file="${basedir}/user-project.properties"/> <path id="project.classpath"> + <fileset dir="${jboss.home}/modules/org/apache/cxf/main/"> + <include name="*.jar"/> + </fileset> + <fileset dir="${jboss.home}/modules/javax/xml/bind/api/main/"> + <include name="*.jar"/> + </fileset> + <fileset dir="${jboss.home}/modules/com/sun/xml/bind/main/"> + <include name="*.jar"/> + </fileset> + <fileset dir="${jboss.home}/modules/org/jboss/ws"> + <include name="**/*.jar"/> + </fileset> + <fileset dir="${jboss.home}/modules/javax/jws/api/main/"> + <include name="*.jar"/> + </fileset> + <path refid="integration.target.javac.classpath" /> + </path> + <eclipseClasspathGenerator pathId="project.classpath" outputFile="${project.home}/.classpath" srcPath="src/main/java" srcOutput="bin/main" /> + <eclipseProjectGenerator projectName="${project.name}" outputFile="${project.home}/.project" /> + <pathWriter pathId="project.classpath" outputFile="${project.home}/libraries.xml" variables="project.jboss.home" /> + </target> + + <target name="configure-project-6" if="jbossws.integration.jboss60"> + <mkdir dir="${project.home}/src/main/java"/> + <mkdir dir="${project.home}/src/main/resources"/> + <copy tofile="${project.home}/build.xml" file="${basedir}/build/user-project-build.xml"> + <filterset refid="project"/> + </copy> + <copy tofile="${project.home}/build.properties" file="${basedir}/user-project.properties"/> + <path id="project.classpath"> <pathelement location="${jboss.client}/cxf-api.jar"/> <pathelement location="${jboss.client}/cxf-common-schemas.jar"/> <pathelement location="${jboss.client}/cxf-common-utilities.jar"/> Modified: stack/cxf/trunk/modules/dist/src/main/distro/user-project-build.xml =================================================================== --- stack/cxf/trunk/modules/dist/src/main/distro/user-project-build.xml 2011-07-08 10:47:26 UTC (rev 14668) +++ stack/cxf/trunk/modules/dist/src/main/distro/user-project-build.xml 2011-07-08 10:50:42 UTC (rev 14669) @@ -7,7 +7,14 @@  <property name="project.name" value="@projectName@" /> <property name="dist.dir" value="dist" /> - <property name="deploy.dir" value="${project.jboss.home}/server/${project.jboss.conf}/deploy" /> + + <condition property="deploy.dir" value="${project.jboss.home}/server/${project.jboss.conf}/deploy"> + <available file="${project.jboss.home}/server" type="dir"/> + </condition> + <condition property="deploy.dir" value="${project.jboss.home}/${project.jboss.conf}/deployments"> + <available file="${project.jboss.home}/${project.jboss.conf}" type="dir"/> + </condition> + <property name="output.dir" value="output" /> <property name="src.main.dir" value="src/main/java" /> <property name="resources.main.dir" value="src/main/resources" /> @@ -57,13 +64,23 @@ <target name="deploy" depends="dist" description="Deploy to JBoss AS"> <fail unless="project.jboss.home">project.jboss.home not set</fail> + <delete quiet="true"> + <fileset dir="${deploy.dir}"> + <include name="${project.name}.${project.type}.undeployed"/> + </fileset> + </delete> <copy todir="${deploy.dir}" file="${dist.dir}/${project.name}.${project.type}" /> </target> <target name="undeploy" description="Undeploy from JBoss AS"> <fail unless="project.jboss.home">project.jboss.home not set</fail> <fail unless="project.jboss.conf">project.jboss.conf not set</fail> - <delete file="${deploy.dir}/${project.name}.${project.type}" /> + <fail unless="project.name">project.name not set</fail> + <delete> + <fileset dir="${deploy.dir}"> + <include name="${project.name}.${project.type}*"/> + </fileset> + </delete> </target> </project>

12 years, 10 months

1
0
0 / 0

JBossWS SVN: r14668 - shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/projectGenerator.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2011-07-08 06:47:26 -0400 (Fri, 08 Jul 2011) New Revision: 14668 Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/projectGenerator/ProjectGeneratorTestCase.java Log: [JBWS-3326] properly set jboss configuration Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/projectGenerator/ProjectGeneratorTestCase.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/projectGenerator/ProjectGeneratorTestCase.java 2011-07-05 20:16:25 UTC (rev 14667) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/projectGenerator/ProjectGeneratorTestCase.java 2011-07-08 10:47:26 UTC (rev 14668) @@ -149,7 +149,13 @@ sb.append("project.name=" + projectName + "\n"); sb.append("project.jboss.home=" + jbossHome.replace('\\', '/') + "\n"); sb.append("project.type=jar\n"); - sb.append("project.jboss.conf=default\n"); + if (isTargetJBoss6()) { + sb.append("project.jboss.conf=default\n"); + } + else + { + sb.append("project.jboss.conf=standalone\n"); + } sb.append("workspace.home=" + binDistroDir.getAbsolutePath().replace('\\', '/') + "\n"); BufferedWriter out = new BufferedWriter(new FileWriter(file)); out.write(sb.toString());

12 years, 10 months

1
0
0 / 0

JBossWS SVN: r14667 - hudson/trunk.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2011-07-05 16:16:25 -0400 (Tue, 05 Jul 2011) New Revision: 14667 Modified: hudson/trunk/ant.properties.example Log: AS7 now builds to jboss-as-7.0.0.CR2-SNAPSHOT Modified: hudson/trunk/ant.properties.example =================================================================== --- hudson/trunk/ant.properties.example 2011-07-05 19:40:46 UTC (rev 14666) +++ hudson/trunk/ant.properties.example 2011-07-05 20:16:25 UTC (rev 14667) @@ -26,7 +26,7 @@ hudson.jboss600.rev=HEAD hudson.jboss700.url=https://github.com/jbossas/jboss-as -hudson.jboss700.build=jboss-7.0.0.CR2-SNAPSHOT +hudson.jboss700.build=jboss-as-7.0.0.CR2-SNAPSHOT hudson.jboss700.rev=master hudson.mail.recipients=

12 years, 10 months

1
0
0 / 0

JBossWS SVN: r14666 - in stack/native: tags and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2011-07-05 15:40:46 -0400 (Tue, 05 Jul 2011) New Revision: 14666 Added: stack/native/tags/jbossws-native-3.1.2.SP10/ Removed: stack/native/branches/jbossws-native-3.1.2.SP10/ Log: Tagging jbossws-native-3.1.2.SP10

12 years, 10 months

1
0
0 / 0

JBossWS SVN: r14665 - stack/cxf/trunk/modules/testsuite.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2011-07-05 11:06:53 -0400 (Tue, 05 Jul 2011) New Revision: 14665 Modified: stack/cxf/trunk/modules/testsuite/pom.xml Log: Reordering AS7 exclusions Modified: stack/cxf/trunk/modules/testsuite/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/pom.xml 2011-07-05 15:06:10 UTC (rev 14664) +++ stack/cxf/trunk/modules/testsuite/pom.xml 2011-07-05 15:06:53 UTC (rev 14665) @@ -1000,7 +1000,6 @@  <exclude>org/jboss/test/ws/jaxws/jbws1854/**</exclude> - <exclude>org/jboss/test/ws/jaxws/samples/jmstransport/**</exclude>  <exclude>org/jboss/test/ws/jaxws/cxf/interop/wstrust10/**</exclude> @@ -1009,27 +1008,48 @@   -  - <exclude>org/jboss/test/ws/jaxws/jbws944/**</exclude> - <exclude>org/jboss/test/ws/jaxws/samples/webserviceref/**</exclude> - <exclude>org/jboss/test/ws/jaxws/samples/webservicerefsec/**</exclude> +  + <exclude>org/jboss/test/ws/jaxws/jbws2074/**</exclude> + <exclude>org/jboss/test/ws/jaxws/jbws2634/**</exclude> + <exclude>org/jboss/test/ws/jaxws/jbws3026/**</exclude> -  - <exclude>org/jboss/test/ws/jaxws/jbws1581/**</exclude> +  + <exclude>org/jboss/test/ws/jaxws/cxf/webserviceref/WebServiceRefServletTestCase*</exclude> + <exclude>org/jboss/test/ws/jaxws/jbws2307/**</exclude> + <exclude>org/jboss/test/ws/jaxws/jbws2527/**</exclude> + <exclude>org/jboss/test/ws/jaxws/samples/advanced/retail/**</exclude> -  +  <exclude>org/jboss/test/ws/jaxws/jbws1813/**</exclude> - <exclude>org/jboss/test/ws/jaxws/jbws1815/**</exclude> <exclude>org/jboss/test/ws/jaxws/jbws1841/**</exclude> - <exclude>org/jboss/test/ws/jaxws/jbws2074/**</exclude> <exclude>org/jboss/test/ws/jaxws/jbws2241/**</exclude> + +  + <exclude>org/jboss/test/ws/management/recording/**</exclude> + +  <exclude>org/jboss/test/ws/jaxws/jbws2630/**</exclude> - <exclude>org/jboss/test/ws/jaxws/jbws2634/**</exclude> - <exclude>org/jboss/test/ws/jaxws/jbws3026/**</exclude> - <exclude>org/jboss/test/ws/jaxws/samples/webserviceref/**/*EJB3TestCase*</exclude> - <exclude>org/jboss/test/ws/management/recording/**</exclude> + +  + <exclude>org/jboss/test/ws/jaxws/samples/webservicerefsec/**</exclude> + <exclude>org/jboss/test/ws/jaxws/jbws2957/**</exclude> + <exclude>org/jboss/test/ws/jaxws/jbws2999/**</exclude> + +  + <exclude>org/jboss/test/ws/jaxws/jbws3140/**</exclude> + +  + <exclude>org/jboss/test/ws/jaxws/samples/webserviceref/**</exclude> + +  + <exclude>org/jboss/test/ws/jaxrpc/**</exclude> + <exclude>org/jboss/test/ws/jaxws/jbws944/**</exclude> + <exclude>org/jboss/test/ws/jaxws/samples/serviceref/**</exclude> + <exclude>org/jboss/test/ws/jaxws/jbws1581/**</exclude> <exclude>org/jboss/test/ws/jaxws/cxf/bus/*EJB3*</exclude> - <exclude>org/jboss/test/ws/projectGenerator/**</exclude> + +  + <exclude>org/jboss/test/ws/jaxws/jbws1815/**</exclude> <exclude>org/jboss/test/ws/jaxws/samples/wsseEJB/WsseEjbTestCase*</exclude> <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/jaas/UsernameAuthorizationEJBTestCase*</exclude> @@ -1042,33 +1062,14 @@  <exclude>org/jboss/test/ws/jaxws/jbws3034/**</exclude> -  - <exclude>org/jboss/test/ws/jaxws/jbws3140/**</exclude> - -  - <exclude>org/jboss/test/ws/jaxws/samples/serviceref/**</exclude> -  <exclude>org/jboss/test/ws/jaxws/samples/wsse/UsernameAuthorizationCustomFileTestCase*</exclude>  <exclude>org/jboss/test/ws/jaxws/samples/jaxr/**</exclude> -  - <exclude>org/jboss/test/ws/jaxws/cxf/webserviceref/WebServiceRefServletTestCase*</exclude> - <exclude>org/jboss/test/ws/jaxws/jbws2307/**</exclude> - <exclude>org/jboss/test/ws/jaxws/jbws2527/**</exclude> - <exclude>org/jboss/test/ws/jaxws/samples/advanced/retail/**</exclude> - -  - <exclude>org/jboss/test/ws/jaxws/jbws2957/**</exclude> - <exclude>org/jboss/test/ws/jaxws/jbws2999/**</exclude> -  <exclude>org/jboss/test/ws/jaxws/samples/**/jmstransport/**</exclude> - -  - <exclude>org/jboss/test/ws/jaxrpc/**</exclude> </excludes> </configuration> </plugin>

12 years, 10 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits July 2011