Modified: airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/security/AuthenticationFilter.java URL: http://svn.apache.org/viewvc/airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/security/AuthenticationFilter.java?rev=1390647&r1=1390646&r2=1390647&view=diff ============================================================================== --- airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/security/AuthenticationFilter.java (original) +++ airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/security/AuthenticationFilter.java Wed Sep 26 18:35:14 2012 @@ -1,61 +1,3 @@ -/* - * - * 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.airavata.services.registry.rest.security; - -import com.sun.jersey.spi.container.ContainerRequest; -import com.sun.jersey.spi.container.ContainerRequestFilter; - -import javax.ws.rs.core.MultivaluedMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; - -/** - * Filter which intercept requests and do authentication. - */ -public class AuthenticationFilter implements ContainerRequestFilter { - - - public ContainerRequest filter(ContainerRequest containerRequest) { - - System.out.println("Filter called !!"); - - MultivaluedMap<String,String> mmap = containerRequest.getRequestHeaders(); - - Iterator<Map.Entry<String, List<String>>> iterator = mmap.entrySet().iterator(); - - while (iterator.hasNext()) { - Map.Entry<String, List<String>> entry = iterator.next(); - System.out.println(entry.getKey()); - - List<String> lstString = entry.getValue(); - - for (String s : lstString) { - System.out.println(s); - } - } - - return containerRequest; //To change body of implemented methods use File | Settings | File Templates. - } -} package org.apache.airavata.services.registry.rest.security; import com.sun.jersey.spi.container.ContainerRequest;
Modified: airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/utils/RegistryListener.java URL: http://svn.apache.org/viewvc/airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/utils/RegistryListener.java?rev=1390647&r1=1390646&r2=1390647&view=diff ============================================================================== --- airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/utils/RegistryListener.java (original) +++ airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/utils/RegistryListener.java Wed Sep 26 18:35:14 2012 @@ -1,185 +1,35 @@ package org.apache.airavata.services.registry.rest.utils; -import org.apache.airavata.registry.api.AiravataRegistry; -import org.apache.airavata.registry.api.Axis2Registry; -import org.apache.airavata.registry.api.DataRegistry; -import org.apache.airavata.registry.api.impl.AiravataJCRRegistry; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import org.apache.airavata.registry.api.AiravataRegistry2; +import org.apache.airavata.registry.api.AiravataRegistryFactory; +import org.apache.airavata.registry.api.AiravataUser; +import org.apache.airavata.registry.api.Gateway; import javax.servlet.ServletContext; import javax.servlet.ServletContextEvent; import javax.servlet.ServletContextListener; -import java.net.URI; -import java.util.HashMap; public class RegistryListener implements ServletContextListener { - private static AiravataRegistry airavataRegistry; - private static Axis2Registry axis2Registry; - private static DataRegistry dataRegistry; - - - protected static Logger log = LoggerFactory.getLogger(RegistryListener.class); - - - public void contextInitialized(ServletContextEvent servletContextEvent) { - try { - ServletContext servletContext = servletContextEvent.getServletContext(); - URI url = new URI("http://localhost:8081/rmi";); - String username = "admin"; - String password = "admin"; - HashMap<String, String> map = new HashMap<String, String>(); - map.put("org.apache.jackrabbit.repository.uri", url.toString()); - - - airavataRegistry = new AiravataJCRRegistry(url, - "org.apache.jackrabbit.rmi.repository.RmiRepositoryFactory", username, password, map); - - axis2Registry = new AiravataJCRRegistry(url, - "org.apache.jackrabbit.rmi.repository.RmiRepositoryFactory", username, password, map); - - dataRegistry = new AiravataJCRRegistry(url, - "org.apache.jackrabbit.rmi.repository.RmiRepositoryFactory", username, password, map); - - servletContext.setAttribute("airavataRegistry", airavataRegistry); - servletContext.setAttribute("axis2Registry", axis2Registry); - servletContext.setAttribute("dataRegistry", dataRegistry); - } catch (Exception e) { - e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates. - } - } - - - public void contextDestroyed(ServletContextEvent servletContextEvent) { - - } -} -/* - * - * 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.airavata.services.registry.rest.utils; - -import org.apache.airavata.common.registry.api.exception.RegistryException; -import org.apache.airavata.registry.api.AiravataRegistry; -import org.apache.airavata.registry.api.Axis2Registry; -import org.apache.airavata.registry.api.DataRegistry; -import org.apache.airavata.registry.api.impl.AiravataJCRRegistry; - -import javax.jcr.RepositoryException; -import javax.servlet.ServletContext; -import javax.servlet.ServletContextEvent; -import javax.servlet.ServletContextListener; -import java.net.URI; -import java.net.URISyntaxException; -import java.util.HashMap; - -public class RegistryListener implements ServletContextListener { - - private static AiravataRegistry airavataRegistry; - private static Axis2Registry axis2Registry; - private static DataRegistry dataRegistry; + private static AiravataRegistry2 airavataRegistry; +// private static Axis2Registry axis2Registry; +// private static DataRegistry dataRegistry; public void contextInitialized(ServletContextEvent servletContextEvent) { try{ ServletContext servletContext = servletContextEvent.getServletContext(); - URI url = new URI("http://localhost:8081/rmi";); - String username = "admin"; - String password = "admin"; - HashMap<String, String> map = new HashMap<String, String>(); - map.put("org.apache.jackrabbit.repository.uri", url.toString()); - - - airavataRegistry = new AiravataJCRRegistry(url, - "org.apache.jackrabbit.rmi.repository.RmiRepositoryFactory", username, password, map); - - axis2Registry =new AiravataJCRRegistry(url, - "org.apache.jackrabbit.rmi.repository.RmiRepositoryFactory", username, password, map); +// URI url = new URI("http://localhost:8081/rmi";); +// String username = "admin"; +// String password = "admin"; +// HashMap<String, String> map = new HashMap<String, String>(); +// map.put("org.apache.jackrabbit.repository.uri", url.toString()); - dataRegistry = new AiravataJCRRegistry(url, - "org.apache.jackrabbit.rmi.repository.RmiRepositoryFactory", username, password, map); + airavataRegistry = AiravataRegistryFactory.getRegistry(new Gateway("default"), new AiravataUser("admin")); servletContext.setAttribute("airavataRegistry", airavataRegistry); - servletContext.setAttribute("axis2Registry", axis2Registry); - servletContext.setAttribute("dataRegistry", dataRegistry); - } catch (URISyntaxException e) { + }catch (Exception e) { e.printStackTrace(); - } catch (RegistryException e) { - e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates. } - - } - - public void contextDestroyed(ServletContextEvent servletContextEvent) { - - } -} -package org.apache.airavata.services.registry.rest.utils; - -import org.apache.airavata.registry.api.AiravataRegistry; -import org.apache.airavata.registry.api.Axis2Registry; -import org.apache.airavata.registry.api.DataRegistry; -import org.apache.airavata.registry.api.impl.AiravataJCRRegistry; - -import javax.jcr.RepositoryException; -import javax.servlet.ServletContext; -import javax.servlet.ServletContextEvent; -import javax.servlet.ServletContextListener; -import java.net.URI; -import java.net.URISyntaxException; -import java.util.HashMap; - -public class RegistryListener implements ServletContextListener { - - private static AiravataRegistry airavataRegistry; - private static Axis2Registry axis2Registry; - private static DataRegistry dataRegistry; - - public void contextInitialized(ServletContextEvent servletContextEvent) { - try{ - ServletContext servletContext = servletContextEvent.getServletContext(); - URI url = new URI("http://localhost:8081/rmi";); - String username = "admin"; - String password = "admin"; - HashMap<String, String> map = new HashMap<String, String>(); - map.put("org.apache.jackrabbit.repository.uri", url.toString()); - - - airavataRegistry = new AiravataJCRRegistry(url, - "org.apache.jackrabbit.rmi.repository.RmiRepositoryFactory", username, password, map); - - axis2Registry =new AiravataJCRRegistry(url, - "org.apache.jackrabbit.rmi.repository.RmiRepositoryFactory", username, password, map); - - dataRegistry = new AiravataJCRRegistry(url, - "org.apache.jackrabbit.rmi.repository.RmiRepositoryFactory", username, password, map); - - servletContext.setAttribute("airavataRegistry", airavataRegistry); - servletContext.setAttribute("axis2Registry", axis2Registry); - servletContext.setAttribute("dataRegistry", dataRegistry); - }catch (RepositoryException e) { - e.printStackTrace(); - } catch (URISyntaxException e) { - e.printStackTrace(); - } - } public void contextDestroyed(ServletContextEvent servletContextEvent) { Modified: airavata/sandbox/airavata-registry-rest/src/main/resources/ServiceMessage.xsd URL: http://svn.apache.org/viewvc/airavata/sandbox/airavata-registry-rest/src/main/resources/ServiceMessage.xsd?rev=1390647&r1=1390646&r2=1390647&view=diff ============================================================================== --- airavata/sandbox/airavata-registry-rest/src/main/resources/ServiceMessage.xsd (original) +++ airavata/sandbox/airavata-registry-rest/src/main/resources/ServiceMessage.xsd Wed Sep 26 18:35:14 2012 @@ -174,363 +174,3 @@ </xs:annotation> </xs:element> </xs:schema> -<?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. --> - -<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"; elementFormDefault="qualified"> - <xs:element name="Message"> - <xs:complexType> - <xs:sequence> - <xs:element ref="Header"/> - <xs:element ref="Body"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="Header"> - <xs:complexType> - <xs:sequence> - <xs:element ref="experimentid" minOccurs="0" maxOccurs="1"/> - <xs:element ref="hostname" minOccurs="0" maxOccurs="1"/> - <xs:element ref="processorcount" minOccurs="0" maxOccurs="1"/> - <xs:element ref="hostcount" minOccurs="0" maxOccurs="1"/> - <xs:element ref="queuename" minOccurs="0" maxOccurs="1"/> - <xs:element ref="walltime" minOccurs="0" maxOccurs="1"/> - <xs:element ref="gfaclocation" minOccurs="0" maxOccurs="1"/> - <xs:element ref="user" minOccurs="0" maxOccurs="1"/> - <xs:element ref="messengerURL" minOccurs="0" maxOccurs="1"/> - <xs:element ref="serviceName" minOccurs="0" maxOccurs="1"/> - <xs:element ref="workflowName" minOccurs="0" maxOccurs="1"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="experimentid" type="xs:string"> - <xs:annotation> - <xs:documentation>Host name</xs:documentation> - </xs:annotation> - </xs:element> - <xs:element name="hostname" type="xs:string"> - <xs:annotation> - <xs:documentation>Host name</xs:documentation> - </xs:annotation> - </xs:element> - <xs:element name="processorcount" type="xs:int"> - <xs:annotation> - <xs:documentation>Process Count</xs:documentation> - </xs:annotation> - </xs:element> - <xs:element name="hostcount" type="xs:int"> - <xs:annotation> - <xs:documentation>Process Count</xs:documentation> - </xs:annotation> - </xs:element> - <xs:element name="queuename" type="xs:string"> - <xs:annotation> - <xs:documentation>Queue Name</xs:documentation> - </xs:annotation> - </xs:element> - <xs:element name="walltime" type="xs:int"> - <xs:annotation> - <xs:documentation>Walltime</xs:documentation> - </xs:annotation> - </xs:element> - <xs:element name="gfaclocation" type="xs:string"> - <xs:annotation> - <xs:documentation>Gfac location</xs:documentation> - </xs:annotation> - </xs:element> - <xs:element name="user" type="xs:string"> - <xs:annotation> - <xs:documentation>User information</xs:documentation> - </xs:annotation> - </xs:element> - <xs:element name="messengerURL" type="xs:string"> - <xs:annotation> - <xs:documentation>Messenger URL information</xs:documentation> - </xs:annotation> - </xs:element> - <xs:element name="serviceName" type="xs:string"> - <xs:annotation> - <xs:documentation>Service Name</xs:documentation> - </xs:annotation> - </xs:element> - <xs:element name="workflowName" type="xs:string"> - <xs:annotation> - <xs:documentation>Workflow Name</xs:documentation> - </xs:annotation> - </xs:element> - <xs:element name="Body"> - <xs:complexType> - <xs:sequence> - <xs:element ref="inputs" minOccurs="0" maxOccurs="1"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="inputs"> - <xs:complexType> - <xs:sequence> - <xs:element ref="input" minOccurs="0" maxOccurs="unbounded"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="input"> - <xs:complexType> - <xs:sequence> - <xs:element ref="name" minOccurs="0" maxOccurs="1"/> - <xs:element ref="param" minOccurs="0" maxOccurs="1"/> - <xs:element ref="value" minOccurs="0" maxOccurs="1"/> - <xs:element ref="type" minOccurs="0" maxOccurs="1"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="name" type="xs:string"> - <xs:annotation> - <xs:documentation>Input Name</xs:documentation> - </xs:annotation> - </xs:element> - <xs:element name="param" type="xs:string"> - <xs:annotation> - <xs:documentation>Input Params</xs:documentation> - </xs:annotation> - </xs:element> - <xs:element name="value" type="xs:string"> - <xs:annotation> - <xs:documentation>Input Value</xs:documentation> - </xs:annotation> - </xs:element> - <xs:element name="type" type="xs:string"> - <xs:annotation> - <xs:documentation>Input Type</xs:documentation> - </xs:annotation> - </xs:element> - <xs:element name="MessageResponse"> - <xs:complexType> - <xs:sequence> - <xs:element ref="experimentid" minOccurs="0" maxOccurs="1"/> - <xs:element ref="status" minOccurs="0" maxOccurs="1"/> - <xs:element ref="message" minOccurs="0" maxOccurs="1"/> - <xs:element ref="inputs" minOccurs="0" maxOccurs="1"/> - <xs:element ref="outputs" minOccurs="0" maxOccurs="1"/> - <xs:element ref="stdout" minOccurs="0" maxOccurs="1"/> - <xs:element ref="stderr" minOccurs="0" maxOccurs="1"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="status" type="xs:string"> - <xs:annotation> - <xs:documentation>Status</xs:documentation> - </xs:annotation> - </xs:element> - <xs:element name="message" type="xs:string"> - <xs:annotation> - <xs:documentation>Message</xs:documentation> - </xs:annotation> - </xs:element> - <xs:element name="outputs"> - <xs:complexType> - <xs:sequence> - <xs:element ref="output" minOccurs="0" maxOccurs="unbounded"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="output"> - <xs:complexType> - <xs:sequence> - <xs:element ref="name" minOccurs="0" maxOccurs="1"/> - <xs:element ref="value" minOccurs="0" maxOccurs="1"/> - <xs:element ref="type" minOccurs="0" maxOccurs="1"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="stdout" type="xs:string"> - <xs:annotation> - <xs:documentation>stdout </xs:documentation> - </xs:annotation> - </xs:element> - <xs:element name="stderr" type="xs:string"> - <xs:annotation> - <xs:documentation>stderr</xs:documentation> - </xs:annotation> - </xs:element> -</xs:schema> -<?xml version="1.0" encoding="UTF-8"?> -<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"; elementFormDefault="qualified"> - <xs:element name="Message"> - <xs:complexType> - <xs:sequence> - <xs:element ref="Header"/> - <xs:element ref="Body"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="Header"> - <xs:complexType> - <xs:sequence> - <xs:element ref="experimentid" minOccurs="0" maxOccurs="1"/> - <xs:element ref="hostname" minOccurs="0" maxOccurs="1"/> - <xs:element ref="processorcount" minOccurs="0" maxOccurs="1"/> - <xs:element ref="hostcount" minOccurs="0" maxOccurs="1"/> - <xs:element ref="queuename" minOccurs="0" maxOccurs="1"/> - <xs:element ref="walltime" minOccurs="0" maxOccurs="1"/> - <xs:element ref="gfaclocation" minOccurs="0" maxOccurs="1"/> - <xs:element ref="user" minOccurs="0" maxOccurs="1"/> - <xs:element ref="messengerURL" minOccurs="0" maxOccurs="1"/> - <xs:element ref="serviceName" minOccurs="0" maxOccurs="1"/> - <xs:element ref="workflowName" minOccurs="0" maxOccurs="1"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="experimentid" type="xs:string"> - <xs:annotation> - <xs:documentation>Host name</xs:documentation> - </xs:annotation> - </xs:element> - <xs:element name="hostname" type="xs:string"> - <xs:annotation> - <xs:documentation>Host name</xs:documentation> - </xs:annotation> - </xs:element> - <xs:element name="processorcount" type="xs:int"> - <xs:annotation> - <xs:documentation>Process Count</xs:documentation> - </xs:annotation> - </xs:element> - <xs:element name="hostcount" type="xs:int"> - <xs:annotation> - <xs:documentation>Process Count</xs:documentation> - </xs:annotation> - </xs:element> - <xs:element name="queuename" type="xs:string"> - <xs:annotation> - <xs:documentation>Queue Name</xs:documentation> - </xs:annotation> - </xs:element> - <xs:element name="walltime" type="xs:int"> - <xs:annotation> - <xs:documentation>Walltime</xs:documentation> - </xs:annotation> - </xs:element> - <xs:element name="gfaclocation" type="xs:string"> - <xs:annotation> - <xs:documentation>Gfac location</xs:documentation> - </xs:annotation> - </xs:element> - <xs:element name="user" type="xs:string"> - <xs:annotation> - <xs:documentation>User information</xs:documentation> - </xs:annotation> - </xs:element> - <xs:element name="messengerURL" type="xs:string"> - <xs:annotation> - <xs:documentation>Messenger URL information</xs:documentation> - </xs:annotation> - </xs:element> - <xs:element name="serviceName" type="xs:string"> - <xs:annotation> - <xs:documentation>Service Name</xs:documentation> - </xs:annotation> - </xs:element> - <xs:element name="workflowName" type="xs:string"> - <xs:annotation> - <xs:documentation>Workflow Name</xs:documentation> - </xs:annotation> - </xs:element> - <xs:element name="Body"> - <xs:complexType> - <xs:sequence> - <xs:element ref="inputs" minOccurs="0" maxOccurs="1"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="inputs"> - <xs:complexType> - <xs:sequence> - <xs:element ref="input" minOccurs="0" maxOccurs="unbounded"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="input"> - <xs:complexType> - <xs:sequence> - <xs:element ref="name" minOccurs="0" maxOccurs="1"/> - <xs:element ref="param" minOccurs="0" maxOccurs="1"/> - <xs:element ref="value" minOccurs="0" maxOccurs="1"/> - <xs:element ref="type" minOccurs="0" maxOccurs="1"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="name" type="xs:string"> - <xs:annotation> - <xs:documentation>Input Name</xs:documentation> - </xs:annotation> - </xs:element> - <xs:element name="param" type="xs:string"> - <xs:annotation> - <xs:documentation>Input Params</xs:documentation> - </xs:annotation> - </xs:element> - <xs:element name="value" type="xs:string"> - <xs:annotation> - <xs:documentation>Input Value</xs:documentation> - </xs:annotation> - </xs:element> - <xs:element name="type" type="xs:string"> - <xs:annotation> - <xs:documentation>Input Type</xs:documentation> - </xs:annotation> - </xs:element> - <xs:element name="MessageResponse"> - <xs:complexType> - <xs:sequence> - <xs:element ref="experimentid" minOccurs="0" maxOccurs="1"/> - <xs:element ref="status" minOccurs="0" maxOccurs="1"/> - <xs:element ref="message" minOccurs="0" maxOccurs="1"/> - <xs:element ref="inputs" minOccurs="0" maxOccurs="1"/> - <xs:element ref="outputs" minOccurs="0" maxOccurs="1"/> - <xs:element ref="stdout" minOccurs="0" maxOccurs="1"/> - <xs:element ref="stderr" minOccurs="0" maxOccurs="1"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="status" type="xs:string"> - <xs:annotation> - <xs:documentation>Status</xs:documentation> - </xs:annotation> - </xs:element> - <xs:element name="message" type="xs:string"> - <xs:annotation> - <xs:documentation>Message</xs:documentation> - </xs:annotation> - </xs:element> - <xs:element name="outputs"> - <xs:complexType> - <xs:sequence> - <xs:element ref="output" minOccurs="0" maxOccurs="unbounded"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="output"> - <xs:complexType> - <xs:sequence> - <xs:element ref="name" minOccurs="0" maxOccurs="1"/> - <xs:element ref="value" minOccurs="0" maxOccurs="1"/> - <xs:element ref="type" minOccurs="0" maxOccurs="1"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="stdout" type="xs:string"> - <xs:annotation> - <xs:documentation>stdout </xs:documentation> - </xs:annotation> - </xs:element> - <xs:element name="stderr" type="xs:string"> - <xs:annotation> - <xs:documentation>stderr</xs:documentation> - </xs:annotation> - </xs:element> -</xs:schema> Modified: airavata/sandbox/airavata-registry-rest/src/main/resources/log4j.xml URL: http://svn.apache.org/viewvc/airavata/sandbox/airavata-registry-rest/src/main/resources/log4j.xml?rev=1390647&r1=1390646&r2=1390647&view=diff ============================================================================== --- airavata/sandbox/airavata-registry-rest/src/main/resources/log4j.xml (original) +++ airavata/sandbox/airavata-registry-rest/src/main/resources/log4j.xml Wed Sep 26 18:35:14 2012 @@ -46,101 +46,4 @@ <appender-ref ref="console" /> </root> -</log4j:configuration> -<?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. - ---> -<!DOCTYPE log4j:configuration PUBLIC "-//LOGGER" "log4j.dtd"> -<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/";> - - <!-- Appenders --> - <appender name="console" class="org.apache.log4j.ConsoleAppender"> - <param name="Target" value="System.out" /> - <layout class="org.apache.log4j.PatternLayout"> - <param name="ConversionPattern" value="%-5p: %c - %m%n" /> - </layout> - </appender> - - <!-- Jersey logger --> - <logger name="com.sun.jersey"> - <level value="info" /> - </logger> - - <!-- Airavata logger --> - <logger name="org.apache.airavata"> - <level value="info" /> - </logger> - - <!-- Root Logger --> - <root> - <priority value="info" /> - <appender-ref ref="console" /> - </root> - -</log4j:configuration> -<?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. - - $Id$ ---> -<!DOCTYPE log4j:configuration PUBLIC "-//LOGGER" "log4j.dtd"> -<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/";> - - <!-- Appenders --> - <appender name="console" class="org.apache.log4j.ConsoleAppender"> - <param name="Target" value="System.out" /> - <layout class="org.apache.log4j.PatternLayout"> - <param name="ConversionPattern" value="%-5p: %c - %m%n" /> - </layout> - </appender> - - <!-- Jersey logger --> - <logger name="com.sun.jersey"> - <level value="info" /> - </logger> - - <!-- Airavata logger --> - <logger name="org.apache.airavata"> - <level value="info" /> - </logger> - - <!-- Root Logger --> - <root> - <priority value="info" /> - <appender-ref ref="console" /> - </root> - </log4j:configuration> \ No newline at end of file Modified: airavata/sandbox/airavata-registry-rest/src/main/resources/service.properties URL: http://svn.apache.org/viewvc/airavata/sandbox/airavata-registry-rest/src/main/resources/service.properties?rev=1390647&r1=1390646&r2=1390647&view=diff ============================================================================== --- airavata/sandbox/airavata-registry-rest/src/main/resources/service.properties (original) +++ airavata/sandbox/airavata-registry-rest/src/main/resources/service.properties Wed Sep 26 18:35:14 2012 @@ -19,45 +19,3 @@ jcr.username=admin jcr.password=admin jcr.url=http://localhost:8081/rmi -# -# 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. -# -jcr.username=admin -jcr.password=admin -jcr.url=http://localhost:8081/rmi -# -# 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. -# -jcr.username=admin -jcr.password=admin -jcr.url=http://localhost:8081/rmi Modified: airavata/sandbox/airavata-registry-rest/src/main/webapp/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/airavata/sandbox/airavata-registry-rest/src/main/webapp/WEB-INF/web.xml?rev=1390647&r1=1390646&r2=1390647&view=diff ============================================================================== --- airavata/sandbox/airavata-registry-rest/src/main/webapp/WEB-INF/web.xml (original) +++ airavata/sandbox/airavata-registry-rest/src/main/webapp/WEB-INF/web.xml Wed Sep 26 18:35:14 2012 @@ -6,86 +6,6 @@ <listener-class>org.apache.airavata.services.registry.rest.utils.RegistryListener</listener-class> </listener> <!--context-param> - <param-name>authenticatorConfigurations</param-name> - <param-value>/WEB-INF/classes/authenticator.configurations.xml</param-value> - </context-param --> - - <filter> - <filter-name>AuthenticationFilter</filter-name> - <filter-class>org.apache.airavata.services.registry.rest.security.HttpAuthenticatorFilter</filter-class> - <init-param> - <param-name>authenticatorConfigurations</param-name> - <param-value>authenticators.xml</param-value> - </init-param> - </filter> - - <servlet> - <servlet-name>Airavata Web Application</servlet-name> - <servlet-class>com.sun.jersey.spi.container.servlet.ServletContainer</servlet-class> - <init-param> - <param-name>com.sun.jersey.config.property.packages</param-name> - <param-value>org.apache.airavata.services.registry.rest</param-value> - </init-param> - <!--init-param> - <param-name>com.sun.jersey.spi.container.ContainerRequestFilters</param-name> - <param-value>org.apache.airavata.services.registry.rest.security.JerseyAuthenticatorFilter</param-value> - </init-param --> - <load-on-startup>1</load-on-startup> - </servlet> - <servlet-mapping> - <servlet-name>Airavata Web Application</servlet-name> - <url-pattern>/*</url-pattern> - </servlet-mapping> - <filter-mapping> - <filter-name>AuthenticationFilter</filter-name> - <url-pattern>/*</url-pattern> - </filter-mapping> -</web-app> -<?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. --> - -<!-- This web.xml file is not required when using Servlet 3.0 container, - see implementation details http://jersey.java.net/nonav/documentation/latest/jax-rs.html#d4e194 --> -<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";> - <listener> - <listener-class>org.apache.airavata.services.registry.rest.utils.RegistryListener</listener-class> - </listener> - <!--context-param> - <param-name>configFile</param-name> - <param-value>/WEB-INF/classes/service.properties</param-value> - </context-param--> - <servlet> - <servlet-name>Airavata Web Application</servlet-name> - <servlet-class>com.sun.jersey.spi.container.servlet.ServletContainer</servlet-class> - <init-param> - <param-name>com.sun.jersey.config.property.packages</param-name> - <param-value>org.apache.airavata.services.registry.rest</param-value> - </init-param> - <init-param> - <param-name>com.sun.jersey.spi.container.ContainerRequestFilters</param-name> - <param-value>org.apache.airavata.services.registry.rest.security.AuthenticationFilter</param-value> - </init-param> - <load-on-startup>1</load-on-startup> - </servlet> - <servlet-mapping> - <servlet-name>Airavata Web Application</servlet-name> - <url-pattern>/*</url-pattern> - </servlet-mapping> -</web-app> -<?xml version="1.0" encoding="UTF-8"?> -<!-- This web.xml file is not required when using Servlet 3.0 container, - see implementation details http://jersey.java.net/nonav/documentation/latest/jax-rs.html#d4e194 --> -<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";> - <listener> - <listener-class>org.apache.airavata.services.registry.rest.utils.RegistryListener</listener-class> - </listener> - <!--context-param> <param-name>configFile</param-name> <param-value>/WEB-INF/classes/service.properties</param-value> </context-param--> Modified: airavata/sandbox/airavata-registry-rest/src/main/webapp/index.jsp URL: http://svn.apache.org/viewvc/airavata/sandbox/airavata-registry-rest/src/main/webapp/index.jsp?rev=1390647&r1=1390646&r2=1390647&view=diff ============================================================================== --- airavata/sandbox/airavata-registry-rest/src/main/webapp/index.jsp (original) +++ airavata/sandbox/airavata-registry-rest/src/main/webapp/index.jsp Wed Sep 26 18:35:14 2012 @@ -6,35 +6,3 @@ for more information on Jersey! </body> </html> -<%-- - 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. ---%> -<html> -<body> -<h2>Jersey RESTful Web Application!</h2> -<p><a href="webresources/myresource">Jersey resource</a> -<p>Visit the <a href="http://jersey.java.net";>Project Jersey website</a> -for more information on Jersey! -</body> -</html> -<html> -<body> -<h2>Jersey RESTful Web Application!</h2> -<p><a href="webresources/myresource">Jersey resource</a> -<p>Visit the <a href="http://jersey.java.net";>Project Jersey website</a> -for more information on Jersey! -</body> -</html> Modified: airavata/sandbox/airavata-registry-rest/src/test/resources/service.properties URL: http://svn.apache.org/viewvc/airavata/sandbox/airavata-registry-rest/src/test/resources/service.properties?rev=1390647&r1=1390646&r2=1390647&view=diff ============================================================================== --- airavata/sandbox/airavata-registry-rest/src/test/resources/service.properties (original) +++ airavata/sandbox/airavata-registry-rest/src/test/resources/service.properties Wed Sep 26 18:35:14 2012 @@ -19,45 +19,3 @@ jcr.username=admin jcr.password=admin jcr.url=http://localhost:8081/rmi -# -# 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. -# -jcr.username=$USER -jcr.password=$PWD -jcr.url=http://localhost:8081/rmi -# -# 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. -# -jcr.username=$USER -jcr.password=$PWD -jcr.url=http://localhost:8081/rmi
