Author: ffang
Date: Wed Jul 25 02:48:13 2007
New Revision: 559379
URL: http://svn.apache.org/viewvc?view=rev&rev=559379
Log:
[CXF-776] change package name to follow apache rule
Added:
incubator/cxf/trunk/testutils/src/main/java/org/apache/cxf/authservice/
incubator/cxf/trunk/testutils/src/main/java/org/apache/cxf/authservice/AuthService.java
(with props)
incubator/cxf/trunk/testutils/src/main/java/org/apache/cxf/authservice/AuthServiceImpl.java
(with props)
incubator/cxf/trunk/testutils/src/main/java/org/apache/cxf/authservice/Authenticate.java
(with props)
Removed:
incubator/cxf/trunk/testutils/src/main/java/de/footprint/www/services/auth/AuthServiceImpl.java
incubator/cxf/trunk/testutils/src/main/java/de/silberlicht/authservice/AuthService.java
incubator/cxf/trunk/testutils/src/main/java/de/silberlicht/authservice/Authenticate.java
Modified:
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/aegis/AegisClientServerTest.java
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/aegis/AegisServerTest.java
incubator/cxf/trunk/systests/src/test/resources/webapp/WEB-INF/beans.xml
Modified:
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/aegis/AegisClientServerTest.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/aegis/AegisClientServerTest.java?view=diff&rev=559379&r1=559378&r2=559379
==============================================================================
---
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/aegis/AegisClientServerTest.java
(original)
+++
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/aegis/AegisClientServerTest.java
Wed Jul 25 02:48:13 2007
@@ -23,10 +23,11 @@
import java.util.List;
import java.util.logging.Logger;
-import de.silberlicht.authservice.AuthService;
-import de.silberlicht.authservice.Authenticate;
+
import org.apache.cxf.Bus;
import org.apache.cxf.aegis.databinding.AegisDatabinding;
+import org.apache.cxf.authservice.AuthService;
+import org.apache.cxf.authservice.Authenticate;
import org.apache.cxf.bus.spring.SpringBusFactory;
import org.apache.cxf.frontend.ClientProxyFactoryBean;
import org.apache.cxf.interceptor.LoggingInInterceptor;
Modified:
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/aegis/AegisServerTest.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/aegis/AegisServerTest.java?view=diff&rev=559379&r1=559378&r2=559379
==============================================================================
---
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/aegis/AegisServerTest.java
(original)
+++
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/aegis/AegisServerTest.java
Wed Jul 25 02:48:13 2007
@@ -35,15 +35,6 @@
private org.mortbay.jetty.Server server;
protected void run() {
- /*ServerFactoryBean sf = new ServerFactoryBean();
- sf.setServiceClass(AuthServiceImpl.class);
- sf.setAddress("http://localhost:9001/service";);
- sf.getServiceFactory().setDataBinding(new AegisDatabinding());
- sf.getInInterceptors().add(new LoggingInInterceptor());
- sf.getOutInterceptors().add(new LoggingOutInterceptor());
- sf.getInFaultInterceptors().add(new LoggingInInterceptor());
- sf.getOutFaultInterceptors().add(new LoggingOutInterceptor());
- sf.create();*/
System.out.println("Starting Server");
server = new org.mortbay.jetty.Server();
@@ -57,7 +48,6 @@
try {
contextPath = getClass().getResource("/").toURI().getPath();
} catch (URISyntaxException e1) {
- // TODO Auto-generated catch block
e1.printStackTrace();
}
webappcontext.setContextPath("/");
@@ -72,7 +62,6 @@
server.start();
} catch (Exception e) {
- // TODO Auto-generated catch block
e.printStackTrace();
}
Modified:
incubator/cxf/trunk/systests/src/test/resources/webapp/WEB-INF/beans.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/resources/webapp/WEB-INF/beans.xml?view=diff&rev=559379&r1=559378&r2=559379
==============================================================================
--- incubator/cxf/trunk/systests/src/test/resources/webapp/WEB-INF/beans.xml
(original)
+++ incubator/cxf/trunk/systests/src/test/resources/webapp/WEB-INF/beans.xml
Wed Jul 25 02:48:13 2007
@@ -42,12 +42,12 @@
class="org.apache.cxf.service.factory.ReflectionServiceFactoryBean">
<property name="dataBinding" ref="aegisDatabinding"/>
</bean>
- <simple:server address="/service"
serviceClass="de.silberlicht.authservice.AuthService">
+ <simple:server address="/service"
serviceClass="org.apache.cxf.authservice.AuthService">
<simple:serviceFactory>
<ref bean="serviceFactory"/>
</simple:serviceFactory>
<simple:serviceBean>
- <bean class="de.footprint.www.services.auth.AuthServiceImpl"/>
+ <bean class="org.apache.cxf.authservice.AuthServiceImpl"/>
</simple:serviceBean>
</simple:server>
Added:
incubator/cxf/trunk/testutils/src/main/java/org/apache/cxf/authservice/AuthService.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/testutils/src/main/java/org/apache/cxf/authservice/AuthService.java?view=auto&rev=559379
==============================================================================
---
incubator/cxf/trunk/testutils/src/main/java/org/apache/cxf/authservice/AuthService.java
(added)
+++
incubator/cxf/trunk/testutils/src/main/java/org/apache/cxf/authservice/AuthService.java
Wed Jul 25 02:48:13 2007
@@ -0,0 +1,50 @@
+/**
+ * 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.authservice;
+
+
+import javax.jws.WebService;
+
+/**
+ * This class was generated by the CXF 2.1-incubator-SNAPSHOT
+ * Tue Jul 24 17:08:55 CST 2007
+ * Generated source version: 2.1-incubator-SNAPSHOT
+ *
+ */
+
[EMAIL PROTECTED](targetNamespace = "http://cxf.apache.org/AuthService";, name =
"AuthService")
+
+public interface AuthService {
+
+ java.util.List<java.lang.String> getRoles(
+ String sid
+ );
+
+ boolean authenticate(
+ String sid,
+ String uid,
+ String pwd
+ );
+
+ //test bean mode
+ boolean authenticate(Authenticate auth);
+
+ String getAuthentication(String sid);
+}
Propchange:
incubator/cxf/trunk/testutils/src/main/java/org/apache/cxf/authservice/AuthService.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
incubator/cxf/trunk/testutils/src/main/java/org/apache/cxf/authservice/AuthService.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added:
incubator/cxf/trunk/testutils/src/main/java/org/apache/cxf/authservice/AuthServiceImpl.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/testutils/src/main/java/org/apache/cxf/authservice/AuthServiceImpl.java?view=auto&rev=559379
==============================================================================
---
incubator/cxf/trunk/testutils/src/main/java/org/apache/cxf/authservice/AuthServiceImpl.java
(added)
+++
incubator/cxf/trunk/testutils/src/main/java/org/apache/cxf/authservice/AuthServiceImpl.java
Wed Jul 25 02:48:13 2007
@@ -0,0 +1,46 @@
+/**
+ * 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.authservice;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+public class AuthServiceImpl implements AuthService {
+
+ public boolean authenticate(String sid, String uid, String pwd) {
+ return sid.equals(uid);
+ }
+
+ public boolean authenticate(Authenticate au) {
+ return au.getUid().equals(au.getSid());
+ }
+
+ public String getAuthentication(String sid) {
+ return "get " + sid;
+ }
+
+ public List<String> getRoles(String sid) {
+ List<String> list = new ArrayList<String>();
+ list.add(sid);
+ return list;
+ }
+
+}
Propchange:
incubator/cxf/trunk/testutils/src/main/java/org/apache/cxf/authservice/AuthServiceImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
incubator/cxf/trunk/testutils/src/main/java/org/apache/cxf/authservice/AuthServiceImpl.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added:
incubator/cxf/trunk/testutils/src/main/java/org/apache/cxf/authservice/Authenticate.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/testutils/src/main/java/org/apache/cxf/authservice/Authenticate.java?view=auto&rev=559379
==============================================================================
---
incubator/cxf/trunk/testutils/src/main/java/org/apache/cxf/authservice/Authenticate.java
(added)
+++
incubator/cxf/trunk/testutils/src/main/java/org/apache/cxf/authservice/Authenticate.java
Wed Jul 25 02:48:13 2007
@@ -0,0 +1,56 @@
+/**
+ * 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.authservice;
+
+
+public class Authenticate {
+
+ protected String sid;
+ protected String uid;
+ protected String pwd;
+
+ public String getSid() {
+ return sid;
+ }
+
+ public void setSid(String value) {
+ this.sid = value;
+ }
+
+ public String getUid() {
+ return uid;
+ }
+
+
+ public void setUid(String value) {
+ this.uid = value;
+ }
+
+
+ public String getPwd() {
+ return pwd;
+ }
+
+ public void setPwd(String value) {
+ this.pwd = value;
+ }
+
+}
Propchange:
incubator/cxf/trunk/testutils/src/main/java/org/apache/cxf/authservice/Authenticate.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
incubator/cxf/trunk/testutils/src/main/java/org/apache/cxf/authservice/Authenticate.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
