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:27:21 UTC
svn commit: r751726 - in /cxf/sandbox/interopfest/wstrust10: ./
src/main/java/interop/client/ src/main/java/interop/server/
Author: dkulp
Date: Mon Mar 9 16:27:20 2009
New Revision: 751726
URL: http://svn.apache.org/viewvc?rev=751726&view=rev
Log:
Checkstyle updates
Modified:
cxf/sandbox/interopfest/wstrust10/ (props changed)
cxf/sandbox/interopfest/wstrust10/src/main/java/interop/client/Client.java
cxf/sandbox/interopfest/wstrust10/src/main/java/interop/client/KeystorePasswordCallback.java
cxf/sandbox/interopfest/wstrust10/src/main/java/interop/client/UTPasswordCallback.java
cxf/sandbox/interopfest/wstrust10/src/main/java/interop/server/KeystorePasswordCallback.java
cxf/sandbox/interopfest/wstrust10/src/main/java/interop/server/Server.java
Propchange: cxf/sandbox/interopfest/wstrust10/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Mar 9 16:27:20 2009
@@ -0,0 +1,10 @@
+.pmd
+.checkstyle
+.ruleset
+target
+eclipse-classes
+.settings
+.classpath
+.project
+.wtpmodules
+
Modified: cxf/sandbox/interopfest/wstrust10/src/main/java/interop/client/Client.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/interopfest/wstrust10/src/main/java/interop/client/Client.java?rev=751726&r1=751725&r2=751726&view=diff
==============================================================================
--- cxf/sandbox/interopfest/wstrust10/src/main/java/interop/client/Client.java (original)
+++ cxf/sandbox/interopfest/wstrust10/src/main/java/interop/client/Client.java Mon Mar 9 16:27:20 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
@@ -27,29 +23,12 @@
import java.util.List;
import javax.xml.namespace.QName;
-import javax.xml.ws.BindingProvider;
import javax.xml.ws.Service;
+import org.apache.cxf.bus.spring.SpringBusFactory;
import org.tempuri.AsymmetricFederatedService;
import org.tempuri.SymmetricFederatedService;
-import org.apache.cxf.Bus;
-import org.apache.cxf.bus.spring.SpringBusFactory;
-import org.apache.cxf.endpoint.Endpoint;
-import org.apache.cxf.frontend.ClientProxy;
-import org.apache.cxf.helpers.XMLUtils;
-import org.apache.cxf.service.model.BindingOperationInfo;
-import org.apache.cxf.transport.Conduit;
-import org.apache.cxf.ws.policy.EffectivePolicy;
-import org.apache.cxf.ws.policy.PolicyAssertion;
-import org.apache.cxf.ws.policy.PolicyBuilder;
-import org.apache.cxf.ws.policy.PolicyEngine;
-import org.apache.cxf.ws.security.SecurityConstants;
-import org.apache.cxf.ws.security.policy.model.Trust10;
-import org.apache.cxf.ws.security.policy.model.Trust13;
-import org.apache.cxf.ws.security.tokenstore.SecurityToken;
-import org.apache.cxf.ws.security.trust.STSClient;
-import org.apache.neethi.Policy;
import interopbaseaddress.interop.IPingService;
@@ -92,8 +71,8 @@
for (String portPrefix : argv) {
try {
Service svc;
- if (portPrefix.charAt(10) == '_' &&
- portPrefix.charAt(9) < '7') {
+ if (portPrefix.charAt(10) == '_'
+ && portPrefix.charAt(9) < '7') {
svc = new SymmetricFederatedService();
} else {
svc = new AsymmetricFederatedService();
Modified: cxf/sandbox/interopfest/wstrust10/src/main/java/interop/client/KeystorePasswordCallback.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/interopfest/wstrust10/src/main/java/interop/client/KeystorePasswordCallback.java?rev=751726&r1=751725&r2=751726&view=diff
==============================================================================
--- cxf/sandbox/interopfest/wstrust10/src/main/java/interop/client/KeystorePasswordCallback.java (original)
+++ cxf/sandbox/interopfest/wstrust10/src/main/java/interop/client/KeystorePasswordCallback.java Mon Mar 9 16:27:20 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/wstrust10/src/main/java/interop/client/UTPasswordCallback.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/interopfest/wstrust10/src/main/java/interop/client/UTPasswordCallback.java?rev=751726&r1=751725&r2=751726&view=diff
==============================================================================
--- cxf/sandbox/interopfest/wstrust10/src/main/java/interop/client/UTPasswordCallback.java (original)
+++ cxf/sandbox/interopfest/wstrust10/src/main/java/interop/client/UTPasswordCallback.java Mon Mar 9 16:27:20 2009
@@ -1,8 +1,21 @@
/**
- * 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;
Modified: cxf/sandbox/interopfest/wstrust10/src/main/java/interop/server/KeystorePasswordCallback.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/interopfest/wstrust10/src/main/java/interop/server/KeystorePasswordCallback.java?rev=751726&r1=751725&r2=751726&view=diff
==============================================================================
--- cxf/sandbox/interopfest/wstrust10/src/main/java/interop/server/KeystorePasswordCallback.java (original)
+++ cxf/sandbox/interopfest/wstrust10/src/main/java/interop/server/KeystorePasswordCallback.java Mon Mar 9 16:27:20 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.server;
Modified: cxf/sandbox/interopfest/wstrust10/src/main/java/interop/server/Server.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/interopfest/wstrust10/src/main/java/interop/server/Server.java?rev=751726&r1=751725&r2=751726&view=diff
==============================================================================
--- cxf/sandbox/interopfest/wstrust10/src/main/java/interop/server/Server.java (original)
+++ cxf/sandbox/interopfest/wstrust10/src/main/java/interop/server/Server.java Mon Mar 9 16:27:20 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;
@@ -69,7 +64,7 @@
argv = new String[] {"XD-SEES"};
*/
}
- private final void addProperties(Endpoint ep) {
+ private void addProperties(Endpoint ep) {
ep.getProperties().put(SecurityConstants.CALLBACK_HANDLER, new KeystorePasswordCallback());
ep.getProperties().put(SecurityConstants.ENCRYPT_USERNAME, "Bob");
ep.getProperties().put(SecurityConstants.ENCRYPT_PROPERTIES, "etc/bob.properties");