You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2009/03/09 17:12:37 UTC
svn commit: r751724 - in /cxf/sandbox/interopfest/wssec11: ./
src/main/java/interop/client/ src/main/java/interop/server/
Author: dkulp
Date: Mon Mar 9 16:12:36 2009
New Revision: 751724
URL: http://svn.apache.org/viewvc?rev=751724&view=rev
Log:
CHeckstyle updates
Modified:
cxf/sandbox/interopfest/wssec11/ (props changed)
cxf/sandbox/interopfest/wssec11/src/main/java/interop/client/Client.java
cxf/sandbox/interopfest/wssec11/src/main/java/interop/client/KeystorePasswordCallback.java
cxf/sandbox/interopfest/wssec11/src/main/java/interop/client/UTPasswordCallback.java
cxf/sandbox/interopfest/wssec11/src/main/java/interop/server/KeystorePasswordCallback.java
cxf/sandbox/interopfest/wssec11/src/main/java/interop/server/PingService.java
cxf/sandbox/interopfest/wssec11/src/main/java/interop/server/Server.java
Propchange: cxf/sandbox/interopfest/wssec11/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Mar 9 16:12:36 2009
@@ -0,0 +1,10 @@
+.pmd
+.checkstyle
+.ruleset
+target
+eclipse-classes
+.settings
+.classpath
+.project
+.wtpmodules
+
Modified: cxf/sandbox/interopfest/wssec11/src/main/java/interop/client/Client.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/interopfest/wssec11/src/main/java/interop/client/Client.java?rev=751724&r1=751723&r2=751724&view=diff
==============================================================================
--- cxf/sandbox/interopfest/wssec11/src/main/java/interop/client/Client.java (original)
+++ cxf/sandbox/interopfest/wssec11/src/main/java/interop/client/Client.java Mon Mar 9 16:12:36 2009
@@ -1,8 +1,4 @@
/**
- * Copyright (c) 1993-2007 IONA Technologies PLC.
- * All Rights Reserved.
- */
-/**
* 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
@@ -20,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package interop.client;
import java.net.URL;
@@ -28,12 +23,11 @@
import java.util.List;
import javax.xml.namespace.QName;
-import javax.xml.ws.BindingProvider;
import org.apache.cxf.bus.spring.SpringBusFactory;
-import interopbaseaddress.interop.PingService11;
import interopbaseaddress.interop.IPingService;
+import interopbaseaddress.interop.PingService11;
public final class Client {
@@ -131,6 +125,6 @@
/*
-[1] These tests require a Kerberos token, but the MS endpoints don't document where that token is supposed to come from.
- The "online" tester for these also does't work.
+[1] These tests require a Kerberos token, but the MS endpoints don't document where
+ that token is supposed to come from. The "online" tester for these also does't work.
*/
Modified: cxf/sandbox/interopfest/wssec11/src/main/java/interop/client/KeystorePasswordCallback.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/interopfest/wssec11/src/main/java/interop/client/KeystorePasswordCallback.java?rev=751724&r1=751723&r2=751724&view=diff
==============================================================================
--- cxf/sandbox/interopfest/wssec11/src/main/java/interop/client/KeystorePasswordCallback.java (original)
+++ cxf/sandbox/interopfest/wssec11/src/main/java/interop/client/KeystorePasswordCallback.java Mon Mar 9 16:12:36 2009
@@ -1,6 +1,20 @@
/**
- * Copyright (c) 1993-2006 IONA Technologies PLC.
- * All Rights Reserved.
+ * 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 interop.client;
Modified: cxf/sandbox/interopfest/wssec11/src/main/java/interop/client/UTPasswordCallback.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/interopfest/wssec11/src/main/java/interop/client/UTPasswordCallback.java?rev=751724&r1=751723&r2=751724&view=diff
==============================================================================
--- cxf/sandbox/interopfest/wssec11/src/main/java/interop/client/UTPasswordCallback.java (original)
+++ cxf/sandbox/interopfest/wssec11/src/main/java/interop/client/UTPasswordCallback.java Mon Mar 9 16:12:36 2009
@@ -1,10 +1,24 @@
/**
- * Copyright (c) 1993-2007 IONA Technologies PLC.
- * All Rights Reserved.
+ * 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 interop.client;
+
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
Modified: cxf/sandbox/interopfest/wssec11/src/main/java/interop/server/KeystorePasswordCallback.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/interopfest/wssec11/src/main/java/interop/server/KeystorePasswordCallback.java?rev=751724&r1=751723&r2=751724&view=diff
==============================================================================
--- cxf/sandbox/interopfest/wssec11/src/main/java/interop/server/KeystorePasswordCallback.java (original)
+++ cxf/sandbox/interopfest/wssec11/src/main/java/interop/server/KeystorePasswordCallback.java Mon Mar 9 16:12:36 2009
@@ -1,9 +1,24 @@
/**
- * Copyright (c) 1993-2006 IONA Technologies PLC.
- * All Rights Reserved.
+ * 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 interop.server;
+
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
Modified: cxf/sandbox/interopfest/wssec11/src/main/java/interop/server/PingService.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/interopfest/wssec11/src/main/java/interop/server/PingService.java?rev=751724&r1=751723&r2=751724&view=diff
==============================================================================
--- cxf/sandbox/interopfest/wssec11/src/main/java/interop/server/PingService.java (original)
+++ cxf/sandbox/interopfest/wssec11/src/main/java/interop/server/PingService.java Mon Mar 9 16:12:36 2009
@@ -16,15 +16,14 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package interop.server;
-import interopbaseaddress.interop.IPingService;
-import interopbaseaddress.interop.PingRequest;
-import interopbaseaddress.interop.PingResponse;
import interopbaseaddress.interop.EchoDataSet.Request;
import interopbaseaddress.interop.EchoDataSetResponse.EchoDataSetResult;
import interopbaseaddress.interop.EchoXmlResponse.EchoXmlResult;
+import interopbaseaddress.interop.IPingService;
+import interopbaseaddress.interop.PingRequest;
+import interopbaseaddress.interop.PingResponse;
/**
*
Modified: cxf/sandbox/interopfest/wssec11/src/main/java/interop/server/Server.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/interopfest/wssec11/src/main/java/interop/server/Server.java?rev=751724&r1=751723&r2=751724&view=diff
==============================================================================
--- cxf/sandbox/interopfest/wssec11/src/main/java/interop/server/Server.java (original)
+++ cxf/sandbox/interopfest/wssec11/src/main/java/interop/server/Server.java Mon Mar 9 16:12:36 2009
@@ -1,8 +1,4 @@
/**
- * Copyright (c) 1993-2007 IONA Technologies PLC.
- * All Rights Reserved.
- */
-/**
* 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
@@ -20,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package interop.server;
import javax.xml.ws.Endpoint;
@@ -53,7 +48,7 @@
doPublish(baseUrl + "/XD-ESPingService", new XDESPingService());
doPublish(baseUrl + "/XD-SEESPingService", new XDSEESPingService());
}
- private final void doPublish(String url, Object obj) {
+ private void doPublish(String url, Object obj) {
Endpoint ep = Endpoint.create(obj);
ep.getProperties().put(SecurityConstants.CALLBACK_HANDLER, new KeystorePasswordCallback());
ep.getProperties().put(SecurityConstants.ENCRYPT_PROPERTIES, "etc/bob.properties");