Removed RepositoryInformationService and its dependancies, fixing STRATOS-148
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/cb38cc92 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/cb38cc92 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/cb38cc92 Branch: refs/heads/master Commit: cb38cc92d87f659c59936841378f1a45bde460b7 Parents: a9714e7 Author: Sajith Kariyawasam <[email protected]> Authored: Mon Dec 2 14:07:56 2013 +0530 Committer: Sajith Kariyawasam <[email protected]> Committed: Mon Dec 2 14:07:56 2013 +0530 ---------------------------------------------------------------------- .../service/RepositoryInformationService.java | 71 ------- .../src/main/resources/META-INF/services.xml | 19 -- .../pom.xml | 119 ------------ .../resources/RepositoryInformationService.wsdl | 193 ------------------- service-stubs/pom.xml | 1 - 5 files changed, 403 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/cb38cc92/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/service/RepositoryInformationService.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/service/RepositoryInformationService.java b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/service/RepositoryInformationService.java deleted file mode 100644 index 6ea6e04..0000000 --- a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/service/RepositoryInformationService.java +++ /dev/null @@ -1,71 +0,0 @@ -/* - * 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.stratos.adc.mgt.service; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.apache.stratos.adc.mgt.dao.RepositoryCredentials; -import org.apache.stratos.adc.mgt.utils.PersistenceManager; - -/** - * - * Exposes information related to internally created repositories - * - */ -public class RepositoryInformationService { - - private static final Log log = LogFactory.getLog(RepositoryInformationService.class); - - public String getRepositoryUrl(int tenantId, String cartridgeType) throws Exception { - - String repoUrl = null; - try { - repoUrl = PersistenceManager.getRepoURL(tenantId, cartridgeType); - } catch (Exception e) { - String msg = "System Exception is occurred when retriving repo URL"; - log.error(msg + ". Reason :" + e.getMessage()); - throw new Exception(msg); - } - if (repoUrl == null) { - log.error("Repository URL is not successfully retrieved " + "for tenant [" + tenantId + - "] and cartridge [" + cartridgeType + "] "); - } - return repoUrl; - } - - public RepositoryCredentials getRepositoryCredentials(int tenantId, String cartridgeType, String alias) throws Exception { - - /*RepositoryCredentials repoCredentials = null; - try { - repoCredentials = PersistenceManager.getRepoCredentials(tenantId,cartridgeType, alias); - } catch (Exception e) { - String msg = "System Exception is occurred when retrieving user credentials"; - log.error(msg + ". Reason :" + e.getMessage()); - throw new Exception(msg); - } - if (repoCredentials == null) { - log.error("Repository credentials are not successfully retrieved " + "for tenant [" + tenantId + - "] and cartridge [" + cartridgeType + "] "); - } - return repoCredentials;*/ - log.error("This method is no longer supported"); - throw new Exception("This method is no longer supported"); - } -} http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/cb38cc92/components/org.apache.stratos.adc.mgt/src/main/resources/META-INF/services.xml ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.adc.mgt/src/main/resources/META-INF/services.xml b/components/org.apache.stratos.adc.mgt/src/main/resources/META-INF/services.xml index ea4a31f..9a36dd9 100644 --- a/components/org.apache.stratos.adc.mgt/src/main/resources/META-INF/services.xml +++ b/components/org.apache.stratos.adc.mgt/src/main/resources/META-INF/services.xml @@ -53,25 +53,6 @@ </parameter> </service> - <service name="RepositoryInformationService" scope="transportsession"> - <schema schemaNamespace="http://org.apache.axis2/xsd"; - elementFormDefaultQualified="true" /> - <transports> - <transport>https</transport> - </transports> - <description> - Exposes information related to internally created - repositories - </description> - <parameter name="ServiceClass">org.apache.stratos.adc.mgt.service.RepositoryInformationService - </parameter> - <parameter name="enableMTOM">true</parameter> - <parameter name="adminService" locked="true">false</parameter> - <parameter name="hiddenService" locked="true">false</parameter> - <parameter name="AuthorizationAction" locked="false"> - /permission/admin/manage/modify/webapp - </parameter> - </service> <service name="InstanceInformationManagementService" scope="transportsession"> <schema schemaNamespace="http://org.apache.axis2/xsd"; http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/cb38cc92/service-stubs/org.apache.stratos.adc.repoinformation.service.stub/pom.xml ---------------------------------------------------------------------- diff --git a/service-stubs/org.apache.stratos.adc.repoinformation.service.stub/pom.xml b/service-stubs/org.apache.stratos.adc.repoinformation.service.stub/pom.xml deleted file mode 100644 index 59d2a60..0000000 --- a/service-stubs/org.apache.stratos.adc.repoinformation.service.stub/pom.xml +++ /dev/null @@ -1,119 +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. - --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> - - <parent> - <groupId>org.apache.stratos</groupId> - <artifactId>stratos-service-stubs-parent</artifactId> - <version>4.0.0-SNAPSHOT</version> - </parent> - - <modelVersion>4.0.0</modelVersion> - <artifactId>org.apache.stratos.adc.repositoryinformation.service.stub</artifactId> - <packaging>bundle</packaging> - <name>Apache Stratos - Repository Information Service Stub</name> - <url>http://apache.org</url> - - <build> - <plugins> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <id>source-code-generation</id> - <phase>process-resources</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <tasks> - <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true"> - <arg line="-uri src/main/resources/RepositoryInformationService.wsdl -u -uw -o target/generated-code -p org.apache.stratos.adc.repository.information"/> - <classpath refid="maven.dependency.classpath"/> - <classpath refid="maven.compile.classpath"/> - <classpath refid="maven.runtime.classpath"/> - </java> - </tasks> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <executions> - <execution> - <id>add-source</id> - <phase>generate-sources</phase> - <goals> - <goal>add-source</goal> - </goals> - <configuration> - <sources> - <source> - target/generated-code/src - </source> - </sources> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - - <extensions>true</extensions> - <configuration> - <instructions> - <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName> - <Bundle-Name>${project.artifactId}</Bundle-Name> - <Export-Package> - org.apache.stratos.adc.repository.information.service.*; version=${project.version}, - org.apache.stratos.adc.repository.information.*; version=${project.version}, - org.apache.stratos.adc.mgt.dao.xsd.*; version=${project.version}, - axis2.apache.org.xsd.*; version=${project.version} - </Export-Package> - <Import-Package> - *;resolution:=optional - </Import-Package> - </instructions> - </configuration> - </plugin> - </plugins> - </build> - - <dependencies> - <dependency> - <groupId>org.apache.axis2.wso2</groupId> - <artifactId>axis2</artifactId> - </dependency> - <dependency> - <groupId>org.apache.axis2.wso2</groupId> - <artifactId>axis2-client</artifactId> - </dependency> - <dependency> - <groupId>wsdl4j.wso2</groupId> - <artifactId>wsdl4j</artifactId> - </dependency> - </dependencies> - -</project> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/cb38cc92/service-stubs/org.apache.stratos.adc.repoinformation.service.stub/src/main/resources/RepositoryInformationService.wsdl ---------------------------------------------------------------------- diff --git a/service-stubs/org.apache.stratos.adc.repoinformation.service.stub/src/main/resources/RepositoryInformationService.wsdl b/service-stubs/org.apache.stratos.adc.repoinformation.service.stub/src/main/resources/RepositoryInformationService.wsdl deleted file mode 100644 index 36c8354..0000000 --- a/service-stubs/org.apache.stratos.adc.repoinformation.service.stub/src/main/resources/RepositoryInformationService.wsdl +++ /dev/null @@ -1,193 +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. - --> - -<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"; xmlns:ax29="http://dao.mgt.adc.stratos.apache.org/xsd"; xmlns:ns1="http://org.apache.axis2/xsd"; xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"; xmlns:http="http://schemas.xmlsoap.org/wsdl/http/"; xmlns:tns="http://service.mgt.adc.stratos.apache.org"; xmlns:xs="http://www.w3.org/2001/XMLSchema"; xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"; xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/"; xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/"; targetNamespace="http://service.mgt.adc.stratos.apache.org";> - <wsdl:documentation>RepositoryInformationService</wsdl:documentation> - <wsdl:types> - <xs:schema xmlns:ns="http://org.apache.axis2/xsd"; xmlns:ax210="http://dao.mgt.adc.stratos.apache.org/xsd"; attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://org.apache.axis2/xsd";> - <xs:import namespace="http://dao.mgt.adc.stratos.apache.org/xsd"/> - <xs:element name="RepositoryInformationServiceException"> - <xs:complexType> - <xs:sequence> - <xs:element minOccurs="0" name="RepositoryInformationServiceException" nillable="true" type="ns1:Exception"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:complexType name="Exception"> - <xs:sequence> - <xs:element minOccurs="0" name="Message" nillable="true" type="xs:string"/> - </xs:sequence> - </xs:complexType> - <xs:element name="getRepositoryUrl"> - <xs:complexType> - <xs:sequence> - <xs:element minOccurs="0" name="tenantId" type="xs:int"/> - <xs:element minOccurs="0" name="cartridgeType" nillable="true" type="xs:string"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="getRepositoryUrlResponse"> - <xs:complexType> - <xs:sequence> - <xs:element minOccurs="0" name="return" nillable="true" type="xs:string"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="getRepositoryCredentials"> - <xs:complexType> - <xs:sequence> - <xs:element minOccurs="0" name="tenantId" type="xs:int"/> - <xs:element minOccurs="0" name="cartridgeType" nillable="true" type="xs:string"/> - <xs:element minOccurs="0" name="alias" nillable="true" type="xs:string"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="getRepositoryCredentialsResponse"> - <xs:complexType> - <xs:sequence> - <xs:element minOccurs="0" name="return" nillable="true" type="ax29:RepositoryCredentials"/> - </xs:sequence> - </xs:complexType> - </xs:element> - </xs:schema> - <xs:schema attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://dao.mgt.adc.stratos.apache.org/xsd";> - <xs:complexType name="RepositoryCredentials"> - <xs:sequence> - <xs:element minOccurs="0" name="password" nillable="true" type="xs:string"/> - <xs:element minOccurs="0" name="url" nillable="true" type="xs:string"/> - <xs:element minOccurs="0" name="userName" nillable="true" type="xs:string"/> - </xs:sequence> - </xs:complexType> - </xs:schema> - </wsdl:types> - <wsdl:message name="getRepositoryCredentialsRequest"> - <wsdl:part name="parameters" element="ns1:getRepositoryCredentials"/> - </wsdl:message> - <wsdl:message name="getRepositoryCredentialsResponse"> - <wsdl:part name="parameters" element="ns1:getRepositoryCredentialsResponse"/> - </wsdl:message> - <wsdl:message name="RepositoryInformationServiceException"> - <wsdl:part name="parameters" element="ns1:RepositoryInformationServiceException"/> - </wsdl:message> - <wsdl:message name="getRepositoryUrlRequest"> - <wsdl:part name="parameters" element="ns1:getRepositoryUrl"/> - </wsdl:message> - <wsdl:message name="getRepositoryUrlResponse"> - <wsdl:part name="parameters" element="ns1:getRepositoryUrlResponse"/> - </wsdl:message> - <wsdl:portType name="RepositoryInformationServicePortType"> - <wsdl:operation name="getRepositoryCredentials"> - <wsdl:input message="tns:getRepositoryCredentialsRequest" wsaw:Action="urn:getRepositoryCredentials"/> - <wsdl:output message="tns:getRepositoryCredentialsResponse" wsaw:Action="urn:getRepositoryCredentialsResponse"/> - <wsdl:fault message="tns:RepositoryInformationServiceException" name="RepositoryInformationServiceException" wsaw:Action="urn:getRepositoryCredentialsRepositoryInformationServiceException"/> - </wsdl:operation> - <wsdl:operation name="getRepositoryUrl"> - <wsdl:input message="tns:getRepositoryUrlRequest" wsaw:Action="urn:getRepositoryUrl"/> - <wsdl:output message="tns:getRepositoryUrlResponse" wsaw:Action="urn:getRepositoryUrlResponse"/> - <wsdl:fault message="tns:RepositoryInformationServiceException" name="RepositoryInformationServiceException" wsaw:Action="urn:getRepositoryUrlRepositoryInformationServiceException"/> - </wsdl:operation> - </wsdl:portType> - <wsdl:binding name="RepositoryInformationServiceSoap11Binding" type="tns:RepositoryInformationServicePortType"> - <soap:binding transport="http://schemas.xmlsoap.org/soap/http"; style="document"/> - <wsdl:operation name="getRepositoryCredentials"> - <soap:operation soapAction="urn:getRepositoryCredentials" style="document"/> - <wsdl:input> - <soap:body use="literal"/> - </wsdl:input> - <wsdl:output> - <soap:body use="literal"/> - </wsdl:output> - <wsdl:fault name="RepositoryInformationServiceException"> - <soap:fault use="literal" name="RepositoryInformationServiceException"/> - </wsdl:fault> - </wsdl:operation> - <wsdl:operation name="getRepositoryUrl"> - <soap:operation soapAction="urn:getRepositoryUrl" style="document"/> - <wsdl:input> - <soap:body use="literal"/> - </wsdl:input> - <wsdl:output> - <soap:body use="literal"/> - </wsdl:output> - <wsdl:fault name="RepositoryInformationServiceException"> - <soap:fault use="literal" name="RepositoryInformationServiceException"/> - </wsdl:fault> - </wsdl:operation> - </wsdl:binding> - <wsdl:binding name="RepositoryInformationServiceSoap12Binding" type="tns:RepositoryInformationServicePortType"> - <soap12:binding transport="http://schemas.xmlsoap.org/soap/http"; style="document"/> - <wsdl:operation name="getRepositoryCredentials"> - <soap12:operation soapAction="urn:getRepositoryCredentials" style="document"/> - <wsdl:input> - <soap12:body use="literal"/> - </wsdl:input> - <wsdl:output> - <soap12:body use="literal"/> - </wsdl:output> - <wsdl:fault name="RepositoryInformationServiceException"> - <soap12:fault use="literal" name="RepositoryInformationServiceException"/> - </wsdl:fault> - </wsdl:operation> - <wsdl:operation name="getRepositoryUrl"> - <soap12:operation soapAction="urn:getRepositoryUrl" style="document"/> - <wsdl:input> - <soap12:body use="literal"/> - </wsdl:input> - <wsdl:output> - <soap12:body use="literal"/> - </wsdl:output> - <wsdl:fault name="RepositoryInformationServiceException"> - <soap12:fault use="literal" name="RepositoryInformationServiceException"/> - </wsdl:fault> - </wsdl:operation> - </wsdl:binding> - <wsdl:binding name="RepositoryInformationServiceHttpBinding" type="tns:RepositoryInformationServicePortType"> - <http:binding verb="POST"/> - <wsdl:operation name="getRepositoryCredentials"> - <http:operation location="getRepositoryCredentials"/> - <wsdl:input> - <mime:content type="text/xml" part="parameters"/> - </wsdl:input> - <wsdl:output> - <mime:content type="text/xml" part="parameters"/> - </wsdl:output> - </wsdl:operation> - <wsdl:operation name="getRepositoryUrl"> - <http:operation location="getRepositoryUrl"/> - <wsdl:input> - <mime:content type="text/xml" part="parameters"/> - </wsdl:input> - <wsdl:output> - <mime:content type="text/xml" part="parameters"/> - </wsdl:output> - </wsdl:operation> - </wsdl:binding> - <wsdl:service name="RepositoryInformationService"> - <wsdl:port name="RepositoryInformationServiceHttpsSoap11Endpoint" binding="tns:RepositoryInformationServiceSoap11Binding"> - <soap:address location="https://10.100.2.139:9443/services/RepositoryInformationService.RepositoryInformationServiceHttpsSoap11Endpoint/"/> - </wsdl:port> - <wsdl:port name="RepositoryInformationServiceHttpsSoap12Endpoint" binding="tns:RepositoryInformationServiceSoap12Binding"> - <soap12:address location="https://10.100.2.139:9443/services/RepositoryInformationService.RepositoryInformationServiceHttpsSoap12Endpoint/"/> - </wsdl:port> - <wsdl:port name="RepositoryInformationServiceHttpsEndpoint" binding="tns:RepositoryInformationServiceHttpBinding"> - <http:address location="https://10.100.2.139:9443/services/RepositoryInformationService.RepositoryInformationServiceHttpsEndpoint/"/> - </wsdl:port> - </wsdl:service> -</wsdl:definitions> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/cb38cc92/service-stubs/pom.xml ---------------------------------------------------------------------- diff --git a/service-stubs/pom.xml b/service-stubs/pom.xml index 47e04ee..908b70a 100644 --- a/service-stubs/pom.xml +++ b/service-stubs/pom.xml @@ -51,7 +51,6 @@ <module>org.apache.stratos.tenant.register.gapp.stub</module> <module>org.apache.stratos.redirector.servlet.stub</module> <module>org.apache.stratos.adc.reponotification.service.stub</module> - <module>org.apache.stratos.adc.repoinformation.service.stub</module> <module>org.apache.stratos.adc.topologymgt.service.stub</module> <module>org.apache.stratos.billing.mgt.stub</module> <module>org.apache.stratos.throttle.stub</module>
