You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by pr...@apache.org on 2014/01/07 10:00:59 UTC
git commit: removing some config, they got moved
Updated Branches:
refs/heads/master 850f099aa -> 53f5dc5a3
removing some config, they got moved
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/53f5dc5a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/53f5dc5a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/53f5dc5a
Branch: refs/heads/master
Commit: 53f5dc5a33fe6a863ae72830d5fcffca3b3f6062
Parents: 850f099
Author: Pradeep Fernando <pr...@gmail.com>
Authored: Tue Jan 7 14:30:41 2014 +0530
Committer: Pradeep Fernando <pr...@gmail.com>
Committed: Tue Jan 7 14:30:41 2014 +0530
----------------------------------------------------------------------
.../webapp/META-INF/webapp-classloading.xml | 35 ------------
.../src/main/webapp/WEB-INF/cxf-servlet.xml | 59 --------------------
.../src/main/webapp/WEB-INF/web.xml | 40 -------------
3 files changed, 134 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/53f5dc5a/components/org.apache.stratos.rest.endpoint/src/main/webapp/META-INF/webapp-classloading.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/webapp/META-INF/webapp-classloading.xml b/components/org.apache.stratos.rest.endpoint/src/main/webapp/META-INF/webapp-classloading.xml
deleted file mode 100644
index c62912d..0000000
--- a/components/org.apache.stratos.rest.endpoint/src/main/webapp/META-INF/webapp-classloading.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
- # 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.
- -->
-
-<!--
- This file defines class loading policy of the whole container. But this behaviour can be overridden by individual webapps by putting this file into the META-INF/ directory.
--->
-<Classloading xmlns="http://wso2.org/projects/as/classloading">
-
- <!-- Parent-first or child-first. Default behaviour is child-first.-->
- <ParentFirst>false</ParentFirst>
-
- <!--
- Default environments that contains provides to all the webapps. This can be overridden by individual webapps by specifing required environments
- Tomcat environment is the default and every webapps gets it even if they didn't specify it.
- e.g. If a webapps requires CXF, they will get both Tomcat and CXF.
- -->
- <Environments>CXF,Carbon</Environments>
-</Classloading>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/53f5dc5a/components/org.apache.stratos.rest.endpoint/src/main/webapp/WEB-INF/cxf-servlet.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/webapp/WEB-INF/cxf-servlet.xml b/components/org.apache.stratos.rest.endpoint/src/main/webapp/WEB-INF/cxf-servlet.xml
deleted file mode 100644
index dfb7263..0000000
--- a/components/org.apache.stratos.rest.endpoint/src/main/webapp/WEB-INF/cxf-servlet.xml
+++ /dev/null
@@ -1,59 +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:jaxrs="http://cxf.apache.org/jaxrs"
- xsi:schemaLocation="
- http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
- http://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/jaxrs.xsd">
-
- <jaxrs:server id="stratosAdmin" address="/">
- <jaxrs:serviceBeans>
- <ref bean="stratosRestEndpointBean"/>
- </jaxrs:serviceBeans>
-
- <jaxrs:providers>
- <ref bean="exceptionHandler"/>
- <ref bean="authenticationFilter"/>
- <ref bean="authorizationFilter"/>
- </jaxrs:providers>
-
- <!--The below config enables OAuth based authentication/authorization for REST API-->
- <!--jaxrs:providers>
- <ref bean="OAuthFilter"/>
- </jaxrs:providers-->
- </jaxrs:server>
-
- <bean id="stratosRestEndpointBean" class="org.apache.stratos.rest.endpoint.services.StratosAdmin"/>
- <bean id="authenticationFilter" class="org.apache.stratos.rest.endpoint.handlers.StratosAuthenticationHandler"/>
- <bean id="authorizationFilter" class="org.apache.stratos.rest.endpoint.handlers.StratosAuthorizingHandler">
- <property name="securedObject" ref="stratosRestEndpointBean"/>
- </bean>
- <bean id="exceptionHandler" class="org.apache.stratos.rest.endpoint.handlers.CustomExceptionMapper"/>
-
- <!--The below config enables OAuth based authentication/authorization for REST API-->
- <!--bean id="OAuthFilter" class="org.apache.stratos.rest.endpoint.handlers.OAuthHandler">
- <property name="password" value="admin"/>
- <property name="username" value="admin"/>
- <property name="oauthValidationEndpoint" value="https://localhost:9443/services/"/>
- </bean-->
-
-</beans>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/53f5dc5a/components/org.apache.stratos.rest.endpoint/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/webapp/WEB-INF/web.xml b/components/org.apache.stratos.rest.endpoint/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 7cef351..0000000
--- a/components/org.apache.stratos.rest.endpoint/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,40 +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.
- -->
-
-<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
- http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
-
- <display-name>S2 Admin Endpoint</display-name>
-
- <servlet>
- <servlet-name>StratosAdminEndpoint</servlet-name>
- <servlet-class>org.apache.cxf.transport.servlet.CXFServlet</servlet-class>
- <load-on-startup>1</load-on-startup>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>StratosAdminEndpoint</servlet-name>
- <url-pattern>/*</url-pattern>
- </servlet-mapping>
-
-</web-app>
-